symfony · nicolas-grekas · May 29, 2019 · May 29, 2019
diff --git a/src/Symfony/Component/Validator/Constraints/Bic.php b/src/Symfony/Component/Validator/Constraints/Bic.php
@@ -48,8 +48,7 @@ class Bic extends Constraint
     public function __construct($options = null)
     {
         if (!class_exists(Countries::class)) {
-            // throw new LogicException('The Intl component is required to use the Bic constraint. Try running "composer require symfony/intl".');
-            @trigger_error(sprintf('Using the "%s" constraint without the "symfony/intl" component installed is deprecated since Symfony 4.2.', __CLASS__), E_USER_DEPRECATED);
+            throw new LogicException('The Intl component is required to use the Bic constraint. Try running "composer require symfony/intl".');
         }
 
         if (isset($options['iban']) && isset($options['ibanPropertyPath'])) {

diff --git a/src/Symfony/Component/Validator/Constraints/BicValidator.php b/src/Symfony/Component/Validator/Constraints/BicValidator.php
@@ -104,15 +104,7 @@ public function validate($value, Constraint $constraint)
             return;
         }
 
-        // @deprecated since Symfony 4.2, will throw in 5.0
-        if (class_exists(Countries::class)) {
-            $validCountryCode = Countries::exists(substr($canonicalize, 4, 2));
-        } else {
-            $validCountryCode = ctype_alpha(substr($canonicalize, 4, 2));
-            // throw new LogicException('The Intl component is required to use the Bic constraint. Try running "composer require symfony/intl".');
-        }
-
-        if (!$validCountryCode) {
+        if (!Countries::exists(substr($canonicalize, 4, 2))) {
             $this->context->buildViolation($constraint->message)
                 ->setParameter('{{ value }}', $this->formatValue($value))
                 ->setCode(Bic::INVALID_COUNTRY_CODE_ERROR)

diff --git a/src/Symfony/Component/Validator/Constraints/Country.php b/src/Symfony/Component/Validator/Constraints/Country.php
@@ -34,8 +34,7 @@ class Country extends Constraint
     public function __construct($options = null)
     {
         if (!class_exists(Countries::class)) {
-            // throw new LogicException('The Intl component is required to use the Country constraint. Try running "composer require symfony/intl".');
-            @trigger_error(sprintf('Using the "%s" constraint without the "symfony/intl" component installed is deprecated since Symfony 4.2.', __CLASS__), E_USER_DEPRECATED);
+            throw new LogicException('The Intl component is required to use the Country constraint. Try running "composer require symfony/intl".');
         }
 
         parent::__construct($options);

diff --git a/src/Symfony/Component/Validator/Constraints/CountryValidator.php b/src/Symfony/Component/Validator/Constraints/CountryValidator.php
@@ -14,7 +14,6 @@
 use Symfony\Component\Intl\Countries;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\LogicException;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 use Symfony\Component\Validator\Exception\UnexpectedValueException;
 
@@ -42,10 +41,6 @@ public function validate($value, Constraint $constraint)
             throw new UnexpectedValueException($value, 'string');
         }
 
-        if (!class_exists(Countries::class)) {
-            throw new LogicException('The Intl component is required to use the Country constraint. Try running "composer require symfony/intl".');
-        }
-
         $value = (string) $value;
 
         if (!Countries::exists($value)) {

diff --git a/src/Symfony/Component/Validator/Constraints/Currency.php b/src/Symfony/Component/Validator/Constraints/Currency.php
@@ -35,8 +35,7 @@ class Currency extends Constraint
     public function __construct($options = null)
     {
         if (!class_exists(Currencies::class)) {
-            // throw new LogicException('The Intl component is required to use the Currency constraint. Try running "composer require symfony/intl".');
-            @trigger_error(sprintf('Using the "%s" constraint without the "symfony/intl" component installed is deprecated since Symfony 4.2.', __CLASS__), E_USER_DEPRECATED);
+            throw new LogicException('The Intl component is required to use the Currency constraint. Try running "composer require symfony/intl".');
         }
 
         parent::__construct($options);

diff --git a/src/Symfony/Component/Validator/Constraints/CurrencyValidator.php b/src/Symfony/Component/Validator/Constraints/CurrencyValidator.php
@@ -14,7 +14,6 @@
 use Symfony\Component\Intl\Currencies;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\LogicException;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 use Symfony\Component\Validator\Exception\UnexpectedValueException;
 
@@ -43,10 +42,6 @@ public function validate($value, Constraint $constraint)
             throw new UnexpectedValueException($value, 'string');
         }
 
-        if (!class_exists(Currencies::class)) {
-            throw new LogicException('The Intl component is required to use the Currency constraint. Try running "composer require symfony/intl".');
-        }
-
         $value = (string) $value;
 
         if (!Currencies::exists($value)) {

diff --git a/src/Symfony/Component/Validator/Constraints/Email.php b/src/Symfony/Component/Validator/Constraints/Email.php
@@ -97,8 +97,7 @@ public function __construct($options = null)
         parent::__construct($options);
 
         if ((self::VALIDATION_MODE_STRICT === $this->mode || true === $this->strict) && !class_exists(StrictEmailValidator::class)) {
-            // throw new LogicException(sprintf('The "egulias/email-validator" component is required to use the "%s" constraint in strict mode.', __CLASS__));
-            @trigger_error(sprintf('Using the "%s" constraint in strict mode without the "egulias/email-validator" component installed is deprecated since Symfony 4.2.', __CLASS__), E_USER_DEPRECATED);
+            throw new LogicException(sprintf('The "egulias/email-validator" component is required to use the "%s" constraint in strict mode.', __CLASS__));
         }
 
         if (null !== $this->normalizer && !\is_callable($this->normalizer)) {

diff --git a/src/Symfony/Component/Validator/Constraints/EmailValidator.php b/src/Symfony/Component/Validator/Constraints/EmailValidator.php
@@ -15,7 +15,6 @@
 use Egulias\EmailValidator\Validation\NoRFCWarningsValidation;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\LogicException;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 use Symfony\Component\Validator\Exception\UnexpectedValueException;
 
@@ -104,10 +103,6 @@ public function validate($value, Constraint $constraint)
         }
 
         if (Email::VALIDATION_MODE_STRICT === $constraint->mode) {
-            if (!class_exists('\Egulias\EmailValidator\EmailValidator')) {
-                throw new LogicException('Strict email validation requires egulias/email-validator ~1.2|~2.0');
-            }
-
             $strictValidator = new \Egulias\EmailValidator\EmailValidator();
 
             if (interface_exists(EmailValidation::class) && !$strictValidator->isValid($value, new NoRFCWarningsValidation())) {

diff --git a/src/Symfony/Component/Validator/Constraints/Expression.php b/src/Symfony/Component/Validator/Constraints/Expression.php
@@ -37,8 +37,7 @@ class Expression extends Constraint
     public function __construct($options = null)
     {
         if (!class_exists(ExpressionLanguage::class)) {
-            // throw new LogicException(sprintf('The "symfony/expression-language" component is required to use the "%s" constraint.', __CLASS__));
-            @trigger_error(sprintf('Using the "%s" constraint without the "symfony/expression-language" component installed is deprecated since Symfony 4.2.', __CLASS__), E_USER_DEPRECATED);
+            throw new LogicException(sprintf('The "symfony/expression-language" component is required to use the "%s" constraint.', __CLASS__));
         }
 
         parent::__construct($options);

diff --git a/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php b/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php
@@ -14,7 +14,6 @@
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\LogicException;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 
 /**
@@ -54,9 +53,6 @@ public function validate($value, Constraint $constraint)
     private function getExpressionLanguage()
     {
         if (null === $this->expressionLanguage) {
-            if (!class_exists('Symfony\Component\ExpressionLanguage\ExpressionLanguage')) {
-                throw new LogicException('Unable to use expressions as the Symfony ExpressionLanguage component is not installed.');
-            }
             $this->expressionLanguage = new ExpressionLanguage();
         }
 

diff --git a/src/Symfony/Component/Validator/Constraints/Language.php b/src/Symfony/Component/Validator/Constraints/Language.php
@@ -34,8 +34,7 @@ class Language extends Constraint
     public function __construct($options = null)
     {
         if (!class_exists(Languages::class)) {
-            // throw new LogicException('The Intl component is required to use the Language constraint. Try running "composer require symfony/intl".');
-            @trigger_error(sprintf('Using the "%s" constraint without the "symfony/intl" component installed is deprecated since Symfony 4.2.', __CLASS__), E_USER_DEPRECATED);
+            throw new LogicException('The Intl component is required to use the Language constraint. Try running "composer require symfony/intl".');
         }
 
         parent::__construct($options);

diff --git a/src/Symfony/Component/Validator/Constraints/LanguageValidator.php b/src/Symfony/Component/Validator/Constraints/LanguageValidator.php
@@ -14,7 +14,6 @@
 use Symfony\Component\Intl\Languages;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\LogicException;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 use Symfony\Component\Validator\Exception\UnexpectedValueException;
 
@@ -42,10 +41,6 @@ public function validate($value, Constraint $constraint)
             throw new UnexpectedValueException($value, 'string');
         }
 
-        if (!class_exists(Languages::class)) {
-            throw new LogicException('The Intl component is required to use the Language constraint. Try running "composer require symfony/intl".');
-        }
-
         $value = (string) $value;
 
         if (!Languages::exists($value)) {

diff --git a/src/Symfony/Component/Validator/Constraints/Locale.php b/src/Symfony/Component/Validator/Constraints/Locale.php
@@ -39,8 +39,7 @@ public function __construct($options = null)
         }
 
         if (!class_exists(Locales::class)) {
-            // throw new LogicException('The Intl component is required to use the Locale constraint. Try running "composer require symfony/intl".');
-            @trigger_error(sprintf('Using the "%s" constraint without the "symfony/intl" component installed is deprecated since Symfony 4.2.', __CLASS__), E_USER_DEPRECATED);
+            throw new LogicException('The Intl component is required to use the Locale constraint. Try running "composer require symfony/intl".');
         }
 
         parent::__construct($options);

diff --git a/src/Symfony/Component/Validator/Constraints/LocaleValidator.php b/src/Symfony/Component/Validator/Constraints/LocaleValidator.php
@@ -14,7 +14,6 @@
 use Symfony\Component\Intl\Locales;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\LogicException;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 use Symfony\Component\Validator\Exception\UnexpectedValueException;
 
@@ -42,10 +41,6 @@ public function validate($value, Constraint $constraint)
             throw new UnexpectedValueException($value, 'string');
         }
 
-        if (!class_exists(Locales::class)) {
-            throw new LogicException('The Intl component is required to use the Locale constraint. Try running "composer require symfony/intl".');
-        }
-
         $inputValue = (string) $value;
         $value = $inputValue;
         if ($constraint->canonicalize) {