Merge pull request Sylius#7367 from venyii/fix-mappedsuperclass-subsc…

…riber [ResourceBundle] Prevent overriding existing association mappings
ezecosystem · Jan 30, 2017 · bfc782c · bfc782c
2 parents 96353b2 + f1150d6
commit bfc782c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/Sylius/Bundle/ResourceBundle/EventListener/ODMMappedSuperClassSubscriber.php b/src/Sylius/Bundle/ResourceBundle/EventListener/ODMMappedSuperClassSubscriber.php
@@ -97,7 +97,7 @@ private function setAssociationMappings(ClassMetadataInfo $metadata, $configurat
 
             if ($parentMetadata->isMappedSuperclass) {
                 foreach ($parentMetadata->associationMappings as $key => $value) {
-                    if ($this->hasRelation($value['association'])) {
+                    if ($this->isRelation($value['association']) && !isset($metadata->associationMappings[$key])) {
                         $metadata->associationMappings[$key] = $value;
                     }
                 }
@@ -115,18 +115,18 @@ private function unsetAssociationMappings(ClassMetadataInfo $metadata)
         }
 
         foreach ($metadata->associationMappings as $key => $value) {
-            if ($this->hasRelation($value['association'])) {
+            if ($this->isRelation($value['association'])) {
                 unset($metadata->associationMappings[$key]);
             }
         }
     }
 
     /**
-     * @param $type
+     * @param string $type
      *
      * @return bool
      */
-    private function hasRelation($type)
+    private function isRelation($type)
     {
         return in_array(
             $type,

diff --git a/src/Sylius/Bundle/ResourceBundle/EventListener/ORMMappedSuperClassSubscriber.php b/src/Sylius/Bundle/ResourceBundle/EventListener/ORMMappedSuperClassSubscriber.php
@@ -96,7 +96,7 @@ private function setAssociationMappings(ClassMetadataInfo $metadata, $configurat
 
             if ($parentMetadata->isMappedSuperclass) {
                 foreach ($parentMetadata->getAssociationMappings() as $key => $value) {
-                    if ($this->hasRelation($value['type'])) {
+                    if ($this->isRelation($value['type']) && !isset($metadata->associationMappings[$key])) {
                         $metadata->associationMappings[$key] = $value;
                     }
                 }
@@ -114,18 +114,18 @@ private function unsetAssociationMappings(ClassMetadataInfo $metadata)
         }
 
         foreach ($metadata->getAssociationMappings() as $key => $value) {
-            if ($this->hasRelation($value['type'])) {
+            if ($this->isRelation($value['type'])) {
                 unset($metadata->associationMappings[$key]);
             }
         }
     }
 
     /**
-     * @param $type
+     * @param string $type
      *
      * @return bool
      */
-    private function hasRelation($type)
+    private function isRelation($type)
     {
         return in_array(
             $type,