diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | none
| License       | MIT
| Doc PR        | none
This commit is contained in:
Javier Spagnoletti 2015-01-29 23:30:47 -03:00 committed by Fabien Potencier
parent 2e7434102a
commit c2aeeeb042
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bridge/Twig/Extension/FormExtension.php
View File

@ -144,7 +144,7 @@ class FormExtension extends \Twig_Extension
public function isSelectedChoice(ChoiceView $choice, $selectedValue) public function isSelectedChoice(ChoiceView $choice, $selectedValue)
{ {
if (is_array($selectedValue)) { if (is_array($selectedValue)) {
return false !== array_search($choice->value, $selectedValue, true); return in_array($choice->value, $selectedValue, true);
} }
return $choice->value === $selectedValue; return $choice->value === $selectedValue;

2
src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php
View File

@ -381,7 +381,7 @@ class ChoiceList implements ChoiceListInterface
*/ */
protected function isPreferred($choice, array $preferredChoices) protected function isPreferred($choice, array $preferredChoices)
{ {
return false !== array_search($choice, $preferredChoices, true); return in_array($choice, $preferredChoices, true);
} }
/** /**

2
src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
View File

@ -111,7 +111,7 @@ class ChoiceType extends AbstractType
// avoid making the type check inside the closure. // avoid making the type check inside the closure.
if ($options['multiple']) { if ($options['multiple']) {
$view->vars['is_selected'] = function ($choice, array $values) { $view->vars['is_selected'] = function ($choice, array $values) {
return false !== array_search($choice, $values, true); return in_array($choice, $values, true);
}; };
} else { } else {
$view->vars['is_selected'] = function ($choice, $value) { $view->vars['is_selected'] = function ($choice, $value) {