Fix internal error in NewExprDynamicReturnTypeExtension

Author: ondrejmirtes

src/Type/Doctrine/QueryBuilder/Expr/NewExprDynamicReturnTypeExtension.php

@@ -5,14 +5,16 @@
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Name;
 use PHPStan\Analyser\Scope;
+use PHPStan\Broker\Broker;
+use PHPStan\Reflection\BrokerAwareExtension;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Rules\Doctrine\ORM\DynamicQueryBuilderArgumentException;
 use PHPStan\Type\Doctrine\ArgumentsProcessor;
 use PHPStan\Type\DynamicStaticMethodReturnTypeExtension;
 use PHPStan\Type\Type;
 
-class NewExprDynamicReturnTypeExtension implements DynamicStaticMethodReturnTypeExtension
+class NewExprDynamicReturnTypeExtension implements DynamicStaticMethodReturnTypeExtension, BrokerAwareExtension
 {
 
 	/** @var \PHPStan\Type\Doctrine\ArgumentsProcessor */
@@ -21,6 +23,9 @@ class NewExprDynamicReturnTypeExtension implements DynamicStaticMethodReturnType
 	/** @var string */
 	private $class;
 
+	/** @var \PHPStan\Broker\Broker */
+	private $broker;
+
 	public function __construct(
 		ArgumentsProcessor $argumentsProcessor,
 		string $class
@@ -30,6 +35,11 @@ public function __construct(
 		$this->class = $class;
 	}
 
+	public function setBroker(Broker $broker): void
+	{
+		$this->broker = $broker;
+	}
+
 	public function getClass(): string
 	{
 		return $this->class;
@@ -46,7 +56,12 @@ public function getTypeFromStaticMethodCall(MethodReflection $methodReflection,
 			throw new \PHPStan\ShouldNotHappenException();
 		}
 
-		$className = $methodCall->class->toString();
+		$className = $scope->resolveName($methodCall->class);
+		if (!$this->broker->hasClass($className)) {
+			return ParametersAcceptorSelector::selectSingle(
+				$methodReflection->getVariants()
+			)->getReturnType();
+		}
 
 		try {
 			$exprObject = new $className(

tests/Rules/Doctrine/ORM/data/query-builder-dql.php

@@ -301,4 +301,9 @@ public function correct(): string
 		return 'e.id = 1';
 	}
 
+	public function newParent(): void
+	{
+		$test = new parent();
+	}
+
 }