Fix constraint class related ambiguities in validators

Sylius · pamil · Jul 3, 2018 · Jul 1, 2018 · Jul 1, 2018 · Jul 1, 2018
commit 66deb99829d7dfc379eadf4cb0d88b6b5f3d07c2
diff --git a/...lius/Bundle/AddressingBundle/Validator/Constraints/ProvinceAddressConstraintValidator.php b/...lius/Bundle/AddressingBundle/Validator/Constraints/ProvinceAddressConstraintValidator.php
@@ -51,6 +51,9 @@ public function validate($value, Constraint $constraint): void
             );
         }
 
+        /** @var ProvinceAddressConstraint $constraint */
+        Assert::isInstanceOf($constraint, ProvinceAddressConstraint::class);
+
         $propertyPath = $this->context->getPropertyPath();
 
         foreach (iterator_to_array($this->context->getViolations()) as $violation) {

diff --git a/...ndle/AttributeBundle/Validator/Constraints/ValidSelectAttributeConfigurationValidator.php b/...ndle/AttributeBundle/Validator/Constraints/ValidSelectAttributeConfigurationValidator.php
@@ -28,6 +28,8 @@ public function validate($attribute, Constraint $constraint): void
     {
         /** @var AttributeInterface $attribute */
         Assert::isInstanceOf($attribute, AttributeInterface::class);
+
+        /** @var ValidSelectAttributeConfiguration $constraint */
         Assert::isInstanceOf($constraint, ValidSelectAttributeConfiguration::class);
 
         if (SelectAttributeType::TYPE !== $attribute->getType()) {

diff --git a/...Bundle/AttributeBundle/Validator/Constraints/ValidTextAttributeConfigurationValidator.php b/...Bundle/AttributeBundle/Validator/Constraints/ValidTextAttributeConfigurationValidator.php
@@ -28,6 +28,8 @@ public function validate($attribute, Constraint $constraint): void
     {
         /** @var AttributeInterface $attribute */
         Assert::isInstanceOf($attribute, AttributeInterface::class);
+
+        /** @var ValidTextAttributeConfiguration $constraint */
         Assert::isInstanceOf($constraint, ValidTextAttributeConfiguration::class);
 
         if (TextAttributeType::TYPE !== $attribute->getType()) {

diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/HasAllVariantPricesDefinedValidator.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/HasAllVariantPricesDefinedValidator.php
@@ -28,8 +28,12 @@ final class HasAllVariantPricesDefinedValidator extends ConstraintValidator
      */
     public function validate($product, Constraint $constraint): void
     {
+        /** @var ProductInterface $product */
         Assert::isInstanceOf($product, ProductInterface::class);
 
+        /** @var HasAllVariantPricesDefined $constraint */
+        Assert::isInstanceOf($constraint, HasAllVariantPricesDefined::class);
+
         if ($product->isSimple()) {
             return;
         }

diff --git a/...Sylius/Bundle/CoreBundle/Validator/Constraints/OrderPaymentMethodEligibilityValidator.php b/...Sylius/Bundle/CoreBundle/Validator/Constraints/OrderPaymentMethodEligibilityValidator.php
@@ -27,8 +27,12 @@ final class OrderPaymentMethodEligibilityValidator extends ConstraintValidator
      */
     public function validate($order, Constraint $constraint): void
     {
+        /** @var OrderInterface $order */
         Assert::isInstanceOf($order, OrderInterface::class);
 
+        /** @var OrderPaymentMethodEligibility $constraint */
+        Assert::isInstanceOf($constraint, OrderPaymentMethodEligibility::class);
+
         $payments = $order->getPayments();
 
         foreach ($payments as $payment) {

diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/OrderProductEligibilityValidator.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/OrderProductEligibilityValidator.php
@@ -28,8 +28,12 @@ final class OrderProductEligibilityValidator extends ConstraintValidator
      */
     public function validate($order, Constraint $constraint): void
     {
+        /** @var OrderInterface $order */
         Assert::isInstanceOf($order, OrderInterface::class);
 
+        /** @var OrderProductEligibility $constraint */
+        Assert::isInstanceOf($constraint, OrderProductEligibility::class);
+
         /** @var OrderItemInterface[] $orderItems */
         $orderItems = $order->getItems();
 

diff --git a/...ylius/Bundle/CoreBundle/Validator/Constraints/OrderShippingMethodEligibilityValidator.php b/...ylius/Bundle/CoreBundle/Validator/Constraints/OrderShippingMethodEligibilityValidator.php
@@ -41,8 +41,12 @@ public function __construct(ShippingMethodEligibilityCheckerInterface $methodEli
      */
     public function validate($order, Constraint $constraint): void
     {
+        /** @var OrderInterface $order */
         Assert::isInstanceOf($order, OrderInterface::class);
 
+        /** @var OrderShippingMethodEligibility $constraint */
+        Assert::isInstanceOf($constraint, OrderShippingMethodEligibility::class);
+
         $shipments = $order->getShipments();
         if ($shipments->isEmpty()) {
             return;

diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/RegisteredUserValidator.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/RegisteredUserValidator.php
@@ -16,6 +16,7 @@
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
+use Webmozart\Assert\Assert;
 
 final class RegisteredUserValidator extends ConstraintValidator
 {
@@ -37,6 +38,9 @@ public function __construct(RepositoryInterface $customerRepository)
      */
     public function validate($customer, Constraint $constraint): void
     {
+        /** @var RegisteredUser $constraint */
+        Assert::isInstanceOf($constraint, RegisteredUser::class);
+
         $existingCustomer = $this->customerRepository->findOneBy(['email' => $customer->getEmail()]);
         if (null !== $existingCustomer && null !== $existingCustomer->getUser()) {
             $this->context->buildViolation($constraint->message)->atPath('email')->addViolation();

diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/UniqueReviewerEmailValidator.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/UniqueReviewerEmailValidator.php
@@ -22,6 +22,7 @@
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
+use Webmozart\Assert\Assert;
 
 class UniqueReviewerEmailValidator extends ConstraintValidator
 {
@@ -60,6 +61,9 @@ public function __construct(
      */
     public function validate($review, Constraint $constraint): void
     {
+        /** @var UniqueReviewerEmail $constraint */
+        Assert::isInstanceOf($constraint, UniqueReviewerEmail::class);
+
         /** @var ReviewerInterface|null $customer */
         $customer = $review->getAuthor();
 

diff --git a/...us/Bundle/CurrencyBundle/Validator/Constraints/DifferentSourceTargetCurrencyValidator.php b/...us/Bundle/CurrencyBundle/Validator/Constraints/DifferentSourceTargetCurrencyValidator.php
@@ -17,6 +17,7 @@
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+use Webmozart\Assert\Assert;
 
 class DifferentSourceTargetCurrencyValidator extends ConstraintValidator
 {
@@ -25,6 +26,9 @@ class DifferentSourceTargetCurrencyValidator extends ConstraintValidator
      */
     public function validate($value, Constraint $constraint)
     {
+        /** @var DifferentSourceTargetCurrency $constraint */
+        Assert::isInstanceOf($constraint, DifferentSourceTargetCurrency::class);
+
         if (!$value instanceof ExchangeRateInterface) {
             throw new UnexpectedTypeException($value, ExchangeRateInterface::class);
         }

diff --git a/src/Sylius/Bundle/CurrencyBundle/Validator/Constraints/UniqueCurrencyPairValidator.php b/src/Sylius/Bundle/CurrencyBundle/Validator/Constraints/UniqueCurrencyPairValidator.php
@@ -19,6 +19,7 @@
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+use Webmozart\Assert\Assert;
 
 class UniqueCurrencyPairValidator extends ConstraintValidator
 {
@@ -40,6 +41,9 @@ public function __construct(ExchangeRateRepositoryInterface $exchangeRateReposit
      */
     public function validate($value, Constraint $constraint)
     {
+        /** @var UniqueCurrencyPair $constraint */
+        Assert::isInstanceOf($constraint, UniqueCurrencyPair::class);
+
         if (!$value instanceof ExchangeRateInterface) {
             throw new UnexpectedTypeException($value, ExchangeRateInterface::class);
         }

diff --git a/src/Sylius/Bundle/ProductBundle/Validator/ProductVariantCombinationValidator.php b/src/Sylius/Bundle/ProductBundle/Validator/ProductVariantCombinationValidator.php
@@ -13,11 +13,13 @@
 
 namespace Sylius\Bundle\ProductBundle\Validator;
 
+use Sylius\Bundle\ProductBundle\Validator\Constraint\ProductVariantCombination;
 use Sylius\Component\Product\Checker\ProductVariantsParityCheckerInterface;
 use Sylius\Component\Product\Model\ProductVariantInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+use Webmozart\Assert\Assert;
 
 final class ProductVariantCombinationValidator extends ConstraintValidator
 {
@@ -39,6 +41,9 @@ public function __construct(ProductVariantsParityCheckerInterface $variantsParit
      */
     public function validate($value, Constraint $constraint): void
     {
+        /** @var ProductVariantCombination $constraint */
+        Assert::isInstanceOf($constraint, ProductVariantCombination::class);
+
         if (!$value instanceof ProductVariantInterface) {
             throw new UnexpectedTypeException($value, ProductVariantInterface::class);
         }

diff --git a/src/Sylius/Bundle/ProductBundle/Validator/UniqueSimpleProductCodeValidator.php b/src/Sylius/Bundle/ProductBundle/Validator/UniqueSimpleProductCodeValidator.php
@@ -13,11 +13,14 @@
 
 namespace Sylius\Bundle\ProductBundle\Validator;
 
+use Sylius\Bundle\ProductBundle\Validator\Constraint\UniqueSimpleProductCode;
 use Sylius\Component\Product\Model\ProductInterface;
+use Sylius\Component\Product\Model\ProductVariantInterface;
 use Sylius\Component\Product\Repository\ProductVariantRepositoryInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+use Webmozart\Assert\Assert;
 
 final class UniqueSimpleProductCodeValidator extends ConstraintValidator
 {
@@ -39,6 +42,9 @@ public function __construct(ProductVariantRepositoryInterface $productVariantRep
      */
     public function validate($value, Constraint $constraint): void
     {
+        /** @var UniqueSimpleProductCode $constraint */
+        Assert::isInstanceOf($constraint, UniqueSimpleProductCode::class);
+
         if (!$value instanceof ProductInterface) {
             throw new UnexpectedTypeException($value, ProductInterface::class);
         }
@@ -47,6 +53,7 @@ public function validate($value, Constraint $constraint): void
             return;
         }
 
+        /** @var ProductVariantInterface $existingProductVariant */
         $existingProductVariant = $this->productVariantRepository->findOneBy(['code' => $value->getCode()]);
 
         if (null !== $existingProductVariant && $existingProductVariant->getProduct()->getId() !== $value->getId()) {