Skip to content

Commit c7fbb60

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 4a229fd + 0c26834 commit c7fbb60

File tree

104 files changed

+307
-307
lines changed

Some content is hidden

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

104 files changed

+307
-307
lines changed

Constraint.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public static function getErrorName(string $errorCode): string
119119
* array, but getDefaultOption() returns
120120
* null
121121
*/
122-
public function __construct(mixed $options = null, array $groups = null, mixed $payload = null)
122+
public function __construct(mixed $options = null, ?array $groups = null, mixed $payload = null)
123123
{
124124
unset($this->groups); // enable lazy initialization
125125

ConstraintViolation.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class ConstraintViolation implements ConstraintViolationInterface
4949
* caused the violation
5050
* @param mixed $cause The cause of the violation
5151
*/
52-
public function __construct(string|\Stringable $message, ?string $messageTemplate, array $parameters, mixed $root, ?string $propertyPath, mixed $invalidValue, int $plural = null, string $code = null, Constraint $constraint = null, mixed $cause = null)
52+
public function __construct(string|\Stringable $message, ?string $messageTemplate, array $parameters, mixed $root, ?string $propertyPath, mixed $invalidValue, ?int $plural = null, ?string $code = null, ?Constraint $constraint = null, mixed $cause = null)
5353
{
5454
$this->message = $message;
5555
$this->messageTemplate = $messageTemplate;

Constraints/AbstractComparison.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ abstract class AbstractComparison extends Constraint
2828
public $value;
2929
public $propertyPath;
3030

31-
public function __construct(mixed $value = null, string $propertyPath = null, string $message = null, array $groups = null, mixed $payload = null, array $options = [])
31+
public function __construct(mixed $value = null, ?string $propertyPath = null, ?string $message = null, ?array $groups = null, mixed $payload = null, array $options = [])
3232
{
3333
if (\is_array($value)) {
3434
$options = array_merge($value, $options);

Constraints/AbstractComparisonValidator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ abstract class AbstractComparisonValidator extends ConstraintValidator
2929
{
3030
private ?PropertyAccessorInterface $propertyAccessor;
3131

32-
public function __construct(PropertyAccessorInterface $propertyAccessor = null)
32+
public function __construct(?PropertyAccessorInterface $propertyAccessor = null)
3333
{
3434
$this->propertyAccessor = $propertyAccessor;
3535
}

Constraints/All.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class All extends Composite
2222
{
2323
public $constraints = [];
2424

25-
public function __construct(mixed $constraints = null, array $groups = null, mixed $payload = null)
25+
public function __construct(mixed $constraints = null, ?array $groups = null, mixed $payload = null)
2626
{
2727
parent::__construct($constraints ?? [], $groups, $payload);
2828
}

Constraints/AtLeastOneOf.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class AtLeastOneOf extends Composite
3636
public $messageCollection = 'Each element of this collection should satisfy its own set of constraints.';
3737
public $includeInternalMessages = true;
3838

39-
public function __construct(mixed $constraints = null, array $groups = null, mixed $payload = null, string $message = null, string $messageCollection = null, bool $includeInternalMessages = null)
39+
public function __construct(mixed $constraints = null, ?array $groups = null, mixed $payload = null, ?string $message = null, ?string $messageCollection = null, ?bool $includeInternalMessages = null)
4040
{
4141
parent::__construct($constraints ?? [], $groups, $payload);
4242

Constraints/Bic.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class Bic extends Constraint
5151
public $iban;
5252
public $ibanPropertyPath;
5353

54-
public function __construct(array $options = null, string $message = null, string $iban = null, string $ibanPropertyPath = null, string $ibanMessage = null, array $groups = null, mixed $payload = null)
54+
public function __construct(?array $options = null, ?string $message = null, ?string $iban = null, ?string $ibanPropertyPath = null, ?string $ibanMessage = null, ?array $groups = null, mixed $payload = null)
5555
{
5656
if (!class_exists(Countries::class)) {
5757
throw new LogicException('The Intl component is required to use the Bic constraint. Try running "composer require symfony/intl".');

Constraints/BicValidator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class BicValidator extends ConstraintValidator
5858

5959
private ?PropertyAccessor $propertyAccessor;
6060

61-
public function __construct(PropertyAccessor $propertyAccessor = null)
61+
public function __construct(?PropertyAccessor $propertyAccessor = null)
6262
{
6363
$this->propertyAccessor = $propertyAccessor;
6464
}

Constraints/Blank.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class Blank extends Constraint
3535

3636
public $message = 'This value should be blank.';
3737

38-
public function __construct(array $options = null, string $message = null, array $groups = null, mixed $payload = null)
38+
public function __construct(?array $options = null, ?string $message = null, ?array $groups = null, mixed $payload = null)
3939
{
4040
parent::__construct($options ?? [], $groups, $payload);
4141

Constraints/Callback.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class Callback extends Constraint
2727
*/
2828
public $callback;
2929

30-
public function __construct(array|string|callable $callback = null, array $groups = null, mixed $payload = null, array $options = [])
30+
public function __construct(array|string|callable|null $callback = null, ?array $groups = null, mixed $payload = null, array $options = [])
3131
{
3232
// Invocation through annotations with an array parameter only
3333
if (\is_array($callback) && 1 === \count($callback) && isset($callback['value'])) {

0 commit comments

Comments
 (0)