IBX-6640: Fixed infinite loop when Normalizer returns an object

ibexa · Sep 26, 2023 · 516ec59 · 516ec59
1 parent 56a9d08
commit 516ec59
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 0 deletions.
diff --git a/src/lib/Output/Generator/Xml/FieldTypeHashGenerator.php b/src/lib/Output/Generator/Xml/FieldTypeHashGenerator.php
@@ -255,6 +255,11 @@ private function generateObjectValue(object $value, \XmlWriter $writer, ?string
             ]);
             $value = null;
         }
+
+        if (is_object($value)) {
+            return;
+        }
+
         $this->generateValue($writer, $value, $key, $elementName);
     }
 }

diff --git a/tests/lib/Output/Generator/FieldTypeHashGeneratorBaseTest.php b/tests/lib/Output/Generator/FieldTypeHashGeneratorBaseTest.php
@@ -219,6 +219,20 @@ public function testGenerateUsingNormalizer(): void
         $this->assertSerializationSame(__FUNCTION__);
     }
 
+    public function testGenerateObjectUsingNormalizer(): void
+    {
+        $object = (object)[];
+        $this->getNormalizer()
+            ->expects(self::once())
+            ->method('normalize')
+            ->with(self::identicalTo($object))
+            ->willReturnArgument(0);
+
+        $this->getGenerator()->generateFieldTypeHash('fieldValue', $object);
+
+        $this->assertSerializationSame(__FUNCTION__);
+    }
+
     public function testGenerateWithMissingNormalizer(): void
     {
         $object = (object)[];

diff --git a/...enerator/_fixtures/Json_FieldTypeHashGeneratorTest__testGenerateObjectUsingNormalizer.out b/...enerator/_fixtures/Json_FieldTypeHashGeneratorTest__testGenerateObjectUsingNormalizer.out
@@ -0,0 +1 @@
+{"Field":{"fieldValue":{}}}
diff --git a/...Generator/_fixtures/Xml_FieldTypeHashGeneratorTest__testGenerateObjectUsingNormalizer.out b/...Generator/_fixtures/Xml_FieldTypeHashGeneratorTest__testGenerateObjectUsingNormalizer.out
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Field/>