Merge branch 'master' into generic-query

Author: arnaud-lb

.github/workflows/build.yml

@@ -14,13 +14,15 @@ jobs:
     runs-on: "ubuntu-latest"
 
     strategy:
+      fail-fast: false
       matrix:
         php-version:
           - "7.1"
           - "7.2"
           - "7.3"
           - "7.4"
           - "8.0"
+          - "8.1"
 
     steps:
       - name: "Checkout"
@@ -35,12 +37,16 @@ jobs:
       - name: "Validate Composer"
         run: "composer validate"
 
-      - name: "Install dependencies"
-        run: "composer install --no-interaction --no-progress --no-suggest"
-
       - name: "Downgrade PHPUnit"
         if: matrix.php-version == '7.1' || matrix.php-version == '7.2' || matrix.php-version == '7.3'
-        run: "composer require --dev phpunit/phpunit:^7.5.20 --update-with-dependencies"
+        run: "composer require --dev phpunit/phpunit:^7.5.20 --no-update --update-with-dependencies"
+
+      - name: "Downgrade Doctrine ORM"
+        if: matrix.php-version == '7.1'
+        run: "composer require --dev doctrine/orm:^2.7.5 doctrine/lexer:^1.0 --no-update --update-with-dependencies"
+
+      - name: "Install dependencies"
+        run: "composer install --no-interaction --no-progress"
 
       - name: "Lint"
         run: "make lint"
@@ -64,7 +70,7 @@ jobs:
         run: "composer validate"
 
       - name: "Install dependencies"
-        run: "composer install --no-interaction --no-progress --no-suggest"
+        run: "composer install --no-interaction --no-progress"
 
       - name: "Lint"
         run: "make lint"
@@ -85,6 +91,7 @@ jobs:
           - "7.3"
           - "7.4"
           - "8.0"
+          - "8.1"
         dependencies:
           - "lowest"
           - "highest"
@@ -99,17 +106,21 @@ jobs:
           coverage: "none"
           php-version: "${{ matrix.php-version }}"
 
+      - name: "Downgrade PHPUnit"
+        if: matrix.php-version == '7.1' || matrix.php-version == '7.2' || matrix.php-version == '7.3'
+        run: "composer require --dev phpunit/phpunit:^7.5.20 --no-update --update-with-dependencies"
+
+      - name: "Downgrade Doctrine ORM"
+        if: matrix.php-version == '7.1'
+        run: "composer require --dev doctrine/orm:^2.7.5 doctrine/lexer:^1.0 --no-update --update-with-dependencies"
+
       - name: "Install lowest dependencies"
         if: ${{ matrix.dependencies == 'lowest' }}
-        run: "composer update --prefer-lowest --no-interaction --no-progress --no-suggest"
+        run: "composer update --prefer-lowest --no-interaction --no-progress"
 
       - name: "Install highest dependencies"
         if: ${{ matrix.dependencies == 'highest' }}
-        run: "composer update --no-interaction --no-progress --no-suggest"
-
-      - name: "Downgrade PHPUnit"
-        if: matrix.php-version == '7.1' || matrix.php-version == '7.2' || matrix.php-version == '7.3'
-        run: "composer require --dev phpunit/phpunit:^7.5.20 --update-with-dependencies"
+        run: "composer update --no-interaction --no-progress"
 
       - name: "Tests"
         run: "make tests"
@@ -127,6 +138,7 @@ jobs:
           - "7.3"
           - "7.4"
           - "8.0"
+          - "8.1"
         dependencies:
           - "lowest"
           - "highest"
@@ -143,17 +155,21 @@ jobs:
           extensions: mbstring
           tools: composer:v2
 
+      - name: "Downgrade PHPUnit"
+        if: matrix.php-version == '7.1' || matrix.php-version == '7.2' || matrix.php-version == '7.3'
+        run: "composer require --dev phpunit/phpunit:^7.5.20 --no-update --update-with-dependencies"
+
+      - name: "Downgrade Doctrine ORM"
+        if: matrix.php-version == '7.1'
+        run: "composer require --dev doctrine/orm:^2.7.5 doctrine/lexer:^1.0 --no-update --update-with-dependencies"
+
       - name: "Install lowest dependencies"
         if: ${{ matrix.dependencies == 'lowest' }}
-        run: "composer update --prefer-lowest --no-interaction --no-progress --no-suggest"
+        run: "composer update --prefer-lowest --no-interaction --no-progress"
 
       - name: "Install highest dependencies"
         if: ${{ matrix.dependencies == 'highest' }}
