Simplified conditions

vilius-g · vilius-g · commit d31120d00df5 · 2019-11-06T11:56:53.000+02:00
diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php b/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php
@@ -103,12 +103,10 @@ public function createView(ChoiceListInterface $list, $preferredChoices = null,
             }
 
             foreach ($preferredViewsOrder as $key => $groupViewsOrder) {
-                if (\is_array($groupViewsOrder)) {
-                    if (0 === \count($groupViewsOrder)) {
-                        unset($preferredViewsOrder[$key]);
-                    } else {
-                        $preferredViewsOrder[$key] = \min($groupViewsOrder);
-                    }
+                if ($groupViewsOrder) {
+                    $preferredViewsOrder[$key] = \min($groupViewsOrder);
+                } else {
+                    unset($preferredViewsOrder[$key]);
                 }
             }
         } else {

Original file line number	Diff line number	Diff line change
`@@ -103,12 +103,10 @@ public function createView(ChoiceListInterface $list, $preferredChoices = null,`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`foreach ($preferredViewsOrder as $key => $groupViewsOrder) {`
`106`		`- if (\is_array($groupViewsOrder)) {`
`107`		`- if (0 === \count($groupViewsOrder)) {`
`108`		`- unset($preferredViewsOrder[$key]);`
`109`		`- } else {`
`110`		`- $preferredViewsOrder[$key] = \min($groupViewsOrder);`
`111`		`- }`
	`106`	`+ if ($groupViewsOrder) {`
	`107`	`+ $preferredViewsOrder[$key] = \min($groupViewsOrder);`
	`108`	`+ } else {`
	`109`	`+ unset($preferredViewsOrder[$key]);`
`112`	`110`	`}`
`113`	`111`	`}`
`114`	`112`	`} else {`