Attempt to load remaining classes after skipping them in ClassBlacklistSourceLocator if they're not in Composer paths

ondrejmirtes · ondrejmirtes · commit 2e612596bcd7 · 2020-06-24T22:30:38.000+02:00
diff --git a/build/phpstan.neon b/build/phpstan.neon
@@ -36,9 +36,6 @@ parameters:
 	stubFiles:
 		- stubs/ReactChildProcess.php
 		- stubs/ReactStreams.php
-	staticReflectionClassNamePatterns!:
-		- '#^PhpParser\\#'
-		- '#^Hoa\\#'
 services:
 	-
 		class: PHPStan\Build\ServiceLocatorDynamicReturnTypeExtension
diff --git a/src/Reflection/BetterReflection/BetterReflectionSourceLocatorFactory.php b/src/Reflection/BetterReflection/BetterReflectionSourceLocatorFactory.php
@@ -5,6 +5,7 @@
 use PHPStan\DependencyInjection\Container;
 use PHPStan\Reflection\BetterReflection\SourceLocator\AutoloadSourceLocator;
 use PHPStan\Reflection\BetterReflection\SourceLocator\ClassBlacklistSourceLocator;
+use PHPStan\Reflection\BetterReflection\SourceLocator\ClassWhitelistSourceLocator;
 use PHPStan\Reflection\BetterReflection\SourceLocator\ComposerJsonAndInstalledJsonSourceLocatorMaker;
 use PHPStan\Reflection\BetterReflection\SourceLocator\OptimizedDirectorySourceLocatorRepository;
 use PHPStan\Reflection\BetterReflection\SourceLocator\OptimizedSingleFileSourceLocatorRepository;
@@ -170,6 +171,7 @@ public function create(): SourceLocator
 			}
 			$locators[] = $locator;
 		}
+		$locators[] = new ClassWhitelistSourceLocator($this->autoloadSourceLocator, $this->staticReflectionClassNamePatterns);
 		$locators[] = new PhpInternalSourceLocator($astLocator, $this->reflectionSourceStubber);
 		$locators[] = new EvaledCodeSourceLocator($astLocator, $this->reflectionSourceStubber);
 
diff --git a/src/Reflection/BetterReflection/SourceLocator/ClassWhitelistSourceLocator.php b/src/Reflection/BetterReflection/SourceLocator/ClassWhitelistSourceLocator.php
@@ -0,0 +1,53 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Reflection\BetterReflection\SourceLocator;
+
+use Nette\Utils\Strings;
+use Roave\BetterReflection\Identifier\Identifier;
+use Roave\BetterReflection\Identifier\IdentifierType;
+use Roave\BetterReflection\Reflection\Reflection;
+use Roave\BetterReflection\Reflector\Reflector;
+use Roave\BetterReflection\SourceLocator\Type\SourceLocator;
+
+class ClassWhitelistSourceLocator implements SourceLocator
+{
+
+	private SourceLocator $sourceLocator;
+
+	/** @var string[] */
+	private array $patterns;
+
+	/**
+	 * @param SourceLocator $sourceLocator
+	 * @param string[] $patterns
+	 */
+	public function __construct(
+		SourceLocator $sourceLocator,
+		array $patterns
+	)
+	{
+		$this->sourceLocator = $sourceLocator;
+		$this->patterns = $patterns;
+	}
+
+	public function locateIdentifier(Reflector $reflector, Identifier $identifier): ?Reflection
+	{
+		if ($identifier->isClass()) {
+			foreach ($this->patterns as $pattern) {
+				if (Strings::match($identifier->getName(), $pattern) !== null) {
+					return $this->sourceLocator->locateIdentifier($reflector, $identifier);
+				}
+			}
+
+			return null;
+		}
+
+		return $this->sourceLocator->locateIdentifier($reflector, $identifier);
+	}
+
+	public function locateIdentifiersByType(Reflector $reflector, IdentifierType $identifierType): array
+	{
+		return $this->sourceLocator->locateIdentifiersByType($reflector, $identifierType);
+	}
+
+}

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`use PHPStan\DependencyInjection\Container;`
`6`	`6`	`use PHPStan\Reflection\BetterReflection\SourceLocator\AutoloadSourceLocator;`
`7`	`7`	`use PHPStan\Reflection\BetterReflection\SourceLocator\ClassBlacklistSourceLocator;`
	`8`	`+use PHPStan\Reflection\BetterReflection\SourceLocator\ClassWhitelistSourceLocator;`
`8`	`9`	`use PHPStan\Reflection\BetterReflection\SourceLocator\ComposerJsonAndInstalledJsonSourceLocatorMaker;`
`9`	`10`	`use PHPStan\Reflection\BetterReflection\SourceLocator\OptimizedDirectorySourceLocatorRepository;`
`10`	`11`	`use PHPStan\Reflection\BetterReflection\SourceLocator\OptimizedSingleFileSourceLocatorRepository;`
`@@ -170,6 +171,7 @@ public function create(): SourceLocator`
`170`	`171`	`}`
`171`	`172`	`$locators[] = $locator;`
`172`	`173`	`}`
	`174`	`+ $locators[] = new ClassWhitelistSourceLocator($this->autoloadSourceLocator, $this->staticReflectionClassNamePatterns);`
`173`	`175`	`$locators[] = new PhpInternalSourceLocator($astLocator, $this->reflectionSourceStubber);`
`174`	`176`	`$locators[] = new EvaledCodeSourceLocator($astLocator, $this->reflectionSourceStubber);`
`175`	`177`