Fix merge (bis)

nicolas-grekas · nicolas-grekas · commit d9f15e03d6c7 · 2024-01-29T16:15:02.000+01:00
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
@@ -938,7 +938,7 @@ protected function extractAttributes(object $object, string $format = null, arra
                 return array_keys((array) $object);
             }
 
-            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};
             }
@@ -978,7 +978,7 @@ protected function extractAttributes(object $object, string $format = null, arra
                 return array_keys((array) $object);
             }
 
-            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};
             }
@@ -1013,7 +1013,7 @@ protected function extractAttributes(object $object, string $format = null, arra
                 return array_keys((array) $object);
             }
 
-            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};
             }

Original file line number	Diff line number	Diff line change
`@@ -938,7 +938,7 @@ protected function extractAttributes(object $object, string $format = null, arra`
`938`	`938`	`return array_keys((array) $object);`
`939`	`939`	`}`
`940`	`940`
`941`		`- protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = [])`
	`941`	`+ protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []): mixed`
`942`	`942`	`{`
`943`	`943`	`return $object->{$attribute};`
`944`	`944`	`}`
`@@ -978,7 +978,7 @@ protected function extractAttributes(object $object, string $format = null, arra`
`978`	`978`	`return array_keys((array) $object);`
`979`	`979`	`}`
`980`	`980`
`981`		`- protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = [])`
	`981`	`+ protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []): mixed`
`982`	`982`	`{`
`983`	`983`	`return $object->{$attribute};`
`984`	`984`	`}`
`@@ -1013,7 +1013,7 @@ protected function extractAttributes(object $object, string $format = null, arra`
`1013`	`1013`	`return array_keys((array) $object);`
`1014`	`1014`	`}`
`1015`	`1015`
`1016`		`- protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = [])`
	`1016`	`+ protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []): mixed`
`1017`	`1017`	`{`
`1018`	`1018`	`return $object->{$attribute};`
`1019`	`1019`	`}`