symfony
diff --git a/‎src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
+13-2Lines changed: 13 additions & 2 deletions b/‎src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
+13-2Lines changed: 13 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/CountryTypeTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/Type/CountryTypeTest.php
+14Lines changed: 14 additions & 0 deletions b/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/CountryTypeTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/Type/CountryTypeTest.php
+14Lines changed: 14 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/LocaleTypeTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/Type/LocaleTypeTest.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/LocaleTypeTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/Type/LocaleTypeTest.php
+1-1Lines changed: 1 addition & 1 deletion
@@ -15,6 +15,7 @@
 use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
 use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
 use Symfony\Component\Form\ChoiceList\Loader\IntlCallbackChoiceLoader;
+use Symfony\Component\Form\Extension\Core\ArrayInclusionFilter;
 use Symfony\Component\Intl\Intl;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -42,16 +43,26 @@ public function configureOptions(OptionsResolver $resolver)
         $resolver->setDefaults(array(
             'choice_loader' => function (Options $options) {
                 $choiceTranslationLocale = $options['choice_translation_locale'];
+                $supportedCountries = $options['supported_countries'];
 
-                return new IntlCallbackChoiceLoader(function () use ($choiceTranslationLocale) {
-                    return array_flip(Intl::getRegionBundle()->getCountryNames($choiceTranslationLocale));
+                return new IntlCallbackChoiceLoader(function () use ($choiceTranslationLocale, $supportedCountries) {
+                    $countries = Intl::getRegionBundle()->getCountryNames($choiceTranslationLocale);
+
+                    if (null !== $supportedCountries) {
+                        $supportedCountries = array_map('strtoupper', $supportedCountries);
+                        $countries = array_filter($countries, new ArrayInclusionFilter($supportedCountries), ARRAY_FILTER_USE_KEY);
+                    }
+
+                    return array_flip($countries);
                 });
             },
             'choice_translation_domain' => false,
             'choice_translation_locale' => null,
+            'supported_countries' => null,
         ));
 
         $resolver->setAllowedTypes('choice_translation_locale', array('null', 'string'));
+        $resolver->setAllowedTypes('supported_countries', array('null', 'string[]'));
     }
 
     /**
 
@@ -57,6 +57,20 @@ public function testChoiceTranslationLocaleOption()
         $this->assertContains(new ChoiceView('MY', 'MY', 'Малайзія'), $choices, '', false, false);
     }
 
+    public function testAcceptedCountriesIsConfigurable()
+    {
+        $choices = $this->factory
+            ->create(static::TESTED_TYPE, null, array(
+                'supported_countries' => array('GB', 'DE'),
+            ))
+            ->createView()->vars['choices'];
+
+        $this->assertContains(new ChoiceView('DE', 'DE', 'Germany'), $choices, '', false, false);
+        $this->assertContains(new ChoiceView('GB', 'GB', 'United Kingdom'), $choices, '', false, false);
+        $this->assertNotContains(new ChoiceView('US', 'US', 'United States'), $choices, '', false, false);
+        $this->assertNotContains(new ChoiceView('FR', 'FR', 'France'), $choices, '', false, false);
+    }
+
     public function testUnknownCountryIsNotIncluded()
     {
         $choices = $this->factory->create(static::TESTED_TYPE, 'country')
 
@@ -37,7 +37,7 @@ public function testLocalesAreSelectable()
 
     public function testSupportedLocalesAreConfigurable()
     {
-        $choices = $this->factory->create(static::TESTED_TYPE, null, ['supported_locales' => ['en', 'zh_Hant_MO']])
+        $choices = $this->factory->create(static::TESTED_TYPE, null, array('supported_locales' => array('en', 'zh_Hant_MO')))
             ->createView()->vars['choices'];
 
         $this->assertContains(new ChoiceView('en', 'en', 'English'), $choices, '', false, false);
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function testLocalesAreSelectable()`
`37`	`37`
`38`	`38`	`public function testSupportedLocalesAreConfigurable()`
`39`	`39`	`{`
`40`		`- $choices = $this->factory->create(static::TESTED_TYPE, null, ['supported_locales' => ['en', 'zh_Hant_MO']])`
	`40`	`+ $choices = $this->factory->create(static::TESTED_TYPE, null, array('supported_locales' => array('en', 'zh_Hant_MO')))`
`41`	`41`	`->createView()->vars['choices'];`
`42`	`42`
`43`	`43`	`$this->assertContains(new ChoiceView('en', 'en', 'English'), $choices, '', false, false);`