[Validator] Add BC layer covering BicValidator without Intl

Robin Chalas · Robin Chalas · commit 270a5d31715e · 2018-09-28T13:11:27.000+02:00
diff --git a/UPGRADE-4.2.md b/UPGRADE-4.2.md
@@ -206,3 +206,4 @@ Validator
  * The component is now decoupled from `symfony/translation` and uses `Symfony\Contracts\Translation\TranslatorInterface` instead
  * The `ValidatorBuilderInterface` has been deprecated and `ValidatorBuilder` made final
  * Deprecated validating instances of `\DateTimeInterface` in `DateTimeValidator`, `DateValidator` and `TimeValidator`. Use `Type` instead or remove the constraint if the underlying model is type hinted to `\DateTimeInterface` already.
+ * Using the `Bic` constraint without `symfony/intl` is deprecated
diff --git a/UPGRADE-5.0.md b/UPGRADE-5.0.md
@@ -191,6 +191,7 @@ Validator
  * The component is now decoupled from `symfony/translation` and uses `Symfony\Contracts\Translation\TranslatorInterface` instead
  * The `ValidatorBuilderInterface` has been removed and `ValidatorBuilder` is now final
  * Removed support for validating instances of `\DateTimeInterface` in `DateTimeValidator`, `DateValidator` and `TimeValidator`. Use `Type` instead or remove the constraint if the underlying model is type hinted to `\DateTimeInterface` already.
+ * The `symfony/intl` component is now required for using the `Bic` constraint
 
 Workflow
 --------
diff --git a/src/Symfony/Component/Validator/CHANGELOG.md b/src/Symfony/Component/Validator/CHANGELOG.md
@@ -10,6 +10,7 @@ CHANGELOG
  * made `ValidatorBuilder` final
  * marked `format` the default option in `DateTime` constraint
  * deprecated validating instances of `\DateTimeInterface` in `DateTimeValidator`, `DateValidator` and `TimeValidator`.
+ * deprecated using the `Bic` constraint without `symfony/intl`
 
 4.1.0
 -----
diff --git a/src/Symfony/Component/Validator/Constraints/Bic.php b/src/Symfony/Component/Validator/Constraints/Bic.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
+use Symfony\Component\Intl\Intl;
 use Symfony\Component\Validator\Constraint;
 
 /**
@@ -36,4 +37,14 @@ class Bic extends Constraint
     );
 
     public $message = 'This is not a valid Business Identifier Code (BIC).';
+
+    public function __construct($options = null)
+    {
+        // @deprecated since Symfony 4.2, throw a LogicException in 5.0
+        if (!class_exists(Intl::class)) {
+            @trigger_error('Using the Bic constraint without the "symfony/intl" component installed is deprecated since Symfony 4.2.', E_USER_DEPRECATED);
+        }
+
+        parent::__construct($options);
+    }
 }
diff --git a/src/Symfony/Component/Validator/Constraints/BicValidator.php b/src/Symfony/Component/Validator/Constraints/BicValidator.php
@@ -14,7 +14,6 @@
 use Symfony\Component\Intl\Intl;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\LogicException;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 
 /**
@@ -69,13 +68,14 @@ public function validate($value, Constraint $constraint)
             return;
         }
 
-        if (!class_exists(Intl::class)) {
-            throw new LogicException('The "symfony/intl" component is required to use the Bic constraint.');
+        // @deprecated since Symfony 4.2,
+        if (class_exists(Intl::class)) {
+            $validCountryCode = isset(Intl::getRegionBundle()->getCountryNames()[substr($canonicalize, 4, 2)]);
+        } else {
+            $validCountryCode = ctype_alpha(substr($canonicalize, 4, 2));
         }
 
-        // next 2 letters must be alphabetic (country code)
-        $countries = Intl::getRegionBundle()->getCountryNames();
-        if (!isset($countries[substr($canonicalize, 4, 2)])) {
+        if (!$validCountryCode) {
             $this->context->buildViolation($constraint->message)
                 ->setParameter('{{ value }}', $this->formatValue($value))
                 ->setCode(Bic::INVALID_COUNTRY_CODE_ERROR)
