diff --git a/src/Sylius/Bundle/AddressingBundle/Validator/Constraints/ProvinceAddressConstraint.php b/src/Sylius/Bundle/AddressingBundle/Validator/Constraints/ProvinceAddressConstraint.php index f4fe3fa842..6e53c3a125 100644 --- a/src/Sylius/Bundle/AddressingBundle/Validator/Constraints/ProvinceAddressConstraint.php +++ b/src/Sylius/Bundle/AddressingBundle/Validator/Constraints/ProvinceAddressConstraint.php @@ -22,9 +22,6 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] class ProvinceAddressConstraint extends Constraint { - /** @var string */ - public $message = 'sylius.address.province.valid'; - /** * @param array|null $options * @param array|null $groups @@ -32,7 +29,7 @@ class ProvinceAddressConstraint extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.address.province.valid', ?array $groups = null, mixed $payload = null, ) { @@ -44,14 +41,12 @@ class ProvinceAddressConstraint extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } public function getTargets(): string diff --git a/src/Sylius/Bundle/AddressingBundle/Validator/Constraints/UniqueProvinceCollection.php b/src/Sylius/Bundle/AddressingBundle/Validator/Constraints/UniqueProvinceCollection.php index c5cbe88ec8..23ff12f9c5 100644 --- a/src/Sylius/Bundle/AddressingBundle/Validator/Constraints/UniqueProvinceCollection.php +++ b/src/Sylius/Bundle/AddressingBundle/Validator/Constraints/UniqueProvinceCollection.php @@ -25,7 +25,7 @@ final class UniqueProvinceCollection extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.country.unique_provinces', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class UniqueProvinceCollection extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.country.unique_provinces'; - public function validatedBy(): string { return 'sylius_unique_province_collection_validator'; diff --git a/src/Sylius/Bundle/AddressingBundle/Validator/Constraints/ZoneCannotContainItself.php b/src/Sylius/Bundle/AddressingBundle/Validator/Constraints/ZoneCannotContainItself.php index 41baef894f..07ba07ffe0 100644 --- a/src/Sylius/Bundle/AddressingBundle/Validator/Constraints/ZoneCannotContainItself.php +++ b/src/Sylius/Bundle/AddressingBundle/Validator/Constraints/ZoneCannotContainItself.php @@ -25,7 +25,7 @@ final class ZoneCannotContainItself extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.zone_member.cannot_be_the_same_as_zone', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class ZoneCannotContainItself extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.zone_member.cannot_be_the_same_as_zone'; - public function validatedBy(): string { return 'sylius_zone_cannot_contain_itself_validator'; diff --git a/src/Sylius/Bundle/AddressingBundle/tests/Validator/Constraints/ProvinceAddressConstraintValidatorTest.php b/src/Sylius/Bundle/AddressingBundle/tests/Validator/Constraints/ProvinceAddressConstraintValidatorTest.php index 0f18842f52..95af3953cb 100644 --- a/src/Sylius/Bundle/AddressingBundle/tests/Validator/Constraints/ProvinceAddressConstraintValidatorTest.php +++ b/src/Sylius/Bundle/AddressingBundle/tests/Validator/Constraints/ProvinceAddressConstraintValidatorTest.php @@ -39,7 +39,7 @@ final class ProvinceAddressConstraintValidatorTest extends TestCase private AddressInterface&MockObject $address; - private MockObject&ProvinceAddressConstraint $constraint; + private ProvinceAddressConstraint $constraint; private ExecutionContextInterface&MockObject $context; @@ -50,7 +50,7 @@ final class ProvinceAddressConstraintValidatorTest extends TestCase $this->countryRepository = $this->createMock(RepositoryInterface::class); $this->provinceRepository = $this->createMock(RepositoryInterface::class); $this->address = $this->createMock(AddressInterface::class); - $this->constraint = $this->createMock(ProvinceAddressConstraint::class); + $this->constraint = new ProvinceAddressConstraint(); $this->context = $this->createMock(ExecutionContextInterface::class); $this->provinceAddressConstraintValidator = new ProvinceAddressConstraintValidator( diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/AddingEligibleProductVariantToCart.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/AddingEligibleProductVariantToCart.php index 65849f09a9..98aebdd781 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/AddingEligibleProductVariantToCart.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/AddingEligibleProductVariantToCart.php @@ -25,9 +25,9 @@ final class AddingEligibleProductVariantToCart extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $productNotExistMessage = null, - ?string $productVariantNotExistMessage = null, - ?string $productVariantNotSufficientMessage = null, + public string $productNotExistMessage = 'sylius.product.not_exist', + public string $productVariantNotExistMessage = 'sylius.product_variant.not_exist', + public string $productVariantNotSufficientMessage = 'sylius.product_variant.not_sufficient', ?string $productVariantNotSufficient = null, ?array $groups = null, mixed $payload = null, @@ -40,9 +40,9 @@ final class AddingEligibleProductVariantToCart extends Constraint static::class, ); - $productNotExistMessage ??= $options['productNotExistMessage'] ?? null; - $productVariantNotExistMessage ??= $options['productVariantNotExistMessage'] ?? null; - $productVariantNotSufficientMessage ??= $options['productVariantNotSufficientMessage'] ?? null; + $this->productNotExistMessage = $options['productNotExistMessage'] ?? $this->productNotExistMessage; + $this->productVariantNotExistMessage = $options['productVariantNotExistMessage'] ?? $this->productVariantNotExistMessage; + $this->productVariantNotSufficientMessage = $options['productVariantNotSufficientMessage'] ?? $this->productVariantNotSufficientMessage; $productVariantNotSufficient ??= $options['productVariantNotSufficient'] ?? null; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; @@ -56,23 +56,13 @@ final class AddingEligibleProductVariantToCart extends Constraint static::class, ); - $productVariantNotSufficientMessage ??= $productVariantNotSufficient; + $this->productVariantNotSufficientMessage = $productVariantNotSufficient; } parent::__construct(groups: $groups, payload: $payload); - - $this->productNotExistMessage = $productNotExistMessage ?? $this->productNotExistMessage; - $this->productVariantNotExistMessage = $productVariantNotExistMessage ?? $this->productVariantNotExistMessage; - $this->productVariantNotSufficientMessage = $productVariantNotSufficientMessage ?? $this->productVariantNotSufficientMessage; $this->productVariantNotSufficient = $this->productVariantNotSufficientMessage; } - public string $productNotExistMessage = 'sylius.product.not_exist'; - - public string $productVariantNotExistMessage = 'sylius.product_variant.not_exist'; - - public string $productVariantNotSufficientMessage = 'sylius.product_variant.not_sufficient'; - /** @deprecated since Sylius 2.3, use $productVariantNotSufficientMessage instead. It will be removed in Sylius 3.0. */ public string $productVariantNotSufficient = 'sylius.product_variant.not_sufficient'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/AdminResetPasswordTokenNonExpired.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/AdminResetPasswordTokenNonExpired.php index 35b37c5215..0f4bbbd6a2 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/AdminResetPasswordTokenNonExpired.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/AdminResetPasswordTokenNonExpired.php @@ -25,7 +25,7 @@ final class AdminResetPasswordTokenNonExpired extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.admin.expired_password_reset_token', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class AdminResetPasswordTokenNonExpired extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.admin.expired_password_reset_token'; - public function validatedBy(): string { return 'sylius_api_validator_admin_non_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 429ad82b6b..2593b12501 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChangedItemQuantityInCart.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChangedItemQuantityInCart.php @@ -25,9 +25,9 @@ final class ChangedItemQuantityInCart extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $productNotExistMessage = null, - ?string $productVariantNotLongerAvailableMessage = null, - ?string $productVariantNotSufficientMessage = null, + public string $productNotExistMessage = 'sylius.product.not_exist', + public string $productVariantNotLongerAvailableMessage = 'sylius.product_variant.not_longer_available', + public string $productVariantNotSufficientMessage = 'sylius.product_variant.not_sufficient', ?string $productVariantNotLongerAvailable = null, ?string $productVariantNotSufficient = null, ?array $groups = null, @@ -41,9 +41,9 @@ final class ChangedItemQuantityInCart extends Constraint static::class, ); - $productNotExistMessage ??= $options['productNotExistMessage'] ?? null; - $productVariantNotLongerAvailableMessage ??= $options['productVariantNotLongerAvailableMessage'] ?? null; - $productVariantNotSufficientMessage ??= $options['productVariantNotSufficientMessage'] ?? null; + $this->productNotExistMessage = $options['productNotExistMessage'] ?? $this->productNotExistMessage; + $this->productVariantNotLongerAvailableMessage = $options['productVariantNotLongerAvailableMessage'] ?? $this->productVariantNotLongerAvailableMessage; + $this->productVariantNotSufficientMessage = $options['productVariantNotSufficientMessage'] ?? $this->productVariantNotSufficientMessage; $productVariantNotLongerAvailable ??= $options['productVariantNotLongerAvailable'] ?? null; $productVariantNotSufficient ??= $options['productVariantNotSufficient'] ?? null; $groups ??= $options['groups'] ?? null; @@ -58,7 +58,7 @@ final class ChangedItemQuantityInCart extends Constraint static::class, ); - $productVariantNotLongerAvailableMessage ??= $productVariantNotLongerAvailable; + $this->productVariantNotLongerAvailableMessage = $productVariantNotLongerAvailable; } if (null !== $productVariantNotSufficient) { @@ -69,24 +69,14 @@ final class ChangedItemQuantityInCart extends Constraint static::class, ); - $productVariantNotSufficientMessage ??= $productVariantNotSufficient; + $this->productVariantNotSufficientMessage = $productVariantNotSufficient; } parent::__construct(groups: $groups, payload: $payload); - - $this->productNotExistMessage = $productNotExistMessage ?? $this->productNotExistMessage; - $this->productVariantNotLongerAvailableMessage = $productVariantNotLongerAvailableMessage ?? $this->productVariantNotLongerAvailableMessage; - $this->productVariantNotSufficientMessage = $productVariantNotSufficientMessage ?? $this->productVariantNotSufficientMessage; $this->productVariantNotLongerAvailable = $this->productVariantNotLongerAvailableMessage; $this->productVariantNotSufficient = $this->productVariantNotSufficientMessage; } - public string $productNotExistMessage = 'sylius.product.not_exist'; - - public string $productVariantNotLongerAvailableMessage = 'sylius.product_variant.not_longer_available'; - - public string $productVariantNotSufficientMessage = 'sylius.product_variant.not_sufficient'; - /** @deprecated since Sylius 2.3, use $productVariantNotLongerAvailableMessage instead. It will be removed in Sylius 3.0. */ public string $productVariantNotLongerAvailable = 'sylius.product_variant.not_longer_available'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/CheckoutCompletion.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/CheckoutCompletion.php index e4a96d0eb0..f38eb8efff 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/CheckoutCompletion.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/CheckoutCompletion.php @@ -25,7 +25,7 @@ class CheckoutCompletion extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.order.invalid_state_transition', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ class CheckoutCompletion extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.order.invalid_state_transition'; - public function validatedBy(): string { return 'sylius_api_validator_checkout_completion'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentMethodEligibility.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentMethodEligibility.php index ce74c43531..cfa48c8a4d 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentMethodEligibility.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentMethodEligibility.php @@ -25,9 +25,9 @@ final class ChosenPaymentMethodEligibility extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $notAvailableMessage = null, - ?string $notExistMessage = null, - ?string $paymentNotFoundMessage = null, + public string $notAvailableMessage = 'sylius.payment_method.not_available', + public string $notExistMessage = 'sylius.payment_method.not_exist', + public string $paymentNotFoundMessage = 'sylius.payment.not_found', ?string $notAvailable = null, ?string $notExist = null, ?string $paymentNotFound = null, @@ -42,9 +42,9 @@ final class ChosenPaymentMethodEligibility extends Constraint static::class, ); - $notAvailableMessage ??= $options['notAvailableMessage'] ?? null; - $notExistMessage ??= $options['notExistMessage'] ?? null; - $paymentNotFoundMessage ??= $options['paymentNotFoundMessage'] ?? null; + $this->notAvailableMessage = $options['notAvailableMessage'] ?? $this->notAvailableMessage; + $this->notExistMessage = $options['notExistMessage'] ?? $this->notExistMessage; + $this->paymentNotFoundMessage = $options['paymentNotFoundMessage'] ?? $this->paymentNotFoundMessage; $notAvailable ??= $options['notAvailable'] ?? null; $notExist ??= $options['notExist'] ?? null; $paymentNotFound ??= $options['paymentNotFound'] ?? null; @@ -60,7 +60,7 @@ final class ChosenPaymentMethodEligibility extends Constraint static::class, ); - $notAvailableMessage ??= $notAvailable; + $this->notAvailableMessage = $notAvailable; } if (null !== $notExist) { @@ -71,7 +71,7 @@ final class ChosenPaymentMethodEligibility extends Constraint static::class, ); - $notExistMessage ??= $notExist; + $this->notExistMessage = $notExist; } if (null !== $paymentNotFound) { @@ -82,25 +82,15 @@ final class ChosenPaymentMethodEligibility extends Constraint static::class, ); - $paymentNotFoundMessage ??= $paymentNotFound; + $this->paymentNotFoundMessage = $paymentNotFound; } parent::__construct(groups: $groups, payload: $payload); - - $this->notAvailableMessage = $notAvailableMessage ?? $this->notAvailableMessage; - $this->notExistMessage = $notExistMessage ?? $this->notExistMessage; - $this->paymentNotFoundMessage = $paymentNotFoundMessage ?? $this->paymentNotFoundMessage; $this->notAvailable = $this->notAvailableMessage; $this->notExist = $this->notExistMessage; $this->paymentNotFound = $this->paymentNotFoundMessage; } - public string $notAvailableMessage = 'sylius.payment_method.not_available'; - - public string $notExistMessage = 'sylius.payment_method.not_exist'; - - public string $paymentNotFoundMessage = 'sylius.payment.not_found'; - /** @deprecated since Sylius 2.3, use $notAvailableMessage instead. It will be removed in Sylius 3.0. */ 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 ac45636806..842cea678b 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibility.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenPaymentRequestActionEligibility.php @@ -26,8 +26,8 @@ final class ChosenPaymentRequestActionEligibility extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $notAvailableMessage = null, - ?string $notExistMessage = null, + public string $notAvailableMessage = 'sylius.payment_request.action_not_available', + public string $notExistMessage = 'sylius.payment_method.not_exist', ?string $notAvailable = null, ?string $notExist = null, ?array $groups = null, @@ -41,8 +41,8 @@ final class ChosenPaymentRequestActionEligibility extends Constraint static::class, ); - $notAvailableMessage ??= $options['notAvailableMessage'] ?? null; - $notExistMessage ??= $options['notExistMessage'] ?? null; + $this->notAvailableMessage = $options['notAvailableMessage'] ?? $this->notAvailableMessage; + $this->notExistMessage = $options['notExistMessage'] ?? $this->notExistMessage; $notAvailable ??= $options['notAvailable'] ?? null; $notExist ??= $options['notExist'] ?? null; $groups ??= $options['groups'] ?? null; @@ -57,7 +57,7 @@ final class ChosenPaymentRequestActionEligibility extends Constraint static::class, ); - $notAvailableMessage ??= $notAvailable; + $this->notAvailableMessage = $notAvailable; } if (null !== $notExist) { @@ -68,21 +68,14 @@ final class ChosenPaymentRequestActionEligibility extends Constraint static::class, ); - $notExistMessage ??= $notExist; + $this->notExistMessage = $notExist; } parent::__construct(groups: $groups, payload: $payload); - - $this->notAvailableMessage = $notAvailableMessage ?? $this->notAvailableMessage; - $this->notExistMessage = $notExistMessage ?? $this->notExistMessage; $this->notAvailable = $this->notAvailableMessage; $this->notExist = $this->notExistMessage; } - public string $notAvailableMessage = 'sylius.payment_request.action_not_available'; - - public string $notExistMessage = 'sylius.payment_method.not_exist'; - /** @deprecated since Sylius 2.3, use $notAvailableMessage instead. It will be removed in Sylius 3.0. */ 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 11931b9420..8f4fd7a1b9 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenShippingMethodEligibility.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ChosenShippingMethodEligibility.php @@ -25,10 +25,10 @@ final class ChosenShippingMethodEligibility extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, - ?string $notFoundMessage = null, - ?string $shipmentNotFoundMessage = null, - ?string $shippingAddressNotFoundMessage = null, + public string $message = 'sylius.shipping_method.not_available', + public string $notFoundMessage = 'sylius.shipping_method.not_found', + public string $shipmentNotFoundMessage = 'sylius.shipment.not_found', + public string $shippingAddressNotFoundMessage = 'sylius.shipping_method.shipping_address_not_found', ?array $groups = null, mixed $payload = null, ) { @@ -40,31 +40,17 @@ final class ChosenShippingMethodEligibility extends Constraint static::class, ); - $message ??= $options['message'] ?? null; - $notFoundMessage ??= $options['notFoundMessage'] ?? null; - $shipmentNotFoundMessage ??= $options['shipmentNotFoundMessage'] ?? null; - $shippingAddressNotFoundMessage ??= $options['shippingAddressNotFoundMessage'] ?? null; + $this->message = $options['message'] ?? $this->message; + $this->notFoundMessage = $options['notFoundMessage'] ?? $this->notFoundMessage; + $this->shipmentNotFoundMessage = $options['shipmentNotFoundMessage'] ?? $this->shipmentNotFoundMessage; + $this->shippingAddressNotFoundMessage = $options['shippingAddressNotFoundMessage'] ?? $this->shippingAddressNotFoundMessage; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; - $this->notFoundMessage = $notFoundMessage ?? $this->notFoundMessage; - $this->shipmentNotFoundMessage = $shipmentNotFoundMessage ?? $this->shipmentNotFoundMessage; - $this->shippingAddressNotFoundMessage = $shippingAddressNotFoundMessage ?? $this->shippingAddressNotFoundMessage; } - public string $message = 'sylius.shipping_method.not_available'; - - public string $notFoundMessage = 'sylius.shipping_method.not_found'; - - public string $shipmentNotFoundMessage = 'sylius.shipment.not_found'; - - /** @var string */ - public $shippingAddressNotFoundMessage = 'sylius.shipping_method.shipping_address_not_found'; - public function validatedBy(): string { return 'sylius_api_validator_chosen_shipping_method_eligibility'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ConfirmResetPassword.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ConfirmResetPassword.php index 70c9976b32..d0c0331e63 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ConfirmResetPassword.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ConfirmResetPassword.php @@ -19,9 +19,6 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class ConfirmResetPassword extends Constraint { - /** @var string */ - public $message = 'sylius.user.plainPassword.mismatch'; - /** * @param array|null $options * @param array|null $groups @@ -29,7 +26,7 @@ final class ConfirmResetPassword extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.user.plainPassword.mismatch', ?array $groups = null, mixed $payload = null, ) { @@ -41,14 +38,12 @@ final class ConfirmResetPassword extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } public function validatedBy(): string diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/CorrectChangeShopUserConfirmPassword.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/CorrectChangeShopUserConfirmPassword.php index b3d2682fef..80d3f4bca6 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/CorrectChangeShopUserConfirmPassword.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/CorrectChangeShopUserConfirmPassword.php @@ -19,9 +19,6 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class CorrectChangeShopUserConfirmPassword extends Constraint { - /** @var string */ - public $message = 'sylius.user.plainPassword.mismatch'; - /** * @param array|null $options * @param array|null $groups @@ -29,7 +26,7 @@ final class CorrectChangeShopUserConfirmPassword extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.user.plainPassword.mismatch', ?array $groups = null, mixed $payload = null, ) { @@ -41,14 +38,12 @@ final class CorrectChangeShopUserConfirmPassword extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } public function validatedBy(): string diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/CorrectOrderAddress.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/CorrectOrderAddress.php index e350f31f4e..a93086a15f 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/CorrectOrderAddress.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/CorrectOrderAddress.php @@ -25,8 +25,8 @@ final class CorrectOrderAddress extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $countryCodeNotExistMessage = null, - ?string $addressWithoutCountryCodeCanNotExistMessage = null, + public string $countryCodeNotExistMessage = 'sylius.country.not_exist', + public string $addressWithoutCountryCodeCanNotExistMessage = 'sylius.address.without_country', ?array $groups = null, mixed $payload = null, ) { @@ -38,22 +38,15 @@ final class CorrectOrderAddress extends Constraint static::class, ); - $countryCodeNotExistMessage ??= $options['countryCodeNotExistMessage'] ?? null; - $addressWithoutCountryCodeCanNotExistMessage ??= $options['addressWithoutCountryCodeCanNotExistMessage'] ?? null; + $this->countryCodeNotExistMessage = $options['countryCodeNotExistMessage'] ?? $this->countryCodeNotExistMessage; + $this->addressWithoutCountryCodeCanNotExistMessage = $options['addressWithoutCountryCodeCanNotExistMessage'] ?? $this->addressWithoutCountryCodeCanNotExistMessage; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->countryCodeNotExistMessage = $countryCodeNotExistMessage ?? $this->countryCodeNotExistMessage; - $this->addressWithoutCountryCodeCanNotExistMessage = $addressWithoutCountryCodeCanNotExistMessage ?? $this->addressWithoutCountryCodeCanNotExistMessage; } - public string $countryCodeNotExistMessage = 'sylius.country.not_exist'; - - public string $addressWithoutCountryCodeCanNotExistMessage = 'sylius.address.without_country'; - public function validatedBy(): string { return 'sylius_api_validator_correct_order_address'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderAddressRequirement.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderAddressRequirement.php index 8422e7263e..afccec3378 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderAddressRequirement.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderAddressRequirement.php @@ -25,7 +25,7 @@ final class OrderAddressRequirement extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.order.address_requirement', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class OrderAddressRequirement extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.order.address_requirement'; - public function validatedBy(): string { return 'sylius_order_address_requirement_validator'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderItemAvailability.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderItemAvailability.php index 7f9e6dc034..69a3d572ca 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderItemAvailability.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderItemAvailability.php @@ -25,7 +25,7 @@ final class OrderItemAvailability extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.product_variant.product_variant_with_name_not_sufficient', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class OrderItemAvailability extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.product_variant.product_variant_with_name_not_sufficient'; - public function validatedBy(): string { return 'sylius_api_validator_order_item_availability'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderNotEmpty.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderNotEmpty.php index 51a83d2bef..a25f0450be 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderNotEmpty.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderNotEmpty.php @@ -25,7 +25,7 @@ final class OrderNotEmpty extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.order.not_empty', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class OrderNotEmpty extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.order.not_empty'; - public function validatedBy(): string { return 'sylius_api_validator_order_not_empty'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderPaymentMethodEligibility.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderPaymentMethodEligibility.php index 71d4726c1c..8ac1ff46be 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderPaymentMethodEligibility.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderPaymentMethodEligibility.php @@ -25,7 +25,7 @@ final class OrderPaymentMethodEligibility extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.order.payment_method_eligibility', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class OrderPaymentMethodEligibility extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.order.payment_method_eligibility'; - public function validatedBy(): string { return 'sylius_api_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 f3f2baf8d7..de09b6c78f 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderProductEligibility.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderProductEligibility.php @@ -25,7 +25,7 @@ final class OrderProductEligibility extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.order.product_eligibility', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class OrderProductEligibility extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.order.product_eligibility'; - public function validatedBy(): string { return 'sylius_api_validator_order_product_eligibility'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderShippingMethodEligibility.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderShippingMethodEligibility.php index 7a0c66ea0d..550a464bf0 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderShippingMethodEligibility.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/OrderShippingMethodEligibility.php @@ -19,10 +19,6 @@ 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 @@ -30,8 +26,8 @@ final class OrderShippingMethodEligibility extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, - ?string $methodNotAvailableMessage = null, + public string $message = 'sylius.order.shipping_method_eligibility', + public string $methodNotAvailableMessage = 'sylius.order.shipping_method_not_available', ?array $groups = null, mixed $payload = null, ) { @@ -43,16 +39,13 @@ final class OrderShippingMethodEligibility extends Constraint static::class, ); - $message ??= $options['message'] ?? null; - $methodNotAvailableMessage ??= $options['methodNotAvailableMessage'] ?? null; + $this->message = $options['message'] ?? $this->message; + $this->methodNotAvailableMessage = $options['methodNotAvailableMessage'] ?? $this->methodNotAvailableMessage; $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 bb7c37cffa..9ab4424265 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/PlacedOrderCartItemsImmutable.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/PlacedOrderCartItemsImmutable.php @@ -25,7 +25,7 @@ final class PlacedOrderCartItemsImmutable extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.order.cart_items_immutable', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class PlacedOrderCartItemsImmutable extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.order.cart_items_immutable'; - public function validatedBy(): string { return 'sylius_validator_placed_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 37e6e1a31e..499458bd16 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/PromotionCouponEligibility.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/PromotionCouponEligibility.php @@ -19,9 +19,6 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class PromotionCouponEligibility extends Constraint { - /** @var string */ - public $message = 'sylius.promotion_coupon.is_invalid'; - /** * @param array|null $options * @param array|null $groups @@ -29,7 +26,7 @@ final class PromotionCouponEligibility extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.promotion_coupon.is_invalid', ?array $groups = null, mixed $payload = null, ) { @@ -41,14 +38,12 @@ final class PromotionCouponEligibility extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } public function validatedBy(): string diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShipmentAlreadyShipped.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShipmentAlreadyShipped.php index f3263612d4..91814e5c3c 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShipmentAlreadyShipped.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShipmentAlreadyShipped.php @@ -25,7 +25,7 @@ final class ShipmentAlreadyShipped extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.shipment.shipped', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class ShipmentAlreadyShipped extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.shipment.shipped'; - public function validatedBy(): string { return 'sylius_api_shipment_already_shipped'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShopUserNotVerified.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShopUserNotVerified.php index f0ffb39f5f..3586f09784 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShopUserNotVerified.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShopUserNotVerified.php @@ -25,7 +25,7 @@ final class ShopUserNotVerified extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.account.is_verified', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class ShopUserNotVerified extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.account.is_verified'; - public function validatedBy(): string { return 'sylius_api_shop_user_not_verified'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShopUserResetPasswordTokenExists.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShopUserResetPasswordTokenExists.php index f322d9f185..d8ab65818f 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShopUserResetPasswordTokenExists.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShopUserResetPasswordTokenExists.php @@ -25,7 +25,7 @@ final class ShopUserResetPasswordTokenExists extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.reset_password.invalid_token', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class ShopUserResetPasswordTokenExists extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.reset_password.invalid_token'; - public function validatedBy(): string { return 'sylius_api_shop_user_reset_password_token_exists'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShopUserResetPasswordTokenNotExpired.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShopUserResetPasswordTokenNotExpired.php index f440069856..248744ecd8 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShopUserResetPasswordTokenNotExpired.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShopUserResetPasswordTokenNotExpired.php @@ -25,7 +25,7 @@ final class ShopUserResetPasswordTokenNotExpired extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.reset_password.token_expired', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class ShopUserResetPasswordTokenNotExpired extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.reset_password.token_expired'; - public function validatedBy(): string { return 'sylius_api_shop_user_reset_password_token_not_expired'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShopUserVerificationTokenEligibility.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShopUserVerificationTokenEligibility.php index f4408fe91f..dc16a22761 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShopUserVerificationTokenEligibility.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/ShopUserVerificationTokenEligibility.php @@ -25,7 +25,7 @@ final class ShopUserVerificationTokenEligibility extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.account.invalid_verification_token', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class ShopUserVerificationTokenEligibility extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.account.invalid_verification_token'; - public function validatedBy(): string { return 'sylius_api_validator_shop_user_verification_token_eligibility'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/SingleValueForProductVariantOption.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/SingleValueForProductVariantOption.php index 03887a401e..91d0f8b262 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/SingleValueForProductVariantOption.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/SingleValueForProductVariantOption.php @@ -25,7 +25,7 @@ final class SingleValueForProductVariantOption extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.product_variant.option_values.single_value', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class SingleValueForProductVariantOption extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.product_variant.option_values.single_value'; - public function validatedBy(): string { return 'sylius_api_validator_single_value_for_product_variant_option'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/UniqueReviewerEmail.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/UniqueReviewerEmail.php index 2a33ddf5ca..eccc10eb90 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/UniqueReviewerEmail.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/UniqueReviewerEmail.php @@ -25,7 +25,7 @@ final class UniqueReviewerEmail extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.review.author.already_exists', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class UniqueReviewerEmail extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.review.author.already_exists'; - public function validatedBy(): string { return 'sylius_api_unique_reviewer_email_validator'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/UniqueShopUserEmail.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/UniqueShopUserEmail.php index d1c748ac09..7a029439bb 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/UniqueShopUserEmail.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/UniqueShopUserEmail.php @@ -25,7 +25,7 @@ final class UniqueShopUserEmail extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.user.email.unique', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class UniqueShopUserEmail extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.user.email.unique'; - public function validatedBy(): string { return 'sylius_validator_unique_shop_user_email'; diff --git a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/UpdateCartEmailNotAllowed.php b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/UpdateCartEmailNotAllowed.php index 6aba743dcb..85934942cf 100644 --- a/src/Sylius/Bundle/ApiBundle/Validator/Constraints/UpdateCartEmailNotAllowed.php +++ b/src/Sylius/Bundle/ApiBundle/Validator/Constraints/UpdateCartEmailNotAllowed.php @@ -25,7 +25,7 @@ final class UpdateCartEmailNotAllowed extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.checkout.email.not_changeable', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class UpdateCartEmailNotAllowed extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.checkout.email.not_changeable'; - public function validatedBy(): string { return 'sylius_validator_update_cart_email_not_allowed'; diff --git a/src/Sylius/Bundle/AttributeBundle/Validator/Constraints/AttributeType.php b/src/Sylius/Bundle/AttributeBundle/Validator/Constraints/AttributeType.php index 16bc1520c5..c4bf311052 100644 --- a/src/Sylius/Bundle/AttributeBundle/Validator/Constraints/AttributeType.php +++ b/src/Sylius/Bundle/AttributeBundle/Validator/Constraints/AttributeType.php @@ -25,7 +25,7 @@ class AttributeType extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $unregisteredAttributeTypeMessage = null, + public string $unregisteredAttributeTypeMessage = 'sylius.attribute.type.unregistered', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ class AttributeType extends Constraint static::class, ); - $unregisteredAttributeTypeMessage ??= $options['unregisteredAttributeTypeMessage'] ?? null; + $this->unregisteredAttributeTypeMessage = $options['unregisteredAttributeTypeMessage'] ?? $this->unregisteredAttributeTypeMessage; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->unregisteredAttributeTypeMessage = $unregisteredAttributeTypeMessage ?? $this->unregisteredAttributeTypeMessage; } - public string $unregisteredAttributeTypeMessage = 'sylius.attribute.type.unregistered'; - public function getTargets(): string { return self::CLASS_CONSTRAINT; diff --git a/src/Sylius/Bundle/AttributeBundle/Validator/Constraints/ValidSelectAttributeConfiguration.php b/src/Sylius/Bundle/AttributeBundle/Validator/Constraints/ValidSelectAttributeConfiguration.php index 580682b47c..51ffe7933d 100644 --- a/src/Sylius/Bundle/AttributeBundle/Validator/Constraints/ValidSelectAttributeConfiguration.php +++ b/src/Sylius/Bundle/AttributeBundle/Validator/Constraints/ValidSelectAttributeConfiguration.php @@ -25,9 +25,9 @@ final class ValidSelectAttributeConfiguration extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $messageMultiple = null, - ?string $messageMinEntries = null, - ?string $messageMaxEntries = null, + public string $messageMultiple = 'sylius.attribute.configuration.multiple', + public string $messageMinEntries = 'sylius.attribute.configuration.min_entries', + public string $messageMaxEntries = 'sylius.attribute.configuration.max_entries', ?array $groups = null, mixed $payload = null, ) { @@ -39,26 +39,16 @@ final class ValidSelectAttributeConfiguration extends Constraint static::class, ); - $messageMultiple ??= $options['messageMultiple'] ?? null; - $messageMinEntries ??= $options['messageMinEntries'] ?? null; - $messageMaxEntries ??= $options['messageMaxEntries'] ?? null; + $this->messageMultiple = $options['messageMultiple'] ?? $this->messageMultiple; + $this->messageMinEntries = $options['messageMinEntries'] ?? $this->messageMinEntries; + $this->messageMaxEntries = $options['messageMaxEntries'] ?? $this->messageMaxEntries; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->messageMultiple = $messageMultiple ?? $this->messageMultiple; - $this->messageMinEntries = $messageMinEntries ?? $this->messageMinEntries; - $this->messageMaxEntries = $messageMaxEntries ?? $this->messageMaxEntries; } - public string $messageMultiple = 'sylius.attribute.configuration.multiple'; - - public string $messageMinEntries = 'sylius.attribute.configuration.min_entries'; - - public string $messageMaxEntries = 'sylius.attribute.configuration.max_entries'; - public function getTargets(): string { return self::CLASS_CONSTRAINT; diff --git a/src/Sylius/Bundle/AttributeBundle/Validator/Constraints/ValidTextAttributeConfiguration.php b/src/Sylius/Bundle/AttributeBundle/Validator/Constraints/ValidTextAttributeConfiguration.php index eb5c3d5106..174d763ebc 100644 --- a/src/Sylius/Bundle/AttributeBundle/Validator/Constraints/ValidTextAttributeConfiguration.php +++ b/src/Sylius/Bundle/AttributeBundle/Validator/Constraints/ValidTextAttributeConfiguration.php @@ -25,7 +25,7 @@ final class ValidTextAttributeConfiguration extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.attribute.configuration.max_length', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class ValidTextAttributeConfiguration extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.attribute.configuration.max_length'; - public function getTargets(): string { return self::CLASS_CONSTRAINT; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/AllowedImageMimeTypes.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/AllowedImageMimeTypes.php index ddaa3c1f1c..ae616e0ccf 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/AllowedImageMimeTypes.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/AllowedImageMimeTypes.php @@ -25,7 +25,7 @@ final class AllowedImageMimeTypes extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.image.file.allowed_mime_types', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class AllowedImageMimeTypes extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.image.file.allowed_mime_types'; - public function validatedBy(): string { return 'sylius_image_allowed_mime_types_validator'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/CartItemAvailability.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/CartItemAvailability.php index f9033993db..c0a1203d87 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/CartItemAvailability.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/CartItemAvailability.php @@ -25,7 +25,7 @@ final class CartItemAvailability extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.cart_item.not_available', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class CartItemAvailability extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.cart_item.not_available'; - public function validatedBy(): string { return 'sylius_cart_item_availability'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/CartItemVariantEnabled.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/CartItemVariantEnabled.php index 9a81b086b4..e85f7d7df7 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/CartItemVariantEnabled.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/CartItemVariantEnabled.php @@ -25,7 +25,7 @@ final class CartItemVariantEnabled extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.cart_item.variant.not_available', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class CartItemVariantEnabled extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.cart_item.variant.not_available'; - public function validatedBy(): string { return 'sylius_cart_item_variant_enabled'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ChannelCodeCollection.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ChannelCodeCollection.php index 2ecc5a424f..692eb95d2d 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ChannelCodeCollection.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ChannelCodeCollection.php @@ -19,39 +19,22 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class ChannelCodeCollection extends Constraint { - /** @var array */ - public array $constraints = []; - - public bool $allowExtraFields = false; - - public bool $allowMissingFields = false; - - public ?string $channelAwarePropertyPath = null; - - public ?string $extraFieldsMessage = null; - - public ?string $missingFieldsMessage = null; - - public string $invalidChannelMessage = 'sylius.channel_code_collection.invalid_channel'; - - public bool $validateAgainstAllChannels = false; - /** * @param array|null $options - * @param array|null $constraints + * @param array $constraints * @param array|null $groups */ #[HasNamedArguments] public function __construct( ?array $options = null, - ?array $constraints = null, - ?bool $allowExtraFields = null, - ?bool $allowMissingFields = null, - ?string $channelAwarePropertyPath = null, - ?string $extraFieldsMessage = null, - ?string $missingFieldsMessage = null, - ?string $invalidChannelMessage = null, - ?bool $validateAgainstAllChannels = null, + public array $constraints = [], + public bool $allowExtraFields = false, + public bool $allowMissingFields = false, + public ?string $channelAwarePropertyPath = null, + public ?string $extraFieldsMessage = null, + public ?string $missingFieldsMessage = null, + public string $invalidChannelMessage = 'sylius.channel_code_collection.invalid_channel', + public bool $validateAgainstAllChannels = false, ?array $groups = null, mixed $payload = null, ) { @@ -63,28 +46,19 @@ final class ChannelCodeCollection extends Constraint 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; + $this->constraints = $options['constraints'] ?? $this->constraints; + $this->allowExtraFields = $options['allowExtraFields'] ?? $this->allowExtraFields; + $this->allowMissingFields = $options['allowMissingFields'] ?? $this->allowMissingFields; + $this->channelAwarePropertyPath = $options['channelAwarePropertyPath'] ?? $this->channelAwarePropertyPath; + $this->extraFieldsMessage = $options['extraFieldsMessage'] ?? $this->extraFieldsMessage; + $this->missingFieldsMessage = $options['missingFieldsMessage'] ?? $this->missingFieldsMessage; + $this->invalidChannelMessage = $options['invalidChannelMessage'] ?? $this->invalidChannelMessage; + $this->validateAgainstAllChannels = $options['validateAgainstAllChannels'] ?? $this->validateAgainstAllChannels; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->constraints = $constraints ?? $this->constraints; - $this->allowExtraFields = $allowExtraFields ?? $this->allowExtraFields; - $this->allowMissingFields = $allowMissingFields ?? $this->allowMissingFields; - $this->channelAwarePropertyPath = $channelAwarePropertyPath ?? $this->channelAwarePropertyPath; - $this->extraFieldsMessage = $extraFieldsMessage ?? $this->extraFieldsMessage; - $this->missingFieldsMessage = $missingFieldsMessage ?? $this->missingFieldsMessage; - $this->invalidChannelMessage = $invalidChannelMessage ?? $this->invalidChannelMessage; - $this->validateAgainstAllChannels = $validateAgainstAllChannels ?? $this->validateAgainstAllChannels; } public function validatedBy(): string diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ChannelDefaultLocaleEnabled.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ChannelDefaultLocaleEnabled.php index 6b98251222..9269446509 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ChannelDefaultLocaleEnabled.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ChannelDefaultLocaleEnabled.php @@ -25,7 +25,7 @@ final class ChannelDefaultLocaleEnabled extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.channel.default_locale.enabled', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class ChannelDefaultLocaleEnabled extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.channel.default_locale.enabled'; - public function getTargets(): string { return self::CLASS_CONSTRAINT; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/CountryCodeExists.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/CountryCodeExists.php index 2ce89c746f..638f1e583e 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/CountryCodeExists.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/CountryCodeExists.php @@ -25,7 +25,7 @@ final class CountryCodeExists extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.country.code.not_exist', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class CountryCodeExists extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.country.code.not_exist'; - public function validatedBy(): string { return 'sylius_country_code_exists'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/CustomerGroupCodeExists.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/CustomerGroupCodeExists.php index 7f7f4bcdcf..d22353d91c 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/CustomerGroupCodeExists.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/CustomerGroupCodeExists.php @@ -25,7 +25,7 @@ final class CustomerGroupCodeExists extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.customer_group.code.not_exist', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class CustomerGroupCodeExists extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.customer_group.code.not_exist'; - public function validatedBy(): string { return 'sylius_customer_group_code_exists'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ExistingChannelCode.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ExistingChannelCode.php index 3d2ab3222c..61b22ac6a1 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ExistingChannelCode.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ExistingChannelCode.php @@ -25,7 +25,7 @@ final class ExistingChannelCode extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.product_variant.channel_pricing.existing_code', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class ExistingChannelCode extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.product_variant.channel_pricing.existing_code'; - public function validatedBy(): string { return 'sylius_channel_code_among_existing_ones'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/HasAllPricesDefined.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/HasAllPricesDefined.php index bcf4d0cf53..310e22f19f 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/HasAllPricesDefined.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/HasAllPricesDefined.php @@ -25,7 +25,7 @@ final class HasAllPricesDefined extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.product_variant.channel_pricing.price.not_defined', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class HasAllPricesDefined extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.product_variant.channel_pricing.price.not_defined'; - public function validatedBy(): string { return 'sylius_has_all_prices_defined'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/HasAllVariantPricesDefined.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/HasAllVariantPricesDefined.php index 9cdb6af0f1..9c3c266097 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/HasAllVariantPricesDefined.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/HasAllVariantPricesDefined.php @@ -25,7 +25,7 @@ final class HasAllVariantPricesDefined extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.product.variants.all_prices_defined', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class HasAllVariantPricesDefined extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.product.variants.all_prices_defined'; - public function validatedBy(): string { return 'sylius_has_all_variant_prices_defined'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/HasEnabledEntity.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/HasEnabledEntity.php index 82b19c64e0..eb01cb2d83 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/HasEnabledEntity.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/HasEnabledEntity.php @@ -25,11 +25,11 @@ final class HasEnabledEntity extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $objectManager = null, - ?string $message = null, - ?string $repositoryMethod = null, - ?string $errorPath = null, - ?string $enabledPath = null, + public ?string $objectManager = null, + public string $message = 'Must have at least one enabled entity', + public string $repositoryMethod = 'findBy', + public ?string $errorPath = null, + public string $enabledPath = 'enabled', ?array $groups = null, mixed $payload = null, ) { @@ -41,34 +41,18 @@ final class HasEnabledEntity extends Constraint static::class, ); - $objectManager ??= $options['objectManager'] ?? null; - $message ??= $options['message'] ?? null; - $repositoryMethod ??= $options['repositoryMethod'] ?? null; - $errorPath ??= $options['errorPath'] ?? null; - $enabledPath ??= $options['enabledPath'] ?? null; + $this->objectManager = $options['objectManager'] ?? $this->objectManager; + $this->message = $options['message'] ?? $this->message; + $this->repositoryMethod = $options['repositoryMethod'] ?? $this->repositoryMethod; + $this->errorPath = $options['errorPath'] ?? $this->errorPath; + $this->enabledPath = $options['enabledPath'] ?? $this->enabledPath; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $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; - - public string $message = 'Must have at least one enabled entity'; - - public string $repositoryMethod = 'findBy'; - - public ?string $errorPath = null; - - public string $enabledPath = 'enabled'; - public function getTargets(): string { return self::CLASS_CONSTRAINT; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/MaxInteger.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/MaxInteger.php index 4e45606bf3..47446b2b1a 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/MaxInteger.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/MaxInteger.php @@ -25,7 +25,7 @@ final class MaxInteger extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.max_integer', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class MaxInteger extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.max_integer'; - public function validatedBy(): string { return 'sylius_max_integer'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/OrderPaymentMethodEligibility.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/OrderPaymentMethodEligibility.php index 8ff5b04136..cd7eb4d7ab 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/OrderPaymentMethodEligibility.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/OrderPaymentMethodEligibility.php @@ -25,7 +25,7 @@ final class OrderPaymentMethodEligibility extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.order.payment_method_eligibility', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class OrderPaymentMethodEligibility extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.order.payment_method_eligibility'; - public function validatedBy(): string { return 'sylius_order_payment_method_eligibility_validator'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/OrderProductEligibility.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/OrderProductEligibility.php index e3dea8f78d..16a17d55de 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/OrderProductEligibility.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/OrderProductEligibility.php @@ -25,7 +25,7 @@ final class OrderProductEligibility extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.order.product_eligibility', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class OrderProductEligibility extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.order.product_eligibility'; - public function validatedBy(): string { return 'sylius_order_product_eligibility_validator'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/OrderShippingMethodEligibility.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/OrderShippingMethodEligibility.php index 8e879b6baf..a17ffd5c0b 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/OrderShippingMethodEligibility.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/OrderShippingMethodEligibility.php @@ -19,10 +19,6 @@ 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 @@ -30,8 +26,8 @@ final class OrderShippingMethodEligibility extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, - ?string $methodNotAvailableMessage = null, + public string $message = 'sylius.order.shipping_method_eligibility', + public string $methodNotAvailableMessage = 'sylius.order.shipping_method_not_available', ?array $groups = null, mixed $payload = null, ) { @@ -43,16 +39,13 @@ final class OrderShippingMethodEligibility extends Constraint static::class, ); - $message ??= $options['message'] ?? null; - $methodNotAvailableMessage ??= $options['methodNotAvailableMessage'] ?? null; + $this->message = $options['message'] ?? $this->message; + $this->methodNotAvailableMessage = $options['methodNotAvailableMessage'] ?? $this->methodNotAvailableMessage; $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 c37f7ae63f..4b7da846a3 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ProductCodeExists.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ProductCodeExists.php @@ -25,7 +25,7 @@ final class ProductCodeExists extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.product.code.not_exist', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class ProductCodeExists extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.product.code.not_exist'; - public function validatedBy(): string { return 'sylius_product_code_exists'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ProductImageVariantsBelongToOwner.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ProductImageVariantsBelongToOwner.php index 942bb4e85e..20a2f6da21 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ProductImageVariantsBelongToOwner.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ProductImageVariantsBelongToOwner.php @@ -25,7 +25,7 @@ final class ProductImageVariantsBelongToOwner extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.product_image.product_variant.not_belong_to_owner', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class ProductImageVariantsBelongToOwner extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.product_image.product_variant.not_belong_to_owner'; - public function getTargets(): string { return self::CLASS_CONSTRAINT; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ProductVariantCodeExists.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ProductVariantCodeExists.php index 41a64616a0..42cccf1536 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ProductVariantCodeExists.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ProductVariantCodeExists.php @@ -25,7 +25,7 @@ final class ProductVariantCodeExists extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.product_variant.code.not_exist', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class ProductVariantCodeExists extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.product_variant.code.not_exist'; - public function validatedBy(): string { return 'sylius_product_variant_code_exists'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ProvinceCodeExists.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ProvinceCodeExists.php index 23262b69ea..0825cf6565 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ProvinceCodeExists.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ProvinceCodeExists.php @@ -25,7 +25,7 @@ final class ProvinceCodeExists extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.province.code.not_exist', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class ProvinceCodeExists extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.province.code.not_exist'; - public function validatedBy(): string { return 'sylius_province_code_exists'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/RegisteredUser.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/RegisteredUser.php index 32f9d2c5a6..b1f8ff05c9 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/RegisteredUser.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/RegisteredUser.php @@ -25,7 +25,7 @@ final class RegisteredUser extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'This email is already registered. Please log in.', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class RegisteredUser extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'This email is already registered. Please log in.'; - public function validatedBy(): string { return 'registered_user_validator'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ResendOrderConfirmationEmailWithValidOrderState.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ResendOrderConfirmationEmailWithValidOrderState.php index 376aab7038..af81c52079 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ResendOrderConfirmationEmailWithValidOrderState.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ResendOrderConfirmationEmailWithValidOrderState.php @@ -25,7 +25,7 @@ final class ResendOrderConfirmationEmailWithValidOrderState extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.resend_order_confirmation_email.invalid_order_state', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class ResendOrderConfirmationEmailWithValidOrderState extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.resend_order_confirmation_email.invalid_order_state'; - public function validatedBy(): string { return 'sylius_order_confirmation_with_valid_order_state'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ResendShipmentConfirmationEmailWithValidShipmentState.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ResendShipmentConfirmationEmailWithValidShipmentState.php index 4d90173919..7299529200 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ResendShipmentConfirmationEmailWithValidShipmentState.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ResendShipmentConfirmationEmailWithValidShipmentState.php @@ -25,7 +25,7 @@ final class ResendShipmentConfirmationEmailWithValidShipmentState extends Constr #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.resend_shipment_confirmation_email.invalid_shipment_state', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class ResendShipmentConfirmationEmailWithValidShipmentState extends Constr static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.resend_shipment_confirmation_email.invalid_shipment_state'; - public function validatedBy(): string { return 'sylius_shipment_confirmation_with_valid_shipment_state'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/TaxonCodeExists.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/TaxonCodeExists.php index 1c892c3c9b..d12fee28d5 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/TaxonCodeExists.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/TaxonCodeExists.php @@ -25,7 +25,7 @@ final class TaxonCodeExists extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.taxon.code.not_exist', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class TaxonCodeExists extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.taxon.code.not_exist'; - public function validatedBy(): string { return 'sylius_taxon_code_exists'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/TranslationForExistingLocales.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/TranslationForExistingLocales.php index 0facae7423..2cb189bf4e 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/TranslationForExistingLocales.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/TranslationForExistingLocales.php @@ -25,7 +25,7 @@ final class TranslationForExistingLocales extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.translation.locale_code.invalid', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class TranslationForExistingLocales extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.translation.locale_code.invalid'; - public function validatedBy(): string { return 'sylius_translation_for_existing_locales'; diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/UniqueReviewerEmail.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/UniqueReviewerEmail.php index e8a3ec829d..fc6681c22b 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/UniqueReviewerEmail.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/UniqueReviewerEmail.php @@ -19,9 +19,6 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] class UniqueReviewerEmail extends Constraint { - /** @var string */ - public $message = 'sylius.review.author.already_exists'; - /** * @param array|null $options * @param array|null $groups @@ -29,7 +26,7 @@ class UniqueReviewerEmail extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.review.author.already_exists', ?array $groups = null, mixed $payload = null, ) { @@ -41,14 +38,12 @@ class UniqueReviewerEmail extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } public function validatedBy(): string diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ZoneCodeExists.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ZoneCodeExists.php index d72e94010e..a443ffd93b 100644 --- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ZoneCodeExists.php +++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/ZoneCodeExists.php @@ -25,7 +25,7 @@ final class ZoneCodeExists extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.zone.code.not_exist', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class ZoneCodeExists extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.zone.code.not_exist'; - public function validatedBy(): string { return 'sylius_zone_code_exists'; diff --git a/src/Sylius/Bundle/CurrencyBundle/Validator/Constraints/DifferentSourceTargetCurrency.php b/src/Sylius/Bundle/CurrencyBundle/Validator/Constraints/DifferentSourceTargetCurrency.php index d28b78ec1f..ef4fada6f7 100644 --- a/src/Sylius/Bundle/CurrencyBundle/Validator/Constraints/DifferentSourceTargetCurrency.php +++ b/src/Sylius/Bundle/CurrencyBundle/Validator/Constraints/DifferentSourceTargetCurrency.php @@ -19,9 +19,6 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] class DifferentSourceTargetCurrency extends Constraint { - /** @var string */ - public $message = 'sylius.exchange_rate.different_source_target_currency'; - /** * @param array|null $options * @param array|null $groups @@ -29,7 +26,7 @@ class DifferentSourceTargetCurrency extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.exchange_rate.different_source_target_currency', ?array $groups = null, mixed $payload = null, ) { @@ -41,14 +38,12 @@ class DifferentSourceTargetCurrency extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } public function getTargets(): string diff --git a/src/Sylius/Bundle/CurrencyBundle/Validator/Constraints/UniqueCurrencyPair.php b/src/Sylius/Bundle/CurrencyBundle/Validator/Constraints/UniqueCurrencyPair.php index fa52e46ddd..2bfd663ddc 100644 --- a/src/Sylius/Bundle/CurrencyBundle/Validator/Constraints/UniqueCurrencyPair.php +++ b/src/Sylius/Bundle/CurrencyBundle/Validator/Constraints/UniqueCurrencyPair.php @@ -19,9 +19,6 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] class UniqueCurrencyPair extends Constraint { - /** @var string */ - public $message = 'sylius.exchange_rate.unique_currency_pair'; - /** * @param array|null $options * @param array|null $groups @@ -29,7 +26,7 @@ class UniqueCurrencyPair extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.exchange_rate.unique_currency_pair', ?array $groups = null, mixed $payload = null, ) { @@ -41,14 +38,12 @@ class UniqueCurrencyPair extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } public function getTargets(): string diff --git a/src/Sylius/Bundle/InventoryBundle/Validator/Constraints/InStock.php b/src/Sylius/Bundle/InventoryBundle/Validator/Constraints/InStock.php index 163e9909a4..5a753a34ca 100644 --- a/src/Sylius/Bundle/InventoryBundle/Validator/Constraints/InStock.php +++ b/src/Sylius/Bundle/InventoryBundle/Validator/Constraints/InStock.php @@ -25,10 +25,10 @@ final class InStock extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, - ?string $shortMessage = null, - ?string $stockablePath = null, - ?string $quantityPath = null, + public string $message = 'sylius.cart_item.not_available', + public string $shortMessage = 'sylius.cart_item.insufficient_stock', + public string $stockablePath = 'stockable', + public string $quantityPath = 'quantity', ?array $groups = null, mixed $payload = null, ) { @@ -40,30 +40,17 @@ final class InStock extends Constraint static::class, ); - $message ??= $options['message'] ?? null; - $shortMessage ??= $options['shortMessage'] ?? null; - $stockablePath ??= $options['stockablePath'] ?? null; - $quantityPath ??= $options['quantityPath'] ?? null; + $this->message = $options['message'] ?? $this->message; + $this->shortMessage = $options['shortMessage'] ?? $this->shortMessage; + $this->stockablePath = $options['stockablePath'] ?? $this->stockablePath; + $this->quantityPath = $options['quantityPath'] ?? $this->quantityPath; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $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'; - - public string $shortMessage = 'sylius.cart_item.insufficient_stock'; - - public string $stockablePath = 'stockable'; - - public string $quantityPath = 'quantity'; - public function validatedBy(): string { return 'sylius_in_stock'; diff --git a/src/Sylius/Bundle/PaymentBundle/Validator/Constraints/GatewayFactoryExists.php b/src/Sylius/Bundle/PaymentBundle/Validator/Constraints/GatewayFactoryExists.php index 2ad1f5ce5b..519cd7b9eb 100644 --- a/src/Sylius/Bundle/PaymentBundle/Validator/Constraints/GatewayFactoryExists.php +++ b/src/Sylius/Bundle/PaymentBundle/Validator/Constraints/GatewayFactoryExists.php @@ -25,7 +25,7 @@ final class GatewayFactoryExists extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $invalidGatewayFactoryMessage = null, + public string $invalidGatewayFactoryMessage = 'sylius.gateway_config.invalid_gateway_factory', ?string $invalidGatewayFactory = null, ?array $groups = null, mixed $payload = null, @@ -38,7 +38,7 @@ final class GatewayFactoryExists extends Constraint static::class, ); - $invalidGatewayFactoryMessage ??= $options['invalidGatewayFactoryMessage'] ?? null; + $this->invalidGatewayFactoryMessage = $options['invalidGatewayFactoryMessage'] ?? $this->invalidGatewayFactoryMessage; $invalidGatewayFactory ??= $options['invalidGatewayFactory'] ?? null; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; @@ -52,17 +52,13 @@ final class GatewayFactoryExists extends Constraint static::class, ); - $invalidGatewayFactoryMessage ??= $invalidGatewayFactory; + $this->invalidGatewayFactoryMessage = $invalidGatewayFactory; } parent::__construct(groups: $groups, payload: $payload); - - $this->invalidGatewayFactoryMessage = $invalidGatewayFactoryMessage ?? $this->invalidGatewayFactoryMessage; $this->invalidGatewayFactory = $this->invalidGatewayFactoryMessage; } - public string $invalidGatewayFactoryMessage = 'sylius.gateway_config.invalid_gateway_factory'; - /** @deprecated since Sylius 2.3, use $invalidGatewayFactoryMessage instead. It will be removed in Sylius 3.0. */ 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 67553eb8ce..0315d85571 100644 --- a/src/Sylius/Bundle/ProductBundle/Validator/Constraint/ProductVariantCombination.php +++ b/src/Sylius/Bundle/ProductBundle/Validator/Constraint/ProductVariantCombination.php @@ -19,8 +19,6 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class ProductVariantCombination extends Constraint { - public string $message = 'sylius.product_variant.combination'; - /** * @param array|null $options * @param array|null $groups @@ -28,7 +26,7 @@ final class ProductVariantCombination extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.product_variant.combination', ?array $groups = null, mixed $payload = null, ) { @@ -40,14 +38,12 @@ final class ProductVariantCombination extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } public function validatedBy(): string diff --git a/src/Sylius/Bundle/ProductBundle/Validator/Constraint/ProductVariantOptionValuesConfiguration.php b/src/Sylius/Bundle/ProductBundle/Validator/Constraint/ProductVariantOptionValuesConfiguration.php index 53af512084..e6114736e8 100644 --- a/src/Sylius/Bundle/ProductBundle/Validator/Constraint/ProductVariantOptionValuesConfiguration.php +++ b/src/Sylius/Bundle/ProductBundle/Validator/Constraint/ProductVariantOptionValuesConfiguration.php @@ -19,15 +19,13 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class ProductVariantOptionValuesConfiguration extends Constraint { - public string $message = 'sylius.product_variant.option_values.not_configured'; - /** * @param array|null $options */ #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.product_variant.option_values.not_configured', ?array $groups = null, mixed $payload = null, ) { @@ -39,14 +37,12 @@ final class ProductVariantOptionValuesConfiguration extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $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 a4c65ffc5e..e8a3d8b0a9 100644 --- a/src/Sylius/Bundle/ProductBundle/Validator/Constraint/UniqueSimpleProductCode.php +++ b/src/Sylius/Bundle/ProductBundle/Validator/Constraint/UniqueSimpleProductCode.php @@ -19,8 +19,6 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class UniqueSimpleProductCode extends Constraint { - public string $message = 'sylius.simple_product.code.unique'; - /** * @param array|null $options * @param array|null $groups @@ -28,7 +26,7 @@ final class UniqueSimpleProductCode extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.simple_product.code.unique', ?array $groups = null, mixed $payload = null, ) { @@ -40,14 +38,12 @@ final class UniqueSimpleProductCode extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } public function validatedBy(): string diff --git a/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/CatalogPromotionActionType.php b/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/CatalogPromotionActionType.php index 9bf920a982..58bb17768d 100644 --- a/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/CatalogPromotionActionType.php +++ b/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/CatalogPromotionActionType.php @@ -25,7 +25,7 @@ final class CatalogPromotionActionType extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $invalidTypeMessage = null, + public string $invalidTypeMessage = 'sylius.catalog_promotion_action.type.invalid', ?string $invalidType = null, ?array $groups = null, mixed $payload = null, @@ -38,7 +38,7 @@ final class CatalogPromotionActionType extends Constraint static::class, ); - $invalidTypeMessage ??= $options['invalidTypeMessage'] ?? null; + $this->invalidTypeMessage = $options['invalidTypeMessage'] ?? $this->invalidTypeMessage; $invalidType ??= $options['invalidType'] ?? null; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; @@ -52,17 +52,13 @@ final class CatalogPromotionActionType extends Constraint static::class, ); - $invalidTypeMessage ??= $invalidType; + $this->invalidTypeMessage = $invalidType; } parent::__construct(groups: $groups, payload: $payload); - - $this->invalidTypeMessage = $invalidTypeMessage ?? $this->invalidTypeMessage; $this->invalidType = $this->invalidTypeMessage; } - public string $invalidTypeMessage = 'sylius.catalog_promotion_action.type.invalid'; - /** @deprecated since Sylius 2.3, use $invalidTypeMessage instead. It will be removed in Sylius 3.0. */ 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 35f08bbcc2..f022da8ca1 100644 --- a/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/CatalogPromotionScopeType.php +++ b/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/CatalogPromotionScopeType.php @@ -25,7 +25,7 @@ final class CatalogPromotionScopeType extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $invalidTypeMessage = null, + public string $invalidTypeMessage = 'sylius.catalog_promotion_scope.type.invalid', ?string $invalidType = null, ?array $groups = null, mixed $payload = null, @@ -38,7 +38,7 @@ final class CatalogPromotionScopeType extends Constraint static::class, ); - $invalidTypeMessage ??= $options['invalidTypeMessage'] ?? null; + $this->invalidTypeMessage = $options['invalidTypeMessage'] ?? $this->invalidTypeMessage; $invalidType ??= $options['invalidType'] ?? null; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; @@ -52,17 +52,13 @@ final class CatalogPromotionScopeType extends Constraint static::class, ); - $invalidTypeMessage ??= $invalidType; + $this->invalidTypeMessage = $invalidType; } parent::__construct(groups: $groups, payload: $payload); - - $this->invalidTypeMessage = $invalidTypeMessage ?? $this->invalidTypeMessage; $this->invalidType = $this->invalidTypeMessage; } - public string $invalidTypeMessage = 'sylius.catalog_promotion_scope.type.invalid'; - /** @deprecated since Sylius 2.3, use $invalidTypeMessage instead. It will be removed in Sylius 3.0. */ 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 6630859f65..5ca86c3855 100644 --- a/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/CouponPossibleGenerationAmount.php +++ b/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/CouponPossibleGenerationAmount.php @@ -25,7 +25,7 @@ final class CouponPossibleGenerationAmount extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.promotion_coupon_generator_instruction.possible_generation_amount', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class CouponPossibleGenerationAmount extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.promotion_coupon_generator_instruction.possible_generation_amount'; - public function getTargets(): string { return self::CLASS_CONSTRAINT; diff --git a/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionActionType.php b/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionActionType.php index 245aef5910..9fa84e074b 100644 --- a/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionActionType.php +++ b/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionActionType.php @@ -25,7 +25,7 @@ final class PromotionActionType extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $invalidTypeMessage = null, + public string $invalidTypeMessage = 'sylius.promotion_action.invalid_type', ?string $invalidType = null, ?array $groups = null, mixed $payload = null, @@ -38,7 +38,7 @@ final class PromotionActionType extends Constraint static::class, ); - $invalidTypeMessage ??= $options['invalidTypeMessage'] ?? null; + $this->invalidTypeMessage = $options['invalidTypeMessage'] ?? $this->invalidTypeMessage; $invalidType ??= $options['invalidType'] ?? null; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; @@ -52,17 +52,13 @@ final class PromotionActionType extends Constraint static::class, ); - $invalidTypeMessage ??= $invalidType; + $this->invalidTypeMessage = $invalidType; } parent::__construct(groups: $groups, payload: $payload); - - $this->invalidTypeMessage = $invalidTypeMessage ?? $this->invalidTypeMessage; $this->invalidType = $this->invalidTypeMessage; } - public string $invalidTypeMessage = 'sylius.promotion_action.invalid_type'; - /** @deprecated since Sylius 2.3, use $invalidTypeMessage instead. It will be removed in Sylius 3.0. */ 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 911ff4f440..2910375209 100644 --- a/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionDateRange.php +++ b/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionDateRange.php @@ -25,7 +25,7 @@ final class PromotionDateRange extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.promotion.end_date_cannot_be_set_prior_start_date', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class PromotionDateRange extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.promotion.end_date_cannot_be_set_prior_start_date'; - public function getTargets(): string { return self::CLASS_CONSTRAINT; diff --git a/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionNotCouponBased.php b/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionNotCouponBased.php index 4f977f11fd..295a1355e3 100644 --- a/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionNotCouponBased.php +++ b/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionNotCouponBased.php @@ -25,7 +25,7 @@ final class PromotionNotCouponBased extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.promotion_coupon.promotion.not_coupon_based', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class PromotionNotCouponBased extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.promotion_coupon.promotion.not_coupon_based'; - public function getTargets(): string { return self::CLASS_CONSTRAINT; diff --git a/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionRuleType.php b/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionRuleType.php index 443b33d16c..88f2839620 100644 --- a/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionRuleType.php +++ b/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionRuleType.php @@ -25,7 +25,7 @@ final class PromotionRuleType extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $invalidTypeMessage = null, + public string $invalidTypeMessage = 'sylius.promotion_rule.invalid_type', ?string $invalidType = null, ?array $groups = null, mixed $payload = null, @@ -38,7 +38,7 @@ final class PromotionRuleType extends Constraint static::class, ); - $invalidTypeMessage ??= $options['invalidTypeMessage'] ?? null; + $this->invalidTypeMessage = $options['invalidTypeMessage'] ?? $this->invalidTypeMessage; $invalidType ??= $options['invalidType'] ?? null; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; @@ -52,17 +52,13 @@ final class PromotionRuleType extends Constraint static::class, ); - $invalidTypeMessage ??= $invalidType; + $this->invalidTypeMessage = $invalidType; } parent::__construct(groups: $groups, payload: $payload); - - $this->invalidTypeMessage = $invalidTypeMessage ?? $this->invalidTypeMessage; $this->invalidType = $this->invalidTypeMessage; } - public string $invalidTypeMessage = 'sylius.promotion_rule.invalid_type'; - /** @deprecated since Sylius 2.3, use $invalidTypeMessage instead. It will be removed in Sylius 3.0. */ 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 07ccb9f610..526a189916 100644 --- a/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionSubjectCoupon.php +++ b/src/Sylius/Bundle/PromotionBundle/Validator/Constraints/PromotionSubjectCoupon.php @@ -25,7 +25,7 @@ final class PromotionSubjectCoupon extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.promotion_coupon.is_invalid', ?array $groups = null, mixed $payload = null, ) { @@ -37,18 +37,14 @@ final class PromotionSubjectCoupon extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.promotion_coupon.is_invalid'; - public function getTargets(): string { return self::CLASS_CONSTRAINT; diff --git a/src/Sylius/Bundle/ShippingBundle/Validator/Constraint/ShippingMethodCalculatorExists.php b/src/Sylius/Bundle/ShippingBundle/Validator/Constraint/ShippingMethodCalculatorExists.php index da63990423..9fded9d3f0 100644 --- a/src/Sylius/Bundle/ShippingBundle/Validator/Constraint/ShippingMethodCalculatorExists.php +++ b/src/Sylius/Bundle/ShippingBundle/Validator/Constraint/ShippingMethodCalculatorExists.php @@ -19,8 +19,6 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class ShippingMethodCalculatorExists extends Constraint { - public string $invalidShippingCalculatorMessage = 'sylius.shipping_method.calculator.invalid'; - /** @deprecated since Sylius 2.3, use $invalidShippingCalculatorMessage instead. It will be removed in Sylius 3.0. */ public string $invalidShippingCalculator = 'sylius.shipping_method.calculator.invalid'; @@ -31,7 +29,7 @@ final class ShippingMethodCalculatorExists extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $invalidShippingCalculatorMessage = null, + public string $invalidShippingCalculatorMessage = 'sylius.shipping_method.calculator.invalid', ?string $invalidShippingCalculator = null, ?array $groups = null, mixed $payload = null, @@ -44,7 +42,7 @@ final class ShippingMethodCalculatorExists extends Constraint static::class, ); - $invalidShippingCalculatorMessage ??= $options['invalidShippingCalculatorMessage'] ?? null; + $this->invalidShippingCalculatorMessage = $options['invalidShippingCalculatorMessage'] ?? $this->invalidShippingCalculatorMessage; $invalidShippingCalculator ??= $options['invalidShippingCalculator'] ?? null; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; @@ -58,12 +56,10 @@ final class ShippingMethodCalculatorExists extends Constraint static::class, ); - $invalidShippingCalculatorMessage ??= $invalidShippingCalculator; + $this->invalidShippingCalculatorMessage = $invalidShippingCalculator; } parent::__construct(groups: $groups, payload: $payload); - - $this->invalidShippingCalculatorMessage = $invalidShippingCalculatorMessage ?? $this->invalidShippingCalculatorMessage; $this->invalidShippingCalculator = $this->invalidShippingCalculatorMessage; } diff --git a/src/Sylius/Bundle/ShippingBundle/Validator/Constraint/ShippingMethodRule.php b/src/Sylius/Bundle/ShippingBundle/Validator/Constraint/ShippingMethodRule.php index 4f9244b16b..e10dfa3eef 100644 --- a/src/Sylius/Bundle/ShippingBundle/Validator/Constraint/ShippingMethodRule.php +++ b/src/Sylius/Bundle/ShippingBundle/Validator/Constraint/ShippingMethodRule.php @@ -19,8 +19,6 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] final class ShippingMethodRule extends Constraint { - public string $invalidTypeMessage = 'sylius.shipping_method.rule.invalid_type'; - /** @deprecated since Sylius 2.3, use $invalidTypeMessage instead. It will be removed in Sylius 3.0. */ public string $invalidType = 'sylius.shipping_method.rule.invalid_type'; @@ -31,7 +29,7 @@ final class ShippingMethodRule extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $invalidTypeMessage = null, + public string $invalidTypeMessage = 'sylius.shipping_method.rule.invalid_type', ?string $invalidType = null, ?array $groups = null, mixed $payload = null, @@ -44,7 +42,7 @@ final class ShippingMethodRule extends Constraint static::class, ); - $invalidTypeMessage ??= $options['invalidTypeMessage'] ?? null; + $this->invalidTypeMessage = $options['invalidTypeMessage'] ?? $this->invalidTypeMessage; $invalidType ??= $options['invalidType'] ?? null; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; @@ -58,12 +56,10 @@ final class ShippingMethodRule extends Constraint static::class, ); - $invalidTypeMessage ??= $invalidType; + $this->invalidTypeMessage = $invalidType; } parent::__construct(groups: $groups, payload: $payload); - - $this->invalidTypeMessage = $invalidTypeMessage ?? $this->invalidTypeMessage; $this->invalidType = $this->invalidTypeMessage; } diff --git a/src/Sylius/Bundle/ShippingBundle/Validator/Constraint/ValidDeliveryTimeRange.php b/src/Sylius/Bundle/ShippingBundle/Validator/Constraint/ValidDeliveryTimeRange.php index 8c6b9b8c8f..e809d8e43a 100644 --- a/src/Sylius/Bundle/ShippingBundle/Validator/Constraint/ValidDeliveryTimeRange.php +++ b/src/Sylius/Bundle/ShippingBundle/Validator/Constraint/ValidDeliveryTimeRange.php @@ -19,15 +19,13 @@ use Symfony\Component\Validator\Constraint; #[\Attribute] 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( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.form.shipping_method.max_delivery_time_days.greater_or_equal_min', ?array $groups = null, mixed $payload = null, ) { @@ -39,14 +37,12 @@ final class ValidDeliveryTimeRange extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $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 8ca398c916..b20d51ca10 100644 --- a/src/Sylius/Bundle/TaxonomyBundle/Validator/Constraints/TaxonParentRelation.php +++ b/src/Sylius/Bundle/TaxonomyBundle/Validator/Constraints/TaxonParentRelation.php @@ -24,7 +24,7 @@ final class TaxonParentRelation extends Constraint #[HasNamedArguments] public function __construct( ?array $options = null, - ?string $message = null, + public string $message = 'sylius.taxon.parent.invalid_relation', ?array $groups = null, mixed $payload = null, ) { @@ -36,18 +36,14 @@ final class TaxonParentRelation extends Constraint static::class, ); - $message ??= $options['message'] ?? null; + $this->message = $options['message'] ?? $this->message; $groups ??= $options['groups'] ?? null; $payload ??= $options['payload'] ?? null; } parent::__construct(groups: $groups, payload: $payload); - - $this->message = $message ?? $this->message; } - public string $message = 'sylius.taxon.parent.invalid_relation'; - public function validatedBy(): string { return 'sylius_taxon_parent_relation_validator';