[DDC-3027] Avoid duplicated mapping using Embedded in MappedSuperclass

lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php

@@ -141,7 +141,10 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory
             $this->completeIdGeneratorMapping($class);
         }
 
+        if (!$class->isMappedSuperclass) {
+
             foreach ($class->embeddedClasses as $property => $embeddableClass) {
+
                 if (isset($embeddableClass['inherited'])) {
                     continue;
                 }
@@ -149,6 +152,7 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory
                 $embeddableMetadata = $this->getMetadataFor($embeddableClass['class']);
                 $class->inlineEmbeddable($property, $embeddableMetadata);
             }
+        }
 
         if ($parent && $parent->isInheritanceTypeSingleTable()) {
             $class->setPrimaryTable($parent->table);

tests/Doctrine/Tests/ORM/Functional/ValueObjectsTest.php

@@ -17,6 +17,8 @@ class ValueObjectsTest extends \Doctrine\Tests\OrmFunctionalTestCase
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC93Address'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC93Vehicle'),
                 $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC93Car'),
+                $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3027Animal'),
+                $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3027Dog'),
             ));
         } catch(\Exception $e) {
         }
@@ -212,6 +214,15 @@ class ValueObjectsTest extends \Doctrine\Tests\OrmFunctionalTestCase
 
         $this->assertEquals($expectedColumnName, $actualColumnName);
     }
+
+    public function testInlineEmbeddableInMappedSuperClass()
+    {
+        $isFieldMapped = $this->_em
+            ->getClassMetadata(__NAMESPACE__ . '\DDC3027Dog')
+            ->hasField('address.street');
+
+        $this->assertTrue($isFieldMapped);
+    }
 }
 
 
@@ -396,3 +407,22 @@ class DDC3028Id
         $this->id = $id;
     }
 }
+
+/**
+ * @MappedSuperclass
+ */
+abstract class DDC3027Animal
+{
+    /** @Id @GeneratedValue(strategy = "AUTO") @Column(type = "integer") */
+    public $id;
+
+    /** @Embedded(class = "DDC93Address") */
+    public $address;
+}
+
+/**
+ * @Entity
+ */
+class DDC3027Dog extends DDC3027Animal
+{
+}