More fixes

Author: ondrejmirtes

phpstan-baseline.neon

@@ -130,31 +130,6 @@ parameters:
 			count: 1
 			path: src/Reflection/BetterReflection/SourceLocator/OptimizedDirectorySourceLocator.php
 
-		-
-			message: "#^Parameter \\#1 \\$haystack of function strrpos expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/Reflection/BetterReflection/SourceLocator/OptimizedDirectorySourceLocator.php
-
-		-
-			message: "#^Parameter \\#1 \\$string of function substr expects string, string\\|null given\\.$#"
-			count: 3
-			path: src/Reflection/BetterReflection/SourceLocator/OptimizedDirectorySourceLocator.php
-
-		-
-			message: "#^Parameter \\#2 \\$subject of function preg_match expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/Reflection/BetterReflection/SourceLocator/OptimizedDirectorySourceLocator.php
-
-		-
-			message: "#^Parameter \\#2 \\$subject of function preg_match_all expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/Reflection/BetterReflection/SourceLocator/OptimizedDirectorySourceLocator.php
-
-		-
-			message: "#^Parameter \\#3 \\$subject of function preg_replace expects array\\|string, string\\|null given\\.$#"
-			count: 4
-			path: src/Reflection/BetterReflection/SourceLocator/OptimizedDirectorySourceLocator.php
-
 		-
 			message: "#^Method PHPStan\\\\Reflection\\\\ClassReflection\\:\\:__construct\\(\\) has parameter \\$reflection with generic class ReflectionClass but does not specify its types\\: T$#"
 			count: 1

src/Reflection/BetterReflection/SourceLocator/OptimizedDirectorySourceLocator.php

@@ -208,15 +208,24 @@ private function findSymbols(string $file): array
 		}
 		// strip strings
 		$contents = preg_replace('{"[^"\\\\]*+(\\\\.[^"\\\\]*+)*+"|\'[^\'\\\\]*+(\\\\.[^\'\\\\]*+)*+\'}s', 'null', $contents);
+		if ($contents === null) {
+			return ['classes' => [], 'functions' => []];
+		}
 		// strip leading non-php code if needed
 		if (substr($contents, 0, 2) !== '<?') {
 			$contents = preg_replace('{^.+?<\?}s', '<?', $contents, 1, $replacements);
+			if ($contents === null) {
+				return ['classes' => [], 'functions' => []];
+			}
 			if ($replacements === 0) {
 				return ['classes' => [], 'functions' => []];
 			}
 		}
 		// strip non-php blocks in the file
 		$contents = preg_replace('{\?>(?:[^<]++|<(?!\?))*+<\?}s', '?><?', $contents);
+		if ($contents === null) {
+			return ['classes' => [], 'functions' => []];
+		}
 		// strip trailing non-php code if needed
 		$pos = strrpos($contents, '?>');
 		if ($pos !== false && strpos(substr($contents, $pos), '<?') === false) {
@@ -225,6 +234,9 @@ private function findSymbols(string $file): array
 		// strip comments if short open tags are in the file
 		if (preg_match('{(<\?)(?!(php|hh))}i', $contents)) {
 			$contents = preg_replace('{//.* | /\*(?:[^*]++|\*(?!/))*\*/}x', '', $contents);
+			if ($contents === null) {
+				return ['classes' => [], 'functions' => []];
+			}
 		}
 
 		preg_match_all('{