symfony
diff --git a/‎src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
Lines changed: 2 additions & 1 deletion b/‎src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
Lines changed: 2 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php
Lines changed: 2 additions & 1 deletion b/‎src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php
Lines changed: 2 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php
Lines changed: 2 additions & 1 deletion b/‎src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php
Lines changed: 2 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/LocalizedTestCase.php
Lines changed: 9 additions & 3 deletions b/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/LocalizedTestCase.php
Lines changed: 9 additions & 3 deletions
diff --git a/‎src/Symfony/Component/Form/composer.json
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Form/composer.json
Lines changed: 1 addition & 1 deletion
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Form\Extension\Core\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Intl\Intl;
 use Symfony\Component\Locale\Locale;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
@@ -23,7 +24,7 @@ class CountryType extends AbstractType
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(array(
-            'choices' => Locale::getDisplayCountries(\Locale::getDefault()),
+            'choices' => Intl::getRegionBundle()->getCountryNames(\Locale::getDefault()),
         ));
     }
 
 
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Form\Extension\Core\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Intl\Intl;
 use Symfony\Component\Locale\Locale;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
@@ -23,7 +24,7 @@ class LanguageType extends AbstractType
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(array(
-            'choices' => Locale::getDisplayLanguages(\Locale::getDefault()),
+            'choices' => Intl::getLanguageBundle()->getLanguageNames(\Locale::getDefault()),
         ));
     }
 
 
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Form\Extension\Core\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Intl\Intl;
 use Symfony\Component\Locale\Locale;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
@@ -23,7 +24,7 @@ class LocaleType extends AbstractType
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(array(
-            'choices' => Locale::getDisplayLocales(\Locale::getDefault()),
+            'choices' => Intl::getLocaleBundle()->getLocaleNames(\Locale::getDefault()),
         ));
     }
 
 
@@ -11,18 +11,24 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
+use Symfony\Component\Intl\Intl;
+
 abstract class LocalizedTestCase extends TypeTestCase
 {
     protected function setUp()
     {
         parent::setUp();
 
-        if (!class_exists('Symfony\Component\Locale\Locale')) {
-            $this->markTestSkipped('The "Locale" component is not available');
+        if (!class_exists('Symfony\Component\Intl\Intl')) {
+            $this->markTestSkipped('The "Intl" component is not available');
         }
 
-        if (!extension_loaded('intl')) {
+        if (!Intl::isExtensionLoaded()) {
             $this->markTestSkipped('The "intl" extension is not available');
         }
+
+        Intl::setDataSource(Intl::STUB);
+
+        \Locale::setDefault('en');
     }
 }
@@ -18,7 +18,7 @@
     "require": {
         "php": ">=5.3.3",
         "symfony/event-dispatcher": "~2.1",
-        "symfony/locale": "~2.0",
+        "symfony/intl": "~2.3",
         "symfony/options-resolver": ">=2.1,<2.4-dev",
         "symfony/property-access": ">=2.2,<2.4-dev"
     },
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`namespace Symfony\Component\Form\Extension\Core\Type;`
`13`	`13`
`14`	`14`	`use Symfony\Component\Form\AbstractType;`
	`15`	`+use Symfony\Component\Intl\Intl;`
`15`	`16`	`use Symfony\Component\Locale\Locale;`
`16`	`17`	`use Symfony\Component\OptionsResolver\OptionsResolverInterface;`
`17`	`18`
`@@ -23,7 +24,7 @@ class CountryType extends AbstractType`
`23`	`24`	`public function setDefaultOptions(OptionsResolverInterface $resolver)`
`24`	`25`	`{`
`25`	`26`	`$resolver->setDefaults(array(`
`26`		`- 'choices' => Locale::getDisplayCountries(\Locale::getDefault()),`
	`27`	`+ 'choices' => Intl::getRegionBundle()->getCountryNames(\Locale::getDefault()),`
`27`	`28`	`));`
`28`	`29`	`}`
`29`	`30`
Original fil 10000 e line number	Diff line number	Diff line change
`@@ -11,18 +11,24 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Form\Tests\Extension\Core\Type;`
`13`	`13`
	`14`	`+use Symfony\Component\Intl\Intl;`
	`15`	`+`
`14`	`16`	`abstract class LocalizedTestCase extends TypeTestCase`
`15`	`17`	`{`
`16`	`18`	`protected function setUp()`
`17`	`19`	`{`
`18`	`20`	`parent::setUp();`
`19`	`21`
`20`		`- if (!class_exists('Symfony\Component\Locale\Locale')) {`
`21`		`- $this->markTestSkipped('The "Locale" component is not available');`
	`22`	`+ if (!class_exists('Symfony\Component\Intl\Intl')) {`
	`23`	`+ $this->markTestSkipped('The "Intl" component is not available');`
`22`	`24`	`}`
`23`	`25`
`24`		`- if (!extension_loaded('intl')) {`
	`26`	`+ if (!Intl::isExtensionLoaded()) {`
`25`	`27`	`$this->markTestSkipped('The "intl" extension is not available');`
`26`	`28`	`}`
	`29`	`+`
	`30`	`+ Intl::setDataSource(Intl::STUB);`
	`31`	`+`
	`32`	`+ \Locale::setDefault('en');`
`27`	`33`	`}`
`28`	`34`	`}`