bug #21481 [Form] Fixed empty conversion of Intl types (HeahDude)

fabpot · fabpot · commit 16263fb04d45 · 2017-03-05T10:16:12.000-08:00
This PR was merged into the 3.2 branch. Discussion ---------- [Form] Fixed empty conversion of Intl types | Q | A | ------------- | --- | Branch? | 3.2 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #20759, #21475 | License | MIT | Doc PR | ~ Commits ------- e43bfaf [Form] Fixed empty conversion of Intl types
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
@@ -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/LanguageType.php b/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.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/LocaleType.php b/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.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/TimezoneType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
@@ -72,6 +72,7 @@ public function loadChoiceList($value = null)
     public function loadChoicesForValues(array $values, $value = null)
     {
         // Optimize
+        $values = array_filter($values);
         if (empty($values)) {
             return array();
         }
@@ -90,6 +91,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();
         }

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
`@@ -72,6 +72,7 @@ public function loadChoiceList($value = null)`
`72`	`72`	`public function loadChoicesForValues(array $values, $value = null)`
`73`	`73`	`{`
`74`	`74`	`// Optimize`
	`75`	`+ $values = array_filter($values);`
`75`	`76`	`if (empty($values)) {`
`76`	`77`	`return array();`
`77`	`78`	`}`
`@@ -90,6 +91,7 @@ public function loadChoicesForValues(array $values, $value = null)`
`90`	`91`	`public function loadValuesForChoices(array $choices, $value = null)`
`91`	`92`	`{`
`92`	`93`	`// Optimize`
	`94`	`+ $choices = array_filter($choices);`
`93`	`95`	`if (empty($choices)) {`
`94`	`96`	`return array();`
`95`	`97`	`}`