Skip to content

Commit 2bbc277

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '6.3' into 6.4
* 6.3: minor #53524 [Messenger] [AmazonSqs] Allow `async-aws/sqs` version 2 (smoench) Fix bad merge List CS fix in .git-blame-ignore-revs 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
2 parents cb3d01b + 516ea59 commit 2bbc277

Some content is hidden

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

55 files changed

+108
-108
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/AutowireIterator.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ class AutowireIterator extends Autowire
2424
*/
2525
public function __construct(
2626
string $tag,
27-
string $indexAttribute = null,
28-
string $defaultIndexMethod = null,
29-
string $defaultPriorityMethod = null,
27+
?string $indexAttribute = null,
28+
?string $defaultIndexMethod = null,
29+
?string $defaultPriorityMethod = null,
3030
string|array $exclude = [],
3131
bool $excludeSelf = true,
3232
) {

‎Attribute/AutowireLocator.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ class AutowireLocator extends Autowire
3333
*/
3434
public function __construct(
3535
string|array $services,
36-
string $indexAttribute = null,
37-
string $defaultIndexMethod = null,
38-
string $defaultPriorityMethod = null,
36+
?string $indexAttribute = null,
37+
?string $defaultIndexMethod = null,
38+
?string $defaultPriorityMethod = null,
3939
string|array $exclude = [],
4040
bool $excludeSelf = true,
4141
) {

‎Attribute/Target.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function getParsedName(): string
3636
return lcfirst(str_replace(' ', '', ucwords(preg_replace('/[^a-zA-Z0-9\x7f-\xff]++/', ' ', $this->name))));
3737
}
3838

39-
public static function parseName(\ReflectionParameter $parameter, self &$attribute = null, string &$parsedName = null): string
39+
public static function parseName(\ReflectionParameter $parameter, ?self &$attribute = null, ?string &$parsedName = null): string
4040
{
4141
$attribute = null;
4242
if (!$target = $parameter->getAttributes(self::class)[0] ?? null) {

‎Compiler/AutowirePass.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@ private function getAliasesSuggestionForType(ContainerBuilder $container, string
696696
return null;
697697
}
698698

699-
private function populateAutowiringAlias(string $id, string $target = null): void
699+
private function populateAutowiringAlias(string $id, ?string $target = null): void
700700
{
701701
if (!preg_match('/(?(DEFINE)(?<V>[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+))^((?&V)(?:\\\\(?&V))*+)(?: \$((?&V)))?$/', $id, $m)) {
702702
return;
@@ -716,7 +716,7 @@ private function populateAutowiringAlias(string $id, string $target = null): voi
716716
}
717717
}
718718

719-
private function getCombinedAlias(string $type, string $name = null): ?string
719+
private function getCombinedAlias(string $type, ?string $name = null): ?string
720720
{
721721
if (str_contains($type, '&')) {
722722
$types = explode('&', $type);

0 commit comments

Comments
 (0)