Merge branch '6.4' into 7.0

* 6.4: stop marking parameters implicitly as nullable include message id provided by the MTA when dispatching the SentMessageEvent
symfony · Mar 28, 2024 · ff57b5c · ff57b5c
2 parents ed1860e + 3141777
commit ff57b5c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Tests/Fixtures/includes/autowiring_classes.php b/Tests/Fixtures/includes/autowiring_classes.php
@@ -16,7 +16,7 @@ class Foo
     public static int $counter = 0;
 
     #[Required]
-    public function cloneFoo(\stdClass $bar = null): static
+    public function cloneFoo(?\stdClass $bar = null): static
     {
         ++self::$counter;
 

diff --git a/Tests/Fixtures/includes/autowiring_classes_80.php b/Tests/Fixtures/includes/autowiring_classes_80.php
@@ -107,7 +107,7 @@ public function __construct(string $arg1, #[AutowireDecorated] AsDecoratorInterf
 #[AsDecorator(decorates: \NonExistent::class, onInvalid: ContainerInterface::NULL_ON_INVALID_REFERENCE)]
 class AsDecoratorBaz implements AsDecoratorInterface
 {
-    public function __construct(#[AutowireDecorated] AsDecoratorInterface $inner = null)
+    public function __construct(#[AutowireDecorated] ?AsDecoratorInterface $inner = null)
     {
     }
 }

diff --git a/Tests/Fixtures/includes/classes.php b/Tests/Fixtures/includes/classes.php
@@ -83,7 +83,7 @@ public function callPassed()
 
 class DummyProxyDumper implements DumperInterface
 {
-    public function isProxyCandidate(Definition $definition, bool &$asGhostObject = null, string $id = null): bool
+    public function isProxyCandidate(Definition $definition, ?bool &$asGhostObject = null, ?string $id = null): bool
     {
         $asGhostObject = false;