-        run: "composer update --no-interaction --no-progress --no-suggest"
-
-      - name: "Downgrade PHPUnit"
-        if: matrix.php-version == '7.1' || matrix.php-version == '7.2' || matrix.php-version == '7.3'
-        run: "composer require --dev phpunit/phpunit:^7.5.20 --update-with-dependencies"
+        run: "composer update --no-interaction --no-progress"
 
       - name: "PHPStan"
         run: "make phpstan"

build-cs/composer.json

@@ -3,5 +3,10 @@
 		"consistence-community/coding-standard": "^3.10",
 		"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
 		"slevomat/coding-standard": "^6.4"
+	},
+	"config": {
+		"allow-plugins": {
+			"dealerdirect/phpcodesniffer-composer-installer": true
+		}
 	}
 }

composer.json

@@ -7,7 +7,7 @@
 	],
 	"require": {
 		"php": "^7.1 || ^8.0",
-		"phpstan/phpstan": "^1.0"
+		"phpstan/phpstan": "^1.3"
 	},
 	"conflict": {
 		"doctrine/collections": "<1.0",
@@ -21,23 +21,28 @@
 		"doctrine/collections": "^1.6",
 		"doctrine/common": "^2.7 || ^3.0",
 		"doctrine/dbal": "^2.13.1",
+		"doctrine/lexer": "^1.2.1",
 		"doctrine/mongodb-odm": "^1.3 || ^2.1",
 		"doctrine/orm": "^2.9.1",
 		"doctrine/persistence": "^1.1 || ^2.0",
 		"nesbot/carbon": "^2.49",
-		"nikic/php-parser": "^4.13.0",
+		"nikic/php-parser": "^4.13.2",
 		"php-parallel-lint/php-parallel-lint": "^1.2",
 		"phpstan/phpstan-phpunit": "^1.0",
 		"phpstan/phpstan-strict-rules": "^1.0",
-		"phpunit/phpunit": "^9.5",
-		"ramsey/uuid-doctrine": "^1.5.0"
+		"phpunit/phpunit": "^9.5.10",
+		"ramsey/uuid-doctrine": "^1.5.0",
+		"symfony/cache": "^4.4.35"
 	},
 	"config": {
 		"platform": {
-			"php": "7.3.24",
-			"ext-mongo": "1.6.16"
+			"ext-mongo": "1.12",
+			"ext-mongodb": "1.6.16"
 		},
-		"sort-packages": true
+		"sort-packages": true,
+		"allow-plugins": {
+			"composer/package-versions-deprecated": true
+		}
 	},
 	"extra": {
 		"branch-alias": {

extension.neon

@@ -9,8 +9,13 @@ parameters:
 		# setting this to false might lead to performance problems
 		# it changes the braching logic - with false, queryBuilders from all branches are analysed separately
 		queryBuilderFastAlgorithm: true
+	featureToggles:
+		skipCheckGenericClasses:
+			- Doctrine\ODM\MongoDB\Mapping\ClassMetadata
+			- Doctrine\ORM\Mapping\ClassMetadata
+			- Doctrine\ORM\Mapping\ClassMetadataInfo
+			- Doctrine\Persistence\Mapping\ClassMetadata
 	stubFiles:
-		- stubs/ClassMetadataInfo.stub
 		- stubs/Criteria.stub
 		- stubs/DocumentManager.stub
 		- stubs/DocumentRepository.stub
@@ -20,6 +25,7 @@ parameters:
 		- stubs/EntityRepository.stub
 		- stubs/ServiceEntityRepository.stub
 		- stubs/MongoClassMetadataInfo.stub
+
 		- stubs/Persistence/ManagerRegistry.stub
 		- stubs/Persistence/ObjectManager.stub
 		- stubs/Persistence/ObjectManagerDecorator.stub
@@ -30,7 +36,10 @@ parameters:
 		- stubs/Collections/Selectable.stub
 		- stubs/ORM/QueryBuilder.stub
 		- stubs/ORM/AbstractQuery.stub
-		- stubs/ORM/Query.stub
+		- stubs/ORM/Mapping/ClassMetadata.stub
+		- stubs/ORM/Mapping/ClassMetadataInfo.stub
+    - stubs/ORM/Query.stub
+		- stubs/Persistence/Mapping/ClassMetadata.stub
 		- stubs/ServiceDocumentRepository.stub
 
 parametersSchema:

phpstan-baseline.neon

@@ -1,7 +1,6 @@
 includes:
 	- extension.neon
 	- rules.neon
-	- phpstan-baseline.neon
 	- vendor/phpstan/phpstan-strict-rules/rules.neon
 	- vendor/phpstan/phpstan-phpunit/extension.neon
 	- vendor/phpstan/phpstan-phpunit/rules.neon
@@ -10,6 +9,7 @@ includes:
 parameters:
 	excludePaths:
 		- tests/*/data/*
+		- tests/*/data-php-*/*
 
 	ignoreErrors:
 		-

phpstan.neon

@@ -30,6 +30,7 @@ public function isAlwaysRead(PropertyReflection $property, string $propertyName)
 
 	/**
 	 * @param class-string $className
+	 * @return \Doctrine\ORM\Mapping\ClassMetadataInfo<object>
 	 */
 	private function findMetadata(string $className): ?\Doctrine\ORM\Mapping\ClassMetadataInfo
 	{

src/Rules/Doctrine/ORM/PropertiesExtension.php

@@ -4,7 +4,7 @@
 
 use Doctrine\Persistence\ObjectManager;
 use PHPStan\Reflection\ReflectionProvider;
-use function file_exists;
+use function is_file;
 use function is_readable;
 
 final class ObjectMetadataResolver
@@ -60,11 +60,18 @@ public function getObjectManager(): ?ObjectManager
 
 	private function loadObjectManager(string $objectManagerLoader): ?ObjectManager
 	{
-		if (
-			!file_exists($objectManagerLoader)
-			|| !is_readable($objectManagerLoader)
-		) {
-			throw new \PHPStan\ShouldNotHappenException('Object manager could not be loaded');
+		if (!is_file($objectManagerLoader)) {
+			throw new \PHPStan\ShouldNotHappenException(sprintf(
+				'Object manager could not be loaded: file "%s" does not exist',
+				$objectManagerLoader
+			));
+		}
+
+		if (!is_readable($objectManagerLoader)) {
+			throw new \PHPStan\ShouldNotHappenException(sprintf(
+				'Object manager could not be loaded: file "%s" is not readable',
+				$objectManagerLoader
+			));
 		}
 
 		return require $objectManagerLoader;
@@ -108,14 +115,14 @@ public function getRepositoryClass(string $className): string
 
 		$ormMetadataClass = 'Doctrine\ORM\Mapping\ClassMetadata';
 		if ($metadata instanceof $ormMetadataClass) {
-			/** @var \Doctrine\ORM\Mapping\ClassMetadata $ormMetadata */
+			/** @var \Doctrine\ORM\Mapping\ClassMetadata<object> $ormMetadata */
 			$ormMetadata = $metadata;
 			return $ormMetadata->customRepositoryClassName ?? $this->getResolvedRepositoryClass();
 		}
 
 		$odmMetadataClass = 'Doctrine\ODM\MongoDB\Mapping\ClassMetadata';
 		if ($metadata instanceof $odmMetadataClass) {
-			/** @var \Doctrine\ODM\MongoDB\Mapping\ClassMetadata $odmMetadata */
+			/** @var \Doctrine\ODM\MongoDB\Mapping\ClassMetadata<object> $odmMetadata */
 			$odmMetadata = $metadata;
 			return $odmMetadata->customRepositoryClassName ?? $this->getResolvedRepositoryClass();
 		}

src/Type/Doctrine/ObjectMetadataResolver.php

@@ -210,6 +210,7 @@ private function findClassNode(string $className, array $nodes): ?Class_
 		foreach ($nodes as $node) {
 			if (
 				$node instanceof Class_
+				&& $node->namespacedName !== null
 				&& $node->namespacedName->toString() === $className
 			) {
 				return $node;

src/Type/Doctrine/QueryBuilder/QueryBuilderMethodDynamicReturnTypeExtension.php

@@ -2,10 +2,40 @@
 
 namespace Doctrine\ODM\MongoDB\Mapping;
 
-class ClassMetadata
+use Doctrine\Persistence\Mapping\ClassMetadata as BaseClassMetadata;
+use ReflectionClass;
+
+/**
+ * @template-covariant T of object
+ * @template-implements BaseClassMetadata<T>
+ */
+class ClassMetadata implements BaseClassMetadata
 {
 
 	/** @var string|null */
 	public $customRepositoryClassName;
 
+	/**
+	 * @var class-string<T>
+	 */
+	public $name;
+
+	/**
+	 * @param class-string<T> $documentName
+	 */
+	public function __construct(string $documentName)
+	{
+
+	}
+
+	/**
+	 * @return class-string<T>
+	 */
+	public function getName();
+
+	/**
+	 * @return ReflectionClass<T>
+	 */
+	public function getReflectionClass();
+
 }

stubs/ClassMetadataInfo.stub

@@ -0,0 +1,18 @@
+<?php
+
+namespace Doctrine\ORM\Mapping;
+
+/**
+ * @template-covariant T of object
+ * @extends ClassMetadataInfo<T>
+ */
+class ClassMetadata extends ClassMetadataInfo
+{
+    /**
+     * @param class-string<T> $entityName
+     */
+    public function __construct($entityName)
+    {
+
+    }
+}