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

Author: ondrejmirtes

.github/workflows/build.yml

@@ -127,6 +127,10 @@ jobs:
         if: ${{ matrix.dependencies == 'lowest' }}
         run: "composer update --prefer-lowest --no-interaction --no-progress"
 
+      - name: "Update Doctrine DBAl to ^3"
+        if: matrix.php-version != '7.2' && matrix.dependencies == 'lowest'
+        run: "composer require --dev doctrine/dbal:^3.3.8 --no-interaction --no-progress"
+
       - name: "Install highest dependencies"
         if: ${{ matrix.dependencies == 'highest' }}
         run: "composer update --no-interaction --no-progress"

composer.json

@@ -33,7 +33,7 @@
 		"php-parallel-lint/php-parallel-lint": "^1.2",
 		"phpstan/phpstan-phpunit": "^1.3.13",
 		"phpstan/phpstan-strict-rules": "^1.5.1",
-		"phpunit/phpunit": "^9.5.10",
+		"phpunit/phpunit": "^9.6.16",
 		"ramsey/uuid": "^4.2",
 		"symfony/cache": "^5.4"
 	},

extension.neon

@@ -41,6 +41,12 @@ parameters:
 		- stubs/ORM/Id/AbstractIdGenerator.stub
 		- stubs/ORM/Mapping/ClassMetadata.stub
 		- stubs/ORM/Mapping/ClassMetadataInfo.stub
+		- stubs/ORM/Mapping/ManyToManyInverseSideMapping.stub
+		- stubs/ORM/Mapping/ManyToManyOwningSideMapping.stub
+		- stubs/ORM/Mapping/ManyToOneAssociationMapping.stub
+		- stubs/ORM/Mapping/OneToManyAssociationMapping.stub
+		- stubs/ORM/Mapping/OneToOneInverseSideMapping.stub
+		- stubs/ORM/Mapping/OneToOneOwningSideMapping.stub
 		- stubs/ORM/NonUniqueResultException.stub
 		- stubs/ORM/NoResultException.stub
 		- stubs/ORM/ORMException.stub

src/Rules/Doctrine/ORM/EntityColumnRule.php

@@ -137,7 +137,7 @@ public function processNode(Node $node, Scope $scope): array
 		}
 
 		$identifiers = [];
