Prevent infinite recursion of self-referencing embeds

as3io · Feb 9, 2017 · e0ceedf · e0ceedf
1 parent 960f267
commit e0ceedf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/Metadata/Driver/YamlFileDriver.php b/src/Metadata/Driver/YamlFileDriver.php
@@ -280,7 +280,13 @@ protected function setEmbeds(Metadata\Interfaces\EmbedInterface $metadata, array
                 $mapping['entity'] = null;
             }
 
-            $embedMeta = $this->loadMetadataForEmbed($mapping['entity']);
+            if ($metadata instanceof Metadata\EmbedMetadata && $mapping['entity'] === $metadata->name) {
+                // This embed meta is referencing itself as an embed property. As such, do not recreate.
+                // This prevents infinite recursion.
+                $embedMeta = $metadata;
+            } else {
+                $embedMeta = $this->loadMetadataForEmbed($mapping['entity']);
+            }
             if (null === $embedMeta) {
                 continue;
             }

diff --git a/src/Util/EntityUtility.php b/src/Util/EntityUtility.php
@@ -235,7 +235,10 @@ public function validateMetadataEmbeds(EmbedInterface $metadata, MetadataFactory
     {
         foreach ($metadata->getEmbeds() as $key => $embeddedProp) {
             $this->validateMetadataAttributes($embeddedProp->embedMeta, $mf);
-            $this->validateMetadataEmbeds($embeddedProp->embedMeta, $mf);
+            if ($metadata !== $embeddedProp->embedMeta) {
+                // Only re-validate if the embedded prop reference isn't the same as the parent.
+                $this->validateMetadataEmbeds($embeddedProp->embedMeta, $mf);
+            }
         }
         return true;
     }