Merge pull request #10637 from greg0ire/move-properties-down

doctrine · Apr 18, 2023 · bf7ffa9 · bf7ffa9
2 parents fd64e13 + 672ff01
commit bf7ffa9
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 54 deletions.
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadata.php b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
@@ -1729,8 +1729,8 @@ public function setAssociationOverride(string $fieldName, array $overrideMapping
                 $mapping['sourceToTargetKeyColumns'] = null;
                 break;
             case self::MANY_TO_MANY:
-                $mapping['relationToSourceKeyColumns'] = null;
-                $mapping['relationToTargetKeyColumns'] = null;
+                $mapping['relationToSourceKeyColumns'] = [];
+                $mapping['relationToTargetKeyColumns'] = [];
                 break;
         }
 

diff --git a/lib/Doctrine/ORM/Mapping/ManyToManyAssociationMapping.php b/lib/Doctrine/ORM/Mapping/ManyToManyAssociationMapping.php
@@ -6,20 +6,4 @@
 
 class ManyToManyAssociationMapping extends ToManyAssociationMapping
 {
-    public array|null $relationToSourceKeyColumns = null;
-    public array|null $relationToTargetKeyColumns = null;
-
-    /** @return list<string> */
-    public function __sleep(): array
-    {
-        $serialized = parent::__sleep();
-
-        foreach (['relationToSourceKeyColumns', 'relationToTargetKeyColumns'] as $arrayKey) {
-            if ($this->$arrayKey !== null) {
-                $serialized[] = $arrayKey;
-            }
-        }
-
-        return $serialized;
-    }
 }
diff --git a/lib/Doctrine/ORM/Mapping/ManyToManyOwningSideMapping.php b/lib/Doctrine/ORM/Mapping/ManyToManyOwningSideMapping.php
@@ -20,6 +20,11 @@ final class ManyToManyOwningSideMapping extends ManyToManyAssociationMapping imp
     /** @var list<mixed> */
     public array $joinTableColumns = [];
 
+    /** @var array<string, string> */
+    public array $relationToSourceKeyColumns = [];
+    /** @var array<string, string> */
+    public array $relationToTargetKeyColumns = [];
+
     /** @return array<string, mixed> */
     public function toArray(): array
     {
@@ -135,6 +140,12 @@ public function __sleep(): array
         $serialized[] = 'joinTable';
         $serialized[] = 'joinTableColumns';
 
+        foreach (['relationToSourceKeyColumns', 'relationToTargetKeyColumns'] as $arrayKey) {
+            if ($this->$arrayKey !== null) {
+                $serialized[] = $arrayKey;
+            }
+        }
+
         return $serialized;
     }
 }
diff --git a/tests/Doctrine/Tests/ORM/Mapping/ManyToManyAssociationMappingTest.php b/tests/Doctrine/Tests/ORM/Mapping/ManyToManyAssociationMappingTest.php
diff --git a/tests/Doctrine/Tests/ORM/Mapping/ManyToManyOwningSideMappingTest.php b/tests/Doctrine/Tests/ORM/Mapping/ManyToManyOwningSideMappingTest.php
@@ -22,14 +22,18 @@ public function testItSurvivesSerialization(): void
             targetEntity: self::class,
         );
 
-        $mapping->joinTable        = new JoinTableMapping();
-        $mapping->joinTable->name  = 'bar';
-        $mapping->joinTableColumns = ['foo', 'bar'];
+        $mapping->joinTable                  = new JoinTableMapping();
+        $mapping->joinTable->name            = 'bar';
+        $mapping->joinTableColumns           = ['foo', 'bar'];
+        $mapping->relationToSourceKeyColumns = ['foo' => 'bar'];
+        $mapping->relationToTargetKeyColumns = ['bar' => 'baz'];
 
         $resurrectedMapping = unserialize(serialize($mapping));
         assert($resurrectedMapping instanceof ManyToManyOwningSideMapping);
 
         self::assertSame($resurrectedMapping->joinTable->name, 'bar');
         self::assertSame(['foo', 'bar'], $resurrectedMapping->joinTableColumns);
+        self::assertSame(['foo' => 'bar'], $resurrectedMapping->relationToSourceKeyColumns);
+        self::assertSame(['bar' => 'baz'], $resurrectedMapping->relationToTargetKeyColumns);
     }
 }