Merge pull request #12234 from mpdude/merge-3.5.x-into-3.6.x

Merge 3.5.x up into 3.6.x

Author: greg0ire

.github/workflows/coding-standards.yml

@@ -24,4 +24,4 @@ on:
 
 jobs:
   coding-standards:
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@8.0.0"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@10.1.0"

.github/workflows/continuous-integration.yml

@@ -35,6 +35,7 @@ jobs:
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
         dbal-version:
           - "default"
           - "3.7"
@@ -189,6 +190,7 @@ jobs:
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
         dbal-version:
           - "default"
           - "3.7"
@@ -263,6 +265,7 @@ jobs:
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
         dbal-version:
           - "default"
           - "3.7"
@@ -330,6 +333,7 @@ jobs:
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
         dbal-version:
           - "default"
           - "3.7"

.github/workflows/documentation.yml

@@ -17,4 +17,4 @@ on:
 jobs:
   documentation:
     name: "Documentation"
-    uses: "doctrine/.github/.github/workflows/documentation.yml@8.0.0"
+    uses: "doctrine/.github/.github/workflows/documentation.yml@10.1.0"

.github/workflows/release-on-milestone-closed.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   release:
-    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@8.0.0"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@10.1.0"
     secrets:
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

docs/en/reference/limitations-and-known-issues.rst

@@ -178,6 +178,14 @@ internally by the ORM currently refers to fields by their name only, without tak
 class containing the field into consideration. This makes it impossible to keep separate
 mapping configuration for both fields.
 
+Apart from that, in the case of having multiple ``private`` fields of the same name within
+the class hierarchy an entity or mapped superclass, the Collection filtering API cannot determine
+the right field to look at. Even if only one of these fields is actually mapped, the ``ArrayCollection``
+will not be able to tell, since it does not have access to any metadata.
+
+Thus, to avoid problems in this regard, it is best to avoid having multiple ``private`` fields of the
+same name in class hierarchies containing entity and mapped superclasses.
+
 Known Issues
 ------------
 

src/Mapping/Driver/ReflectionBasedDriver.php

@@ -22,13 +22,8 @@ trait ReflectionBasedDriver
      */
     private function isRepeatedPropertyDeclaration(ReflectionProperty $property, ClassMetadata $metadata): bool
     {
-        /** @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/Doctrine/Tests/ORM/Functional/Ticket/GH12063.php renamed to tests/Doctrine/Tests/ORM/Functional/Ticket/GH12063Test.php

@@ -11,7 +11,7 @@
 use Doctrine\ORM\Mapping\Id;
 use Doctrine\Tests\OrmFunctionalTestCase;
 
-class GH12063 extends OrmFunctionalTestCase
+class GH12063Test extends OrmFunctionalTestCase
 {
     protected function setUp(): void
     {
@@ -67,7 +67,7 @@ enum GH12063Code: string
 class GH12063Association
 {
     #[Id]
-    #[Column]
+    #[Column(length: 3)]
     public GH12063Code $code;
 }
 
@@ -80,6 +80,6 @@ class GH12063Entity
     public int|null $id = null;
 
     #[ORM\ManyToOne]
-    #[ORM\JoinColumn(referencedColumnName: 'code')]
+    #[ORM\JoinColumn(referencedColumnName: 'code', options: ['length' => 3])]
     public GH12063Association $association;
 }

tests/Tests/Models/Enums/Library.php

@@ -11,8 +11,10 @@
 use Doctrine\ORM\Mapping\GeneratedValue;
 use Doctrine\ORM\Mapping\Id;
 use Doctrine\ORM\Mapping\OneToMany;
+use Doctrine\ORM\Mapping\Table;
 
 #[Entity]
+#[Table('`library`')]
 class Library
 {
     #[Id]

tests/Tests/ORM/Functional/QueryTest.php

@@ -432,7 +432,9 @@ public function testToIterableWithMixedResultEntityScalars(): void
         $this->_em->flush();
         $this->_em->clear();
 
-        $query  = $this->_em->createQuery('select a, a.topic, a.text from ' . CmsArticle::class . ' a');
+        $query  = $this->_em->createQuery(
+            'select a, a.topic, a.text from ' . CmsArticle::class . ' a order by a.id asc',
+        );
         $result = $query->toIterable();
 
         $it = iterator_to_array($result);

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

@@ -30,15 +30,6 @@ public static 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);
-    }
 }
 
 #[ORM\Entity]
@@ -122,26 +113,3 @@ class GH10450MappedSuperclassChildProtected extends GH10450BaseMappedSuperclassP
     #[ORM\Column(type: 'text', name: 'child')]
     protected string $field;
 }
-
-abstract class GH10450AbstractEntity
-{
-    #[ORM\Column(type: 'integer')]
-    #[ORM\Id]
-    #[ORM\GeneratedValue]
-    protected int $id;
-}
-
-#[ORM\Entity]
-#[ORM\InheritanceType('SINGLE_TABLE')]
-#[ORM\DiscriminatorMap(['cat' => GH10450Cat::class])]
-#[ORM\DiscriminatorColumn(name: 'type')]
-abstract class GH10450Animal extends GH10450AbstractEntity
-{
-    #[ORM\Column(type: 'text', name: 'base')]
-    private string $field;
-}
-
-#[ORM\Entity]
-class GH10450Cat extends GH10450Animal
-{
-}