Fix anonymous class that extends the outer class

ondrejmirtes · ondrejmirtes · commit 4cad0c63d5d2 · 2020-08-02T20:53:39.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -439,6 +439,8 @@ jobs:
             extensions: ""
           - script: "bin/phpstan analyse -l 8 -c tests/e2e/magic-setter/test.neon tests/e2e/magic-setter/test.php"
             extensions: ""
+          - script: "bin/phpstan analyse -l 8 tests/e2e/anon-class/Granularity.php"
+            extensions: ""
 
     steps:
       - name: "Checkout"
diff --git a/build.xml b/build.xml
@@ -180,7 +180,7 @@
 					<arg value="--encoding=utf-8"/>
 					<arg value="--tab-width=4"/>
 					<arg value="--cache=tmp/cache/phpcs"/>
-					<arg value="--ignore=tests/*/data,tests/*/traits,tests/notAutoloaded,tests/*/cache,src/Reflection/SignatureMap/functionMap.php,tests/e2e/magic-setter"/>
+					<arg value="--ignore=tests/*/data,tests/*/traits,tests/notAutoloaded,tests/*/cache,src/Reflection/SignatureMap/functionMap.php,tests/e2e/magic-setter,tests/e2e/anon-class"/>
 					<arg value="-sp"/>
 					<arg path="src"/>
 					<arg path="tests"/>
@@ -201,6 +201,7 @@
 			<arg value="--extensions=php"/>
 			<arg value="--encoding=utf-8"/>
 			<arg value="--tab-width=4"/>
+			<arg value="--ignore=tests/*/data,tests/*/traits,tests/notAutoloaded,tests/*/cache,src/Reflection/SignatureMap/functionMap.php,tests/e2e/magic-setter,tests/e2e/anon-class"/>
 			<arg value="-sp"/>
 			<arg path="src"/>
 			<arg path="tests"/>
diff --git a/build/baseline-7.4.neon b/build/baseline-7.4.neon
@@ -94,6 +94,6 @@ parameters:
 			count: 1
 			path: ../src/Reflection/ReflectionProvider/SetterReflectionProviderProvider.php
 		-
-			message: "#^Class class@anonymous/src/Testing/TestCase\\.php\\:262 has an uninitialized property \\$reflectionProvider\\. Give it default value or assign it in the constructor\\.$#"
+			message: "#^Class class@anonymous/src/Testing/TestCase\\.php\\:258 has an uninitialized property \\$reflectionProvider\\. Give it default value or assign it in the constructor\\.$#"
 			count: 1
 			path: ../src/Testing/TestCase.php
diff --git a/src/Broker/Broker.php b/src/Broker/Broker.php
@@ -73,6 +73,11 @@ public function getClassName(string $className): string
 		return $this->reflectionProvider->getClassName($className);
 	}
 
+	public function supportsAnonymousClasses(): bool
+	{
+		return $this->reflectionProvider->supportsAnonymousClasses();
+	}
+
 	public function getAnonymousClassReflection(\PhpParser\Node\Stmt\Class_ $classNode, Scope $scope): ClassReflection
 	{
 		return $this->reflectionProvider->getAnonymousClassReflection($classNode, $scope);
diff --git a/src/Reflection/BetterReflection/BetterReflectionProvider.php b/src/Reflection/BetterReflection/BetterReflectionProvider.php
@@ -167,6 +167,11 @@ public function getClassName(string $className): string
 		return $reflectionClass->getName();
 	}
 
