do not overwrite the cache key when it is false

xabbuh · xabbuh · commit fd00244269b0 · 2024-01-29T11:52:16.000+01:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -783,7 +783,7 @@ protected function createChildContext(array $parentContext, string $attribute, ?
         $context = parent::createChildContext($parentContext, $attribute, $format);
         if ($context['cache_key'] ?? false) {
             $context['cache_key'] .= '-'.$attribute;
-        } else {
+        } elseif (false !== ($context['cache_key'] ?? null)) {
             $context['cache_key'] = $this->getCacheKey($format, $context);
         }
 
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
@@ -555,11 +555,6 @@ public function testProvidingContextCacheKeyGeneratesSameChildContextCacheKey()
         $foobar->foo = new EmptyDummy();
         $foobar->bar = 'bar';
         $foobar->baz = 'baz';
-        $data = [
-            'foo' => [],
-            'bar' => 'bar',
-            'baz' => 'baz',
-        ];
 
         $normalizer = new class() extends AbstractObjectNormalizerDummy {
             public $childContextCacheKey;
@@ -600,11 +595,6 @@ public function testChildContextKeepsOriginalContextCacheKey()
         $foobar->foo = new EmptyDummy();
         $foobar->bar = 'bar';
         $foobar->baz = 'baz';
-        $data = [
-            'foo' => [],
-            'bar' => 'bar',
-            'baz' => 'baz',
-        ];
 
         $normalizer = new class() extends AbstractObjectNormalizerDummy {
             public $childContextCacheKey;
@@ -640,11 +630,6 @@ public function testChildContextCacheKeyStaysFalseWhenOriginalCacheKeyIsFalse()
         $foobar->foo = new EmptyDummy();
         $foobar->bar = 'bar';
         $foobar->baz = 'baz';
-        $data = [
-            'foo' => [],
-            'bar' => 'bar',
-            'baz' => 'baz',
-        ];
 
         $normalizer = new class() extends AbstractObjectNormalizerDummy {
             public $childContextCacheKey;

Original file line number	Diff line number	Diff line change
`@@ -783,7 +783,7 @@ protected function createChildContext(array $parentContext, string $attribute, ?`
`783`	`783`	`$context = parent::createChildContext($parentContext, $attribute, $format);`
`784`	`784`	`if ($context['cache_key'] ?? false) {`
`785`	`785`	`$context['cache_key'] .= '-'.$attribute;`
`786`		`- } else {`
	`786`	`+ } elseif (false !== ($context['cache_key'] ?? null)) {`
`787`	`787`	`$context['cache_key'] = $this->getCacheKey($format, $context);`
`788`	`788`	`}`
`789`	`789`