Only analysis FileExcluder excludes stub files

ondrejmirtes · ondrejmirtes · commit 8ef5163f906f · 2023-01-12T13:30:52.000+01:00
This will allow us to use ReflectionProvider in StubFilesExtension
diff --git a/src/Analyser/IgnoredError.php b/src/Analyser/IgnoredError.php
@@ -5,7 +5,6 @@
 use Nette\Utils\Strings;
 use PHPStan\File\FileExcluder;
 use PHPStan\File\FileHelper;
-use PHPStan\PhpDoc\EmptyStubFilesProvider;
 use function count;
 use function implode;
 use function is_array;
@@ -60,7 +59,7 @@ public static function shouldIgnore(
 				return false;
 			}
 
-			$fileExcluder = new FileExcluder($fileHelper, new EmptyStubFilesProvider(), [$path]);
+			$fileExcluder = new FileExcluder($fileHelper, [$path]);
 			$isExcluded = $fileExcluder->isExcludedFromAnalysing($error->getFilePath());
 			if (!$isExcluded && $error->getTraitFilePath() !== null) {
 				return $fileExcluder->isExcludedFromAnalysing($error->getTraitFilePath());
diff --git a/src/File/FileExcluder.php b/src/File/FileExcluder.php
@@ -2,8 +2,6 @@
 
 namespace PHPStan\File;
 
-use PHPStan\PhpDoc\StubFilesProvider;
-use function array_merge;
 use function fnmatch;
 use function in_array;
 use function preg_match;
@@ -36,11 +34,10 @@ class FileExcluder
 	 */
 	public function __construct(
 		FileHelper $fileHelper,
-		StubFilesProvider $stubFilesProvider,
 		array $analyseExcludes,
 	)
 	{
-		foreach (array_merge($analyseExcludes, $stubFilesProvider->getStubFiles()) as $exclude) {
+		foreach ($analyseExcludes as $exclude) {
 			$len = strlen($exclude);
 			$trailingDirSeparator = ($len > 0 && in_array($exclude[$len - 1], ['\\', '/'], true));
 
diff --git a/src/File/FileExcluderFactory.php b/src/File/FileExcluderFactory.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\File;
 
+use PHPStan\PhpDoc\StubFilesProvider;
 use function array_key_exists;
 use function array_merge;
 use function array_unique;
@@ -16,6 +17,7 @@ class FileExcluderFactory
 	 */
 	public function __construct(
 		private FileExcluderRawFactory $fileExcluderRawFactory,
+		private StubFilesProvider $stubFilesProvider,
 		private array $obsoleteExcludesAnalyse,
 		private ?array $excludePaths,
 	)
@@ -25,7 +27,7 @@ public function __construct(
 	public function createAnalyseFileExcluder(): FileExcluder
 	{
 		if ($this->excludePaths === null) {
-			return $this->fileExcluderRawFactory->create($this->obsoleteExcludesAnalyse);
+			return $this->fileExcluderRawFactory->create(array_merge($this->obsoleteExcludesAnalyse, $this->stubFilesProvider->getStubFiles()));
 		}
 
 		$paths = [];
@@ -36,7 +38,7 @@ public function createAnalyseFileExcluder(): FileExcluder
 			$paths = array_merge($paths, $this->excludePaths['analyseAndScan']);
 		}
 
-		return $this->fileExcluderRawFactory->create(array_values(array_unique($paths)));
+		return $this->fileExcluderRawFactory->create(array_merge(array_values(array_unique($paths)), $this->stubFilesProvider->getStubFiles()));
 	}
 
 	public function createScanFileExcluder(): FileExcluder
diff --git a/src/PhpDoc/EmptyStubFilesProvider.php b/src/PhpDoc/EmptyStubFilesProvider.php
diff --git a/tests/PHPStan/File/FileExcluderTest.php b/tests/PHPStan/File/FileExcluderTest.php
@@ -2,7 +2,6 @@
 
 namespace PHPStan\File;
 
-use PHPStan\PhpDoc\EmptyStubFilesProvider;
 use PHPStan\Testing\PHPStanTestCase;
 
 class FileExcluderTest extends PHPStanTestCase
@@ -20,7 +19,7 @@ public function testFilesAreExcludedFromAnalysingOnWindows(
 	{
 		$this->skipIfNotOnWindows();
 
-		$fileExcluder = new FileExcluder($this->getFileHelper(), new EmptyStubFilesProvider(), $analyseExcludes);
+		$fileExcluder = new FileExcluder($this->getFileHelper(), $analyseExcludes);
 
 		$this->assertSame($isExcluded, $fileExcluder->isExcludedFromAnalysing($filePath));
 	}
@@ -128,7 +127,7 @@ public function testFilesAreExcludedFromAnalysingOnUnix(
 	{
 		$this->skipIfNotOnUnix();
 
-		$fileExcluder = new FileExcluder($this->getFileHelper(), new EmptyStubFilesProvider(), $analyseExcludes);
+		$fileExcluder = new FileExcluder($this->getFileHelper(), $analyseExcludes);
 
 		$this->assertSame($isExcluded, $fileExcluder->isExcludedFromAnalysing($filePath));
 	}

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace PHPStan\File;`
`4`	`4`
	`5`	`+use PHPStan\PhpDoc\StubFilesProvider;`
`5`	`6`	`use function array_key_exists;`
`6`	`7`	`use function array_merge;`
`7`	`8`	`use function array_unique;`
`@@ -16,6 +17,7 @@ class FileExcluderFactory`
`16`	`17`	`*/`
`17`	`18`	`public function __construct(`
`18`	`19`	`private FileExcluderRawFactory $fileExcluderRawFactory,`
	`20`	`+ private StubFilesProvider $stubFilesProvider,`
`19`	`21`	`private array $obsoleteExcludesAnalyse,`
`20`	`22`	`private ?array $excludePaths,`
`21`	`23`	`)`
`@@ -25,7 +27,7 @@ public function __construct(`
`25`	`27`	`public function createAnalyseFileExcluder(): FileExcluder`
`26`	`28`	`{`
`27`	`29`	`if ($this->excludePaths === null) {`
`28`		`- return $this->fileExcluderRawFactory->create($this->obsoleteExcludesAnalyse);`
	`30`	`+ return $this->fileExcluderRawFactory->create(array_merge($this->obsoleteExcludesAnalyse, $this->stubFilesProvider->getStubFiles()));`
`29`	`31`	`}`
`30`	`32`
`31`	`33`	`$paths = [];`
`@@ -36,7 +38,7 @@ public function createAnalyseFileExcluder(): FileExcluder`
`36`	`38`	`$paths = array_merge($paths, $this->excludePaths['analyseAndScan']);`
`37`	`39`	`}`
`38`	`40`
`39`		`- return $this->fileExcluderRawFactory->create(array_values(array_unique($paths)));`
	`41`	`+ return $this->fileExcluderRawFactory->create(array_merge(array_values(array_unique($paths)), $this->stubFilesProvider->getStubFiles()));`
`40`	`42`	`}`
`41`	`43`
`42`	`44`	`public function createScanFileExcluder(): FileExcluder`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`
`3`	`3`	`namespace PHPStan\File;`
`4`	`4`
`5`		`-use PHPStan\PhpDoc\EmptyStubFilesProvider;`
`6`	`5`	`use PHPStan\Testing\PHPStanTestCase;`
`7`	`6`
`8`	`7`	`class FileExcluderTest extends PHPStanTestCase`
`@@ -20,7 +19,7 @@ public function testFilesAreExcludedFromAnalysingOnWindows(`
`20`	`19`	`{`
`21`	`20`	`$this->skipIfNotOnWindows();`
`22`	`21`
`23`		`- $fileExcluder = new FileExcluder($this->getFileHelper(), new EmptyStubFilesProvider(), $analyseExcludes);`
	`22`	`+ $fileExcluder = new FileExcluder($this->getFileHelper(), $analyseExcludes);`
`24`	`23`
`25`	`24`	`$this->assertSame($isExcluded, $fileExcluder->isExcludedFromAnalysing($filePath));`
`26`	`25`	`}`
`@@ -128,7 +127,7 @@ public function testFilesAreExcludedFromAnalysingOnUnix(`
`128`	`127`	`{`
`129`	`128`	`$this->skipIfNotOnUnix();`
`130`	`129`
`131`		`- $fileExcluder = new FileExcluder($this->getFileHelper(), new EmptyStubFilesProvider(), $analyseExcludes);`
	`130`	`+ $fileExcluder = new FileExcluder($this->getFileHelper(), $analyseExcludes);`
`132`	`131`
`133`	`132`	`$this->assertSame($isExcluded, $fileExcluder->isExcludedFromAnalysing($filePath));`
`134`	`133`	`}`