Merge branch '2.20.x' into 2.21.x

* 2.20.x:
  Introduce testNotListedValueInEnumArray
  Fix documentation for JoinColumn nullable (doctrine#11798)
  Ignore deprecations from doctrine/common
  Fix fields of transient classes being considered duplicate with `reportFieldsWhereDeclared`

Author: derrabus

docs/en/reference/association-mapping.rst

@@ -1368,8 +1368,7 @@ defaults to "id", just as in one-to-one or many-to-one mappings.
 
 Additionally, when using typed properties with Doctrine 2.9 or newer
 you can skip ``targetEntity`` in ``ManyToOne`` and ``OneToOne``
-associations as they will be set based on type. Also ``nullable``
-attribute on ``JoinColumn`` will be inherited from PHP type. So that:
+associations as they will be set based on type. So that:
 
 .. configuration-block::
 
@@ -1409,7 +1408,7 @@ Is essentially the same as following:
         <?php
         /** One Product has One Shipment. */
         #[OneToOne(targetEntity: Shipment::class)]
-        #[JoinColumn(name: 'shipment_id', referencedColumnName: 'id', nullable: false)]
+        #[JoinColumn(name: 'shipment_id', referencedColumnName: 'id')]
         private Shipment $shipment;
 
     .. code-block:: annotation
@@ -1418,7 +1417,7 @@ Is essentially the same as following:
         /**
          * One Product has One Shipment.
          * @OneToOne(targetEntity="Shipment")
-         * @JoinColumn(name="shipment_id", referencedColumnName="id", nullable=false)
+         * @JoinColumn(name="shipment_id", referencedColumnName="id")
          */
         private Shipment $shipment;
 
@@ -1442,7 +1441,6 @@ Is essentially the same as following:
               joinColumn:
                 name: shipment_id
                 referencedColumnName: id
-                nullable: false
 
 If you accept these defaults, you can reduce the mapping code to a
 minimum.

phpstan-baseline.neon

@@ -3144,6 +3144,15 @@ parameters:
 			count: 1
 			path: src/Persisters/SqlValueVisitor.php
 
+		-
+			message: '''
+				#^Class Doctrine\\ORM\\Proxy\\Autoloader extends deprecated class Doctrine\\Common\\Proxy\\Autoloader\:
+				The Autoloader class is deprecated since doctrine/common 3\.5\.$#
+			'''
+			identifier: class.extendsDeprecatedClass
+			count: 1
+			path: src/Proxy/Autoloader.php
+
 		-
 			message: '#^Method Doctrine\\ORM\\Proxy\\DefaultProxyClassNameResolver\:\:resolveClassName\(\) should return class\-string\<T of object\> but returns class\-string\<Doctrine\\Persistence\\Proxy\<T of object\>\>\|class\-string\<T of object\>\.$#'
 			identifier: return.type
@@ -3186,6 +3195,42 @@ parameters:
 			count: 1
 			path: src/Proxy/ProxyFactory.php
 
+		-
+			message: '''
+				#^Call to method __construct\(\) of deprecated class Doctrine\\Common\\Proxy\\AbstractProxyFactory\:
+				The AbstractProxyFactory class is deprecated since doctrine/common 3\.5\.$#
+			'''
+			identifier: staticMethod.deprecatedClass
+			count: 1
+			path: src/Proxy/ProxyFactory.php
+
+		-
+			message: '''
+				#^Call to method generateProxyClasses\(\) of deprecated class Doctrine\\Common\\Proxy\\AbstractProxyFactory\:
+				The AbstractProxyFactory class is deprecated since doctrine/common 3\.5\.$#
+			'''
+			identifier: staticMethod.deprecatedClass
+			count: 1
+			path: src/Proxy/ProxyFactory.php
+
+		-
+			message: '''
+				#^Call to method getProxy\(\) of deprecated class Doctrine\\Common\\Proxy\\AbstractProxyFactory\:
+				The AbstractProxyFactory class is deprecated since doctrine/common 3\.5\.$#
+			'''
+			identifier: staticMethod.deprecatedClass
+			count: 1
+			path: src/Proxy/ProxyFactory.php
+
+		-
+			message: '''
+				#^Class Doctrine\\ORM\\Proxy\\ProxyFactory extends deprecated class Doctrine\\Common\\Proxy\\AbstractProxyFactory\:
+				The AbstractProxyFactory class is deprecated since doctrine/common 3\.5\.$#
+			'''
+			identifier: class.extendsDeprecatedClass
+			count: 1
+			path: src/Proxy/ProxyFactory.php
+
 		-
 			message: '#^Comparison operation "\<" between 0\|1\|2\|3\|4 and 0 is always false\.$#'
 			identifier: smaller.alwaysFalse
@@ -3198,6 +3243,15 @@ parameters:
 			count: 1
 			path: src/Proxy/ProxyFactory.php
 
+		-
+			message: '''
+				#^Instantiation of deprecated class Doctrine\\Common\\Proxy\\ProxyGenerator\:
+				The ProxyGenerator class is deprecated since doctrine/common 3\.5\.$#
+			'''
+			identifier: new.deprecated
+			count: 1
+			path: src/Proxy/ProxyFactory.php
+
 		-
 			message: '#^Method Doctrine\\ORM\\Proxy\\ProxyFactory\:\:createCloner\(\) has Doctrine\\ORM\\EntityNotFoundException in PHPDoc @throws tag but it''s not thrown\.$#'
 			identifier: throws.unusedType
@@ -3336,6 +3390,15 @@ parameters:
 			count: 1
 			path: src/Proxy/ProxyFactory.php
 
+		-
+			message: '''
+				#^Return type of method Doctrine\\ORM\\Proxy\\ProxyFactory\:\:getProxy\(\) has typehint with deprecated interface Doctrine\\Common\\Proxy\\Proxy\:
+				The Proxy interface is deprecated since doctrine/common 3\.5\.$#
+			'''
+			identifier: return.deprecatedInterface
+			count: 1
+			path: src/Proxy/ProxyFactory.php
+
 		-
 			message: '#^Call to function method_exists\(\) with ''Doctrine\\\\DBAL\\\\Cache\\\\QueryCacheProfile'' and ''getResultCache'' will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType

src/Internal/Hydration/SimpleObjectHydrator.php

@@ -16,6 +16,7 @@
 use function array_search;
 use function count;
 use function in_array;
+use function is_array;
 use function key;
 use function reset;
 use function sprintf;
@@ -143,14 +144,21 @@ protected function hydrateRowData(array $row, array &$result)
             }
 
             if ($value !== null && isset($cacheKeyInfo['enumType'])) {
-                $originalValue = $value;
+                $originalValue = $currentValue = $value;
                 try {
-                    $value = $this->buildEnum($originalValue, $cacheKeyInfo['enumType']);
+                    if (! is_array($originalValue)) {
+                        $value = $this->buildEnum($originalValue, $cacheKeyInfo['enumType']);
+                    } else {
+                        $value = [];
+                        foreach ($originalValue as $i => $currentValue) {
+                            $value[$i] = $this->buildEnum($currentValue, $cacheKeyInfo['enumType']);
+                        }
+                    }
                 } catch (ValueError $e) {
                     throw MappingException::invalidEnumValue(
                         $entityName,
                         $cacheKeyInfo['fieldName'],
-                        (string) $originalValue,
+                        (string) $currentValue,
                         $cacheKeyInfo['enumType'],
                         $e
                     );

src/Mapping/Driver/ReflectionBasedDriver.php

@@ -32,8 +32,13 @@ private function isRepeatedPropertyDeclaration(ReflectionProperty $property, Cla
                 || $metadata->isInheritedEmbeddedClass($property->name);
         }
 
+        /** @var class-string $declaringClass */
         $declaringClass = $property->class;
 
+        if ($this->isTransient($declaringClass)) {
+            return isset($metadata->fieldMappings[$property->name]);
+        }
+
         if (
             isset($metadata->fieldMappings[$property->name]['declared'])
             && $metadata->fieldMappings[$property->name]['declared'] === $declaringClass

tests/Tests/ORM/Functional/Ticket/GH10450Test.php

@@ -32,6 +32,15 @@ public function classesThatOverrideFieldNames(): Generator
         yield 'Entity class that redeclares a protected field inherited from a base entity' => [GH10450EntityChildProtected::class];
         yield 'Entity class that redeclares a protected field inherited from a mapped superclass' => [GH10450MappedSuperclassChildProtected::class];
     }
+
+    public function testFieldsOfTransientClassesAreNotConsideredDuplicate(): void
+    {
+        $em = $this->getTestEntityManager();
+
+        $metadata = $em->getClassMetadata(GH10450Cat::class);
+
+        self::assertArrayHasKey('id', $metadata->fieldMappings);
+    }
 }
 
 /**
@@ -179,3 +188,38 @@ class GH10450MappedSuperclassChildProtected extends GH10450BaseMappedSuperclassP
      */
     protected $field;
 }
