[Validator] Adapted to latest Intl changes

webmozart · webmozart · commit 209a9cb72256 · 2013-04-05T10:11:15.000+02:00
diff --git a/src/Symfony/Component/Validator/Constraints/CountryValidator.php b/src/Symfony/Component/Validator/Constraints/CountryValidator.php
@@ -39,8 +39,9 @@ public function validate($value, Constraint $constraint)
         }
 
         $value = (string) $value;
+        $countries = Intl::getRegionBundle()->getCountryNames();
 
-        if (!in_array($value, array_keys(Intl::getRegionBundle()->getCountryNames(\Locale::getDefault())))) {
+        if (!isset($countries[$value])) {
             $this->context->addViolation($constraint->message, array('{{ value }}' => $value));
         }
     }
diff --git a/src/Symfony/Component/Validator/Constraints/LanguageValidator.php b/src/Symfony/Component/Validator/Constraints/LanguageValidator.php
@@ -39,8 +39,9 @@ public function validate($value, Constraint $constraint)
         }
 
         $value = (string) $value;
+        $languages = Intl::getLanguageBundle()->getLanguageNames();
 
-        if (!in_array($value, array_keys(Intl::getLanguageBundle()->getLanguageNames(\Locale::getDefault())))) {
+        if (!isset($languages[$value])) {
             $this->context->addViolation($constraint->message, array('{{ value }}' => $value));
         }
     }
diff --git a/src/Symfony/Component/Validator/Constraints/LocaleValidator.php b/src/Symfony/Component/Validator/Constraints/LocaleValidator.php
@@ -39,7 +39,7 @@ public function validate($value, Constraint $constraint)
         }
 
         $value = (string) $value;
-        $locales = Intl::getLocaleBundle()->getLocaleNames(\Locale::getDefault());
+        $locales = Intl::getLocaleBundle()->getLocaleNames();
 
         if (!isset($locales[$value])) {
             $this->context->addViolation($constraint->message, array('{{ value }}' => $value));

Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,9 @@ public function validate($value, Constraint $constraint)`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`$value = (string) $value;`
	`42`	`+ $countries = Intl::getRegionBundle()->getCountryNames();`
`42`	`43`
`43`		`- if (!in_array($value, array_keys(Intl::getRegionBundle()->getCountryNames(\Locale::getDefault())))) {`
	`44`	`+ if (!isset($countries[$value])) {`
`44`	`45`	`$this->context->addViolation($constraint->message, array('{{ value }}' => $value));`
`45`	`46`	`}`
`46`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function validate($value, Constraint $constraint)`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`$value = (string) $value;`
`42`		`- $locales = Intl::getLocaleBundle()->getLocaleNames(\Locale::getDefault());`
	`42`	`+ $locales = Intl::getLocaleBundle()->getLocaleNames();`
`43`	`43`
`44`	`44`	`if (!isset($locales[$value])) {`
`45`	`45`	`$this->context->addViolation($constraint->message, array('{{ value }}' => $value));`