-		if ($metadata->generatorType !== 5) { // ClassMetadataInfo::GENERATOR_TYPE_NONE
+		if ($metadata->generatorType !== 5) { // ClassMetadata::GENERATOR_TYPE_NONE
 			try {
 				$identifiers = $metadata->getIdentifierFieldNames();
 			} catch (Throwable $e) {

src/Rules/Doctrine/ORM/EntityRelationRule.php

@@ -87,7 +87,7 @@ public function processNode(Node $node, Scope $scope): array
 
 		$columnType = null;
 		$toMany = false;
-		if ((bool) ($associationMapping['type'] & 3)) { // ClassMetadataInfo::TO_ONE
+		if ((bool) ($associationMapping['type'] & 3)) { // ClassMetadata::TO_ONE
 			$columnType = new ObjectType($associationMapping['targetEntity']);
 			if (in_array($propertyName, $identifiers, true)) {
 				$nullable = false;
@@ -98,7 +98,7 @@ public function processNode(Node $node, Scope $scope): array
 			if ($nullable) {
 				$columnType = TypeCombinator::addNull($columnType);
 			}
-		} elseif ((bool) ($associationMapping['type'] & 12)) { // ClassMetadataInfo::TO_MANY
+		} elseif ((bool) ($associationMapping['type'] & 12)) { // ClassMetadata::TO_MANY
 			$toMany = true;
 			$columnType = TypeCombinator::intersect(
 				new ObjectType('Doctrine\Common\Collections\Collection'),

src/Rules/Doctrine/ORM/PropertiesExtension.php

@@ -2,7 +2,7 @@
 
 namespace PHPStan\Rules\Doctrine\ORM;
 
-use Doctrine\ORM\Mapping\ClassMetadataInfo;
+use Doctrine\ORM\Mapping\ClassMetadata;
 use PHPStan\Reflection\PropertyReflection;
 use PHPStan\Rules\Properties\ReadWritePropertiesExtension;
 use PHPStan\Type\Doctrine\ObjectMetadataResolver;
@@ -47,7 +47,7 @@ public function isAlwaysWritten(PropertyReflection $property, string $propertyNa
 
 		if (isset($metadata->fieldMappings[$propertyName])) {
 			$mapping = $metadata->fieldMappings[$propertyName];
-			if (array_key_exists('generated', $mapping) && $mapping['generated'] !== ClassMetadataInfo::GENERATED_NEVER) {
+			if (array_key_exists('generated', $mapping) && $mapping['generated'] !== ClassMetadata::GENERATED_NEVER) {
 				return true;
 			}
 		}
@@ -84,9 +84,9 @@ public function isInitialized(PropertyReflection $property, string $propertyName
 	}
 
 	/**
-	 * @param ClassMetadataInfo<object> $metadata
+	 * @param ClassMetadata<object> $metadata
 	 */
-	private function isGeneratedIdentifier(ClassMetadataInfo $metadata, string $propertyName): bool
+	private function isGeneratedIdentifier(ClassMetadata $metadata, string $propertyName): bool
 	{
 		if ($metadata->isIdentifierNatural()) {
 			return false;

src/Type/Doctrine/ObjectMetadataResolver.php

@@ -3,7 +3,7 @@
 namespace PHPStan\Type\Doctrine;
 
 use Doctrine\Common\Annotations\AnnotationException;
-use Doctrine\ORM\Mapping\ClassMetadataInfo;
+use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\MappingException;
 use Doctrine\Persistence\ObjectManager;
 use PHPStan\Doctrine\Mapping\ClassMetadataFactory;
@@ -108,9 +108,9 @@ private function getMetadataFactory(): ?ClassMetadataFactory
 	/**
 	 * @template T of object
 	 * @param class-string<T> $className
-	 * @return ClassMetadataInfo<T>|null
+	 * @return ClassMetadata<T>|null
 	 */
-	public function getClassMetadata(string $className): ?ClassMetadataInfo
+	public function getClassMetadata(string $className): ?ClassMetadata
 	{
 		if ($this->isTransient($className)) {
 			return null;
@@ -135,11 +135,11 @@ public function getClassMetadata(string $className): ?ClassMetadataInfo
 			return null;
 		}
 
-		if (!$metadata instanceof ClassMetadataInfo) {
+		if (!$metadata instanceof ClassMetadata) {
 			return null;
 		}
 
-		/** @var ClassMetadataInfo<T> $ormMetadata */
+		/** @var ClassMetadata<T> $ormMetadata */
 		$ormMetadata = $metadata;
 
 		return $ormMetadata;

src/Type/Doctrine/Query/QueryResultTypeWalker.php

@@ -4,7 +4,7 @@
 
 use BackedEnum;
 use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\Mapping\ClassMetadataInfo;
+use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\Query\AST;
 use Doctrine\ORM\Query\AST\TypedExpression;
@@ -1285,10 +1285,10 @@ private function isQueryComponentNullable(string $dqlAlias): bool
 	}
 
 	/**
-	 * @param ClassMetadataInfo<object> $class
+	 * @param ClassMetadata<object> $class
 	 * @return array{string, ?class-string<BackedEnum>} Doctrine type name and enum type of field
 	 */
-	private function getTypeOfField(ClassMetadataInfo $class, string $fieldName): array
+	private function getTypeOfField(ClassMetadata $class, string $fieldName): array
 	{
 		assert(isset($class->fieldMappings[$fieldName]));
 

stubs/ORM/Mapping/ClassMetadata.stub

@@ -93,6 +93,7 @@ namespace Doctrine\ORM\Mapping;
  *    inherited?: class-string,
  *    declared?: class-string,
  * }
+ * @phpstan-type ConcreteAssociationMapping = OneToOneOwningSideMapping|OneToOneInverseSideMapping|ManyToOneAssociationMapping|OneToManyAssociationMapping|ManyToManyOwningSideMapping|ManyToManyInverseSideMapping
  */
 class ClassMetadata extends ClassMetadataInfo
 {

stubs/ORM/Mapping/ManyToManyInverseSideMapping.stub

@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\ORM\Mapping;
+
+final class ManyToManyInverseSideMapping
+{
+}