Fixed getProperties() for embeddables

symfony · vudaltsov · Jun 1, 2017 · Jun 1, 2017 · Jun 1, 2017 · Jun 2, 2017
commit 24201908a4fb4341129172b3aa3c4f3868cb4ced
@@ -50,7 +50,19 @@ public function getProperties($class, array $context = array())
             return;
         }
 
-        return array_merge($metadata->getFieldNames(), $metadata->getAssociationNames());
+        $properties = array_merge($metadata->getFieldNames(), $metadata->getAssociationNames());
+
+        if (class_exists('Doctrine\ORM\Mapping\Embedded')) {
+            if ($metadata instanceof ClassMetadataInfo && count($metadata->embeddedClasses) > 0) {
+                $properties = array_filter($properties, function ($property) {
+                    return false === strpos($property, '.');
+                });
+
+                $properties = array_merge($properties, array_keys($metadata->embeddedClasses));
+            }
+        }
+
+        return $properties;
     }
 
     /**

diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
@@ -62,6 +62,21 @@ public function testGetProperties()
         );
     }
 
+    public function testGetEmbeddableProperties()
+    {
+        if (!class_exists('Doctrine\ORM\Mapping\Embedded')) {
+            return;
+        }
+
+        $this->assertEquals(
+            array(
+                'id',
+                'embedded',
+            ),
+            $this->extractor->getProperties('Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\DoctrineWithEmbedded')
+        );
+    }
+
     /**
      * @dataProvider typesProvider
      */