Analyze new Expr() first assigned to a variable

Author: ondrejmirtes

extension.neon

@@ -91,3 +91,48 @@ services:
 			- phpstan.broker.dynamicMethodReturnTypeExtension
 		arguments:
 			managerClass: Doctrine\Common\Persistence\ObjectManager
+
+	## NewExprDynamicReturnTypeExtensions
+
+	-
+		class: PHPStan\Type\Doctrine\QueryBuilder\Expr\NewExprDynamicReturnTypeExtension
+		tags:
+			- phpstan.broker.dynamicStaticMethodReturnTypeExtension
+		arguments:
+			class: Doctrine\ORM\Query\Expr\Base
+	-
+		class: PHPStan\Type\Doctrine\QueryBuilder\Expr\NewExprDynamicReturnTypeExtension
+		tags:
+			- phpstan.broker.dynamicStaticMethodReturnTypeExtension
+		arguments:
+			class: Doctrine\ORM\Query\Expr\Comparison
+	-
+		class: PHPStan\Type\Doctrine\QueryBuilder\Expr\NewExprDynamicReturnTypeExtension
+		tags:
+			- phpstan.broker.dynamicStaticMethodReturnTypeExtension
+		arguments:
+			class: Doctrine\ORM\Query\Expr\From
+	-
+		class: PHPStan\Type\Doctrine\QueryBuilder\Expr\NewExprDynamicReturnTypeExtension
+		tags:
+			- phpstan.broker.dynamicStaticMethodReturnTypeExtension
+		arguments:
+			class: Doctrine\ORM\Query\Expr\Func
+	-
+		class: PHPStan\Type\Doctrine\QueryBuilder\Expr\NewExprDynamicReturnTypeExtension
+		tags:
+			- phpstan.broker.dynamicStaticMethodReturnTypeExtension
+		arguments:
+			class: Doctrine\ORM\Query\Expr\Join
+	-
+		class: PHPStan\Type\Doctrine\QueryBuilder\Expr\NewExprDynamicReturnTypeExtension
+		tags:
+			- phpstan.broker.dynamicStaticMethodReturnTypeExtension
+		arguments:
+			class: Doctrine\ORM\Query\Expr\Math
+	-
+		class: PHPStan\Type\Doctrine\QueryBuilder\Expr\NewExprDynamicReturnTypeExtension
+		tags:
+			- phpstan.broker.dynamicStaticMethodReturnTypeExtension
+		arguments:
+			class: Doctrine\ORM\Query\Expr\OrderBy

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

@@ -0,0 +1,31 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Type\Doctrine\QueryBuilder\Expr;
+
+use PHPStan\Type\ObjectType;
+
+class ExprType extends ObjectType
+{
+
+	/** @var \PhpParser\Node\Arg[] */
+	private $constructorArgs;
+
+	/**
+	 * @param string $className
+	 * @param \PhpParser\Node\Arg[] $constructorArgs
+	 */
+	public function __construct(string $className, array $constructorArgs)
+	{
+		parent::__construct($className);
+		$this->constructorArgs = $constructorArgs;
+	}
+
+	/**
+	 * @return \PhpParser\Node\Arg[]
+	 */
+	public function getConstructorArgs(): array
+	{
+		return $this->constructorArgs;
+	}
+
+}

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

@@ -0,0 +1,41 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Type\Doctrine\QueryBuilder\Expr;
+
+use PhpParser\Node\Expr\StaticCall;
+use PhpParser\Node\Name;
+use PHPStan\Analyser\Scope;
+use PHPStan\Reflection\MethodReflection;
+use PHPStan\Type\DynamicStaticMethodReturnTypeExtension;
+use PHPStan\Type\Type;
+
+class NewExprDynamicReturnTypeExtension implements DynamicStaticMethodReturnTypeExtension
+{
+
+	/** @var string */
+	private $class;
+
+	public function __construct(string $class)
+	{
+		$this->class = $class;
+	}
+
+	public function getClass(): string
+	{
+		return $this->class;
+	}
+
+	public function isStaticMethodSupported(MethodReflection $methodReflection): bool
+	{
+		return $methodReflection->getName() === '__construct';
+	}
+
+	public function getTypeFromStaticMethodCall(MethodReflection $methodReflection, StaticCall $methodCall, Scope $scope): Type
+	{
+		if (!$methodCall->class instanceof Name) {
+			throw new \PHPStan\ShouldNotHappenException();
+		}
+		return new ExprType($methodCall->class->toString(), $methodCall->args);
+	}
+
+}

src/Type/Doctrine/QueryBuilder/QueryBuilderGetQueryDynamicReturnTypeExtension.php

@@ -3,7 +3,6 @@
 namespace PHPStan\Type\Doctrine\QueryBuilder;
 
 use PhpParser\Node\Expr\MethodCall;
-use PhpParser\Node\Expr\New_;
 use PhpParser\Node\Identifier;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
