Delegate get_called_class() to static::class

Closes phpstan/phpstan#9341
phpstan · May 23, 2023 · 188acf4 · 188acf4
1 parent 4e19347
commit 188acf4
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 4 deletions.
diff --git a/src/Type/Php/GetCalledClassDynamicReturnTypeExtension.php b/src/Type/Php/GetCalledClassDynamicReturnTypeExtension.php
@@ -2,11 +2,12 @@
 
 namespace PHPStan\Type\Php;
 
+use PhpParser\Node\Expr\ClassConstFetch;
 use PhpParser\Node\Expr\FuncCall;
+use PhpParser\Node\Name;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\FunctionReflection;
 use PHPStan\Type\Constant\ConstantBooleanType;
-use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\DynamicFunctionReturnTypeExtension;
 use PHPStan\Type\Type;
 
@@ -20,9 +21,8 @@ public function isFunctionSupported(FunctionReflection $functionReflection): boo
 
 	public function getTypeFromFunctionCall(FunctionReflection $functionReflection, FuncCall $functionCall, Scope $scope): Type
 	{
-		$classContext = $scope->getClassReflection();
-		if ($classContext !== null) {
-			return new ConstantStringType($classContext->getName(), true);
+		if ($scope->isInClass()) {
+			return $scope->getType(new ClassConstFetch(new Name('static'), 'class'));
 		}
 		return new ConstantBooleanType(false);
 	}

diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -1197,6 +1197,7 @@ public function dataFileAsserts(): iterable
 		}
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/always-true-elseif.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7547.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-9341.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/pathinfo.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-8568.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/DeadCode/data/bug-8620.php');

diff --git a/tests/PHPStan/Analyser/data/bug-9341.php b/tests/PHPStan/Analyser/data/bug-9341.php
@@ -0,0 +1,32 @@
+<?php declare(strict_types = 1);
+
+namespace Bug9341;
+
+use function PHPStan\Testing\assertType;
+
+interface MyInterface {}
+
+trait MyTrait
+{
+	public static function parse(): mixed
+	{
+		$class = get_called_class();
+		assertType('class-string<static(Bug9341\MyAbstractBase)>', $class);
+		if (!is_a($class, MyInterface::class, true)) {
+			return false;
+		}
+		assertType('class-string<Bug9341\MyInterface&static(Bug9341\MyAbstractBase)>', $class);
+		$fileObject = new $class();
+		assertType('Bug9341\MyInterface&static(Bug9341\MyAbstractBase)', $fileObject);
+		return $fileObject;
+	}
+}
+
+abstract class MyAbstractBase {
+	use MyTrait;
+}
+
+class MyClass extends MyAbstractBase implements MyInterface
+{
+
+}
diff --git a/tests/PHPStan/Rules/Classes/InstantiationRuleTest.php b/tests/PHPStan/Rules/Classes/InstantiationRuleTest.php
@@ -446,4 +446,9 @@ public function testBug3311a(): void
 		]);
 	}
 
+	public function testBug9341(): void
+	{
+		$this->analyse([__DIR__ . '/../../Analyser/data/bug-9341.php'], []);
+	}
+
 }