It is not FileExcluder job to exclude stub files

phpstan · Jan 12, 2023 · 7bdfdd4 · 7bdfdd4
1 parent 8ef5163
commit 7bdfdd4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/Command/CommandHelper.php b/src/Command/CommandHelper.php
@@ -20,16 +20,20 @@
 use PHPStan\DependencyInjection\InvalidIgnoredErrorPatternsException;
 use PHPStan\DependencyInjection\LoaderFactory;
 use PHPStan\ExtensionInstaller\GeneratedConfig;
+use PHPStan\File\FileExcluder;
 use PHPStan\File\FileFinder;
 use PHPStan\File\FileHelper;
+use PHPStan\PhpDoc\StubFilesProvider;
 use PHPStan\ShouldNotHappenException;
 use ReflectionClass;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\ConsoleOutputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Throwable;
+use function array_filter;
 use function array_key_exists;
 use function array_map;
+use function array_values;
 use function class_exists;
 use function count;
 use function dirname;
@@ -467,13 +471,20 @@ public static function begin(
 
 		$pathRoutingParser = $container->getService('pathRoutingParser');
 
+		/** @var StubFilesProvider $stubFilesProvider */
+		$stubFilesProvider = $container->getByType(StubFilesProvider::class);
+
 		/** @var Closure(): array{string[], bool} $filesCallback */
-		$filesCallback = static function () use ($fileFinder, $pathRoutingParser, $paths): array {
+		$filesCallback = static function () use ($currentWorkingDirectoryFileHelper, $stubFilesProvider, $fileFinder, $pathRoutingParser, $paths): array {
 			$fileFinderResult = $fileFinder->findFiles($paths);
 			$files = $fileFinderResult->getFiles();
 
 			$pathRoutingParser->setAnalysedFiles($files);
 
+			$stubFilesExcluder = new FileExcluder($currentWorkingDirectoryFileHelper, $stubFilesProvider->getProjectStubFiles());
+
+			$files = array_values(array_filter($files, static fn (string $file) => !$stubFilesExcluder->isExcludedFromAnalysing($file)));
+
 			return [$files, $fileFinderResult->isOnlyFiles()];
 		};
 

diff --git a/src/File/FileExcluderFactory.php b/src/File/FileExcluderFactory.php
@@ -2,7 +2,6 @@
 
 namespace PHPStan\File;
 
-use PHPStan\PhpDoc\StubFilesProvider;
 use function array_key_exists;
 use function array_merge;
 use function array_unique;
@@ -17,7 +16,6 @@ class FileExcluderFactory
 	 */
 	public function __construct(
 		private FileExcluderRawFactory $fileExcluderRawFactory,
-		private StubFilesProvider $stubFilesProvider,
 		private array $obsoleteExcludesAnalyse,
 		private ?array $excludePaths,
 	)
@@ -27,7 +25,7 @@ public function __construct(
 	public function createAnalyseFileExcluder(): FileExcluder
 	{
 		if ($this->excludePaths === null) {
-			return $this->fileExcluderRawFactory->create(array_merge($this->obsoleteExcludesAnalyse, $this->stubFilesProvider->getStubFiles()));
+			return $this->fileExcluderRawFactory->create($this->obsoleteExcludesAnalyse);
 		}
 
 		$paths = [];
@@ -38,7 +36,7 @@ public function createAnalyseFileExcluder(): FileExcluder
 			$paths = array_merge($paths, $this->excludePaths['analyseAndScan']);
 		}
 
-		return $this->fileExcluderRawFactory->create(array_merge(array_values(array_unique($paths)), $this->stubFilesProvider->getStubFiles()));
+		return $this->fileExcluderRawFactory->create(array_values(array_unique($paths)));
 	}
 
 	public function createScanFileExcluder(): FileExcluder