Raise Symfony minimum from 2.3 to 3.2, update tests to pass on 4.0.

teslat · Dec 28, 2017 · b1f526c · b1f526c
1 parent 90f2527
commit b1f526c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 28 deletions.
diff --git a/composer.json b/composer.json
@@ -10,8 +10,8 @@
         "commerceguys/enum": "~1.0"
     },
     "require-dev": {
-        "symfony/validator": ">=2.3",
-        "symfony/intl": ">=2.3",
+        "symfony/validator": ">=3.2",
+        "symfony/intl": ">=3.2",
         "phpunit/phpunit": "~4.0",
         "mikey179/vfsStream": "1.*",
         "squizlabs/php_codesniffer": "2.*"

diff --git a/src/Validator/Constraints/AddressFormatConstraintValidator.php b/src/Validator/Constraints/AddressFormatConstraintValidator.php
@@ -187,26 +187,17 @@ protected function validatePostalCode($postalCode, array $subdivisions, AddressF
     /**
      * Adds a violation.
      *
-     * Accounts for differences between Symfony versions.
-     *
      * @param string $field          The field.
      * @param string        $message        The error message.
      * @param mixed         $invalidValue   The invalid, validated value.
      * @param AddressFormat $addressFormat The address format.
      */
     protected function addViolation($field, $message, $invalidValue, AddressFormat $addressFormat)
     {
-        if ($this->context instanceof \Symfony\Component\Validator\Context\ExecutionContextInterface) {
-            $this->context->buildViolation($message)
-                ->atPath('[' . $field . ']')
-                ->setInvalidValue($invalidValue)
-                ->addViolation();
-        } else {
-            $this->buildViolation($message)
-                ->atPath('[' . $field . ']')
-                ->setInvalidValue($invalidValue)
-                ->addViolation();
-        }
+        $this->context->buildViolation($message)
+            ->atPath('[' . $field . ']')
+            ->setInvalidValue($invalidValue)
+            ->addViolation();
     }
 
     /**

diff --git a/src/Validator/Constraints/CountryConstraintValidator.php b/src/Validator/Constraints/CountryConstraintValidator.php
@@ -44,15 +44,9 @@ public function validate($value, Constraint $constraint)
         $value = (string) $value;
 
         if (!isset($countries[$value])) {
-            if ($this->context instanceof \Symfony\Component\Validator\Context\ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->addViolation();
-            }
+            $this->context->buildViolation($constraint->message)
+                ->setParameter('{{ value }}', $this->formatValue($value))
+                ->addViolation();
         }
     }
 }
diff --git a/tests/Validator/Constraints/AddressFormatConstraintValidatorTest.php b/tests/Validator/Constraints/AddressFormatConstraintValidatorTest.php
@@ -6,12 +6,12 @@
 use CommerceGuys\Addressing\AddressFormat\AddressField;
 use CommerceGuys\Addressing\Validator\Constraints\AddressFormatConstraint;
 use CommerceGuys\Addressing\Validator\Constraints\AddressFormatConstraintValidator;
-use Symfony\Component\Validator\Tests\Constraints\AbstractConstraintValidatorTest;
+use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
 /**
  * @coversDefaultClass \CommerceGuys\Addressing\Validator\Constraints\AddressFormatConstraintValidator
  */
-class AddressFormatConstraintValidatorTest extends AbstractConstraintValidatorTest
+class AddressFormatConstraintValidatorTest extends ConstraintValidatorTestCase
 {
     /**
      * @var AddressFormatConstraint

diff --git a/tests/Validator/Constraints/CountryConstraintValidatorTest.php b/tests/Validator/Constraints/CountryConstraintValidatorTest.php
@@ -4,12 +4,12 @@
 
 use CommerceGuys\Addressing\Validator\Constraints\CountryConstraint;
 use CommerceGuys\Addressing\Validator\Constraints\CountryConstraintValidator;
-use Symfony\Component\Validator\Tests\Constraints\AbstractConstraintValidatorTest;
+use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
 /**
  * @coversDefaultClass \CommerceGuys\Addressing\Validator\Constraints\CountryConstraintValidator
  */
-class CountryConstraintValidatorTest extends AbstractConstraintValidatorTest
+class CountryConstraintValidatorTest extends ConstraintValidatorTestCase
 {
     /**
      * @var CountryConstraint