8000 Revert "Merge branch '2.3' into 2.5" · symfony/symfony@c0115af · GitHub
[go: up one dir, main page]
Skip to content

Commit c0115af

Browse files
fabpotfabpot
committed
Revert "Merge branch '2.3' into 2.5"
This reverts commit f7a1adb, reversing changes made to 45e42a8.
1 parent b45428e commit c0115af

File tree

26 files changed

+339
-373
lines changed

26 files changed

+339
-373
lines changed

‎src/Symfony/Bridge/Twig/Extension/FormExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public function humanize($text)
144144
public function isSelectedChoice(ChoiceView $choice, $selectedValue)
145145
{
146146
if (is_array($selectedValue)) {
147-
return in_array($choice->value, $selectedValue, true);
147+
return false !== array_search($choice->value, $selectedValue, true);
148148
}
149149

150150
return $choice->value === $selectedValue;

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ public function testTranslator()
246246
$this->assertEquals(array('fr'), $calls[0][1][0]);
247247
}
248248

249-
public function testTranslatorMultipleFallbacks()
249+
public function testTranslatorMultipleFullback()
250250
{
251251
$container = $this->createContainerFromFile('translator_fallbacks');
252252

‎src/Symfony/Component/Console/Application.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ public function getHelp()
253253
$this->getLongVersion(),
254254
'',
255255
'<comment>Usage:</comment>',
256-
' command [options] [arguments]',
256+
' [options] command [arguments]',
257257
'',
258258
'<comment>Options:</comment>',
259259
);

‎src/Symfony/Component/Console/Tests/Fixtures/application_1.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<info>Console Tool</info>
22

33
<comment>Usage:</comment>
4-
command [options] [arguments]
4+
[options] command [arguments]
55

66
<comment>Options:</comment>
77
<info>--help</info> <info>-h</info> Display this help message

‎src/Symfony/Component/Console/Tests/Fixtures/application_2.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<info>My Symfony application</info> version <comment>v1.0</comment>
22

33
<comment>Usage:</comment>
4-
command [options] [arguments]
4+
[options] command [arguments]
55

66
<comment>Options:</comment>
77
<info>--help</info> <info>-h</info> Display this help message

‎src/Symfony/Component/Console/Tests/Fixtures/application_astext1.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<info>Console Tool</info>
22

33
<comment>Usage:</comment>
4-
command [options] [arguments]
4+
[options] command [arguments]
55

66
<comment>Options:</comment>
77
<info>--help</info> <info>-h</info> Display this help message

‎src/Symfony/Component/Console/Tests/Fixtures/application_astext2.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<info>Console Tool</info>
22

33
<comment>Usage:</comment>
4-
command [options] [arguments]
4+
[options] command [arguments]
55

66
<comment>Options:</comment>
77
<info>--help</info> <info>-h</info> Display this help message

‎src/Symfony/Component/Console/Tests/Fixtures/application_gethelp.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<info>Console Tool</info>
22

33
<comment>Usage:</comment>
4-
command [options] [arguments]
4+
[options] command [arguments]
55

66
<comment>Options:</comment>
77
<info>--help</info> <info>-h</info> Display this help message

‎src/Symfony/Component/Console/Tests/Fixtures/application_run1.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Console Tool
22

33
Usage:
4-
command [options] [arguments]
4+
[options] command [arguments]
55

66
Options:
77
--help -h Display this help message

‎src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ protected function addChoice(array &$bucketForPreferred, array &$bucketForRemain
385385
*/
386386
protected function isPreferred($choice, array $preferredChoices)
387387
{
388-
return in_array($choice, $preferredChoices, true);
388+
return false !== array_search($choice, $preferredChoices, true);
389389
}
390390

391391
/**

0 commit comments

Comments
 (0)
0