[2.7] [Form] Replaced calls to array_search() by in_array() where is no need to get the index

phansys · fabpot · commit c2aeeeb04238 · 2015-02-05T07:23:00.000+01:00
| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | none
| License       | MIT
| Doc PR        | none
diff --git a/src/Symfony/Bridge/Twig/Extension/FormExtension.php b/src/Symfony/Bridge/Twig/Extension/FormExtension.php
@@ -144,7 +144,7 @@ public function humanize($text)
     public function isSelectedChoice(ChoiceView $choice, $selectedValue)
     {
         if (is_array($selectedValue)) {
-            return false !== array_search($choice->value, $selectedValue, true);
+            return in_array($choice->value, $selectedValue, true);
         }
 
         return $choice->value === $selectedValue;
diff --git a/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php b/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php
@@ -381,7 +381,7 @@ protected function addChoice(array &$bucketForPreferred, array &$bucketForRemain
      */
     protected function isPreferred($choice, array $preferredChoices)
     {
-        return false !== array_search($choice, $preferredChoices, true);
+        return in_array($choice, $preferredChoices, true);
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -111,7 +111,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         // avoid making the type check inside the closure.
         if ($options['multiple']) {
             $view->vars['is_selected'] = function ($choice, array $values) {
-                return false !== array_search($choice, $values, true);
+                return in_array($choice, $values, true);
             };
         } else {
             $view->vars['is_selected'] = function ($choice, $value) {

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ public function humanize($text)`
`144`	`144`	`public function isSelectedChoice(ChoiceView $choice, $selectedValue)`
`145`	`145`	`{`
`146`	`146`	`if (is_array($selectedValue)) {`
`147`		`- return false !== array_search($choice->value, $selectedValue, true);`
	`147`	`+ return in_array($choice->value, $selectedValue, true);`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`return $choice->value === $selectedValue;`
Original file line number	Diff line number	Diff line change
`@@ -381,7 +381,7 @@ protected function addChoice(array &$bucketForPreferred, array &$bucketForRemain`
`381`	`381`	`*/`
`382`	`382`	`protected function isPreferred($choice, array $preferredChoices)`
`383`	`383`	`{`
`384`		`- return false !== array_search($choice, $preferredChoices, true);`
	`384`	`+ return in_array($choice, $preferredChoices, true);`
`385`	`385`	`}`
`386`	`386`
`387`	`387`	`/**`