Merge branch '1.3.x' into 1.4.x

Author: ondrejmirtes

.github/workflows/build.yml

@@ -23,6 +23,7 @@ jobs:
           - "8.0"
           - "8.1"
           - "8.2"
+          - "8.3"
 
     steps:
       - name: "Checkout"
@@ -143,6 +144,7 @@ jobs:
           - "8.0"
           - "8.1"
           - "8.2"
+          - "8.3"
 
     steps:
       - name: "Checkout"

composer.json

@@ -24,7 +24,7 @@
 		"doctrine/dbal": "^2.13.8 || ^3.3.3",
 		"doctrine/lexer": "^1.2.1",
 		"doctrine/mongodb-odm": "^1.3 || ^2.1",
-		"doctrine/orm": "^2.11.0",
+		"doctrine/orm": "^2.14.0",
 		"doctrine/persistence": "^1.3.8 || ^2.2.1",
 		"gedmo/doctrine-extensions": "^3.8",
 		"nesbot/carbon": "^2.49",

extension.neon

@@ -74,8 +74,9 @@ conditionalTags:
 services:
 	-
 		class: PHPStan\Type\Doctrine\DescriptorRegistryFactory
-	-
-		class: PHPStan\Type\Doctrine\DescriptorRegistry
+
+	doctrineTypeDescriptorRegistry:
+		class: PHPStan\Type\Doctrine\DefaultDescriptorRegistry
 		factory: @PHPStan\Type\Doctrine\DescriptorRegistryFactory::createRegistry
 
 	-
@@ -115,6 +116,7 @@ services:
 		arguments:
 			queryBuilderClass: %doctrine.queryBuilderClass%
 			argumentsProcessor: @doctrineQueryBuilderArgumentsProcessor
+			descriptorRegistry: @doctrineTypeDescriptorRegistry
 		tags:
 			- phpstan.broker.dynamicMethodReturnTypeExtension
 	-
@@ -138,6 +140,7 @@ services:
 		class: PHPStan\Type\Doctrine\CreateQueryDynamicReturnTypeExtension
 		arguments:
 			objectMetadataResolver: @PHPStan\Type\Doctrine\ObjectMetadataResolver
+			descriptorRegistry: @doctrineTypeDescriptorRegistry
 		tags:
 			- phpstan.broker.dynamicMethodReturnTypeExtension
 	-
@@ -166,6 +169,11 @@ services:
 			descendIntoOtherMethods: %doctrine.searchOtherMethodsForQueryBuilderBeginning%
 			parser: @defaultAnalysisParser
 
+	-
+		class: PHPStan\Type\Doctrine\QueryBuilder\ReturnQueryBuilderExpressionTypeResolverExtension
+		tags:
+			- phpstan.broker.expressionTypeResolverExtension
+
 	-
 		class: PHPStan\Stubs\Doctrine\StubFilesExtensionLoader
 		tags:

rules.neon

@@ -35,7 +35,6 @@ services:
 		class: PHPStan\Rules\Doctrine\ORM\QueryBuilderDqlRule
 		arguments:
 			reportDynamicQueryBuilders: %doctrine.reportDynamicQueryBuilders%
-			searchOtherMethodsForQueryBuilderBeginning: %doctrine.searchOtherMethodsForQueryBuilderBeginning%
 		tags:
 			- phpstan.rules.rule
 	-
@@ -44,6 +43,7 @@ services:
 			reportUnknownTypes: %doctrine.reportUnknownTypes%
 			allowNullablePropertyForRequiredField: %doctrine.allowNullablePropertyForRequiredField%
 			bleedingEdge: %featureToggles.bleedingEdge%
+			descriptorRegistry: @doctrineTypeDescriptorRegistry
 		tags:
 			- phpstan.rules.rule
 	-

src/Rules/Doctrine/ORM/QueryBuilderDqlRule.php

@@ -12,7 +12,6 @@
 use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\Type\Doctrine\DoctrineTypeUtils;
 use PHPStan\Type\Doctrine\ObjectMetadataResolver;
-use PHPStan\Type\Doctrine\QueryBuilder\OtherMethodQueryBuilderParser;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\TypeUtils;
 use Throwable;
@@ -32,23 +31,13 @@ class QueryBuilderDqlRule implements Rule
 	/** @var bool */
 	private $reportDynamicQueryBuilders;
 
-	/** @var OtherMethodQueryBuilderParser */
-	private $otherMethodQueryBuilderParser;
-
-	/** @var bool */
-	private $searchOtherMethodsForQueryBuilderBeginning;
-
 	public function __construct(
 		ObjectMetadataResolver $objectMetadataResolver,
-		OtherMethodQueryBuilderParser $otherMethodQueryBuilderParser,
-		bool $reportDynamicQueryBuilders,
-		bool $searchOtherMethodsForQueryBuilderBeginning
+		bool $reportDynamicQueryBuilders
 	)
 	{
 		$this->objectMetadataResolver = $objectMetadataResolver;
-		$this->otherMethodQueryBuilderParser = $otherMethodQueryBuilderParser;
 		$this->reportDynamicQueryBuilders = $reportDynamicQueryBuilders;
-		$this->searchOtherMethodsForQueryBuilderBeginning = $searchOtherMethodsForQueryBuilderBeginning;
 	}
 
 	public function getNodeType(): string
