Take advantage of ArgumentsProcessor for ExprType

Author: ondrejmirtes

extension.neon

@@ -104,39 +104,46 @@ services:
 			- phpstan.broker.dynamicStaticMethodReturnTypeExtension
 		arguments:
 			class: Doctrine\ORM\Query\Expr\Base
+			argumentsProcessor: @argumentsProcessor
 	-
 		class: PHPStan\Type\Doctrine\QueryBuilder\Expr\NewExprDynamicReturnTypeExtension
 		tags:
 			- phpstan.broker.dynamicStaticMethodReturnTypeExtension
 		arguments:
 			class: Doctrine\ORM\Query\Expr\Comparison
+			argumentsProcessor: @argumentsProcessor
 	-
 		class: PHPStan\Type\Doctrine\QueryBuilder\Expr\NewExprDynamicReturnTypeExtension
 		tags:
 			- phpstan.broker.dynamicStaticMethodReturnTypeExtension
 		arguments:
 			class: Doctrine\ORM\Query\Expr\From
+			argumentsProcessor: @argumentsProcessor
 	-
 		class: PHPStan\Type\Doctrine\QueryBuilder\Expr\NewExprDynamicReturnTypeExtension
 		tags:
 			- phpstan.broker.dynamicStaticMethodReturnTypeExtension
 		arguments:
 			class: Doctrine\ORM\Query\Expr\Func
+			argumentsProcessor: @argumentsProcessor
 	-
 		class: PHPStan\Type\Doctrine\QueryBuilder\Expr\NewExprDynamicReturnTypeExtension
 		tags:
 			- phpstan.broker.dynamicStaticMethodReturnTypeExtension
 		arguments:
 			class: Doctrine\ORM\Query\Expr\Join
+			argumentsProcessor: @argumentsProcessor
 	-
 		class: PHPStan\Type\Doctrine\QueryBuilder\Expr\NewExprDynamicReturnTypeExtension
 		tags:
 			- phpstan.broker.dynamicStaticMethodReturnTypeExtension
 		arguments:
 			class: Doctrine\ORM\Query\Expr\Math
+			argumentsProcessor: @argumentsProcessor
 	-
 		class: PHPStan\Type\Doctrine\QueryBuilder\Expr\NewExprDynamicReturnTypeExtension
 		tags:
 			- phpstan.broker.dynamicStaticMethodReturnTypeExtension
 		arguments:
 			class: Doctrine\ORM\Query\Expr\OrderBy
+			argumentsProcessor: @argumentsProcessor

phpcs.xml

@@ -24,6 +24,7 @@
 				@dataProvider,
 				@requires
 			"/>
+			<property name="enableObjectTypeHint" value="false"/>
 		</properties>
 	</rule>
 	<rule ref="SlevomatCodingStandard.ControlStructures.AssignmentInCondition"/>

src/Type/Doctrine/ArgumentsProcessor.php

@@ -30,8 +30,7 @@ public function processArgs(
 				$value instanceof ExprType
 				&& strpos($value->getClassName(), 'Doctrine\ORM\Query\Expr') === 0
 			) {
-				$className = $value->getClassName();
-				$args[] = new $className(...$this->processArgs($scope, '__construct', $value->getConstructorArgs()));
+				$args[] = $value->getExprObject();
 				continue;
 			}
 			// todo $qb->expr() support

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

@@ -7,25 +7,25 @@
 class ExprType extends ObjectType
 {
 
-	/** @var \PhpParser\Node\Arg[] */
-	private $constructorArgs;
+	/** @var object */
+	private $exprObject;
 
 	/**
 	 * @param string $className
-	 * @param \PhpParser\Node\Arg[] $constructorArgs
+	 * @param object $exprObject
 	 */
-	public function __construct(string $className, array $constructorArgs)
+	public function __construct(string $className, $exprObject)
 	{
 		parent::__construct($className);
-		$this->constructorArgs = $constructorArgs;
+		$this->exprObject = $exprObject;
 	}
 
 	/**
-	 * @return \PhpParser\Node\Arg[]
+	 * @return object
 	 */
-	public function getConstructorArgs(): array
+	public function getExprObject()
 	{
-		return $this->constructorArgs;
+		return $this->exprObject;
 	}
 
 }

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

@@ -6,17 +6,27 @@
 use PhpParser\Node\Name;
 use PHPStan\Analyser\Scope;
 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
 {
 
+	/** @var \PHPStan\Type\Doctrine\ArgumentsProcessor */
+	private $argumentsProcessor;
+
 	/** @var string */
 	private $class;
 
-	public function __construct(string $class)
+	public function __construct(
+		ArgumentsProcessor $argumentsProcessor,
+		string $class
+	)
 	{
+		$this->argumentsProcessor = $argumentsProcessor;
 		$this->class = $class;
 	}
 
@@ -35,7 +45,24 @@ public function getTypeFromStaticMethodCall(MethodReflection $methodReflection,
 		if (!$methodCall->class instanceof Name) {
 			throw new \PHPStan\ShouldNotHappenException();
 		}
-		return new ExprType($methodCall->class->toString(), $methodCall->args);
+
+		$className = $methodCall->class->toString();
+
+		try {
+			$exprObject = new $className(
+				...$this->argumentsProcessor->processArgs(
+					$scope,
+					$methodReflection->getName(),
+					$methodCall->args
+				)
+			);
+		} catch (DynamicQueryBuilderArgumentException $e) {
+			return ParametersAcceptorSelector::selectSingle(
+				$methodReflection->getVariants()
+			)->getReturnType();
+		}
+
+		return new ExprType($className, $exprObject);
 	}
 
 }

tests/Rules/Doctrine/ORM/QueryBuilderDqlRuleTest.php

@@ -105,9 +105,10 @@ protected function getMethodTypeSpecifyingExtensions(): array
 	 */
 	public function getDynamicStaticMethodReturnTypeExtensions(): array
 	{
+		$argumentsProcessor = new ArgumentsProcessor();
 		return [
-			new NewExprDynamicReturnTypeExtension(OrderBy::class),
-			new NewExprDynamicReturnTypeExtension(Base::class),
+			new NewExprDynamicReturnTypeExtension($argumentsProcessor, OrderBy::class),
+			new NewExprDynamicReturnTypeExtension($argumentsProcessor, Base::class),
 		];
 	}