feature #28846 [Intl] Simplify API (ro0NL)

fabpot · fabpot · commit 61c9967f03ae · 2019-04-15T13:51:58.000+02:00
This PR was squashed before being merged into the 4.3-dev branch (closes #28846). Discussion ---------- [Intl] Simplify API | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no  | Deprecations? | no | Tests pass? | yes  | Fixed tickets | #18368 | License | MIT | Doc PR | symfony/symfony-docs#11221 Simplifies the Intl API. It greatly reduces the no. of boilerplate classes in this component. Very over complicated, much wow :) Solving (IMHO): ```php class LanguageBundle extends LanguageDataProvider implements LanguageBundleInterface ``` Which seems very over complicated just to provide static data. ```php // before Intl::getLanguageBundle()->getLanguageName() // string | null // after Languages::getName() // string Languages::exists() // bool ``` I left out Canonicalization on puropose, that's a new topic to me. - [x] Languages - [x] Locales - [x] Currencies - [x] Regions - [x] Scripts - [ ] Timezones (#28831) - [x] Update constraints - [x] Update form types Thoughts? Commits ------- d6b67d469a [Intl] Simplify API
diff --git a/Constraints/Bic.php b/Constraints/Bic.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-use Symfony\Component\Intl\Intl;
+use Symfony\Component\Intl\Regions;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
@@ -47,7 +47,7 @@ class Bic extends Constraint
 
     public function __construct($options = null)
     {
-        if (!class_exists(Intl::class)) {
+        if (!class_exists(Regions::class)) {
             // throw new LogicException(sprintf('The "symfony/intl" component is required to use the "%s" constraint.', __CLASS__));
             @trigger_error(sprintf('Using the "%s" constraint without the "symfony/intl" component installed is deprecated since Symfony 4.2.', __CLASS__), E_USER_DEPRECATED);
         }
diff --git a/Constraints/BicValidator.php b/Constraints/BicValidator.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-use Symfony\Component\Intl\Intl;
+use Symfony\Component\Intl\Regions;
 use Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
@@ -105,8 +105,8 @@ public function validate($value, Constraint $constraint)
         }
 
         // @deprecated since Symfony 4.2, will throw in 5.0
-        if (class_exists(Intl::class)) {
-            $validCountryCode = isset(Intl::getRegionBundle()->getCountryNames()[substr($canonicalize, 4, 2)]);
+        if (class_exists(Regions::class)) {
+            $validCountryCode = Regions::exists(substr($canonicalize, 4, 2));
         } else {
             $validCountryCode = ctype_alpha(substr($canonicalize, 4, 2));
             // throw new LogicException('The "symfony/intl" component is required to use the Bic constraint.');
diff --git a/Constraints/Country.php b/Constraints/Country.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-use Symfony\Component\Intl\Intl;
+use Symfony\Component\Intl\Regions;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Exception\LogicException;
 
@@ -33,7 +33,7 @@ class Country extends Constraint
 
     public function __construct($options = null)
     {
-        if (!class_exists(Intl::class)) {
+        if (!class_exists(Regions::class)) {
             // throw new LogicException(sprintf('The "symfony/intl" component is required to use the "%s" constraint.', __CLASS__));
             @trigger_error(sprintf('Using the "%s" constraint without the "symfony/intl" component installed is deprecated since Symfony 4.2.', __CLASS__), E_USER_DEPRECATED);
         }
diff --git a/Constraints/CountryValidator.php b/Constraints/CountryValidator.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-use Symfony\Component\Intl\Intl;
+use Symfony\Component\Intl\Regions;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\LogicException;
@@ -42,14 +42,13 @@ public function validate($value, Constraint $constraint)
             throw new UnexpectedValueException($value, 'string');
         }
 
-        if (!class_exists(Intl::class)) {
+        if (!class_exists(Regions::class)) {
             throw new LogicException('The "symfony/intl" component is required to use the Country constraint.');
         }
 
         $value = (string) $value;
-        $countries = Intl::getRegionBundle()->getCountryNames();
 
-        if (!isset($countries[$value])) {
+        if (!Regions::exists($value)) {
             $this->context->buildViolation($constraint->message)
                 ->setParameter('{{ value }}', $this->formatValue($value))
                 ->setCode(Country::NO_SUCH_COUNTRY_ERROR)
diff --git a/Constraints/Currency.php b/Constraints/Currency.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-use Symfony\Component\Intl\Intl;
+use Symfony\Component\Intl\Currencies;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Exception\LogicException;
 
@@ -34,7 +34,7 @@ class Currency extends Constraint
 
     public function __construct($options = null)
     {
-        if (!class_exists(Intl::class)) {
+        if (!class_exists(Currencies::class)) {
             // throw new LogicException(sprintf('The "symfony/intl" component is required to use the "%s" constraint.', __CLASS__));
             @trigger_error(sprintf('Using the "%s" constraint without the "symfony/intl" component installed is deprecated since Symfony 4.2.', __CLASS__), E_USER_DEPRECATED);
         }
diff --git a/Constraints/CurrencyValidator.php b/Constraints/CurrencyValidator.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-use Symfony\Component\Intl\Intl;
+use Symfony\Component\Intl\Currencies;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\LogicException;
@@ -43,14 +43,13 @@ public function validate($value, Constraint $constraint)
             throw new UnexpectedValueException($value, 'string');
         }
 
-        if (!class_exists(Intl::class)) {
+        if (!class_exists(Currencies::class)) {
             throw new LogicException('The "symfony/intl" component is required to use the Currency constraint.');
         }
 
         $value = (string) $value;
-        $currencies = Intl::getCurrencyBundle()->getCurrencyNames();
 
-        if (!isset($currencies[$value])) {
+        if (!Currencies::exists($value))  {
             $this->context->buildViolation($constraint->message)
                 ->setParameter('{{ value }}', $this->formatValue($value))
                 ->setCode(Currency::NO_SUCH_CURRENCY_ERROR)
diff --git a/Constraints/Language.php b/Constraints/Language.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-use Symfony\Component\Intl\Intl;
+use Symfony\Component\Intl\Languages;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Exception\LogicException;
 
@@ -33,7 +33,7 @@ class Language extends Constraint
 
     public function __construct($options = null)
     {
-        if (!class_exists(Intl::class)) {
+        if (!class_exists(Languages::class)) {
             // throw new LogicException(sprintf('The "symfony/intl" component is required to use the "%s" constraint.', __CLASS__));
             @trigger_error(sprintf('Using the "%s" constraint without the "symfony/intl" component installed is deprecated since Symfony 4.2.', __CLASS__), E_USER_DEPRECATED);
         }
diff --git a/Constraints/LanguageValidator.php b/Constraints/LanguageValidator.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-use Symfony\Component\Intl\Intl;
+use Symfony\Component\Intl\Languages;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\LogicException;
@@ -42,14 +42,13 @@ public function validate($value, Constraint $constraint)
             throw new UnexpectedValueException($value, 'string');
         }
 
-        if (!class_exists(Intl::class)) {
+        if (!class_exists(Languages::class)) {
             throw new LogicException('The "symfony/intl" component is required to use the Language constraint.');
         }
 
         $value = (string) $value;
-        $languages = Intl::getLanguageBundle()->getLanguageNames();
 
-        if (!isset($languages[$value])) {
+        if (!Languages::exists($value)) {
             $this->context->buildViolation($constraint->message)
                 ->setParameter('{{ value }}', $this->formatValue($value))
                 ->setCode(Language::NO_SUCH_LANGUAGE_ERROR)
diff --git a/Constraints/Locale.php b/Constraints/Locale.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-use Symfony\Component\Intl\Intl;
+use Symfony\Component\Intl\Locales;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Exception\LogicException;
 
@@ -38,7 +38,7 @@ public function __construct($options = null)
             @trigger_error('The "canonicalize" option with value "false" is deprecated since Symfony 4.1, set it to "true" instead.', E_USER_DEPRECATED);
         }
 
-        if (!class_exists(Intl::class)) {
+        if (!class_exists(Locales::class)) {
             // throw new LogicException(sprintf('The "symfony/intl" component is required to use the "%s" constraint.', __CLASS__));
             @trigger_error(sprintf('Using the "%s" constraint without the "symfony/intl" component installed is deprecated since Symfony 4.2.', __CLASS__), E_USER_DEPRECATED);
         }
diff --git a/Constraints/LocaleValidator.php b/Constraints/LocaleValidator.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Validator\Constraints;
 
 use Symfony\Component\Intl\Intl;
+use Symfony\Component\Intl\Locales;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
@@ -46,10 +47,8 @@ public function validate($value, Constraint $constraint)
         if ($constraint->canonicalize) {
             $value = \Locale::canonicalize($value);
         }
-        $localeBundle = Intl::getLocaleBundle();
-        $locales = $localeBundle->getLocaleNames();
 
-        if (!isset($locales[$value]) && !\in_array($value, $localeBundle->getAliases(), true)) {
+        if (!Locales::exists($value) && !\in_array($value, Locales::getAliases(), true)) {
             $this->context->buildViolation($constraint->message)
                 ->setParameter('{{ value }}', $this->formatValue($inputValue))
                 ->setCode(Locale::NO_SUCH_LOCALE_ERROR)
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
         "symfony/http-foundation": "~4.1",
         "symfony/http-kernel": "~3.4|~4.0",
         "symfony/var-dumper": "~3.4|~4.0",
-        "symfony/intl": "~4.1",
+        "symfony/intl": "^4.3",
         "symfony/yaml": "~3.4|~4.0",
         "symfony/config": "~3.4|~4.0",
         "symfony/dependency-injection": "~3.4|~4.0",
@@ -43,7 +43,7 @@
         "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
         "symfony/dependency-injection": "<3.4",
         "symfony/http-kernel": "<3.4",
-        "symfony/intl": "<4.1",
+        "symfony/intl": "<4.3",
         "symfony/translation": "<4.2",
         "symfony/yaml": "<3.4"
     },

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Validator\Constraints;`
`13`	`13`
`14`		`-use Symfony\Component\Intl\Intl;`
	`14`	`+use Symfony\Component\Intl\Regions;`
`15`	`15`	`use Symfony\Component\PropertyAccess\PropertyAccess;`
`16`	`16`	`use Symfony\Component\Validator\Constraint;`
`17`	`17`	`use Symfony\Component\Validator\Exception\ConstraintDefinitionException;`
`@@ -47,7 +47,7 @@ class Bic extends Constraint`
`47`	`47`
`48`	`48`	`public function __construct($options = null)`
`49`	`49`	`{`
`50`		`- if (!class_exists(Intl::class)) {`
	`50`	`+ if (!class_exists(Regions::class)) {`
`51`	`51`	`// throw new LogicException(sprintf('The "symfony/intl" component is required to use the "%s" constraint.', __CLASS__));`
`52`	`52`	`@trigger_error(sprintf('Using the "%s" constraint without the "symfony/intl" component installed is deprecated since Symfony 4.2.', __CLASS__), E_USER_DEPRECATED);`
`53`	`53`	`}`