@@ -13,8 +12,8 @@
 use PHPStan\Type\ConstantScalarType;
 use PHPStan\Type\Doctrine\ObjectMetadataResolver;
 use PHPStan\Type\Doctrine\Query\QueryType;
+use PHPStan\Type\Doctrine\QueryBuilder\Expr\ExprType;
 use PHPStan\Type\Type;
-use PHPStan\Type\TypeWithClassName;
 use function in_array;
 use function method_exists;
 use function strtolower;
@@ -130,12 +129,11 @@ protected function processArgs(Scope $scope, string $methodName, array $methodCa
 		foreach ($methodCallArgs as $arg) {
 			$value = $scope->getType($arg->value);
 			if (
-				$arg->value instanceof New_
-				&& $value instanceof TypeWithClassName
+				$value instanceof ExprType
 				&& strpos($value->getClassName(), 'Doctrine\ORM\Query\Expr') === 0
 			) {
 				$className = $value->getClassName();
-				$args[] = new $className(...$this->processArgs($scope, '__construct', $arg->value->args));
+				$args[] = new $className(...$this->processArgs($scope, '__construct', $value->getConstructorArgs()));
 				continue;
 			}
 			// todo $qb->expr() support

tests/Rules/Doctrine/ORM/QueryBuilderDqlRuleTest.php

@@ -2,11 +2,14 @@
 
 namespace PHPStan\Rules\Doctrine\ORM;
 
+use Doctrine\ORM\Query\Expr\Base;
+use Doctrine\ORM\Query\Expr\OrderBy;
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
 use PHPStan\Type\Doctrine\ObjectMetadataResolver;
 use PHPStan\Type\Doctrine\Query\QueryGetDqlDynamicReturnTypeExtension;
 use PHPStan\Type\Doctrine\QueryBuilder\CreateQueryBuilderDynamicReturnTypeExtension;
+use PHPStan\Type\Doctrine\QueryBuilder\Expr\NewExprDynamicReturnTypeExtension;
 use PHPStan\Type\Doctrine\QueryBuilder\QueryBuilderGetQueryDynamicReturnTypeExtension;
 use PHPStan\Type\Doctrine\QueryBuilder\QueryBuilderMethodDynamicReturnTypeExtension;
 use PHPStan\Type\Doctrine\QueryBuilder\QueryBuilderTypeSpecifyingExtension;
@@ -62,6 +65,14 @@ public function testRule(): void
 				'QueryBuilder: [Semantical Error] line 0, col 78 near \'name ASC\': Error: Class PHPStan\Rules\Doctrine\ORM\MyEntity has no field or association named name',
 				139,
 			],
+			[
+				'QueryBuilder: [Semantical Error] line 0, col 78 near \'name ASC\': Error: Class PHPStan\Rules\Doctrine\ORM\MyEntity has no field or association named name',
+				160,
+			],
+			[
+				'QueryBuilder: [Semantical Error] line 0, col 60 near \'transient = 1\': Error: Class PHPStan\Rules\Doctrine\ORM\MyEntity has no field or association named transient',
+				170,
+			],
 		]);
 	}
 
@@ -88,4 +99,15 @@ protected function getMethodTypeSpecifyingExtensions(): array
 		];
 	}
 
+	/**
+	 * @return \PHPStan\Type\DynamicStaticMethodReturnTypeExtension[]
+	 */
+	public function getDynamicStaticMethodReturnTypeExtensions(): array
+	{
+		return [
+			new NewExprDynamicReturnTypeExtension(OrderBy::class),
+			new NewExprDynamicReturnTypeExtension(Base::class),
+		];
+	}
+
 }

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

@@ -154,4 +154,38 @@ public function addNewExprCorrect(): void
 			->getQuery();
 	}
 
+	public function addNewExprFirstAssignedToVariable(): void
+	{
+		$orderBy = new \Doctrine\ORM\Query\Expr\OrderBy('e.name', 'ASC');
+		$this->entityManager->createQueryBuilder()
+			->select('e')
+			->from(MyEntity::class, 'e')
+			->andWhere('e.id = 1')
+			->add('orderBy', $orderBy)
+			->getQuery();
+	}
+
+	public function addNewExprBase(): void
+	{
+		$this->entityManager->createQueryBuilder()
+			->select('e')
+			->from(MyEntity::class, 'e')
+			->add('where', new \Doctrine\ORM\Query\Expr\Andx([
+				'e.transient = 1',
+				'e.name = \'foo\'',
+			]))
+			->getQuery();
+	}
+
+	public function addNewExprBaseCorrect(): void
+	{
+		$this->entityManager->createQueryBuilder()
+			->select('e')
+			->from(MyEntity::class, 'e')
+			->add('where', new \Doctrine\ORM\Query\Expr\Andx([
+				'e.id = 1',
+			]))
+			->getQuery();
+	}
+
 }