Skip to content

Commit 516ea59

Browse files
Merge branch '5.4' into 6.3
* 5.4: Fix implicitly-required parameters List CS fix in .git-blame-ignore-revs Apply php-cs-fixer fix --rules nullable_type_declaration_for_default_null_value [Messenger][AmazonSqs] Allow async-aws/sqs version 2
2 parents 62020f2 + f6557cc commit 516ea59

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+101
-101
lines changed

Argument/BoundArgument.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ final class BoundArgument implements ArgumentInterface
2828
private int $type;
2929
private ?string $file;
3030

31-
public function __construct(mixed $value, bool $trackUsage = true, int $type = 0, string $file = null)
31+
public function __construct(mixed $value, bool $trackUsage = true, int $type = 0, ?string $file = null)
3232
{
3333
$this->value = $value;
3434
if ($trackUsage) {

Argument/ServiceLocator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class ServiceLocator extends BaseServiceLocator
2424
private array $serviceMap;
2525
private ?array $serviceTypes;
2626

27-
public function __construct(\Closure $factory, array $serviceMap, array $serviceTypes = null)
27+
public function __construct(\Closure $factory, array $serviceMap, ?array $serviceTypes = null)
2828
{
2929
$this->factory = $factory;
3030
$this->serviceMap = $serviceMap;

Argument/TaggedIteratorArgument.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class TaggedIteratorArgument extends IteratorArgument
3535
* @param array $exclude Services to exclude from the iterator
3636
* @param bool $excludeSelf Whether to automatically exclude the referencing service from the iterator
3737
*/
38-
public function __construct(string $tag, string $indexAttribute = null, string $defaultIndexMethod = null, bool $needsIndexes = false, string $defaultPriorityMethod = null, array $exclude = [], bool $excludeSelf = true)
38+
public function __construct(string $tag, ?string $indexAttribute = null, ?string $defaultIndexMethod = null, bool $needsIndexes = false, ?string $defaultPriorityMethod = null, array $exclude = [], bool $excludeSelf = true)
3939
{
4040
parent::__construct([]);
4141

Attribute/AutoconfigureTag.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#[\Attribute(\Attribute::TARGET_CLASS | \Attribute::IS_REPEATABLE)]
2020
class AutoconfigureTag extends Autoconfigure
2121
{
22-
public function __construct(string $name = null, array $attributes = [])
22+
public function __construct(?string $name = null, array $attributes = [])
2323
{
2424
parent::__construct(
2525
tags: [

Attribute/Autowire.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ class Autowire
3838
* @param bool|class-string|class-string[] $lazy Whether to use lazy-loading for this argument
3939
*/
4040
public function __construct(
41-
string|array|ArgumentInterface $value = null,
42-
string $service = null,
43-
string $expression = null,
44-
string $env = null,
45-
string $param = null,
41+
string|array|ArgumentInterface|null $value = null,
42+
?string $service = null,
43+
?string $expression = null,
44+
?string $env = null,
45+
?string $param = null,
4646
bool|string|array $lazy = false,
4747
) {
4848
if ($this->lazy = \is_string($lazy) ? [$lazy] : $lazy) {

Attribute/AutowireCallable.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ class AutowireCallable extends Autowire
2525
* @param bool|class-string $lazy Whether to use lazy-loading for this argument
2626
*/
2727
public function __construct(
28-
string|array $callable = null,
29-
string $service = null,
30-
string $method = null,
28+
string|array|null $callable = null,
29+
?string $service = null,
30+
?string $method = null,
3131
bool|string $lazy = false,
3232
) {
3333
if (!(null !== $callable xor null !== $service)) {

Attribute/Target.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function __construct(string $name)
2828
$this->name = lcfirst(str_replace(' ', '', ucwords(preg_replace('/[^a-zA-Z0-9\x7f-\xff]++/', ' ', $name))));
2929
}
3030

31-
public static function parseName(\ReflectionParameter $parameter, self &$attribute = null): string
31+
public static function parseName(\ReflectionParameter $parameter, ?self &$attribute = null): string
3232
{
3333
$attribute = null;
3434
if (!$target = $parameter->getAttributes(self::class)[0] ?? null) {

Compiler/AutowirePass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@ private function populateAutowiringAlias(string $id): void
688688
}
689689
}
690690

691-
private function getCombinedAlias(string $type, string $name = null): ?string
691+
private function getCombinedAlias(string $type, ?string $name = null): ?string
692692
{
693693
if (str_contains($type, '&')) {
694694
$types = explode('&', $type);

Compiler/CheckTypeDeclarationsPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ private function checkTypeDeclarations(Definition $checkedDefinition, \Reflectio
161161
/**
162162
* @throws InvalidParameterTypeException When a parameter is not compatible with the declared type
163163
*/
164-
private function checkType(Definition $checkedDefinition, mixed $value, \ReflectionParameter $parameter, ?string $envPlaceholderUniquePrefix, \ReflectionType $reflectionType = null): void
164+
private function checkType(Definition $checkedDefinition, mixed $value, \ReflectionParameter $parameter, ?string $envPlaceholderUniquePrefix, ?\ReflectionType $reflectionType = null): void
165165
{
166166
$reflectionType ??= $parameter->getType();
167167

Compiler/InlineServiceDefinitionsPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class InlineServiceDefinitionsPass extends AbstractRecursivePass
3232
private array $notInlinableIds = [];
3333
private ?ServiceReferenceGraph $graph = null;
3434

35-
public function __construct(AnalyzeServiceReferencesPass $analyzingPass = null)
35+
public function __construct(?AnalyzeServiceReferencesPass $analyzingPass = null)
3636
{
3737
$this->analyzingPass = $analyzingPass;
3838
}

0 commit comments

Comments
 (0)