Skip to content

Commit 5d511ce

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 dfd9693 + cded64e commit 5d511ce

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Tests/Fixtures/AttributeFixtures/ExtendedRoute.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#[\Attribute(\Attribute::IS_REPEATABLE | \Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD)]
88
class ExtendedRoute extends Route
99
{
10-
public function __construct(array|string $path = null, ?string $name = null, array $defaults = [])
10+
public function __construct(array|string|null $path = null, ?string $name = null, array $defaults = [])
1111
{
1212
parent::__construct("/{section<(foo|bar|baz)>}" . $path, $name, [], [], array_merge(['section' => 'foo'], $defaults));
1313
}

Tests/Fixtures/TraceableAttributeClassLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ final class TraceableAttributeClassLoader extends AttributeClassLoader
2020
/** @var list<string> */
2121
public array $foundClasses = [];
2222

23-
public function load(mixed $class, string $type = null): RouteCollection
23+
public function load(mixed $class, ?string $type = null): RouteCollection
2424
{
2525
if (!is_string($class)) {
2626
throw new \InvalidArgumentException(sprintf('Expected string, got "%s"', get_debug_type($class)));

0 commit comments

Comments
 (0)