@@ -69,14 +58,6 @@ public function processNode(Node $node, Scope $scope): array
 		$calledOnType = $scope->getType($node->var);
 		$queryBuilderTypes = DoctrineTypeUtils::getQueryBuilderTypes($calledOnType);
 		if (count($queryBuilderTypes) === 0) {
-
-			if ($this->searchOtherMethodsForQueryBuilderBeginning) {
-				$queryBuilderTypes = $this->otherMethodQueryBuilderParser->getQueryBuilderTypes($scope, $node);
-				if (count($queryBuilderTypes) !== 0) {
-					return [];
-				}
-			}
-
 			if (
 				$this->reportDynamicQueryBuilders
 				&& (new ObjectType('Doctrine\ORM\QueryBuilder'))->isSuperTypeOf($calledOnType)->yes()

src/Type/Doctrine/DefaultDescriptorRegistry.php

@@ -0,0 +1,39 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Type\Doctrine;
+
+use Doctrine\DBAL\Types\Type;
+use PHPStan\Type\Doctrine\Descriptors\DoctrineTypeDescriptor;
+
+class DefaultDescriptorRegistry implements DescriptorRegistry
+{
+
+	/** @var array<class-string<Type>, DoctrineTypeDescriptor> */
+	private $descriptors = [];
+
+	/**
+	 * @param DoctrineTypeDescriptor[] $descriptors
+	 */
+	public function __construct(array $descriptors)
+	{
+		foreach ($descriptors as $descriptor) {
+			$this->descriptors[$descriptor->getType()] = $descriptor;
+		}
+	}
+
+	public function get(string $type): DoctrineTypeDescriptor
+	{
+		$typesMap = Type::getTypesMap();
+		if (!isset($typesMap[$type])) {
+			throw new DescriptorNotRegisteredException();
+		}
+
+		/** @var class-string<Type> $typeClass */
+		$typeClass = $typesMap[$type];
+		if (!isset($this->descriptors[$typeClass])) {
+			throw new DescriptorNotRegisteredException();
+		}
+		return $this->descriptors[$typeClass];
+	}
+
+}

src/Type/Doctrine/DescriptorRegistry.php

@@ -2,38 +2,11 @@
 
 namespace PHPStan\Type\Doctrine;
 
-use Doctrine\DBAL\Types\Type;
 use PHPStan\Type\Doctrine\Descriptors\DoctrineTypeDescriptor;
 
-class DescriptorRegistry
+interface DescriptorRegistry
 {
 
-	/** @var array<class-string<Type>, DoctrineTypeDescriptor> */
-	private $descriptors = [];
-
-	/**
-	 * @param DoctrineTypeDescriptor[] $descriptors
-	 */
-	public function __construct(array $descriptors)
-	{
-		foreach ($descriptors as $descriptor) {
-			$this->descriptors[$descriptor->getType()] = $descriptor;
-		}
-	}
-
-	public function get(string $type): DoctrineTypeDescriptor
-	{
-		$typesMap = Type::getTypesMap();
-		if (!isset($typesMap[$type])) {
-			throw new DescriptorNotRegisteredException();
-		}
-
-		/** @var class-string<Type> $typeClass */
-		$typeClass = $typesMap[$type];
-		if (!isset($this->descriptors[$typeClass])) {
-			throw new DescriptorNotRegisteredException();
-		}
-		return $this->descriptors[$typeClass];
-	}
+	public function get(string $type): DoctrineTypeDescriptor;
 
 }

src/Type/Doctrine/DescriptorRegistryFactory.php

@@ -19,7 +19,7 @@ public function __construct(Container $container)
 
 	public function createRegistry(): DescriptorRegistry
 	{
-		return new DescriptorRegistry($this->container->getServicesByTag(self::TYPE_DESCRIPTOR_TAG));
+		return new DefaultDescriptorRegistry($this->container->getServicesByTag(self::TYPE_DESCRIPTOR_TAG));
 	}
 
 }

src/Type/Doctrine/QueryBuilder/OtherMethodQueryBuilderParser.php

@@ -3,8 +3,6 @@
 namespace PHPStan\Type\Doctrine\QueryBuilder;
 
 use PhpParser\Node;
-use PhpParser\Node\Expr\MethodCall;
-use PhpParser\Node\Identifier;
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
@@ -17,13 +15,12 @@
 use PHPStan\Analyser\ScopeFactory;
 use PHPStan\DependencyInjection\Container;
 use PHPStan\Parser\Parser;
-use PHPStan\Reflection\ReflectionProvider;
+use PHPStan\Reflection\MethodReflection;
 use PHPStan\Type\Generic\TemplateTypeMap;
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeTraverser;
 use PHPStan\Type\UnionType;
-use function count;
 use function is_array;
 
 class OtherMethodQueryBuilderParser
@@ -32,61 +29,28 @@ class OtherMethodQueryBuilderParser
 	/** @var bool */
 	private $descendIntoOtherMethods;
 
-	/** @var ReflectionProvider */
-	private $reflectionProvider;
-
 	/** @var Parser */
 	private $parser;
 
 	/** @var Container */
 	private $container;
 
-	public function __construct(bool $descendIntoOtherMethods, ReflectionProvider $reflectionProvider, Parser $parser, Container $container)
+	public function __construct(bool $descendIntoOtherMethods, Parser $parser, Container $container)
 	{
 		$this->descendIntoOtherMethods = $descendIntoOtherMethods;
-		$this->reflectionProvider = $reflectionProvider;
 		$this->parser = $parser;
 		$this->container = $container;
 	}
 
 	/**
-	 * @return QueryBuilderType[]
+	 * @return list<QueryBuilderType>
 	 */
-	public function getQueryBuilderTypes(Scope $scope, MethodCall $methodCall): array
+	public function findQueryBuilderTypesInCalledMethod(Scope $scope, MethodReflection $methodReflection): array
 	{
-		if (!$this->descendIntoOtherMethods || !$methodCall->var instanceof MethodCall) {
-			return [];
-		}
-
-		return $this->findQueryBuilderTypesInCalledMethod($scope, $methodCall->var);
-	}
-	/**
-	 * @return QueryBuilderType[]
-	 */
-	private function findQueryBuilderTypesInCalledMethod(Scope $scope, MethodCall $methodCall): array
-	{
-		$methodCalledOnType = $scope->getType($methodCall->var);
-		if (!$methodCall->name instanceof Identifier) {
-			return [];
-		}
-
-		$methodCalledOnTypeClassNames = $methodCalledOnType->getObjectClassNames();
-
-		if (count($methodCalledOnTypeClassNames) !== 1) {
-			return [];
-		}
-
-		if (!$this->reflectionProvider->hasClass($methodCalledOnTypeClassNames[0])) {
-			return [];
-		}
-
-		$classReflection = $this->reflectionProvider->getClass($methodCalledOnTypeClassNames[0]);
-		$methodName = $methodCall->name->toString();
-		if (!$classReflection->hasNativeMethod($methodName)) {
+		if (!$this->descendIntoOtherMethods) {
 			return [];
 		}
 
-		$methodReflection = $classReflection->getNativeMethod($methodName);
 		$fileName = $methodReflection->getDeclaringClass()->getFileName();
 		if ($fileName === null) {
 			return [];

src/Type/Doctrine/QueryBuilder/QueryBuilderGetQueryDynamicReturnTypeExtension.php

@@ -65,22 +65,17 @@ class QueryBuilderGetQueryDynamicReturnTypeExtension implements DynamicMethodRet
 	/** @var DescriptorRegistry */
 	private $descriptorRegistry;
 
-	/** @var OtherMethodQueryBuilderParser */
-	private $otherMethodQueryBuilderParser;
-
 	public function __construct(
 		ObjectMetadataResolver $objectMetadataResolver,
 		ArgumentsProcessor $argumentsProcessor,
 		?string $queryBuilderClass,
-		DescriptorRegistry $descriptorRegistry,
-		OtherMethodQueryBuilderParser $otherMethodQueryBuilderParser
+		DescriptorRegistry $descriptorRegistry
 	)
 	{
 		$this->objectMetadataResolver = $objectMetadataResolver;
 		$this->argumentsProcessor = $argumentsProcessor;
 		$this->queryBuilderClass = $queryBuilderClass;
 		$this->descriptorRegistry = $descriptorRegistry;
-		$this->otherMethodQueryBuilderParser = $otherMethodQueryBuilderParser;
 	}
 
 	public function getClass(): string
@@ -107,10 +102,7 @@ public function getTypeFromMethodCall(
 		)->getReturnType();
 		$queryBuilderTypes = DoctrineTypeUtils::getQueryBuilderTypes($calledOnType);
 		if (count($queryBuilderTypes) === 0) {
-			$queryBuilderTypes = $this->otherMethodQueryBuilderParser->getQueryBuilderTypes($scope, $methodCall);
-			if (count($queryBuilderTypes) === 0) {
-				return $defaultReturnType;
-			}
+			return $defaultReturnType;
 		}
 
 		$objectManager = $this->objectMetadataResolver->getObjectManager();