Merge pull request #3 from basilicom/recursion-prevention-patch-1

Prevent recursion when exporting object fields
basilicom · Dec 18, 2020 · 07a80ec · 07a80ec
2 parents 470e955 + 45ef217
commit 07a80ec
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/Service/Xml.php b/Service/Xml.php
@@ -20,6 +20,8 @@ class Xml
 
     private $language = null;
 
+    private $exportCache = []; // stores id
+
     /**
      * @param string|bool $xslt
      */
@@ -107,6 +109,8 @@ private function exportObject(DataObject $object, $useRecursion=true, $addFields
     {
         $objectData = [];
 
+        $this->exportCache[$object->getId()] = true; // remember that we are exported this object
+
         $className = 'Folder';
 
         if ($object->getType() !== 'folder') {
@@ -224,7 +228,13 @@ private function getForTypeManyToManyObjectRelation($object, $fieldname): array
 
         if (is_iterable($relationObjects)) {
             foreach($relationObjects as $relationObject) {
-                $exportObject = $this->exportObject($relationObject, false, !$this->omitRelationObjectFields);
+
+                $addFields = !$this->omitRelationObjectFields;
+
+                if ($this->exportCache[$relationObject->getId()]) {
+                    $addFields = false;
+                }
+                $exportObject = $this->exportObject($relationObject, false, $addFields);                
 
                 if (!array_key_exists($exportObject['_attributes']['class'], $relations)) {
                     $relations[$exportObject['_attributes']['class']] = [];
@@ -254,7 +264,13 @@ private function getForTypeAdvancedManyToManyObjectRelation($object, $fieldname)
         if (is_iterable($relationMetaObjects)) {
             foreach ($object->$getterFunction() as $relationMetaObject) {
                 $relationObject = $relationMetaObject->getObject();
-                $exportObject = $this->exportObject($relationObject, false, !$this->omitRelationObjectFields);
+
+                $addFields = !$this->omitRelationObjectFields;
+
+                if ($this->exportCache[$relationObject->getId()]) {
+                    $addFields = false;
+                }
+                $exportObject = $this->exportObject($relationObject, false, $addFields);                
                 $data = $relationMetaObject->getData();
 
                 $meta['pc:relation'][] = [