Do not cache cache attributes if attributes is in the context

sroze · sroze · commit 303280d06a69 · 2017-11-28T09:26:30.000Z
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -126,7 +126,7 @@ protected function getAttributes($object, $format = null, array $context)
             return $allowedAttributes;
         }
 
-        if (isset($this->attributesCache[$class])) {
+        if (isset($this->attributesCache[$class]) && !isset($context['attributes'])) {
             return $this->attributesCache[$class];
         }
 
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
@@ -713,6 +713,37 @@ public function testAttributesContextDenormalizeConstructor()
             'inner' => array('foo' => 'foo', 'bar' => 'bar'),
         ), DummyWithConstructorObjectAndDefaultValue::class, null, $context));
     }
+
+    public function testNormalizeSameObjectWithDifferentAttributes()
+    {
+        $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
+        $this->normalizer = new ObjectNormalizer($classMetadataFactory);
+        $serializer = new Serializer(array($this->normalizer));
+        $this->normalizer->setSerializer($serializer);
+
+        $dummy = new ObjectOuter();
+        $dummy->foo = new ObjectInner();
+        $dummy->foo->foo = 'foo.foo';
+        $dummy->foo->bar = 'foo.bar';
+
+        $dummy->bar = new ObjectInner();
+        $dummy->bar->foo = 'bar.foo';
+        $dummy->bar->bar = 'bar.bar';
+
+        $this->assertEquals(array(
+            'foo' => array(
+                'bar' => 'foo.bar',
+            ),
+            'bar' => array(
+                'foo' => 'bar.foo',
+            ),
+        ), $this->normalizer->normalize($dummy, 'json', array(
+            'attributes' => array(
+                'foo' => array('bar'),
+                'bar' => array('foo'),
+            ),
+        )));
+    }
 }
 
 class ObjectDummy

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ protected function getAttributes($object, $format = null, array $context)`
`126`	`126`	`return $allowedAttributes;`
`127`	`127`	`}`
`128`	`128`
`129`		`- if (isset($this->attributesCache[$class])) {`
	`129`	`+ if (isset($this->attributesCache[$class]) && !isset($context['attributes'])) {`
`130`	`130`	`return $this->attributesCache[$class];`
`131`	`131`	`}`
`132`	`132`