[Form] Disallow passing non-array values to 'choices' option of ChoiceType and its derivatives

kix · kix · commit 4002e6fa24d5 · 2015-06-17T23:16:12.000+05:00
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -239,6 +239,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
         ));
 
         $resolver->setAllowedTypes(array(
+            'choices' => array('null', 'array'),
             'choice_list' => array('null', 'Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceListInterface'),
             'preferred_choices' => 'array',
         ));
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CountryTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CountryTypeTest.php
@@ -50,4 +50,14 @@ public function testUnknownCountryIsNotIncluded()
             }
         }
     }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+     */
+    public function testSetInvalidChoices()
+    {
+        $this->factory->create('country', null, array(
+            'choices' => 'bad value',
+        ));
+    }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CurrencyTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CurrencyTypeTest.php
@@ -34,4 +34,14 @@ public function testCurrenciesAreSelectable()
         $this->assertContains(new ChoiceView('USD', 'USD', 'US Dollar'), $choices, '', false, false);
         $this->assertContains(new ChoiceView('SIT', 'SIT', 'Slovenian Tolar'), $choices, '', false, false);
     }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+     */
+    public function testSetInvalidChoices()
+    {
+        $this->factory->create('currency', null, array(
+            'choices' => 'bad value',
+        ));
+    }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/LanguageTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/LanguageTypeTest.php
@@ -45,4 +45,14 @@ public function testMultipleLanguagesIsNotIncluded()
 
         $this->assertNotContains(new ChoiceView('mul', 'mul', 'Mehrsprachig'), $choices, '', false, false);
     }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+     */
+    public function testSetInvalidChoices()
+    {
+        $this->factory->create('language', null, array(
+            'choices' => 'bad value',
+        ));
+    }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/LocaleTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/LocaleTypeTest.php
@@ -34,4 +34,14 @@ public function testLocalesAreSelectable()
         $this->assertContains(new ChoiceView('en_GB', 'en_GB', 'English (United Kingdom)'), $choices, '', false, false);
         $this->assertContains(new ChoiceView('zh_Hant_MO', 'zh_Hant_MO', 'Chinese (Traditional, Macau SAR China)'), $choices, '', false, false);
     }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+     */
+    public function testSetInvalidChoices()
+    {
+        $this->factory->create('locale', null, array(
+            'choices' => 'bad value',
+        ));
+    }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php
@@ -27,4 +27,14 @@ public function testTimezonesAreSelectable()
         $this->assertArrayHasKey('America', $choices);
         $this->assertContains(new ChoiceView('America/New_York', 'America/New_York', 'New York'), $choices['America'], '', false, false);
     }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+     */
+    public function testSetInvalidChoices()
+    {
+        $this->factory->create('timezone', null, array(
+            'choices' => 'bad value',
+        ));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -50,4 +50,14 @@ public function testUnknownCountryIsNotIncluded()`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`	`}`
	`53`	`+`
	`54`	`+ /**`
	`55`	`+ * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException`
	`56`	`+ */`
	`57`	`+ public function testSetInvalidChoices()`
	`58`	`+ {`
	`59`	`+ $this->factory->create('country', null, array(`
	`60`	`+ 'choices' => 'bad value',`
	`61`	`+ ));`
	`62`	`+ }`
`53`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,4 +45,14 @@ public function testMultipleLanguagesIsNotIncluded()`
`45`	`45`
`46`	`46`	`$this->assertNotContains(new ChoiceView('mul', 'mul', 'Mehrsprachig'), $choices, '', false, false);`
`47`	`47`	`}`
	`48`	`+`
	`49`	`+ /**`
	`50`	`+ * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException`
	`51`	`+ */`
	`52`	`+ public function testSetInvalidChoices()`
	`53`	`+ {`
	`54`	`+ $this->factory->create('language', null, array(`
	`55`	`+ 'choices' => 'bad value',`
	`56`	`+ ));`
	`57`	`+ }`
`48`	`58`	`}`