Fix FileExcluder on Windows

staabm · web-flow · commit aefc87a6cf99 · 2024-09-17T10:18:33.000+02:00
diff --git a/src/File/FileExcluder.php b/src/File/FileExcluder.php
@@ -50,7 +50,7 @@ final class FileExcluder
 	 * @param string[] $analyseExcludes
 	 */
 	public function __construct(
-		FileHelper $fileHelper,
+		private FileHelper $fileHelper,
 		array $analyseExcludes,
 	)
 	{
@@ -89,6 +89,8 @@ public function __construct(
 
 	public function isExcludedFromAnalysing(string $file): bool
 	{
+		$file = $this->fileHelper->normalizePath($file);
+
 		foreach ($this->literalAnalyseExcludes as $exclude) {
 			if (str_starts_with($file, $exclude)) {
 				return true;
diff --git a/tests/PHPStan/File/FileExcluderTest.php b/tests/PHPStan/File/FileExcluderTest.php
@@ -64,7 +64,7 @@ public function dataExcludeOnWindows(): array
 			],
 			[
 				__DIR__ . '\data\parse-error.php',
-				['tests/PHPStan/File/data/*'],
+				['*/tests/PHPStan/File/data/*'],
 				true,
 			],
 			[

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ final class FileExcluder`
`50`	`50`	`* @param string[] $analyseExcludes`
`51`	`51`	`*/`
`52`	`52`	`public function __construct(`
`53`		`- FileHelper $fileHelper,`
	`53`	`+ private FileHelper $fileHelper,`
`54`	`54`	`array $analyseExcludes,`
`55`	`55`	`)`
`56`	`56`	`{`
`@@ -89,6 +89,8 @@ public function __construct(`
`89`	`89`
`90`	`90`	`public function isExcludedFromAnalysing(string $file): bool`
`91`	`91`	`{`
	`92`	`+ $file = $this->fileHelper->normalizePath($file);`
	`93`	`+`
`92`	`94`	`foreach ($this->literalAnalyseExcludes as $exclude) {`
`93`	`95`	`if (str_starts_with($file, $exclude)) {`
`94`	`96`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public function dataExcludeOnWindows(): array`
`64`	`64`	`],`
`65`	`65`	`[`
`66`	`66`	`__DIR__ . '\data\parse-error.php',`
`67`		`- ['tests/PHPStan/File/data/*'],`
	`67`	`+ ['/tests/PHPStan/File/data/'],`
`68`	`68`	`true,`
`69`	`69`	`],`
`70`	`70`	`[`