Skip to content

Commit af02616

Browse files
committed
Merge branch '7.0' into 7.1
* 7.0: Fix implicit nullable parameters stop marking parameters implicitly as nullable include message id provided by the MTA when dispatching the SentMessageEvent Remove whitespaces from block form_help Fix TypeError on ProgressBar
2 parents 6928ba4 + ff57b5c commit af02616

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Tests/Fixtures/includes/autowiring_classes.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class Foo
1616
public static int $counter = 0;
1717

1818
#[Required]
19-
public function cloneFoo(\stdClass $bar = null): static
19+
public function cloneFoo(?\stdClass $bar = null): static
2020
{
2121
++self::$counter;
2222

Tests/Fixtures/includes/autowiring_classes_80.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public function __construct(string $arg1, #[AutowireDecorated] AsDecoratorInterf
108108
#[AsDecorator(decorates: \NonExistent::class, onInvalid: ContainerInterface::NULL_ON_INVALID_REFERENCE)]
109109
class AsDecoratorBaz implements AsDecoratorInterface
110110
{
111-
public function __construct(#[AutowireDecorated] AsDecoratorInterface $inner = null)
111+
public function __construct(#[AutowireDecorated] ?AsDecoratorInterface $inner = null)
112112
{
113113
}
114114
}

Tests/Fixtures/includes/classes.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public function callPassed()
8383

8484
class DummyProxyDumper implements DumperInterface
8585
{
86-
public function isProxyCandidate(Definition $definition, bool &$asGhostObject = null, string $id = null): bool
86+
public function isProxyCandidate(Definition $definition, ?bool &$asGhostObject = null, ?string $id = null): bool
8787
{
8888
$asGhostObject = false;
8989

0 commit comments

Comments
 (0)