feature #35596 [Serializer] Add support for stdClass (dunglas)

chalasr · chalasr · commit 99ca1abd3567 · 2020-02-05T10:15:58.000+01:00
This PR was merged into the 5.1-dev branch. Discussion ---------- [Serializer] Add support for stdClass | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes  | Deprecations? | no  | Tickets | Fix #33047, #33894 | License | MIT | Doc PR | n/a Add support for `stdClass`. Alternative to #33894. Commits ------- d7bca80 [Serializer] Add support for stdClass
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -262,7 +262,7 @@ protected function getAttributes($object, string $format = null, array $context)
             array_unshift($attributes, $mapping->getTypeProperty());
         }
 
-        if ($context['cache_key']) {
+        if ($context['cache_key'] && \stdClass::class !== $class) {
             $this->attributesCache[$key] = $attributes;
         }
 
diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
@@ -62,6 +62,10 @@ public function hasCacheableSupportsMethod(): bool
      */
     protected function extractAttributes(object $object, string $format = null, array $context = [])
     {
+        if (\stdClass::class === \get_class($object)) {
+            return array_keys((array) $object);
+        }
+
         // If not using groups, detect manually
         $attributes = [];
 
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
@@ -696,6 +696,20 @@ public function testObjectClassResolver()
             $normalizer->normalize($obj, 'any')
         );
     }
+
+    public function testNormalizeStdClass()
+    {
+        $o1 = new \stdClass();
+        $o1->foo = 'f';
+        $o1->bar = 'b';
+
+        $this->assertSame(['foo' => 'f', 'bar' => 'b'], $this->normalizer->normalize($o1));
+
+        $o2 = new \stdClass();
+        $o2->baz = 'baz';
+
+        $this->assertSame(['baz' => 'baz'], $this->normalizer->normalize($o2));
+    }
 }
 
 class ProxyObjectDummy extends ObjectDummy

Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,7 @@ protected function getAttributes($object, string $format = null, array $context)`
`262`	`262`	`array_unshift($attributes, $mapping->getTypeProperty());`
`263`	`263`	`}`
`264`	`264`
`265`		`- if ($context['cache_key']) {`
	`265`	`+ if ($context['cache_key'] && \stdClass::class !== $class) {`
`266`	`266`	`$this->attributesCache[$key] = $attributes;`
`267`	`267`	`}`
`268`	`268`