StubValidator - call StubFilesProvider on the original DIC, not on the stubValidator one

ondrejmirtes · ondrejmirtes · commit 47f36d8971fd · 2026-03-26T21:43:01.000+01:00
diff --git a/conf/config.stubValidator.neon b/conf/config.stubValidator.neon
@@ -7,13 +7,17 @@ parameters:
 	reportMaybes: true
 	reportStatic: true
 
+parametersSchema:
+	allStubFiles: listOf(string())
+
 extensions:
 	stubValidatorRules: PHPStan\DependencyInjection\StubValidatorRuleServicesExtension
 
 services:
 	-
 		class: PHPStan\PhpDoc\StubSourceLocatorFactory
 		arguments:
+			allStubFiles: %allStubFiles%
 			php8Parser: @php8PhpParser
 
 	# overrides service from parsers.neon
diff --git a/src/DependencyInjection/ContainerFactory.php b/src/DependencyInjection/ContainerFactory.php
@@ -97,6 +97,7 @@ public function setJournalContainer(): void
 	 * @param string[] $analysedPaths
 	 * @param string[] $composerAutoloaderProjectPaths
 	 * @param string[] $analysedPathsFromConfig
+	 * @param array<mixed> $additionalParameters
 	 */
 	public function create(
 		string $tempDirectory,
@@ -109,6 +110,7 @@ public function create(
 		?string $cliAutoloadFile = null,
 		?string $singleReflectionFile = null,
 		?string $singleReflectionInsteadOfFile = null,
+		array $additionalParameters = [],
 	): Container
 	{
 		[$allConfigFiles, $projectConfig] = $this->detectDuplicateIncludedFiles(
@@ -133,7 +135,7 @@ public function create(
 		];
 		$configurator->setDebugMode(true);
 		$configurator->setTempDirectory($tempDirectory);
-		$configurator->addParameters([
+		$configurator->addParameters(array_merge([
 			'rootDir' => $this->rootDirectory,
 			'currentWorkingDirectory' => $this->currentWorkingDirectory,
 			'cliArgumentsVariablesRegistered' => ini_get('register_argc_argv') === '1',
@@ -145,7 +147,7 @@ public function create(
 			'usedLevel' => $usedLevel,
 			'cliAutoloadFile' => $cliAutoloadFile,
 			'env' => getenv(),
-		]);
+		], $additionalParameters));
 		$configurator->addDynamicParameters([
 			'singleReflectionFile' => $singleReflectionFile,
 			'singleReflectionInsteadOfFile' => $singleReflectionInsteadOfFile,
diff --git a/src/DependencyInjection/DerivativeContainerFactory.php b/src/DependencyInjection/DerivativeContainerFactory.php
@@ -43,8 +43,9 @@ public function __construct(
 
 	/**
 	 * @param string[] $additionalConfigFiles
+	 * @param array<mixed> $additionalParameters
 	 */
-	public function create(array $additionalConfigFiles): Container
+	public function create(array $additionalConfigFiles, array $additionalParameters = []): Container
 	{
 		$containerFactory = new ContainerFactory(
 			$this->currentWorkingDirectory,
@@ -62,6 +63,7 @@ public function create(array $additionalConfigFiles): Container
 			$this->cliAutoloadFile,
 			$this->singleReflectionFile,
 			$this->singleReflectionInsteadOfFile,
+			$additionalParameters,
 		);
 	}
 
diff --git a/src/PhpDoc/StubSourceLocatorFactory.php b/src/PhpDoc/StubSourceLocatorFactory.php
@@ -17,12 +17,15 @@
 final class StubSourceLocatorFactory
 {
 
+	/**
+	 * @param string[] $allStubFiles
+	 */
 	public function __construct(
 		private Parser $php8Parser,
 		private PhpStormStubsSourceStubber $phpStormStubsSourceStubber,
 		private OptimizedSingleFileSourceLocatorRepository $optimizedSingleFileSourceLocatorRepository,
 		private OptimizedPsrAutoloaderLocatorFactory $optimizedPsrAutoloaderLocatorFactory,
-		private StubFilesProvider $stubFilesProvider,
+		private array $allStubFiles,
 	)
 	{
 	}
@@ -31,7 +34,7 @@ public function create(): SourceLocator
 	{
 		$locators = [];
 		$astPhp8Locator = new Locator($this->php8Parser);
-		foreach ($this->stubFilesProvider->getStubFiles() as $stubFile) {
+		foreach ($this->allStubFiles as $stubFile) {
 			$locators[] = $this->optimizedSingleFileSourceLocatorRepository->getOrCreate($stubFile);
 		}
 
diff --git a/src/PhpDoc/StubValidator.php b/src/PhpDoc/StubValidator.php
@@ -26,6 +26,7 @@ final class StubValidator
 
 	public function __construct(
 		private DerivativeContainerFactory $derivativeContainerFactory,
+		private StubFilesProvider $stubFilesProvider,
 	)
 	{
 	}
@@ -46,6 +47,8 @@ public function validate(array $stubFiles, bool $debug): array
 		try {
 			$container = $this->derivativeContainerFactory->create([
 				__DIR__ . '/../../conf/config.stubValidator.neon',
+			], [
+				'allStubFiles' => $this->stubFilesProvider->getStubFiles(),
 			]);
 
 			$fileAnalyser = $container->getByType(FileAnalyser::class);

Original file line number	Diff line number	Diff line change
`@@ -17,12 +17,15 @@`
`17`	`17`	`final class StubSourceLocatorFactory`
`18`	`18`	`{`
`19`	`19`
	`20`	`+ /**`
	`21`	`+ * @param string[] $allStubFiles`
	`22`	`+ */`
`20`	`23`	`public function __construct(`
`21`	`24`	`private Parser $php8Parser,`
`22`	`25`	`private PhpStormStubsSourceStubber $phpStormStubsSourceStubber,`
`23`	`26`	`private OptimizedSingleFileSourceLocatorRepository $optimizedSingleFileSourceLocatorRepository,`
`24`	`27`	`private OptimizedPsrAutoloaderLocatorFactory $optimizedPsrAutoloaderLocatorFactory,`
`25`		`- private StubFilesProvider $stubFilesProvider,`
	`28`	`+ private array $allStubFiles,`
`26`	`29`	`)`
`27`	`30`	`{`
`28`	`31`	`}`
`@@ -31,7 +34,7 @@ public function create(): SourceLocator`
`31`	`34`	`{`
`32`	`35`	`$locators = [];`
`33`	`36`	`$astPhp8Locator = new Locator($this->php8Parser);`
`34`		`- foreach ($this->stubFilesProvider->getStubFiles() as $stubFile) {`
	`37`	`+ foreach ($this->allStubFiles as $stubFile) {`
`35`	`38`	`$locators[] = $this->optimizedSingleFileSourceLocatorRepository->getOrCreate($stubFile);`
`36`	`39`	`}`
`37`	`40`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ final class StubValidator`
`26`	`26`
`27`	`27`	`public function __construct(`
`28`	`28`	`private DerivativeContainerFactory $derivativeContainerFactory,`
	`29`	`+ private StubFilesProvider $stubFilesProvider,`
`29`	`30`	`)`
`30`	`31`	`{`
`31`	`32`	`}`
`@@ -46,6 +47,8 @@ public function validate(array $stubFiles, bool $debug): array`
`46`	`47`	`try {`
`47`	`48`	`$container = $this->derivativeContainerFactory->create([`
`48`	`49`	`__DIR__ . '/../../conf/config.stubValidator.neon',`
	`50`	`+ ], [`
	`51`	`+ 'allStubFiles' => $this->stubFilesProvider->getStubFiles(),`
`49`	`52`	`]);`
`50`	`53`
`51`	`54`	`$fileAnalyser = $container->getByType(FileAnalyser::class);`