Reword the actual fix

doctrine · Jan 15, 2023 · 0408e70 · 0408e70
1 parent 959b133
commit 0408e70
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
@@ -381,10 +381,6 @@ private function addInheritedRelations(ClassMetadata $subClass, ClassMetadata $p
                 if ($mapping['type'] & ClassMetadata::TO_MANY && ! $mapping['isOwningSide']) {
                     throw MappingException::illegalToManyAssociationOnMappedSuperclass($parentClass->name, $field);
                 }
-
-                if (! isset($mapping['inherited'])) {
-                    $mapping['sourceEntity'] = $subClass->name;
-                }
             }
 
             //$subclassMapping = $mapping;
@@ -396,6 +392,16 @@ private function addInheritedRelations(ClassMetadata $subClass, ClassMetadata $p
                 $mapping['declared'] = $parentClass->name;
             }
 
+            // When the class inheriting the relation ($subClass) is the first entity class since the
+            // relation has been defined in a mapped superclass (or in a chain
+            // of mapped superclasses) above, then declare this current entity class as the source of
+            // the relationship.
+            // According to the definitions given in https://github.com/doctrine/orm/pull/10396/,
+            // this is the case <=> ! isset($mapping['inherited']).
+            if (! isset($mapping['inherited'])) {
+                $mapping['sourceEntity'] = $subClass->name;
+            }
+
             $subClass->addInheritedAssociationMapping($mapping);
         }
     }