Support new Expr() in QueryBuilder calls

Author: ondrejmirtes

src/Type/Doctrine/QueryBuilder/QueryBuilderGetQueryDynamicReturnTypeExtension.php

@@ -3,6 +3,7 @@
 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,6 +14,7 @@
 use PHPStan\Type\Doctrine\ObjectMetadataResolver;
 use PHPStan\Type\Doctrine\Query\QueryType;
 use PHPStan\Type\Type;
+use PHPStan\Type\TypeWithClassName;
 use function in_array;
 use function method_exists;
 use function strtolower;
@@ -127,8 +129,16 @@ protected function processArgs(Scope $scope, string $methodName, array $methodCa
 		$args = [];
 		foreach ($methodCallArgs as $arg) {
 			$value = $scope->getType($arg->value);
+			if (
+				$arg->value instanceof New_
+				&& $value instanceof TypeWithClassName
+				&& strpos($value->getClassName(), 'Doctrine\ORM\Query\Expr') === 0
+			) {
+				$className = $value->getClassName();
+				$args[] = new $className(...$this->processArgs($scope, '__construct', $arg->value->args));
+				continue;
+			}
 			// todo $qb->expr() support
-			// todo new Expr\Andx support
 			if ($value instanceof ConstantArrayType) {
 				$array = [];
 				foreach ($value->getKeyTypes() as $i => $keyType) {

tests/Rules/Doctrine/ORM/QueryBuilderDqlRuleTest.php

@@ -54,6 +54,14 @@ public function testRule(): void
 				'QueryBuilder: [Semantical Error] line 0, col 60 near \'transient = \': Error: Class PHPStan\Rules\Doctrine\ORM\MyEntity has no field or association named transient',
 				107,
 			],
+			[
+				"QueryBuilder: [Syntax Error] line 0, col 82: Error: Expected end of string, got ')'\nDQL: SELECT e FROM PHPStan\Rules\Doctrine\ORM\MyEntity e WHERE e.id = 1 ORDER BY e.name) ASC",
+				129,
+			],
+			[
+				'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,
+			],
 		]);
 	}
 

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

@@ -124,4 +124,34 @@ public function limitOffsetCorrect(int $offset, int $limit): void
 			->getQuery();
 	}
 
+	public function addNewExprSyntaxError(): void
+	{
+		$this->entityManager->createQueryBuilder()
+			->select('e')
+			->from(MyEntity::class, 'e')
+			->andWhere('e.id = 1')
+			->add('orderBy', new \Doctrine\ORM\Query\Expr\OrderBy('e.name)', 'ASC'))
+			->getQuery();
+	}
+
+	public function addNewExprSemanticError(): void
+	{
+		$this->entityManager->createQueryBuilder()
+			->select('e')
+			->from(MyEntity::class, 'e')
+			->andWhere('e.id = 1')
+			->add('orderBy', new \Doctrine\ORM\Query\Expr\OrderBy('e.name', 'ASC'))
+			->getQuery();
+	}
+
+	public function addNewExprCorrect(): void
+	{
+		$this->entityManager->createQueryBuilder()
+			->select('e')
+			->from(MyEntity::class, 'e')
+			->andWhere('e.id = 1')
+			->add('orderBy', new \Doctrine\ORM\Query\Expr\OrderBy('e.title', 'ASC'))
+			->getQuery();
+	}
+
 }