Commit98561d4

committed

Do not cache cache attributes ifattributes is in the context

1 parentb568e16 commit98561d4Copy full SHA for 98561d4

File tree

+32

-1

lines changed

src/Symfony/Component/Serializer
- Normalizer
  - AbstractObjectNormalizer.php
- Tests/Normalizer
  - ObjectNormalizerTest.php

+32

-1

lines changed

Lines changed: 1 addition & 1 deletion

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`

Lines changed: 31 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -713,6 +713,37 @@ public function testAttributesContextDenormalizeConstructor()`
`713`	`713`	`'inner' =>array('foo' =>'foo','bar' =>'bar'),`
`714`	`714`	`), DummyWithConstructorObjectAndDefaultValue::class,null,$context));`
`715`	`715`	`}`
	`716`	`+`
	`717`	`+publicfunctiontestNormalizeSameObjectWithDifferentAttributes()`
	`718`	`+ {`
	`719`	`+$classMetadataFactory =newClassMetadataFactory(newAnnotationLoader(newAnnotationReader()));`
	`720`	`+$this->normalizer =newObjectNormalizer($classMetadataFactory);`
	`721`	`+$serializer =newSerializer(array($this->normalizer));`
	`722`	`+$this->normalizer->setSerializer($serializer);`
	`723`	`+`
	`724`	`+$dummy =newObjectOuter();`
	`725`	`+$dummy->foo =newObjectInner();`
	`726`	`+$dummy->foo->foo ='foo.foo';`
	`727`	`+$dummy->foo->bar ='foo.bar';`
	`728`	`+`
	`729`	`+$dummy->bar =newObjectInner();`
	`730`	`+$dummy->bar->foo ='bar.foo';`
	`731`	`+$dummy->bar->bar ='bar.bar';`
	`732`	`+`
	`733`	`+$this->assertEquals(array(`
	`734`	`+'foo' =>array(`
	`735`	`+'bar' =>'foo.bar',`
	`736`	`+ ),`
	`737`	`+'bar' =>array(`
	`738`	`+'foo' =>'bar.foo',`
	`739`	`+ )`
	`740`	`+ ),$this->normalizer->normalize($dummy,'json',array(`
	`741`	`+'attributes' =>array(`
	`742`	`+'foo' =>array('bar'),`
	`743`	`+'bar' =>array('foo')`
	`744`	`+ )`
	`745`	`+ )));`
	`746`	`+ }`
`716`	`747`	`}`
`717`	`748`
`718`	`749`	`class ObjectDummy`

Comments

(0)