[Validator] add exception when intl component not found

ronfroy · nicolas-grekas · commit b6f29f47217d · 2018-09-21T13:37:49.000+02:00
diff --git a/src/Symfony/Component/Validator/Constraints/BicValidator.php b/src/Symfony/Component/Validator/Constraints/BicValidator.php
@@ -14,6 +14,7 @@
 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;
 
 /**
@@ -68,10 +69,11 @@ public function validate($value, Constraint $constraint)
             return;
         }
 
-        // next 2 letters must be alphabetic (country code)
         if (!class_exists(Intl::class)) {
-            throw new \LogicException('The "symfony/intl" component is required to use the Bic constraint.');
+            throw new LogicException('The "symfony/intl" component is required to use the Bic constraint.');
         }
+
+        // next 2 letters must be alphabetic (country code)
         $countries = Intl::getRegionBundle()->getCountryNames();
         if (!isset($countries[substr($canonicalize, 4, 2)])) {
             $this->context->buildViolation($constraint->message)
diff --git a/src/Symfony/Component/Validator/Constraints/CountryValidator.php b/src/Symfony/Component/Validator/Constraints/CountryValidator.php
@@ -14,6 +14,7 @@
 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;
 
 /**
@@ -40,6 +41,10 @@ public function validate($value, Constraint $constraint)
             throw new UnexpectedTypeException($value, 'string');
         }
 
+        if (!class_exists(Intl::class)) {
+            throw new LogicException('The "symfony/intl" component is required to use the Country constraint.');
+        }
+
         $value = (string) $value;
         $countries = Intl::getRegionBundle()->getCountryNames();
 
diff --git a/src/Symfony/Component/Validator/Constraints/CurrencyValidator.php b/src/Symfony/Component/Validator/Constraints/CurrencyValidator.php
@@ -14,6 +14,7 @@
 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;
 
 /**
@@ -41,6 +42,10 @@ public function validate($value, Constraint $constraint)
             throw new UnexpectedTypeException($value, 'string');
         }
 
+        if (!class_exists(Intl::class)) {
+            throw new LogicException('The "symfony/intl" component is required to use the Currency constraint.');
+        }
+
         $value = (string) $value;
         $currencies = Intl::getCurrencyBundle()->getCurrencyNames();
 
diff --git a/src/Symfony/Component/Validator/Constraints/LanguageValidator.php b/src/Symfony/Component/Validator/Constraints/LanguageValidator.php
@@ -14,6 +14,7 @@
 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;
 
 /**
@@ -40,6 +41,10 @@ public function validate($value, Constraint $constraint)
             throw new UnexpectedTypeException($value, 'string');
         }
 
+        if (!class_exists(Intl::class)) {
+            throw new LogicException('The "symfony/intl" component is required to use the Language constraint.');
+        }
+
         $value = (string) $value;
         $languages = Intl::getLanguageBundle()->getLanguageNames();
 
diff --git a/src/Symfony/Component/Validator/Exception/LogicException.php b/src/Symfony/Component/Validator/Exception/LogicException.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Validator\Exception;
+
+class LogicException extends \LogicException implements ExceptionInterface
+{
+}
diff --git a/src/Symfony/Component/Validator/Mapping/Factory/BlackHoleMetadataFactory.php b/src/Symfony/Component/Validator/Mapping/Factory/BlackHoleMetadataFactory.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Validator\Mapping\Factory;
 
+use Symfony\Component\Validator\Exception\LogicException;
+
 /**
  * Metadata factory that does not store metadata.
  *
@@ -27,7 +29,7 @@ class BlackHoleMetadataFactory implements MetadataFactoryInterface
      */
     public function getMetadataFor($value)
     {
-        throw new \LogicException('This class does not support metadata.');
+        throw new LogicException('This class does not support metadata.');
     }
 
     /**
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Factory/BlackHoleMetadataFactoryTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Factory/BlackHoleMetadataFactoryTest.php
@@ -17,7 +17,7 @@
 class BlackHoleMetadataFactoryTest extends TestCase
 {
     /**
-     * @expectedException \LogicException
+     * @expectedException \Symfony\Component\Validator\Exception\LogicException
      */
     public function testGetMetadataForThrowsALogicException()
     {
diff --git a/src/Symfony/Component/Validator/ValidatorBuilder.php b/src/Symfony/Component/Validator/ValidatorBuilder.php
@@ -17,6 +17,7 @@
 use Doctrine\Common\Cache\ArrayCache;
 use Symfony\Component\Translation\TranslatorInterface as LegacyTranslatorInterface;
 use Symfony\Component\Validator\Context\ExecutionContextFactory;
+use Symfony\Component\Validator\Exception\LogicException;
 use Symfony\Component\Validator\Exception\ValidatorException;
 use Symfony\Component\Validator\Mapping\Cache\CacheInterface;
 use Symfony\Component\Validator\Mapping\Factory\LazyLoadingMetadataFactory;
@@ -191,8 +192,8 @@ public function enableAnnotationMapping(Reader $annotationReader = null)
         }
 
         if (null === $annotationReader) {
-            if (!class_exists('Doctrine\Common\Annotations\AnnotationReader') || !class_exists('Doctrine\Common\Cache\ArrayCache')) {
-                throw new \RuntimeException('Enabling annotation based constraint mapping requires the packages doctrine/annotations and doctrine/cache to be installed.');
+            if (!class_exists(AnnotationReader::class) || !class_exists(ArrayCache::class)) {
+                throw new LogicException('Enabling annotation based constraint mapping requires the packages doctrine/annotations and doctrine/cache to be installed.');
             }
 
             $annotationReader = new CachedReader(new AnnotationReader(), new ArrayCache());

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Validator\Mapping\Factory;`
`13`	`13`
	`14`	`+use Symfony\Component\Validator\Exception\LogicException;`
	`15`	`+`
`14`	`16`	`/**`
`15`	`17`	`* Metadata factory that does not store metadata.`
`16`	`18`	`*`
`@@ -27,7 +29,7 @@ class BlackHoleMetadataFactory implements MetadataFactoryInterface`
`27`	`29`	`*/`
`28`	`30`	`public function getMetadataFor($value)`
`29`	`31`	`{`
`30`		`- throw new \LogicException('This class does not support metadata.');`
	`32`	`+ throw new LogicException('This class does not support metadata.');`
`31`	`33`	`}`
`32`	`34`
`33`	`35`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`class BlackHoleMetadataFactoryTest extends TestCase`
`18`	`18`	`{`
`19`	`19`	`/**`
`20`		`- * @expectedException \LogicException`
	`20`	`+ * @expectedException \Symfony\Component\Validator\Exception\LogicException`
`21`	`21`	`*/`
`22`	`22`	`public function testGetMetadataForThrowsALogicException()`
`23`	`23`	`{`