Merge remote-tracking branch 'origin/1.3.x' into 1.4.x

Author: ondrejmirtes

extension.neon

@@ -150,7 +150,12 @@ services:
 			argumentsProcessor: @doctrineQueryBuilderArgumentsProcessor
 		tags:
 			- phpstan.broker.dynamicMethodReturnTypeExtension
-
+	-
+		class: PHPStan\Type\Doctrine\QueryBuilder\Expr\BaseExpressionDynamicReturnTypeExtension
+		arguments:
+			argumentsProcessor: @doctrineQueryBuilderArgumentsProcessor
+		tags:
+			- phpstan.broker.dynamicMethodReturnTypeExtension
 	-
 		class: PHPStan\Rules\Doctrine\ORM\PropertiesExtension
 		tags:

phpstan.neon

@@ -28,6 +28,9 @@ parameters:
 		-
 			message: '~^Variable method call on object\.$~'
 			path: src/Type/Doctrine/QueryBuilder/Expr/ExpressionBuilderDynamicReturnTypeExtension.php
+		-
+			message: '~^Variable method call on object\.$~'
+			path: src/Type/Doctrine/QueryBuilder/Expr/BaseExpressionDynamicReturnTypeExtension.php
 		-
 			message: '~^Variable property access on PhpParser\\Node\\Stmt\\Declare_\|PhpParser\\Node\\Stmt\\Namespace_\.$~'
 			path: src/Type/Doctrine/QueryBuilder/OtherMethodQueryBuilderParser.php

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

@@ -0,0 +1,69 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Type\Doctrine\QueryBuilder\Expr;
+
+use PhpParser\Node\Expr\MethodCall;
+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\DynamicMethodReturnTypeExtension;
+use PHPStan\Type\Type;
+use function get_class;
+use function is_object;
+use function method_exists;
+
+class BaseExpressionDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
+{
+
+	/** @var ArgumentsProcessor */
+	private $argumentsProcessor;
+
+	public function __construct(
+		ArgumentsProcessor $argumentsProcessor
+	)
+	{
+		$this->argumentsProcessor = $argumentsProcessor;
+	}
+
+	public function getClass(): string
+	{
+		return 'Doctrine\ORM\Query\Expr\Base';
+	}
+
+	public function isMethodSupported(MethodReflection $methodReflection): bool
+	{
+		return true;
+	}
+
+	public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type
+	{
+		$defaultReturnType = ParametersAcceptorSelector::selectFromArgs($scope, $methodCall->getArgs(), $methodReflection->getVariants())->getReturnType();
+
+		try {
+			$args = $this->argumentsProcessor->processArgs($scope, $methodReflection->getName(), $methodCall->getArgs());
+		} catch (DynamicQueryBuilderArgumentException $e) {
+			return $defaultReturnType;
+		}
+
+		$calledOnType = $scope->getType($methodCall->var);
+		if (!$calledOnType instanceof ExprType) {
+			return $defaultReturnType;
+		}
+
+		$expr = $calledOnType->getExprObject();
+
+		if (!method_exists($expr, $methodReflection->getName())) {
+			return $defaultReturnType;
+		}
+
+		$exprValue = $expr->{$methodReflection->getName()}(...$args);
+		if (is_object($exprValue)) {
+			return new ExprType(get_class($exprValue), $exprValue);
+		}
+
+		return $scope->getTypeFromValue($exprValue);
+	}
+
+}

tests/Rules/Doctrine/ORM/QueryBuilderDqlRuleTest.php

@@ -124,6 +124,11 @@ public function testRuleBranches(): void
 		$this->analyse([__DIR__ . '/data/query-builder-branches-dql.php'], $errors);
 	}
 
+	public function testAndOrVariants(): void
+	{
+		$this->analyse([__DIR__ . '/data/query-builder-dql-and-or-variants.php'], []);
+	}
+
 	public function testBranchingPerformance(): void
 	{
 		$this->analyse([__DIR__ . '/data/query-builder-branches-performance.php'], [

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

@@ -0,0 +1,47 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Rules\Doctrine\ORM;
+
+use Doctrine\ORM\EntityManager;
+
+class TestAndxWithConsequentMethodCall
+{
+
+	/** @var EntityManager */
+	private $entityManager;
+
+	public function __construct(EntityManager $entityManager)
+	{
+		$this->entityManager = $entityManager;
+	}
+
+	public function emptyConstructorConsequentCall(): void
+	{
+		$expr = (new \Doctrine\ORM\Query\Expr\Andx())->add('1 = 1');
+		$queryBuilder = $this->entityManager->createQueryBuilder();
+		$queryBuilder->select('e')
+			->from(MyEntity::class, 'e')
+			->andWhere($expr);
+		$queryBuilder->getQuery();
+	}
+
+	public function usedConstructor(): void
+	{
+		$expr = new \Doctrine\ORM\Query\Expr\Andx('1 = 1');
+		$queryBuilder = $this->entityManager->createQueryBuilder();
+		$queryBuilder->select('e')
+			->from(MyEntity::class, 'e')
+			->andWhere($expr);
+		$queryBuilder->getQuery();
+	}
+
+	public function createdFromQueryBuilder(): void
+	{
+		$queryBuilder = $this->entityManager->createQueryBuilder();
+		$queryBuilder->select('e')
+			->from(MyEntity::class, 'e')
+			->andWhere($queryBuilder->expr()->andX('1 = 1'));
+		$queryBuilder->getQuery();
+	}
+
+}

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

@@ -281,6 +281,16 @@ public function qbCustomExprMethodSyntaxError(): void
 		$queryBuilder->getQuery();
 	}
 
+	public function qbExprMethod(): void
+	{
+		$expr = (new \Doctrine\ORM\Query\Expr\Andx())->add('1 = 1');
+		$queryBuilder = $this->entityManager->createQueryBuilder();
+		$queryBuilder->select('e')
+			->from(MyEntity::class, 'e')
+			->andWhere($expr);
+		$queryBuilder->getQuery();
+	}
+
 }
 
 class CustomExpr extends \Doctrine\ORM\Query\Expr