+	public function supportsAnonymousClasses(): bool
+	{
+		return true;
+	}
+
 	public function getAnonymousClassReflection(\PhpParser\Node\Stmt\Class_ $classNode, Scope $scope): ClassReflection
 	{
 		if (isset($classNode->namespacedName)) {
diff --git a/src/Reflection/ReflectionProvider.php b/src/Reflection/ReflectionProvider.php
@@ -13,6 +13,8 @@ public function getClass(string $className): ClassReflection;
 
 	public function getClassName(string $className): string;
 
+	public function supportsAnonymousClasses(): bool;
+
 	public function getAnonymousClassReflection(
 		\PhpParser\Node\Stmt\Class_ $classNode,
 		Scope $scope
diff --git a/src/Reflection/ReflectionProvider/ChainReflectionProvider.php b/src/Reflection/ReflectionProvider/ChainReflectionProvider.php
@@ -63,9 +63,26 @@ public function getClassName(string $className): string
 		throw new \PHPStan\Broker\ClassNotFoundException($className);
 	}
 
+	public function supportsAnonymousClasses(): bool
+	{
+		foreach ($this->providers as $provider) {
+			if (!$provider->supportsAnonymousClasses()) {
+				continue;
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+
 	public function getAnonymousClassReflection(\PhpParser\Node\Stmt\Class_ $classNode, Scope $scope): ClassReflection
 	{
 		foreach ($this->providers as $provider) {
+			if (!$provider->supportsAnonymousClasses()) {
+				continue;
+			}
+
 			return $provider->getAnonymousClassReflection($classNode, $scope);
 		}
 
diff --git a/src/Reflection/ReflectionProvider/ClassBlacklistReflectionProvider.php b/src/Reflection/ReflectionProvider/ClassBlacklistReflectionProvider.php
@@ -117,9 +117,14 @@ public function getClassName(string $className): string
 		return $this->reflectionProvider->getClassName($className);
 	}
 
+	public function supportsAnonymousClasses(): bool
+	{
+		return false;
+	}
+
 	public function getAnonymousClassReflection(\PhpParser\Node\Stmt\Class_ $classNode, Scope $scope): ClassReflection
 	{
-		return $this->reflectionProvider->getAnonymousClassReflection($classNode, $scope);
+		throw new \PHPStan\ShouldNotHappenException();
 	}
 
 	public function hasFunction(\PhpParser\Node\Name $nameNode, ?Scope $scope): bool
diff --git a/src/Reflection/ReflectionProvider/MemoizingReflectionProvider.php b/src/Reflection/ReflectionProvider/MemoizingReflectionProvider.php
@@ -57,6 +57,11 @@ public function getClassName(string $className): string
 		return $this->classNames[$lowerClassName] = $this->provider->getClassName($className);
 	}
 
+	public function supportsAnonymousClasses(): bool
+	{
+		return $this->provider->supportsAnonymousClasses();
+	}
+
 	public function getAnonymousClassReflection(\PhpParser\Node\Stmt\Class_ $classNode, Scope $scope): ClassReflection
 	{
 		return $this->provider->getAnonymousClassReflection($classNode, $scope);
diff --git a/src/Reflection/Runtime/RuntimeReflectionProvider.php b/src/Reflection/Runtime/RuntimeReflectionProvider.php
@@ -4,10 +4,7 @@
 
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
-use PHPStan\Broker\AnonymousClassNameHelper;
 use PHPStan\DependencyInjection\Reflection\ClassReflectionExtensionRegistryProvider;
-use PHPStan\File\FileHelper;
-use PHPStan\File\RelativePathHelper;
 use PHPStan\PhpDoc\StubPhpDocProvider;
 use PHPStan\PhpDoc\Tag\ParamTag;
 use PHPStan\Reflection\ClassReflection;
@@ -38,14 +35,6 @@ class RuntimeReflectionProvider implements ReflectionProvider
 
 	private \PHPStan\Reflection\SignatureMap\NativeFunctionReflectionProvider $nativeFunctionReflectionProvider;
 
-	private \PhpParser\PrettyPrinter\Standard $printer;
-
-	private AnonymousClassNameHelper $anonymousClassNameHelper;
-
-	private \PHPStan\File\FileHelper $fileHelper;
-
-	private RelativePathHelper $relativePathHelper;
-
 	private StubPhpDocProvider $stubPhpDocProvider;
 
 	/** @var \PHPStan\Reflection\FunctionReflection[] */
@@ -66,10 +55,6 @@ public function __construct(
 		FunctionReflectionFactory $functionReflectionFactory,
 		FileTypeMapper $fileTypeMapper,
 		NativeFunctionReflectionProvider $nativeFunctionReflectionProvider,
-		\PhpParser\PrettyPrinter\Standard $printer,
-		AnonymousClassNameHelper $anonymousClassNameHelper,
-		FileHelper $fileHelper,
-		RelativePathHelper $relativePathHelper,
 		StubPhpDocProvider $stubPhpDocProvider
 	)
 	{
@@ -78,10 +63,6 @@ public function __construct(
 		$this->functionReflectionFactory = $functionReflectionFactory;
 		$this->fileTypeMapper = $fileTypeMapper;
 		$this->nativeFunctionReflectionProvider = $nativeFunctionReflectionProvider;
-		$this->printer = $printer;
-		$this->anonymousClassNameHelper = $anonymousClassNameHelper;
-		$this->fileHelper = $fileHelper;
-		$this->relativePathHelper = $relativePathHelper;
 		$this->stubPhpDocProvider = $stubPhpDocProvider;
 	}
 
@@ -137,50 +118,17 @@ public function getClassName(string $className): string
 		return $realName;
 	}
 
+	public function supportsAnonymousClasses(): bool
+	{
+		return false;
+	}
+
 	public function getAnonymousClassReflection(
 		\PhpParser\Node\Stmt\Class_ $classNode,
 		Scope $scope
 	): ClassReflection
 	{
-		if (isset($classNode->namespacedName)) {
-			throw new \PHPStan\ShouldNotHappenException();
-		}
-
-		if (!$scope->isInTrait()) {
-			$scopeFile = $scope->getFile();
-		} else {
-			$scopeFile = $scope->getTraitReflection()->getFileName();
-			if ($scopeFile === false) {
-				$scopeFile = $scope->getFile();
-			}
-		}
-
-		$filename = $this->fileHelper->normalizePath($this->relativePathHelper->getRelativePath($scopeFile), '/');
-
-		$className = $this->anonymousClassNameHelper->getAnonymousClassName(
-			$classNode,
-			$scopeFile
-		);
-		$classNode->name = new \PhpParser\Node\Identifier($className);
-		$classNode->setAttribute('anonymousClass', true);
-
-		if (isset(self::$anonymousClasses[$className])) {
-			return self::$anonymousClasses[$className];
-		}
-
-		eval($this->printer->prettyPrint([$classNode]));
-
-		/** @var class-string $className */
-		$className = $className;
-
-		self::$anonymousClasses[$className] = $this->getClassFromReflection(
-			new \ReflectionClass($className),
-			sprintf('class@anonymous/%s:%s', $filename, $classNode->getLine()),
-			$scopeFile
-		);
-		$this->classReflections[$className] = self::$anonymousClasses[$className];
-
-		return self::$anonymousClasses[$className];
+		throw new \PHPStan\ShouldNotHappenException();
 	}
 
 	/**
diff --git a/src/Testing/TestCase.php b/src/Testing/TestCase.php
@@ -206,7 +206,6 @@ private function createRuntimeReflectionProvider(ReflectionProvider $actualRefle
 		$phpDocNodeResolver = self::getContainer()->getByType(PhpDocNodeResolver::class);
 		$currentWorkingDirectory = $this->getCurrentWorkingDirectory();
 		$fileHelper = new FileHelper($currentWorkingDirectory);
-		$relativePathHelper = new SimpleRelativePathHelper($currentWorkingDirectory);
 		$anonymousClassNameHelper = new AnonymousClassNameHelper(new FileHelper($currentWorkingDirectory), new SimpleRelativePathHelper($fileHelper->normalizePath($currentWorkingDirectory, '/')));
 		$setterReflectionProviderProvider = new ReflectionProvider\SetterReflectionProviderProvider();
 		$fileTypeMapper = new FileTypeMapper($setterReflectionProviderProvider, $parser, $phpDocStringResolver, $phpDocNodeResolver, $cache, $anonymousClassNameHelper);
@@ -222,10 +221,6 @@ private function createRuntimeReflectionProvider(ReflectionProvider $actualRefle
 				$functionReflectionFactory,
 				$fileTypeMapper,
 				self::getContainer()->getByType(NativeFunctionReflectionProvider::class),
-				self::getContainer()->getByType(Standard::class),
-				$anonymousClassNameHelper,
-				$fileHelper,
-				$relativePathHelper,
 				self::getContainer()->getByType(StubPhpDocProvider::class)
 			),
 			self::getPhpStormStubsSourceStubber(),
diff --git a/tests/PHPStan/Broker/BrokerTest.php b/tests/PHPStan/Broker/BrokerTest.php
@@ -46,10 +46,6 @@ protected function setUp(): void
 			$this->createMock(FunctionReflectionFactory::class),
 			new FileTypeMapper($setterReflectionProviderProvider, $this->getParser(), $phpDocStringResolver, $phpDocNodeResolver, $this->createMock(Cache::class), $anonymousClassNameHelper),
 			self::getContainer()->getByType(NativeFunctionReflectionProvider::class),
-			self::getContainer()->getByType(\PhpParser\PrettyPrinter\Standard::class),
-			$anonymousClassNameHelper,
-			$fileHelper,
-			$relativePathHelper,
 			self::getContainer()->getByType(StubPhpDocProvider::class)
 		);
 		$setterReflectionProviderProvider->setReflectionProvider($reflectionProvider);
diff --git a/tests/e2e/anon-class/Granularity.php b/tests/e2e/anon-class/Granularity.php
@@ -0,0 +1,16 @@
+<?php declare(strict_types=1);
+
+class Granularity
+{
+
+	/**
+	 * @return mixed[]
+	 */
+	protected static function provideInstances(): array
+	{
+		$myclass = new class() extends Granularity { };
+
+		return [];
+	}
+
+}

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,6 @@ parameters:`
`94`	`94`	`count: 1`
`95`	`95`	`path: ../src/Reflection/ReflectionProvider/SetterReflectionProviderProvider.php`
`96`	`96`	`-`
`97`		`- message: "#^Class class@anonymous/src/Testing/TestCase\\.php\\:262 has an uninitialized property \\$reflectionProvider\\. Give it default value or assign it in the constructor\\.$#"`
	`97`	`+ message: "#^Class class@anonymous/src/Testing/TestCase\\.php\\:258 has an uninitialized property \\$reflectionProvider\\. Give it default value or assign it in the constructor\\.$#"`
`98`	`98`	`count: 1`
`99`	`99`	`path: ../src/Testing/TestCase.php`
Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,11 @@ public function getClassName(string $className): string`
`73`	`73`	`return $this->reflectionProvider->getClassName($className);`
`74`	`74`	`}`
`75`	`75`
	`76`	`+ public function supportsAnonymousClasses(): bool`
	`77`	`+ {`
	`78`	`+ return $this->reflectionProvider->supportsAnonymousClasses();`
	`79`	`+ }`
	`80`	`+`
`76`	`81`	`public function getAnonymousClassReflection(\PhpParser\Node\Stmt\Class_ $classNode, Scope $scope): ClassReflection`
`77`	`82`	`{`
`78`	`83`	`return $this->reflectionProvider->getAnonymousClassReflection($classNode, $scope);`
Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,11 @@ public function getClassName(string $className): string`
`167`	`167`	`return $reflectionClass->getName();`
`168`	`168`	`}`
`169`	`169`
	`170`	`+ public function supportsAnonymousClasses(): bool`
	`171`	`+ {`
	`172`	`+ return true;`
	`173`	`+ }`
	`174`	`+`
`170`	`175`	`public function getAnonymousClassReflection(\PhpParser\Node\Stmt\Class_ $classNode, Scope $scope): ClassReflection`
`171`	`176`	`{`
`172`	`177`	`if (isset($classNode->namespacedName)) {`
Original file line number	Diff line number	Diff line change
`@@ -117,9 +117,14 @@ public function getClassName(string $className): string`
`117`	`117`	`return $this->reflectionProvider->getClassName($className);`
`118`	`118`	`}`
`119`	`119`
	`120`	`+ public function supportsAnonymousClasses(): bool`
	`121`	`+ {`
	`122`	`+ return false;`
	`123`	`+ }`
	`124`	`+`
`120`	`125`	`public function getAnonymousClassReflection(\PhpParser\Node\Stmt\Class_ $classNode, Scope $scope): ClassReflection`
`121`	`126`	`{`
`122`		`- return $this->reflectionProvider->getAnonymousClassReflection($classNode, $scope);`
	`127`	`+ throw new \PHPStan\ShouldNotHappenException();`
`123`	`128`	`}`
`124`	`129`
`125`	`130`	`public function hasFunction(\PhpParser\Node\Name $nameNode, ?Scope $scope): bool`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,11 @@ public function getClassName(string $className): string`
`57`	`57`	`return $this->classNames[$lowerClassName] = $this->provider->getClassName($className);`
`58`	`58`	`}`
`59`	`59`
	`60`	`+ public function supportsAnonymousClasses(): bool`
	`61`	`+ {`
	`62`	`+ return $this->provider->supportsAnonymousClasses();`
	`63`	`+ }`
	`64`	`+`
`60`	`65`	`public function getAnonymousClassReflection(\PhpParser\Node\Stmt\Class_ $classNode, Scope $scope): ClassReflection`
`61`	`66`	`{`
`62`	`67`	`return $this->provider->getAnonymousClassReflection($classNode, $scope);`