symfony
diff --git a/‎src/Symfony/Component/Serializer/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/CHANGELOG.md
+1Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Component/Serializer/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/CHANGELOG.md
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
+4Lines changed: 4 additions & 0 deletions b/‎src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Serializer/Tests/SerializerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Tests/SerializerTest.php
+4-1Lines changed: 4 additions & 1 deletion b/‎src/Symfony/Component/Serializer/Tests/SerializerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Tests/SerializerTest.php
+4-1Lines changed: 4 additions & 1 deletion
@@ -5,6 +5,7 @@ CHANGELOG
 ---
 
  * Add support of PHP backed enumerations
+ * Add support for preserving empty object in object property
 
 5.3
 ---
 
@@ -592,6 +592,10 @@ private function updateData(array $data, string $attribute, $attributeValue, str
             return $data;
         }
 
+        if ([] === $attributeValue && ($context[self::PRESERVE_EMPTY_OBJECTS] ?? $this->defaultContext[self::PRESERVE_EMPTY_OBJECTS] ?? false)) {
+            $attributeValue = new \ArrayObject();
+        }
+
         if ($this->nameConverter) {
             $attribute = $this->nameConverter->normalize($attribute, $class, $format, $context);
         }
 
@@ -535,7 +535,10 @@ public function testNormalizePreserveEmptyArrayObject()
         $object['foo'] = new \ArrayObject();
         $object['bar'] = new \ArrayObject(['notempty']);
         $object['baz'] = new \ArrayObject(['nested' => new \ArrayObject()]);
-        $this->assertEquals('{"foo":{},"bar":["notempty"],"baz":{"nested":{}}}', $serializer->serialize($object, 'json', [AbstractObjectNormalizer::PRESERVE_EMPTY_OBJECTS => true]));
+        $object['innerObject'] = new class() {
+            public $map = [];
+        };
+        $this->assertEquals('{"foo":{},"bar":["notempty"],"baz":{"nested":{}},"innerObject":{"map":{}}}', $serializer->serialize($object, 'json', [AbstractObjectNormalizer::PRESERVE_EMPTY_OBJECTS => true]));
     }
 
     public function testNormalizeScalar()
Original file line number	Diff line number	Diff line change
`@@ -592,6 +592,10 @@ private function updateData(array $data, string $attribute, $attributeValue, str`
`592`	`592`	`return $data;`
`593`	`593`	`}`
`594`	`594`
	`595`	`+ if ([] === $attributeValue && ($context[self::PRESERVE_EMPTY_OBJECTS] ?? $this->defaultContext[self::PRESERVE_EMPTY_OBJECTS] ?? false)) {`
	`596`	`+ $attributeValue = new \ArrayObject();`
	`597`	`+ }`
	`598`	`+`
`595`	`599`	`if ($this->nameConverter) {`
`596`	`600`	`$attribute = $this->nameConverter->normalize($attribute, $class, $format, $context);`
`597`	`601`	`}`