diff --git a/src/Sylius/Bundle/AddressingBundle/Validator/Constraints/ProvinceAddressConstraint.php b/src/Sylius/Bundle/AddressingBundle/Validator/Constraints/ProvinceAddressConstraint.php index 8fcd4060fc..f4fe3fa842 100644 --- a/src/Sylius/Bundle/AddressingBundle/Validator/Constraints/ProvinceAddressConstraint.php +++ b/src/Sylius/Bundle/AddressingBundle/Validator/Constraints/ProvinceAddressConstraint.php @@ -26,14 +26,29 @@ class ProvinceAddressConstraint extends Constraint public $message = 'sylius.address.province.valid'; /** + * @param array|null $options * @param array|null $groups */ #[HasNamedArguments] public function __construct( + ?array $options = null, ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/addressing-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); $this->message = $message ?? $this->message; diff --git a/src/Sylius/Bundle/AddressingBundle/Validator/Constraints/UniqueProvinceCollection.php b/src/Sylius/Bundle/AddressingBundle/Validator/Constraints/UniqueProvinceCollection.php index 415d9b5387..c5cbe88ec8 100644 --- a/src/Sylius/Bundle/AddressingBundle/Validator/Constraints/UniqueProvinceCollection.php +++ b/src/Sylius/Bundle/AddressingBundle/Validator/Constraints/UniqueProvinceCollection.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class UniqueProvinceCollection extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.country.unique_provinces', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/addressing-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.country.unique_provinces'; diff --git a/src/Sylius/Bundle/AddressingBundle/Validator/Constraints/ZoneCannotContainItself.php b/src/Sylius/Bundle/AddressingBundle/Validator/Constraints/ZoneCannotContainItself.php index 79e767b0b9..41baef894f 100644 --- a/src/Sylius/Bundle/AddressingBundle/Validator/Constraints/ZoneCannotContainItself.php +++ b/src/Sylius/Bundle/AddressingBundle/Validator/Constraints/ZoneCannotContainItself.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class ZoneCannotContainItself extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.zone_member.cannot_be_the_same_as_zone', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/addressing-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.zone_member.cannot_be_the_same_as_zone'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/AddingEligibleProductVariantToCart.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/AddingEligibleProductVariantToCart.php index 284e3a8125..b9a5340aa0 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/AddingEligibleProductVariantToCart.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/AddingEligibleProductVariantToCart.php @@ -19,20 +19,38 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class AddingEligibleProductVariantToCart extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $productNotExistMessage = 'sylius.product.not_exist', - string $productVariantNotExistMessage = 'sylius.product_variant.not_exist', - string $productVariantNotSufficient = 'sylius.product_variant.not_sufficient', + ?array $options = null, + ?string $productNotExistMessage = null, + ?string $productVariantNotExistMessage = null, + ?string $productVariantNotSufficient = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/api-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $productNotExistMessage ??= $options['productNotExistMessage'] ?? null; + $productVariantNotExistMessage ??= $options['productVariantNotExistMessage'] ?? null; + $productVariantNotSufficient ??= $options['productVariantNotSufficient'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->productNotExistMessage = $productNotExistMessage; - $this->productVariantNotExistMessage = $productVariantNotExistMessage; - $this->productVariantNotSufficient = $productVariantNotSufficient; + $this->productNotExistMessage = $productNotExistMessage ?? $this->productNotExistMessage; + $this->productVariantNotExistMessage = $productVariantNotExistMessage ?? $this->productVariantNotExistMessage; + $this->productVariantNotSufficient = $productVariantNotSufficient ?? $this->productVariantNotSufficient; } public string $productNotExistMessage = 'sylius.product.not_exist'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/AdminResetPasswordTokenNonExpired.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/AdminResetPasswordTokenNonExpired.php index 3f165770ac..35b37c5215 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/AdminResetPasswordTokenNonExpired.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/AdminResetPasswordTokenNonExpired.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class AdminResetPasswordTokenNonExpired extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.admin.expired_password_reset_token', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/api-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.admin.expired_password_reset_token'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChangedItemQuantityInCart.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChangedItemQuantityInCart.php index b0336d1053..8eda9c03d2 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChangedItemQuantityInCart.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChangedItemQuantityInCart.php @@ -19,20 +19,38 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class ChangedItemQuantityInCart extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $productNotExistMessage = 'sylius.product.not_exist', - string $productVariantNotLongerAvailable = 'sylius.product_variant.not_longer_available', - string $productVariantNotSufficient = 'sylius.product_variant.not_sufficient', + ?array $options = null, + ?string $productNotExistMessage = null, + ?string $productVariantNotLongerAvailable = null, + ?string $productVariantNotSufficient = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/api-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $productNotExistMessage ??= $options['productNotExistMessage'] ?? null; + $productVariantNotLongerAvailable ??= $options['productVariantNotLongerAvailable'] ?? null; + $productVariantNotSufficient ??= $options['productVariantNotSufficient'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->productNotExistMessage = $productNotExistMessage; - $this->productVariantNotLongerAvailable = $productVariantNotLongerAvailable; - $this->productVariantNotSufficient = $productVariantNotSufficient; + $this->productNotExistMessage = $productNotExistMessage ?? $this->productNotExistMessage; + $this->productVariantNotLongerAvailable = $productVariantNotLongerAvailable ?? $this->productVariantNotLongerAvailable; + $this->productVariantNotSufficient = $productVariantNotSufficient ?? $this->productVariantNotSufficient; } public string $productNotExistMessage = 'sylius.product.not_exist'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/CheckoutCompletion.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/CheckoutCompletion.php index 3c53977c5b..e4a96d0eb0 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/CheckoutCompletion.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/CheckoutCompletion.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] class CheckoutCompletion extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.order.invalid_state_transition', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/api-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.order.invalid_state_transition'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentMethodEligibility.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentMethodEligibility.php index 6f3c638d1d..a5f207b32a 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentMethodEligibility.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentMethodEligibility.php @@ -19,20 +19,38 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class ChosenPaymentMethodEligibility extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $notAvailable = 'sylius.payment_method.not_available', - string $notExist = 'sylius.payment_method.not_exist', - string $paymentNotFound = 'sylius.payment.not_found', + ?array $options = null, + ?string $notAvailable = null, + ?string $notExist = null, + ?string $paymentNotFound = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/api-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $notAvailable ??= $options['notAvailable'] ?? null; + $notExist ??= $options['notExist'] ?? null; + $paymentNotFound ??= $options['paymentNotFound'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->notAvailable = $notAvailable; - $this->notExist = $notExist; - $this->paymentNotFound = $paymentNotFound; + $this->notAvailable = $notAvailable ?? $this->notAvailable; + $this->notExist = $notExist ?? $this->notExist; + $this->paymentNotFound = $paymentNotFound ?? $this->paymentNotFound; } public string $notAvailable = 'sylius.payment_method.not_available'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibility.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibility.php index 47752525e4..17e292cc0a 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibility.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibility.php @@ -20,18 +20,35 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class ChosenPaymentRequestActionEligibility extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $notAvailable = 'sylius.payment_request.action_not_available', - string $notExist = 'sylius.payment_method.not_exist', + ?array $options = null, + ?string $notAvailable = null, + ?string $notExist = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/api-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $notAvailable ??= $options['notAvailable'] ?? null; + $notExist ??= $options['notExist'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->notAvailable = $notAvailable; - $this->notExist = $notExist; + $this->notAvailable = $notAvailable ?? $this->notAvailable; + $this->notExist = $notExist ?? $this->notExist; } public string $notAvailable = 'sylius.payment_request.action_not_available'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenShippingMethodEligibility.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenShippingMethodEligibility.php index 147c77ed35..664eb6e994 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenShippingMethodEligibility.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenShippingMethodEligibility.php @@ -19,20 +19,38 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class ChosenShippingMethodEligibility extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.shipping_method.not_available', - string $notFoundMessage = 'sylius.shipping_method.not_found', - string $shipmentNotFoundMessage = 'sylius.shipment.not_found', + ?array $options = null, + ?string $message = null, + ?string $notFoundMessage = null, + ?string $shipmentNotFoundMessage = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/api-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $notFoundMessage ??= $options['notFoundMessage'] ?? null; + $shipmentNotFoundMessage ??= $options['shipmentNotFoundMessage'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; - $this->notFoundMessage = $notFoundMessage; - $this->shipmentNotFoundMessage = $shipmentNotFoundMessage; + $this->message = $message ?? $this->message; + $this->notFoundMessage = $notFoundMessage ?? $this->notFoundMessage; + $this->shipmentNotFoundMessage = $shipmentNotFoundMessage ?? $this->shipmentNotFoundMessage; } public string $message = 'sylius.shipping_method.not_available'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ConfirmResetPassword.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ConfirmResetPassword.php index 02a571bbb2..70c9976b32 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ConfirmResetPassword.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ConfirmResetPassword.php @@ -23,14 +23,29 @@ final class ConfirmResetPassword extends Constraint public $message = 'sylius.user.plainPassword.mismatch'; /** + * @param array|null $options * @param array|null $groups */ #[HasNamedArguments] public function __construct( + ?array $options = null, ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/api-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); $this->message = $message ?? $this->message; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/CorrectChangeShopUserConfirmPassword.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/CorrectChangeShopUserConfirmPassword.php index dd2efe7521..b3d2682fef 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/CorrectChangeShopUserConfirmPassword.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/CorrectChangeShopUserConfirmPassword.php @@ -23,14 +23,29 @@ final class CorrectChangeShopUserConfirmPassword extends Constraint public $message = 'sylius.user.plainPassword.mismatch'; /** + * @param array|null $options * @param array|null $groups */ #[HasNamedArguments] public function __construct( + ?array $options = null, ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/api-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); $this->message = $message ?? $this->message; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/CorrectOrderAddress.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/CorrectOrderAddress.php index 2c556f993b..e350f31f4e 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/CorrectOrderAddress.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/CorrectOrderAddress.php @@ -19,18 +19,35 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class CorrectOrderAddress extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $countryCodeNotExistMessage = 'sylius.country.not_exist', - string $addressWithoutCountryCodeCanNotExistMessage = 'sylius.address.without_country', + ?array $options = null, + ?string $countryCodeNotExistMessage = null, + ?string $addressWithoutCountryCodeCanNotExistMessage = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/api-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $countryCodeNotExistMessage ??= $options['countryCodeNotExistMessage'] ?? null; + $addressWithoutCountryCodeCanNotExistMessage ??= $options['addressWithoutCountryCodeCanNotExistMessage'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->countryCodeNotExistMessage = $countryCodeNotExistMessage; - $this->addressWithoutCountryCodeCanNotExistMessage = $addressWithoutCountryCodeCanNotExistMessage; + $this->countryCodeNotExistMessage = $countryCodeNotExistMessage ?? $this->countryCodeNotExistMessage; + $this->addressWithoutCountryCodeCanNotExistMessage = $addressWithoutCountryCodeCanNotExistMessage ?? $this->addressWithoutCountryCodeCanNotExistMessage; } public string $countryCodeNotExistMessage = 'sylius.country.not_exist'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderAddressRequirement.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderAddressRequirement.php index 0abe20b75f..8422e7263e 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderAddressRequirement.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderAddressRequirement.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class OrderAddressRequirement extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.order.address_requirement', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/api-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.order.address_requirement'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderItemAvailability.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderItemAvailability.php index 13cafcd80a..7f9e6dc034 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderItemAvailability.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderItemAvailability.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class OrderItemAvailability extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.product_variant.product_variant_with_name_not_sufficient', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/api-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.product_variant.product_variant_with_name_not_sufficient'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderNotEmpty.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderNotEmpty.php index 087d0a6eb4..51a83d2bef 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderNotEmpty.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderNotEmpty.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class OrderNotEmpty extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.order.not_empty', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/api-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.order.not_empty'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderPaymentMethodEligibility.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderPaymentMethodEligibility.php index 8ca027e8d9..71d4726c1c 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderPaymentMethodEligibility.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderPaymentMethodEligibility.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class OrderPaymentMethodEligibility extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.order.payment_method_eligibility', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/api-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.order.payment_method_eligibility'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderProductEligibility.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderProductEligibility.php index 970c15b90e..f3f2baf8d7 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderProductEligibility.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderProductEligibility.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class OrderProductEligibility extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.order.product_eligibility', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/api-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.order.product_eligibility'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderShippingMethodEligibility.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderShippingMethodEligibility.php index b475262367..7a0c66ea0d 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderShippingMethodEligibility.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderShippingMethodEligibility.php @@ -19,14 +19,40 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class OrderShippingMethodEligibility extends Constraint { + public string $message = 'sylius.order.shipping_method_eligibility'; + + public string $methodNotAvailableMessage = 'sylius.order.shipping_method_not_available'; + + /** + * @param array|null $options + * @param array|null $groups + */ #[HasNamedArguments] public function __construct( - public string $message = 'sylius.order.shipping_method_eligibility', - public string $methodNotAvailableMessage = 'sylius.order.shipping_method_not_available', + ?array $options = null, + ?string $message = null, + ?string $methodNotAvailableMessage = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/api-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $methodNotAvailableMessage ??= $options['methodNotAvailableMessage'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); + + $this->message = $message ?? $this->message; + $this->methodNotAvailableMessage = $methodNotAvailableMessage ?? $this->methodNotAvailableMessage; } public function getMessage(): string diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/PlacedOrderCartItemsImmutable.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/PlacedOrderCartItemsImmutable.php index e6e2bdc962..bb7c37cffa 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/PlacedOrderCartItemsImmutable.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/PlacedOrderCartItemsImmutable.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class PlacedOrderCartItemsImmutable extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.order.cart_items_immutable', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/api-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.order.cart_items_immutable'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/PromotionCouponEligibility.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/PromotionCouponEligibility.php index 1bc269b847..37e6e1a31e 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/PromotionCouponEligibility.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/PromotionCouponEligibility.php @@ -23,14 +23,29 @@ final class PromotionCouponEligibility extends Constraint public $message = 'sylius.promotion_coupon.is_invalid'; /** + * @param array|null $options * @param array|null $groups */ #[HasNamedArguments] public function __construct( + ?array $options = null, ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/api-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); $this->message = $message ?? $this->message; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShipmentAlreadyShipped.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShipmentAlreadyShipped.php index a5eeca22fb..f3263612d4 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShipmentAlreadyShipped.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShipmentAlreadyShipped.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class ShipmentAlreadyShipped extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.shipment.shipped', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/api-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.shipment.shipped'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShopUserNotVerified.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShopUserNotVerified.php index c5007bb52f..f0ffb39f5f 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShopUserNotVerified.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShopUserNotVerified.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class ShopUserNotVerified extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.account.is_verified', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/api-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.account.is_verified'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShopUserResetPasswordTokenExists.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShopUserResetPasswordTokenExists.php index 59a3296a90..f322d9f185 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShopUserResetPasswordTokenExists.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShopUserResetPasswordTokenExists.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class ShopUserResetPasswordTokenExists extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.reset_password.invalid_token', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/api-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.reset_password.invalid_token'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShopUserResetPasswordTokenNotExpired.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShopUserResetPasswordTokenNotExpired.php index b07374d2eb..f440069856 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShopUserResetPasswordTokenNotExpired.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShopUserResetPasswordTokenNotExpired.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class ShopUserResetPasswordTokenNotExpired extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.reset_password.token_expired', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/api-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.reset_password.token_expired'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShopUserVerificationTokenEligibility.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShopUserVerificationTokenEligibility.php index ddb21e3616..f4408fe91f 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShopUserVerificationTokenEligibility.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShopUserVerificationTokenEligibility.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class ShopUserVerificationTokenEligibility extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.account.invalid_verification_token', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/api-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.account.invalid_verification_token'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/SingleValueForProductVariantOption.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/SingleValueForProductVariantOption.php index e2e7bc3ce6..03887a401e 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/SingleValueForProductVariantOption.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/SingleValueForProductVariantOption.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class SingleValueForProductVariantOption extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.product_variant.option_values.single_value', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/api-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.product_variant.option_values.single_value'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/UniqueReviewerEmail.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/UniqueReviewerEmail.php index 70dfb4d240..2a33ddf5ca 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/UniqueReviewerEmail.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/UniqueReviewerEmail.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class UniqueReviewerEmail extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.review.author.already_exists', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/api-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.review.author.already_exists'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/UniqueShopUserEmail.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/UniqueShopUserEmail.php index 85c2cf43e5..d1c748ac09 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/UniqueShopUserEmail.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/UniqueShopUserEmail.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class UniqueShopUserEmail extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.user.email.unique', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/api-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.user.email.unique'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/UpdateCartEmailNotAllowed.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/UpdateCartEmailNotAllowed.php index 691ecf57ba..6aba743dcb 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/UpdateCartEmailNotAllowed.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/UpdateCartEmailNotAllowed.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class UpdateCartEmailNotAllowed extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.checkout.email.not_changeable', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/api-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.checkout.email.not_changeable'; diff --git a/src/Sylius/Bundle/AttributeBundle/Validator/Constraints/AttributeType.php b/src/Sylius/Bundle/AttributeBundle/Validator/Constraints/AttributeType.php index 4008ca29fd..16bc1520c5 100644 --- a/src/Sylius/Bundle/AttributeBundle/Validator/Constraints/AttributeType.php +++ b/src/Sylius/Bundle/AttributeBundle/Validator/Constraints/AttributeType.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] class AttributeType extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $unregisteredAttributeTypeMessage = 'sylius.attribute.type.unregistered', + ?array $options = null, + ?string $unregisteredAttributeTypeMessage = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/attribute-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $unregisteredAttributeTypeMessage ??= $options['unregisteredAttributeTypeMessage'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->unregisteredAttributeTypeMessage = $unregisteredAttributeTypeMessage; + $this->unregisteredAttributeTypeMessage = $unregisteredAttributeTypeMessage ?? $this->unregisteredAttributeTypeMessage; } public string $unregisteredAttributeTypeMessage = 'sylius.attribute.type.unregistered'; diff --git a/src/Sylius/Bundle/AttributeBundle/Validator/Constraints/ValidSelectAttributeConfiguration.php b/src/Sylius/Bundle/AttributeBundle/Validator/Constraints/ValidSelectAttributeConfiguration.php index e31b177b55..580682b47c 100644 --- a/src/Sylius/Bundle/AttributeBundle/Validator/Constraints/ValidSelectAttributeConfiguration.php +++ b/src/Sylius/Bundle/AttributeBundle/Validator/Constraints/ValidSelectAttributeConfiguration.php @@ -19,20 +19,38 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class ValidSelectAttributeConfiguration extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $messageMultiple = 'sylius.attribute.configuration.multiple', - string $messageMinEntries = 'sylius.attribute.configuration.min_entries', - string $messageMaxEntries = 'sylius.attribute.configuration.max_entries', + ?array $options = null, + ?string $messageMultiple = null, + ?string $messageMinEntries = null, + ?string $messageMaxEntries = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/attribute-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $messageMultiple ??= $options['messageMultiple'] ?? null; + $messageMinEntries ??= $options['messageMinEntries'] ?? null; + $messageMaxEntries ??= $options['messageMaxEntries'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->messageMultiple = $messageMultiple; - $this->messageMinEntries = $messageMinEntries; - $this->messageMaxEntries = $messageMaxEntries; + $this->messageMultiple = $messageMultiple ?? $this->messageMultiple; + $this->messageMinEntries = $messageMinEntries ?? $this->messageMinEntries; + $this->messageMaxEntries = $messageMaxEntries ?? $this->messageMaxEntries; } public string $messageMultiple = 'sylius.attribute.configuration.multiple'; diff --git a/src/Sylius/Bundle/AttributeBundle/Validator/Constraints/ValidTextAttributeConfiguration.php b/src/Sylius/Bundle/AttributeBundle/Validator/Constraints/ValidTextAttributeConfiguration.php index 890ad0feeb..eb5c3d5106 100644 --- a/src/Sylius/Bundle/AttributeBundle/Validator/Constraints/ValidTextAttributeConfiguration.php +++ b/src/Sylius/Bundle/AttributeBundle/Validator/Constraints/ValidTextAttributeConfiguration.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class ValidTextAttributeConfiguration extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.attribute.configuration.max_length', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/attribute-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.attribute.configuration.max_length'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/AllowedImageMimeTypes.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/AllowedImageMimeTypes.php index 070c6a5100..ddaa3c1f1c 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/AllowedImageMimeTypes.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/AllowedImageMimeTypes.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class AllowedImageMimeTypes extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.image.file.allowed_mime_types', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/core-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.image.file.allowed_mime_types'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/CartItemAvailability.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/CartItemAvailability.php index e0a34a67dd..f9033993db 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/CartItemAvailability.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/CartItemAvailability.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class CartItemAvailability extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.cart_item.not_available', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/core-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.cart_item.not_available'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/CartItemVariantEnabled.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/CartItemVariantEnabled.php index 8073146254..9a81b086b4 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/CartItemVariantEnabled.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/CartItemVariantEnabled.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class CartItemVariantEnabled extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.cart_item.variant.not_available', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/core-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.cart_item.variant.not_available'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ChannelCodeCollection.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ChannelCodeCollection.php index ee07036cbb..2ecc5a424f 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ChannelCodeCollection.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ChannelCodeCollection.php @@ -37,11 +37,13 @@ final class ChannelCodeCollection extends Constraint public bool $validateAgainstAllChannels = false; /** + * @param array|null $options * @param array|null $constraints * @param array|null $groups */ #[HasNamedArguments] public function __construct( + ?array $options = null, ?array $constraints = null, ?bool $allowExtraFields = null, ?bool $allowMissingFields = null, @@ -53,6 +55,26 @@ final class ChannelCodeCollection extends Constraint ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/core-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $constraints ??= $options['constraints'] ?? null; + $allowExtraFields ??= $options['allowExtraFields'] ?? null; + $allowMissingFields ??= $options['allowMissingFields'] ?? null; + $channelAwarePropertyPath ??= $options['channelAwarePropertyPath'] ?? null; + $extraFieldsMessage ??= $options['extraFieldsMessage'] ?? null; + $missingFieldsMessage ??= $options['missingFieldsMessage'] ?? null; + $invalidChannelMessage ??= $options['invalidChannelMessage'] ?? null; + $validateAgainstAllChannels ??= $options['validateAgainstAllChannels'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); $this->constraints = $constraints ?? $this->constraints; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ChannelDefaultLocaleEnabled.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ChannelDefaultLocaleEnabled.php index c25ce6cfb4..6b98251222 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ChannelDefaultLocaleEnabled.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ChannelDefaultLocaleEnabled.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class ChannelDefaultLocaleEnabled extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.channel.default_locale.enabled', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/core-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.channel.default_locale.enabled'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/CountryCodeExists.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/CountryCodeExists.php index 004e5cc97a..2ce89c746f 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/CountryCodeExists.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/CountryCodeExists.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class CountryCodeExists extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.country.code.not_exist', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/core-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.country.code.not_exist'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/CustomerGroupCodeExists.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/CustomerGroupCodeExists.php index 3330a14970..7f7f4bcdcf 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/CustomerGroupCodeExists.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/CustomerGroupCodeExists.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class CustomerGroupCodeExists extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.customer_group.code.not_exist', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/core-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.customer_group.code.not_exist'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ExistingChannelCode.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ExistingChannelCode.php index 6003488e28..3d2ab3222c 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ExistingChannelCode.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ExistingChannelCode.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class ExistingChannelCode extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.product_variant.channel_pricing.existing_code', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/core-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.product_variant.channel_pricing.existing_code'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/HasAllPricesDefined.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/HasAllPricesDefined.php index a335f5d8b4..bcf4d0cf53 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/HasAllPricesDefined.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/HasAllPricesDefined.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class HasAllPricesDefined extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.product_variant.channel_pricing.price.not_defined', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/core-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.product_variant.channel_pricing.price.not_defined'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/HasAllVariantPricesDefined.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/HasAllVariantPricesDefined.php index 3358390936..9cdb6af0f1 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/HasAllVariantPricesDefined.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/HasAllVariantPricesDefined.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class HasAllVariantPricesDefined extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.product.variants.all_prices_defined', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/core-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.product.variants.all_prices_defined'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/HasEnabledEntity.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/HasEnabledEntity.php index 60034631df..82b19c64e0 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/HasEnabledEntity.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/HasEnabledEntity.php @@ -19,24 +19,44 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class HasEnabledEntity extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( + ?array $options = null, ?string $objectManager = null, - string $message = 'Must have at least one enabled entity', - string $repositoryMethod = 'findBy', + ?string $message = null, + ?string $repositoryMethod = null, ?string $errorPath = null, - string $enabledPath = 'enabled', + ?string $enabledPath = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/core-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $objectManager ??= $options['objectManager'] ?? null; + $message ??= $options['message'] ?? null; + $repositoryMethod ??= $options['repositoryMethod'] ?? null; + $errorPath ??= $options['errorPath'] ?? null; + $enabledPath ??= $options['enabledPath'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->objectManager = $objectManager; - $this->message = $message; - $this->repositoryMethod = $repositoryMethod; - $this->errorPath = $errorPath; - $this->enabledPath = $enabledPath; + $this->objectManager = $objectManager ?? $this->objectManager; + $this->message = $message ?? $this->message; + $this->repositoryMethod = $repositoryMethod ?? $this->repositoryMethod; + $this->errorPath = $errorPath ?? $this->errorPath; + $this->enabledPath = $enabledPath ?? $this->enabledPath; } public ?string $objectManager = null; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/MaxInteger.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/MaxInteger.php index 4492b122bd..4e45606bf3 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/MaxInteger.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/MaxInteger.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class MaxInteger extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.max_integer', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/core-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.max_integer'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/OrderPaymentMethodEligibility.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/OrderPaymentMethodEligibility.php index 5c40bba3ae..8ff5b04136 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/OrderPaymentMethodEligibility.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/OrderPaymentMethodEligibility.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class OrderPaymentMethodEligibility extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.order.payment_method_eligibility', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/core-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.order.payment_method_eligibility'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/OrderProductEligibility.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/OrderProductEligibility.php index 5ce29c4cb6..e3dea8f78d 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/OrderProductEligibility.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/OrderProductEligibility.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class OrderProductEligibility extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.order.product_eligibility', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/core-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.order.product_eligibility'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/OrderShippingMethodEligibility.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/OrderShippingMethodEligibility.php index d10796ca4e..8e879b6baf 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/OrderShippingMethodEligibility.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/OrderShippingMethodEligibility.php @@ -19,14 +19,40 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class OrderShippingMethodEligibility extends Constraint { + public string $message = 'sylius.order.shipping_method_eligibility'; + + public string $methodNotAvailableMessage = 'sylius.order.shipping_method_not_available'; + + /** + * @param array|null $options + * @param array|null $groups + */ #[HasNamedArguments] public function __construct( - public string $message = 'sylius.order.shipping_method_eligibility', - public string $methodNotAvailableMessage = 'sylius.order.shipping_method_not_available', + ?array $options = null, + ?string $message = null, + ?string $methodNotAvailableMessage = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/core-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $methodNotAvailableMessage ??= $options['methodNotAvailableMessage'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); + + $this->message = $message ?? $this->message; + $this->methodNotAvailableMessage = $methodNotAvailableMessage ?? $this->methodNotAvailableMessage; } public function getMessage(): string diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ProductCodeExists.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ProductCodeExists.php index 294dd22782..c37f7ae63f 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ProductCodeExists.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ProductCodeExists.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class ProductCodeExists extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.product.code.not_exist', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/core-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.product.code.not_exist'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ProductImageVariantsBelongToOwner.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ProductImageVariantsBelongToOwner.php index 7cd2d19db0..942bb4e85e 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ProductImageVariantsBelongToOwner.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ProductImageVariantsBelongToOwner.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class ProductImageVariantsBelongToOwner extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.product_image.product_variant.not_belong_to_owner', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/core-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.product_image.product_variant.not_belong_to_owner'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ProductVariantCodeExists.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ProductVariantCodeExists.php index 51269d26d9..41a64616a0 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ProductVariantCodeExists.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ProductVariantCodeExists.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class ProductVariantCodeExists extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.product_variant.code.not_exist', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/core-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.product_variant.code.not_exist'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ProvinceCodeExists.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ProvinceCodeExists.php index bffbaf9356..23262b69ea 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ProvinceCodeExists.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ProvinceCodeExists.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class ProvinceCodeExists extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.province.code.not_exist', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/core-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.province.code.not_exist'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/RegisteredUser.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/RegisteredUser.php index c09f5d0c30..32f9d2c5a6 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/RegisteredUser.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/RegisteredUser.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class RegisteredUser extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'This email is already registered. Please log in.', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/core-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'This email is already registered. Please log in.'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ResendOrderConfirmationEmailWithValidOrderState.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ResendOrderConfirmationEmailWithValidOrderState.php index 5048620c33..376aab7038 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ResendOrderConfirmationEmailWithValidOrderState.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ResendOrderConfirmationEmailWithValidOrderState.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class ResendOrderConfirmationEmailWithValidOrderState extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.resend_order_confirmation_email.invalid_order_state', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/core-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.resend_order_confirmation_email.invalid_order_state'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ResendShipmentConfirmationEmailWithValidShipmentState.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ResendShipmentConfirmationEmailWithValidShipmentState.php index a777efbbba..4d90173919 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ResendShipmentConfirmationEmailWithValidShipmentState.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ResendShipmentConfirmationEmailWithValidShipmentState.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class ResendShipmentConfirmationEmailWithValidShipmentState extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.resend_shipment_confirmation_email.invalid_shipment_state', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/core-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.resend_shipment_confirmation_email.invalid_shipment_state'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/TaxonCodeExists.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/TaxonCodeExists.php index 9c8dbdbe66..1c892c3c9b 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/TaxonCodeExists.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/TaxonCodeExists.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class TaxonCodeExists extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.taxon.code.not_exist', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/core-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.taxon.code.not_exist'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/TranslationForExistingLocales.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/TranslationForExistingLocales.php index 4d8ade3956..0facae7423 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/TranslationForExistingLocales.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/TranslationForExistingLocales.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class TranslationForExistingLocales extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.translation.locale_code.invalid', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/core-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.translation.locale_code.invalid'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/UniqueReviewerEmail.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/UniqueReviewerEmail.php index 74e0c70e3a..e8a3ec829d 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/UniqueReviewerEmail.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/UniqueReviewerEmail.php @@ -23,14 +23,29 @@ class UniqueReviewerEmail extends Constraint public $message = 'sylius.review.author.already_exists'; /** + * @param array|null $options * @param array|null $groups */ #[HasNamedArguments] public function __construct( + ?array $options = null, ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/core-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); $this->message = $message ?? $this->message; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ZoneCodeExists.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ZoneCodeExists.php index 8078b80011..d72e94010e 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ZoneCodeExists.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ZoneCodeExists.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class ZoneCodeExists extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.zone.code.not_exist', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/core-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.zone.code.not_exist'; diff --git a/src/Sylius/Bundle/CurrencyBundle/Validator/Constraints/DifferentSourceTargetCurrency.php b/src/Sylius/Bundle/CurrencyBundle/Validator/Constraints/DifferentSourceTargetCurrency.php index 042c460ff2..d28b78ec1f 100644 --- a/src/Sylius/Bundle/CurrencyBundle/Validator/Constraints/DifferentSourceTargetCurrency.php +++ b/src/Sylius/Bundle/CurrencyBundle/Validator/Constraints/DifferentSourceTargetCurrency.php @@ -23,14 +23,29 @@ class DifferentSourceTargetCurrency extends Constraint public $message = 'sylius.exchange_rate.different_source_target_currency'; /** + * @param array|null $options * @param array|null $groups */ #[HasNamedArguments] public function __construct( + ?array $options = null, ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/currency-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); $this->message = $message ?? $this->message; diff --git a/src/Sylius/Bundle/CurrencyBundle/Validator/Constraints/UniqueCurrencyPair.php b/src/Sylius/Bundle/CurrencyBundle/Validator/Constraints/UniqueCurrencyPair.php index bad7295df8..fa52e46ddd 100644 --- a/src/Sylius/Bundle/CurrencyBundle/Validator/Constraints/UniqueCurrencyPair.php +++ b/src/Sylius/Bundle/CurrencyBundle/Validator/Constraints/UniqueCurrencyPair.php @@ -23,14 +23,29 @@ class UniqueCurrencyPair extends Constraint public $message = 'sylius.exchange_rate.unique_currency_pair'; /** + * @param array|null $options * @param array|null $groups */ #[HasNamedArguments] public function __construct( + ?array $options = null, ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/currency-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); $this->message = $message ?? $this->message; diff --git a/src/Sylius/Bundle/InventoryBundle/Validator/Constraints/InStock.php b/src/Sylius/Bundle/InventoryBundle/Validator/Constraints/InStock.php index 9aa76d1e60..163e9909a4 100644 --- a/src/Sylius/Bundle/InventoryBundle/Validator/Constraints/InStock.php +++ b/src/Sylius/Bundle/InventoryBundle/Validator/Constraints/InStock.php @@ -19,22 +19,41 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class InStock extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.cart_item.not_available', - string $shortMessage = 'sylius.cart_item.insufficient_stock', - string $stockablePath = 'stockable', - string $quantityPath = 'quantity', + ?array $options = null, + ?string $message = null, + ?string $shortMessage = null, + ?string $stockablePath = null, + ?string $quantityPath = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/inventory-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $shortMessage ??= $options['shortMessage'] ?? null; + $stockablePath ??= $options['stockablePath'] ?? null; + $quantityPath ??= $options['quantityPath'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; - $this->shortMessage = $shortMessage; - $this->stockablePath = $stockablePath; - $this->quantityPath = $quantityPath; + $this->message = $message ?? $this->message; + $this->shortMessage = $shortMessage ?? $this->shortMessage; + $this->stockablePath = $stockablePath ?? $this->stockablePath; + $this->quantityPath = $quantityPath ?? $this->quantityPath; } public string $message = 'sylius.cart_item.not_available'; diff --git a/src/Sylius/Bundle/PaymentBundle/Validator/Constraints/GatewayFactoryExists.php b/src/Sylius/Bundle/PaymentBundle/Validator/Constraints/GatewayFactoryExists.php index 5e7fec9c81..3f000f80ec 100644 --- a/src/Sylius/Bundle/PaymentBundle/Validator/Constraints/GatewayFactoryExists.php +++ b/src/Sylius/Bundle/PaymentBundle/Validator/Constraints/GatewayFactoryExists.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class GatewayFactoryExists extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $invalidGatewayFactory = 'sylius.gateway_config.invalid_gateway_factory', + ?array $options = null, + ?string $invalidGatewayFactory = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/payment-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $invalidGatewayFactory ??= $options['invalidGatewayFactory'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->invalidGatewayFactory = $invalidGatewayFactory; + $this->invalidGatewayFactory = $invalidGatewayFactory ?? $this->invalidGatewayFactory; } public string $invalidGatewayFactory = 'sylius.gateway_config.invalid_gateway_factory'; diff --git a/src/Sylius/Bundle/ProductBundle/Validator/Constraint/ProductVariantCombination.php b/src/Sylius/Bundle/ProductBundle/Validator/Constraint/ProductVariantCombination.php index 1365d5a06f..67553eb8ce 100644 --- a/src/Sylius/Bundle/ProductBundle/Validator/Constraint/ProductVariantCombination.php +++ b/src/Sylius/Bundle/ProductBundle/Validator/Constraint/ProductVariantCombination.php @@ -22,14 +22,29 @@ final class ProductVariantCombination extends Constraint public string $message = 'sylius.product_variant.combination'; /** + * @param array|null $options * @param array|null $groups */ #[HasNamedArguments] public function __construct( + ?array $options = null, ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/product-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); $this->message = $message ?? $this->message; diff --git a/src/Sylius/Bundle/ProductBundle/Validator/Constraint/ProductVariantOptionValuesConfiguration.php b/src/Sylius/Bundle/ProductBundle/Validator/Constraint/ProductVariantOptionValuesConfiguration.php index b816a47157..53af512084 100644 --- a/src/Sylius/Bundle/ProductBundle/Validator/Constraint/ProductVariantOptionValuesConfiguration.php +++ b/src/Sylius/Bundle/ProductBundle/Validator/Constraint/ProductVariantOptionValuesConfiguration.php @@ -21,15 +21,32 @@ final class ProductVariantOptionValuesConfiguration extends Constraint { public string $message = 'sylius.product_variant.option_values.not_configured'; + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.product_variant.option_values.not_configured', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/product-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public function validatedBy(): string diff --git a/src/Sylius/Bundle/ProductBundle/Validator/Constraint/UniqueSimpleProductCode.php b/src/Sylius/Bundle/ProductBundle/Validator/Constraint/UniqueSimpleProductCode.php index 636372422a..a4c65ffc5e 100644 --- a/src/Sylius/Bundle/ProductBundle/Validator/Constraint/UniqueSimpleProductCode.php +++ b/src/Sylius/Bundle/ProductBundle/Validator/Constraint/UniqueSimpleProductCode.php @@ -22,14 +22,29 @@ final class UniqueSimpleProductCode extends Constraint public string $message = 'sylius.simple_product.code.unique'; /** + * @param array|null $options * @param array|null $groups */ #[HasNamedArguments] public function __construct( + ?array $options = null, ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/product-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); $this->message = $message ?? $this->message; diff --git a/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/CatalogPromotionActionType.php b/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/CatalogPromotionActionType.php index 9281eb5312..1535e9d14d 100644 --- a/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/CatalogPromotionActionType.php +++ b/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/CatalogPromotionActionType.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class CatalogPromotionActionType extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $invalidType = 'sylius.catalog_promotion_action.type.invalid', + ?array $options = null, + ?string $invalidType = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/promotion-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $invalidType ??= $options['invalidType'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->invalidType = $invalidType; + $this->invalidType = $invalidType ?? $this->invalidType; } public string $invalidType = 'sylius.catalog_promotion_action.type.invalid'; diff --git a/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/CatalogPromotionScopeType.php b/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/CatalogPromotionScopeType.php index 2eed60b29a..bd090614f4 100644 --- a/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/CatalogPromotionScopeType.php +++ b/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/CatalogPromotionScopeType.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class CatalogPromotionScopeType extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $invalidType = 'sylius.catalog_promotion_scope.type.invalid', + ?array $options = null, + ?string $invalidType = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/promotion-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $invalidType ??= $options['invalidType'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->invalidType = $invalidType; + $this->invalidType = $invalidType ?? $this->invalidType; } public string $invalidType = 'sylius.catalog_promotion_scope.type.invalid'; diff --git a/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/CouponPossibleGenerationAmount.php b/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/CouponPossibleGenerationAmount.php index 428354d1d5..6630859f65 100644 --- a/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/CouponPossibleGenerationAmount.php +++ b/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/CouponPossibleGenerationAmount.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class CouponPossibleGenerationAmount extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.promotion_coupon_generator_instruction.possible_generation_amount', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/promotion-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.promotion_coupon_generator_instruction.possible_generation_amount'; diff --git a/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionActionType.php b/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionActionType.php index 471a22d56a..574dee3f00 100644 --- a/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionActionType.php +++ b/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionActionType.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class PromotionActionType extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $invalidType = 'sylius.promotion_action.invalid_type', + ?array $options = null, + ?string $invalidType = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/promotion-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $invalidType ??= $options['invalidType'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->invalidType = $invalidType; + $this->invalidType = $invalidType ?? $this->invalidType; } public string $invalidType = 'sylius.promotion_action.invalid_type'; diff --git a/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionDateRange.php b/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionDateRange.php index 10637baa9a..911ff4f440 100644 --- a/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionDateRange.php +++ b/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionDateRange.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class PromotionDateRange extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.promotion.end_date_cannot_be_set_prior_start_date', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/promotion-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.promotion.end_date_cannot_be_set_prior_start_date'; diff --git a/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionNotCouponBased.php b/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionNotCouponBased.php index ce01153191..4f977f11fd 100644 --- a/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionNotCouponBased.php +++ b/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionNotCouponBased.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class PromotionNotCouponBased extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.promotion_coupon.promotion.not_coupon_based', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/promotion-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.promotion_coupon.promotion.not_coupon_based'; diff --git a/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionRuleType.php b/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionRuleType.php index 25ffa2951e..4bc58dde09 100644 --- a/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionRuleType.php +++ b/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionRuleType.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class PromotionRuleType extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $invalidType = 'sylius.promotion_rule.invalid_type', + ?array $options = null, + ?string $invalidType = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/promotion-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $invalidType ??= $options['invalidType'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->invalidType = $invalidType; + $this->invalidType = $invalidType ?? $this->invalidType; } public string $invalidType = 'sylius.promotion_rule.invalid_type'; diff --git a/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionSubjectCoupon.php b/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionSubjectCoupon.php index 1fa4de83d0..07ccb9f610 100644 --- a/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionSubjectCoupon.php +++ b/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionSubjectCoupon.php @@ -19,16 +19,32 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class PromotionSubjectCoupon extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.promotion_coupon.is_invalid', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/promotion-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.promotion_coupon.is_invalid'; diff --git a/src/Sylius/Bundle/ShippingBundle/Validator/Constraint/ShippingMethodCalculatorExists.php b/src/Sylius/Bundle/ShippingBundle/Validator/Constraint/ShippingMethodCalculatorExists.php index df09b3fa2d..81101f6e14 100644 --- a/src/Sylius/Bundle/ShippingBundle/Validator/Constraint/ShippingMethodCalculatorExists.php +++ b/src/Sylius/Bundle/ShippingBundle/Validator/Constraint/ShippingMethodCalculatorExists.php @@ -22,14 +22,29 @@ final class ShippingMethodCalculatorExists extends Constraint public string $invalidShippingCalculator = 'sylius.shipping_method.calculator.invalid'; /** + * @param array|null $options * @param array|null $groups */ #[HasNamedArguments] public function __construct( + ?array $options = null, ?string $invalidShippingCalculator = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/shipping-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $invalidShippingCalculator ??= $options['invalidShippingCalculator'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); $this->invalidShippingCalculator = $invalidShippingCalculator ?? $this->invalidShippingCalculator; diff --git a/src/Sylius/Bundle/ShippingBundle/Validator/Constraint/ShippingMethodRule.php b/src/Sylius/Bundle/ShippingBundle/Validator/Constraint/ShippingMethodRule.php index 7000a4f7e2..c81dd53915 100644 --- a/src/Sylius/Bundle/ShippingBundle/Validator/Constraint/ShippingMethodRule.php +++ b/src/Sylius/Bundle/ShippingBundle/Validator/Constraint/ShippingMethodRule.php @@ -22,14 +22,29 @@ final class ShippingMethodRule extends Constraint public string $invalidType = 'sylius.shipping_method.rule.invalid_type'; /** + * @param array|null $options * @param array|null $groups */ #[HasNamedArguments] public function __construct( + ?array $options = null, ?string $invalidType = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/shipping-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $invalidType ??= $options['invalidType'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); $this->invalidType = $invalidType ?? $this->invalidType; diff --git a/src/Sylius/Bundle/ShippingBundle/Validator/Constraint/ValidDeliveryTimeRange.php b/src/Sylius/Bundle/ShippingBundle/Validator/Constraint/ValidDeliveryTimeRange.php index 6b1f6e1740..8c6b9b8c8f 100644 --- a/src/Sylius/Bundle/ShippingBundle/Validator/Constraint/ValidDeliveryTimeRange.php +++ b/src/Sylius/Bundle/ShippingBundle/Validator/Constraint/ValidDeliveryTimeRange.php @@ -21,15 +21,32 @@ final class ValidDeliveryTimeRange extends Constraint { public string $message = 'sylius.form.shipping_method.max_delivery_time_days.greater_or_equal_min'; + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.form.shipping_method.max_delivery_time_days.greater_or_equal_min', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/shipping-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public function validatedBy(): string diff --git a/src/Sylius/Bundle/TaxonomyBundle/Validator/Constraints/TaxonParentRelation.php b/src/Sylius/Bundle/TaxonomyBundle/Validator/Constraints/TaxonParentRelation.php index f6419e9b73..8ca398c916 100644 --- a/src/Sylius/Bundle/TaxonomyBundle/Validator/Constraints/TaxonParentRelation.php +++ b/src/Sylius/Bundle/TaxonomyBundle/Validator/Constraints/TaxonParentRelation.php @@ -18,16 +18,32 @@ use Symfony\Component\Validator\Constraint; final class TaxonParentRelation extends Constraint { - + /** + * @param array|null $options + */ #[HasNamedArguments] public function __construct( - string $message = 'sylius.taxon.parent.invalid_relation', + ?array $options = null, + ?string $message = null, ?array $groups = null, mixed $payload = null, ) { + if (\is_array($options)) { + trigger_deprecation( + 'sylius/taxonomy-bundle', + '2.3', + 'Passing an array of options to configure the "%s" constraint is deprecated and will be removed in Sylius 3.0, use named arguments instead.', + static::class, + ); + + $message ??= $options['message'] ?? null; + $groups ??= $options['groups'] ?? null; + $payload ??= $options['payload'] ?? null; + } + parent::__construct(groups: $groups, payload: $payload); - $this->message = $message; + $this->message = $message ?? $this->message; } public string $message = 'sylius.taxon.parent.invalid_relation';