+
+abstract class GH10450AbstractEntity
+{
+    /**
+     * @ORM\Column(type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     *
+     * @var int
+     */
+    protected $id;
+}
+
+/**
+ * @ORM\Entity
+ * @ORM\InheritanceType("SINGLE_TABLE")
+ * @ORM\DiscriminatorMap({ "cat": "GH10450Cat" })
+ * @ORM\DiscriminatorColumn(name="type")
+ */
+abstract class GH10450Animal extends GH10450AbstractEntity
+{
+    /**
+     * @ORM\Column(type="text", name="base")
+     *
+     * @var string
+     */
+    private $field;
+}
+
+/**
+ * @ORM\Entity
+ */
+class GH10450Cat extends GH10450Animal
+{
+}

tests/Tests/ORM/Hydration/SimpleObjectHydratorTest.php

@@ -7,12 +7,15 @@
 use Doctrine\DBAL\Types\Type as DBALType;
 use Doctrine\ORM\Internal\Hydration\HydrationException;
 use Doctrine\ORM\Internal\Hydration\SimpleObjectHydrator;
+use Doctrine\ORM\Mapping\MappingException;
 use Doctrine\ORM\Query\ResultSetMapping;
 use Doctrine\Tests\DbalTypes\GH8565EmployeePayloadType;
 use Doctrine\Tests\DbalTypes\GH8565ManagerPayloadType;
 use Doctrine\Tests\Mocks\ArrayResultFactory;
 use Doctrine\Tests\Models\CMS\CmsAddress;
 use Doctrine\Tests\Models\Company\CompanyPerson;
