Merge pull request #2029 from sandergo90/embedded-inherited

[Translatable]: fix duplicate inherited properties

Author: AkenRoberts

CHANGELOG.md

@@ -40,6 +40,10 @@ a release.
 #### Fixed
 - Remove hard-coded parent column name in repository prev/next sibling queries [#2020]
 
+### Translatable
+#### Fixed
+- Fix duplicate inherited properties [#2029]
+
 ## [2.4.37] - 2019-03-17
 ### Translatable
 #### Fixed

lib/Gedmo/Translatable/Mapping/Driver/Annotation.php

@@ -91,6 +91,9 @@ public function readExtendedMetadata($meta, array &$config)
         // Embedded entity
         if (property_exists($meta, 'embeddedClasses') && $meta->embeddedClasses) {
             foreach ($meta->embeddedClasses as $propertyName => $embeddedClassInfo) {
+                if ($meta->isInheritedEmbeddedClass($propertyName)) {
+                    continue;
+                }
                 $embeddedClass = new \ReflectionClass($embeddedClassInfo['class']);
                 foreach ($embeddedClass->getProperties() as $embeddedProperty) {
                     if ($translatable = $this->reader->getPropertyAnnotation($embeddedProperty, self::TRANSLATABLE)) {

lib/Gedmo/Translatable/Mapping/Driver/Xml.php

@@ -53,6 +53,9 @@ public function readExtendedMetadata($meta, array &$config)
 
         if (property_exists($meta, 'embeddedClasses') && $meta->embeddedClasses) {
             foreach ($meta->embeddedClasses as $propertyName => $embeddedClassInfo) {
+                if ($meta->isInheritedEmbeddedClass($propertyName)) {
+                    continue;
+                }
                 $xmlEmbeddedClass = $this->_getMapping($embeddedClassInfo['class']);
                 $this->inspectElementsForTranslatableFields($xmlEmbeddedClass, $config, $propertyName);
             }