Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit d8ee5ae41f70 · 2023-11-29T09:42:18.000+01:00
* 6.4:
  [Serializer] Fix anonymous test class
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
@@ -848,7 +848,7 @@ public function testNormalizeWithIgnoreAttributeAndPrivateProperties()
     public function testNormalizeBasedOnAllowedAttributes()
     {
         $normalizer = new class() extends AbstractObjectNormalizer {
-            protected function getAllowedAttributes($classOrObject, array $context, bool $attributesAsString = false)
+            protected function getAllowedAttributes($classOrObject, array $context, bool $attributesAsString = false): array
             {
                 return ['foo'];
             }
@@ -858,12 +858,12 @@ protected function extractAttributes(object $object, string $format = null, arra
                 return [];
             }
 
-            protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = [])
+            protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []): mixed
             {
                 return $object->$attribute;
             }
 
-            protected function setAttributeValue(object $object, string $attribute, $value, string $format = null, array $context = [])
+            protected function setAttributeValue(object $object, string $attribute, $value, string $format = null, array $context = []): void
             {
             }
         };

Original file line number	Diff line number	Diff line change
`@@ -848,7 +848,7 @@ public function testNormalizeWithIgnoreAttributeAndPrivateProperties()`
`848`	`848`	`public function testNormalizeBasedOnAllowedAttributes()`
`849`	`849`	`{`
`850`	`850`	`$normalizer = new class() extends AbstractObjectNormalizer {`
`851`		`- protected function getAllowedAttributes($classOrObject, array $context, bool $attributesAsString = false)`
	`851`	`+ protected function getAllowedAttributes($classOrObject, array $context, bool $attributesAsString = false): array`
`852`	`852`	`{`
`853`	`853`	`return ['foo'];`
`854`	`854`	`}`
`@@ -858,12 +858,12 @@ protected function extractAttributes(object $object, string $format = null, arra`
`858`	`858`	`return [];`
`859`	`859`	`}`
`860`	`860`
`861`		`- protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = [])`
	`861`	`+ protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []): mixed`
`862`	`862`	`{`
`863`	`863`	`return $object->$attribute;`
`864`	`864`	`}`
`865`	`865`
`866`		`- protected function setAttributeValue(object $object, string $attribute, $value, string $format = null, array $context = [])`
	`866`	`+ protected function setAttributeValue(object $object, string $attribute, $value, string $format = null, array $context = []): void`
`867`	`867`	`{`
`868`	`868`	`}`
`869`	`869`	`};`