Merge pull request #103 from as3io/hotfix-0.3.18

Prevent infinite recursion of self-referencing embeds

Author: zarathustra323

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;
             }

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;
     }

src/Version.php

@@ -9,10 +9,10 @@
  */
 class Version
 {
-    const VERSION = '0.3.17';
-    const ID = 3017;
+    const VERSION = '0.3.18';
+    const ID = 3018;
     const MAJOR = 0;
     const MINOR = 3;
-    const PATCH = 17;
+    const PATCH = 18;
     const EXTRA = '';
 }