+use Doctrine\Tests\Models\Enums\Scale;
+use Doctrine\Tests\Models\Enums\Unit;
 use Doctrine\Tests\Models\GH8565\GH8565Employee;
 use Doctrine\Tests\Models\GH8565\GH8565Manager;
 use Doctrine\Tests\Models\GH8565\GH8565Person;
@@ -155,4 +158,28 @@ public function testWrongValuesShouldNotBeConvertedToPhpValue(): void
         $result   = $hydrator->hydrateAll($stmt, $rsm);
         self::assertEquals($result[0], $expectedEntity);
     }
+
+    /**
+     * @requires PHP 8.1
+     */
+    public function testNotListedValueInEnumArray(): void
+    {
+        $this->expectException(MappingException::class);
+        $this->expectExceptionMessage('Case "unknown_case" is not listed in enum "Doctrine\Tests\Models\Enums\Unit"');
+        $rsm = new ResultSetMapping();
+        $rsm->addEntityResult(Scale::class, 's');
+        $rsm->addFieldResult('s', 's__id', 'id');
+        $rsm->addFieldResult('s', 's__supported_units', 'supportedUnits');
+        $rsm->addEnumResult('s__supported_units', Unit::class);
+        $resultSet = [
+            [
+                's__id' => 1,
+                's__supported_units' => 'g,m,unknown_case',
+            ],
+        ];
+
+        $stmt     = ArrayResultFactory::createFromArray($resultSet);
+        $hydrator = new SimpleObjectHydrator($this->entityManager);
+        $hydrator->hydrateAll($stmt, $rsm);
+    }
 }