Commitea24bfc

committed

[Serializer] Catch \Throwable in getCacheKey()

1 parent5da141b commitea24bfcCopy full SHA for ea24bfc

File tree

+33

-0

lines changed

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

+33

-0

lines changed

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -401,6 +401,20 @@ protected function createChildContext(array $parentContext, $attribute/*, string`
`401`	`401`	`privatefunctiongetCacheKey($format,array$context)`
`402`	`402`	`{`
`403`	`403`	`unset($context['cache_key']);// avoid artificially different keys`
	`404`	`+`
	`405`	`+if (interface_exists(\Throwable::class)) {`
	`406`	`+try {`
	`407`	`+returnmd5($format.serialize([`
	`408`	`+'context' =>$context,`
	`409`	`+'ignored' =>$this->ignoredAttributes,`
	`410`	`+'camelized' =>$this->camelizedAttributes,`
	`411`	`+ ]));`
	`412`	`+ }catch (\Throwable$exception) {`
	`413`	`+// The context cannot be serialized, skip the cache`
	`414`	`+returnfalse;`
	`415`	`+ }`
	`416`	`+ }`
	`417`	`+`
`404`	`418`	`try {`
`405`	`419`	`returnmd5($format.serialize([`
`406`	`420`	`'context' =>$context,`

Lines changed: 19 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -194,6 +194,13 @@ public function testExtraAttributesException()`
`194`	`194`	`'allow_extra_attributes' =>false,`
`195`	`195`	`]);`
`196`	`196`	`}`
	`197`	`+`
	`198`	`+publicfunctiontestContextNotSerializable()`
	`199`	`+ {`
	`200`	`+$normalizer =newObjectNormalizer();`
	`201`	`+$result =$normalizer->normalize(newDummy(),null, ['not_serializable' =>newNotSerializable()]);`
	`202`	`+$this->assertIsArray($result);`
	`203`	`+ }`
`197`	`204`	`}`
`198`	`205`
`199`	`206`	`class AbstractObjectNormalizerDummyextends AbstractObjectNormalizer`
`@@ -379,3 +386,15 @@ public function setSerializer(SerializerInterface $serializer)`
`379`	`386`	`$this->serializer =$serializer;`
`380`	`387`	`}`
`381`	`388`	`}`
	`389`	`+`
	`390`	`+class NotSerializable`
	`391`	`+{`
	`392`	`+function__sleep()`
	`393`	`+ {`
	`394`	`+if (class_exists(\Error::class)) {`
	`395`	`+thrownew \Error('not serializable');`
	`396`	`+ }`
	`397`	`+`
	`398`	`+thrownew \Exception('not serializable');`
	`399`	`+ }`
	`400`	`+}`

Comments

(0)