Merge branch '6.3' into 6.4

nicolas-grekas · nicolas-grekas · commit 59cc26c5d2b3 · 2024-01-29T16:15:10.000+01:00
* 6.3:
  Fix merge (bis)
  Fix merge
diff --git a/src/Symfony/Bridge/Twig/Tests/Mime/NotificationEmailTest.php b/src/Symfony/Bridge/Twig/Tests/Mime/NotificationEmailTest.php
@@ -142,7 +142,7 @@ public function testContext()
             'action_url' => null,
             'markdown' => false,
             'raw' => false,
-            'footer_text' => 'Notification e-mail sent by Symfony',
+            'footer_text' => 'Notification email sent by Symfony',
             'some' => 'context',
         ], $email->getContext());
 
@@ -158,7 +158,7 @@ public function testContext()
             'action_url' => null,
             'markdown' => false,
             'raw' => false,
-            'footer_text' => 'Notification e-mail sent by Symfony',
+            'footer_text' => 'Notification email sent by Symfony',
             'some' => 'context',
             'foo' => 'bar',
         ], $email->getContext());
@@ -173,7 +173,7 @@ public function testContext()
             'action_url' => 'Action URL',
             'markdown' => false,
             'raw' => false,
-            'footer_text' => 'Notification e-mail sent by Symfony',
+            'footer_text' => 'Notification email sent by Symfony',
             'some' => 'context',
             'foo' => 'bar',
         ], $email->getContext());
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
@@ -931,7 +931,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};
             }
@@ -971,7 +971,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};
             }
@@ -1006,7 +1006,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
`@@ -931,7 +931,7 @@ protected function extractAttributes(object $object, string $format = null, arra`
`931`	`931`	`return array_keys((array) $object);`
`932`	`932`	`}`
`933`	`933`
`934`		`- protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = [])`
	`934`	`+ protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []): mixed`
`935`	`935`	`{`
`936`	`936`	`return $object->{$attribute};`
`937`	`937`	`}`
`@@ -971,7 +971,7 @@ protected function extractAttributes(object $object, string $format = null, arra`
`971`	`971`	`return array_keys((array) $object);`
`972`	`972`	`}`
`973`	`973`
`974`		`- protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = [])`
	`974`	`+ protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []): mixed`
`975`	`975`	`{`
`976`	`976`	`return $object->{$attribute};`
`977`	`977`	`}`
`@@ -1006,7 +1006,7 @@ protected function extractAttributes(object $object, string $format = null, arra`
`1006`	`1006`	`return array_keys((array) $object);`
`1007`	`1007`	`}`
`1008`	`1008`
`1009`		`- protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = [])`
	`1009`	`+ protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []): mixed`
`1010`	`1010`	`{`
`1011`	`1011`	`return $object->{$attribute};`
`1012`	`1012`	`}`