[Form] Fixed empty conversion of Intl types

HeahDude · HeahDude · commit 6e581555a2f7 · 2017-01-31T22:42:05.000+01:00
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php b/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
@@ -75,6 +75,7 @@ public function loadChoiceList($value = null)
     public function loadChoicesForValues(array $values, $value = null)
     {
         // Optimize
+        $values = array_filter($values);
         if (empty($values)) {
             return array();
         }
@@ -93,6 +94,7 @@ public function loadChoicesForValues(array $values, $value = null)
     public function loadValuesForChoices(array $choices, $value = null)
     {
         // Optimize
+        $choices = array_filter($choices);
         if (empty($choices)) {
             return array();
         }
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php b/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php
@@ -74,6 +74,7 @@ public function loadChoiceList($value = null)
      */
     public function loadChoicesForValues(array $values, $value = null)
     {
+        $values = array_filter($values);
         // Optimize
         if (empty($values)) {
             return array();
@@ -92,6 +93,7 @@ public function loadChoicesForValues(array $values, $value = null)
      */
     public function loadValuesForChoices(array $choices, $value = null)
     {
+        $choices = array_filter($choices);
         // Optimize
         if (empty($choices)) {
             return array();
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php b/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php
@@ -74,6 +74,7 @@ public function loadChoiceList($value = null)
      */
     public function loadChoicesForValues(array $values, $value = null)
     {
+        $values = array_filter($values);
         // Optimize
         if (empty($values)) {
             return array();
@@ -92,6 +93,7 @@ public function loadChoicesForValues(array $values, $value = null)
      */
     public function loadValuesForChoices(array $choices, $value = null)
     {
+        $choices = array_filter($choices);
         // Optimize
         if (empty($choices)) {
             return array();
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php b/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php
@@ -74,6 +74,7 @@ public function loadChoiceList($value = null)
      */
     public function loadChoicesForValues(array $values, $value = null)
     {
+        $values = array_filter($values);
         // Optimize
         if (empty($values)) {
             return array();
@@ -92,6 +93,7 @@ public function loadChoicesForValues(array $values, $value = null)
      */
     public function loadValuesForChoices(array $choices, $value = null)
     {
+        $choices = array_filter($choices);
         // Optimize
         if (empty($choices)) {
             return array();
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
@@ -71,6 +71,7 @@ public function loadChoiceList($value = null)
      */
     public function loadChoicesForValues(array $values, $value = null)
     {
+        $values = array_filter($values);
         // Optimize
         if (empty($values)) {
             return array();
@@ -89,6 +90,7 @@ public function loadChoicesForValues(array $values, $value = null)
      */
     public function loadValuesForChoices(array $choices, $value = null)
     {
+        $choices = array_filter($choices);
         // Optimize
         if (empty($choices)) {
             return array();
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,12 @@ 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);
     }
+
+    public function testSubmitNull()
+    {
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\CurrencyType');
+        $form->submit(null);
+
+        $this->assertNull($form->getData());
+    }
 }
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,12 @@ public function testTimezonesAreSelectable()
         $this->assertArrayHasKey('America', $choices);
         $this->assertContains(new ChoiceView('America/New_York', 'America/New_York', 'New York'), $choices['America'], '', false, false);
     }
+
+    public function testSubmitNull()
+    {
+        $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\TimezoneType');
+        $form->submit(null);
+
+        $this->assertNull($form->getData());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ public function loadChoiceList($value = null)`
`75`	`75`	`public function loadChoicesForValues(array $values, $value = null)`
`76`	`76`	`{`
`77`	`77`	`// Optimize`
	`78`	`+ $values = array_filter($values);`
`78`	`79`	`if (empty($values)) {`
`79`	`80`	`return array();`
`80`	`81`	`}`
`@@ -93,6 +94,7 @@ public function loadChoicesForValues(array $values, $value = null)`
`93`	`94`	`public function loadValuesForChoices(array $choices, $value = null)`
`94`	`95`	`{`
`95`	`96`	`// Optimize`
	`97`	`+ $choices = array_filter($choices);`
`96`	`98`	`if (empty($choices)) {`
`97`	`99`	`return array();`
`98`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,4 +34,12 @@ public function testCurrenciesAreSelectable()`
`34`	`34`	`$this->assertContains(new ChoiceView('USD', 'USD', 'US Dollar'), $choices, '', false, false);`
`35`	`35`	`$this->assertContains(new ChoiceView('SIT', 'SIT', 'Slovenian Tolar'), $choices, '', false, false);`
`36`	`36`	`}`
	`37`	`+`
	`38`	`+ public function testSubmitNull()`
	`39`	`+ {`
	`40`	`+ $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\CurrencyType');`
	`41`	`+ $form->submit(null);`
	`42`	`+`
	`43`	`+ $this->assertNull($form->getData());`
	`44`	`+ }`
`37`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,12 @@ public function testTimezonesAreSelectable()`
`27`	`27`	`$this->assertArrayHasKey('America', $choices);`
`28`	`28`	`$this->assertContains(new ChoiceView('America/New_York', 'America/New_York', 'New York'), $choices['America'], '', false, false);`
`29`	`29`	`}`
	`30`	`+`
	`31`	`+ public function testSubmitNull()`
	`32`	`+ {`
	`33`	`+ $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\TimezoneType');`
	`34`	`+ $form->submit(null);`
	`35`	`+`
	`36`	`+ $this->assertNull($form->getData());`
	`37`	`+ }`
`30`	`38`	`}`