Fix PHPStan Pro reanalyse results

phpstan · May 5, 2021 · 179b213 · 179b213
1 parent 8fe9e60
commit 179b213
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/conf/config.neon b/conf/config.neon
@@ -316,6 +316,7 @@ parametersSchema:
 
 	# internal - static reflection
 	singleReflectionFile: schema(string(), nullable())
+	singleReflectionInsteadOfFile: schema(string(), nullable())
 
 rules:
 	- PHPStan\Rules\Debug\DumpTypeRule
@@ -1474,6 +1475,7 @@ services:
 		arguments:
 			reflectionProvider: @innerRuntimeReflectionProvider
 			patterns: %staticReflectionClassNamePatterns%
+			singleReflectionInsteadOfFile: %singleReflectionInsteadOfFile%
 		autowired: false
 
 	innerRuntimeReflectionProvider:

diff --git a/src/Command/CommandHelper.php b/src/Command/CommandHelper.php
@@ -47,7 +47,8 @@ public static function begin(
 		bool $allowXdebug,
 		bool $manageMemoryLimitFile = true,
 		bool $debugEnabled = false,
-		?string $singleReflectionFile = null
+		?string $singleReflectionFile = null,
+		?string $singleReflectionInsteadOfFile = null
 	): InceptionResult
 	{
 		if (!$allowXdebug) {
@@ -249,7 +250,7 @@ public static function begin(
 		}
 
 		try {
-			$container = $containerFactory->create($tmpDir, $additionalConfigFiles, $paths, $composerAutoloaderProjectPaths, $analysedPathsFromConfig, $level ?? self::DEFAULT_LEVEL, $generateBaselineFile, $autoloadFile, $singleReflectionFile);
+			$container = $containerFactory->create($tmpDir, $additionalConfigFiles, $paths, $composerAutoloaderProjectPaths, $analysedPathsFromConfig, $level ?? self::DEFAULT_LEVEL, $generateBaselineFile, $autoloadFile, $singleReflectionFile, $singleReflectionInsteadOfFile);
 		} catch (\Nette\DI\InvalidConfigurationException | \Nette\Utils\AssertionException $e) {
 			$errorOutput->writeLineFormatted('<error>Invalid configuration:</error>');
 			$errorOutput->writeLineFormatted($e->getMessage());

diff --git a/src/Command/FixerWorkerCommand.php b/src/Command/FixerWorkerCommand.php
@@ -117,7 +117,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 				$allowXdebug,
 				false,
 				false,
-				$singleReflectionFile
+				$singleReflectionFile,
+				$insteadOfFile
 			);
 		} catch (\PHPStan\Command\InceptionNotSuccessfulException $e) {
 			return 1;

diff --git a/src/DependencyInjection/ContainerFactory.php b/src/DependencyInjection/ContainerFactory.php
@@ -51,6 +51,7 @@ public function __construct(string $currentWorkingDirectory)
 	 * @param string|null $generateBaselineFile
 	 * @param string|null $cliAutoloadFile
 	 * @param string|null $singleReflectionFile
+	 * @param string|null $singleReflectionInsteadOfFile
 	 * @return \PHPStan\DependencyInjection\Container
 	 */
 	public function create(
@@ -62,7 +63,8 @@ public function create(
 		string $usedLevel = CommandHelper::DEFAULT_LEVEL,
 		?string $generateBaselineFile = null,
 		?string $cliAutoloadFile = null,
-		?string $singleReflectionFile = null
+		?string $singleReflectionFile = null,
+		?string $singleReflectionInsteadOfFile = null
 	): Container
 	{
 		$configurator = new Configurator(new LoaderFactory(
@@ -93,6 +95,7 @@ public function create(
 		]);
 		$configurator->addDynamicParameters([
 			'singleReflectionFile' => $singleReflectionFile,
+			'singleReflectionInsteadOfFile' => $singleReflectionInsteadOfFile,
 		]);
 		$configurator->addConfig($this->configDirectory . '/config.neon');
 		foreach ($additionalConfigFiles as $additionalConfigFile) {

diff --git a/src/Reflection/ReflectionProvider/ClassBlacklistReflectionProvider.php b/src/Reflection/ReflectionProvider/ClassBlacklistReflectionProvider.php
@@ -21,7 +21,7 @@ class ClassBlacklistReflectionProvider implements ReflectionProvider
 	/** @var string[] */
 	private array $patterns;
 
-	private ?string $singleReflectionFile;
+	private ?string $singleReflectionInsteadOfFile;
 
 	/**
 	 * @param \PHPStan\Reflection\ReflectionProvider $reflectionProvider
@@ -31,13 +31,13 @@ public function __construct(
 		ReflectionProvider $reflectionProvider,
 		PhpStormStubsSourceStubber $phpStormStubsSourceStubber,
 		array $patterns,
-		?string $singleReflectionFile
+		?string $singleReflectionInsteadOfFile
 	)
 	{
 		$this->reflectionProvider = $reflectionProvider;
 		$this->phpStormStubsSourceStubber = $phpStormStubsSourceStubber;
 		$this->patterns = $patterns;
-		$this->singleReflectionFile = $singleReflectionFile;
+		$this->singleReflectionInsteadOfFile = $singleReflectionInsteadOfFile;
 	}
 
 	public function hasClass(string $className): bool
@@ -52,8 +52,8 @@ public function hasClass(string $className): bool
 		}
 
 		$classReflection = $this->reflectionProvider->getClass($className);
-		if ($this->singleReflectionFile !== null) {
-			if ($classReflection->getFileName() === $this->singleReflectionFile) {
+		if ($this->singleReflectionInsteadOfFile !== null) {
+			if ($classReflection->getFileName() === $this->singleReflectionInsteadOfFile) {
 				return false;
 			}
 		}
@@ -133,7 +133,7 @@ public function hasFunction(\PhpParser\Node\Name $nameNode, ?Scope $scope): bool
 			return false;
 		}
 
-		if ($this->singleReflectionFile === null) {
+		if ($this->singleReflectionInsteadOfFile === null) {
 			return true;
 		}
 
@@ -142,7 +142,7 @@ public function hasFunction(\PhpParser\Node\Name $nameNode, ?Scope $scope): bool
 			return true;
 		}
 
-		return $functionReflection->getFileName() !== $this->singleReflectionFile;
+		return $functionReflection->getFileName() !== $this->singleReflectionInsteadOfFile;
 	}
 
 	public function getFunction(\PhpParser\Node\Name $nameNode, ?Scope $scope): FunctionReflection