8000 Merge branch '5.2' into 5.x · symfony/symfony@f052d11 · GitHub
[go: up one dir, main page]
Skip to content

Commit f052d11

Browse files
chalasrchalasr
committed
Merge branch '5.2' into 5.x
* 5.2: [Security] Fix test fix test [Console] Fix tests
2 parents 8de664d + 7bc31c6 commit f052d11

17 files changed

+34
-34
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ public function testRunOnlyWarnsOnUnregistrableCommandAtTheEnd()
205205
$tester->run(['command' => 'list']);
206206

207207
$this->assertSame(0, $tester->getStatusCode());
208-
$display = explode('Lists commands', $tester->getDisplay());
208+
$display = explode('List commands', $tester->getDisplay());
209209

210210
$this->assertStringContainsString(trim('[WARNING] Some commands could not be registered:'), trim($display[1]));
211211
}

‎src/Symfony/Bundle/FrameworkBundle/composer.json

Lines changed: 1 addition & 1 deletion
8000
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"phpunit/phpunit": "<5.4.3",
7575
"symfony/asset": "<5.3",
7676
"symfony/browser-kit": "<4.4",
77-
"symfony/console": "<5.2",
77+
"symfony/console": "<5.2.5",
7878
"symfony/dotenv": "<5.1",
7979
"symfony/dom-crawler": "<4.4",
8080
"symfony/http-client": "<4.4",

‎src/Symfony/Component/Console/Tests/Command/ListCommandTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function testExecuteListsCommands()
2323
$commandTester = new CommandTester($command = $application->get('list'));
2424
$commandTester->execute(['command' => $command->getName()], ['decorated' => false]);
2525

26-
$this->assertMatchesRegularExpression('/help\s{2,}Displays help for a command/', $commandTester->getDisplay(), '->execute() returns a list of available commands');
26+
$this->assertMatchesRegularExpression('/help\s{2,}Display help for a command/', $commandTester->getDisplay(), '->execute() returns a list of available commands');
2727
}
2828

2929
public function testExecuteListsCommandsWithXmlOption()
@@ -40,8 +40,8 @@ public function testExecuteListsCommandsWithRawOption()
4040
$commandTester = new CommandTester($command = $application->get('list'));
4141
$commandTester->execute(['command' => $command->getName(), '--raw' => true]);
4242
$output = <<<'EOF'
43-
help Displays help for a command
44-
list Lists commands
43+
help Display help for a command
44+
list List commands
4545

4646
EOF;
4747

@@ -85,8 +85,8 @@ public function testExecuteListsCommandsOrder()
8585
-v|vv|vvv, --verbose Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
8686
8787
Available commands:
88-
help Displays help for a command
89-
list Lists commands
88+
help Display help for a command
89+
list List commands
9090
0foo
9191
0foo:bar 0foo:bar command
9292
EOF;
@@ -102,8 +102,8 @@ public function testExecuteListsCommandsOrderRaw()
102102
$commandTester = new CommandTester($command = $application->get('list'));
103103
$commandTester->execute(['command' => $command->getName(), '--raw' => true]);
104104
$output = <<<'EOF'
105-
help Displays help for a command
106-
list Lists commands
105+
help Display help for a command
106+
list List commands
107107
0foo:bar 0foo:bar command
108108
EOF;
109109

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"usage": [
77
"help [--format FORMAT] [--raw] [--] [<command_name>]"
88
],
9-
"description": "Displays help for a command",
9+
"description": "Display help for a command",
1010
"help": "The <info>help<\/info> command displays help for a given command:\n\n <info>app\/console help list<\/info>\n\nYou can also output the help in other formats by using the <comment>--format<\/comment> option:\n\n <info>app\/console help --format=xml list<\/info>\n\nTo display the list of available commands, please use the <info>list<\/info> command.",
1111
"definition": {
1212
"arguments": {
@@ -109,7 +109,7 @@
109109
"usage": [
110110
"list [--raw] [--format FORMAT] [--short] [--] [<namespace>]"
111111
],
112-
"description": "Lists commands",
112+
"description": "List commands",
113113
"help": "The <info>list<\/info> command lists all commands:\n\n <info>app\/console list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n <info>app\/console list test<\/info>\n\nYou can also output the information in other formats by using the <comment>--format<\/comment> option:\n\n <info>app\/console list --format=xml<\/info>\n\nIt's also possible to get raw list of commands (useful for embedding command runner):\n\n <info>app\/console list --raw<\/info>",
114114
"definition": {
115115
"arguments": {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Console Tool
77
`help`
88
------
99

10-
Displays help for a command
10+
Display help for a command
1111

1212
### Usage
1313

@@ -118,7 +118,7 @@ Do not ask any interactive question
118118
`list`
119119
------
120120

121-
Lists commands
121+
List commands
122122

123123
### Usage
124124

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ Console Tool
1212
<info>-v|vv|vvv, --verbose</info> Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
1313

1414
<comment>Available commands:</comment>
15-
<info>help</info> Displays help for a command
16-
<info>list</info> Lists commands
15+
<info>help</info> Display help for a command
16+
<info>list</info> List commands

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<usages>
66
<usage>help [--format FORMAT] [--raw] [--] [&lt;command_name&gt;]</usage>
77
</usages>
8-
<description>Displays help for a command</description>
8+
<description>Display help for a command</description>
99
<help>The &lt;info&gt;help&lt;/info&gt; command displays help for a given command:
1010

1111
&lt;info&gt;app/console help list&lt;/info&gt;
@@ -60,7 +60,7 @@
6060
<usages>
6161
<usage>list [--raw] [--format FORMAT] [--short] [--] [&lt;namespace&gt;]</usage>
6262
</usages>
63-
<description>Lists commands</description>
63+
<description>List commands</description>
6464
<help>The &lt;info&gt;list&lt;/info&gt; command lists all commands:
6565

6666
&lt;info&gt;app/console list&lt;/info&gt;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"usage": [
1111
"help [--format FORMAT] [--raw] [--] [<command_name>]"
1212
],
13-
"description": "Displays help for a command",
13+
"description": "Display help for a command",
1414
"help": "The <info>help<\/info> command displays help for a given command:\n\n <info>app\/console help list<\/info>\n\nYou can also output the help in other formats by using the <comment>--format<\/comment> option:\n\n <info>app\/console help --format=xml list<\/info>\n\nTo display the list of available commands, please use the <info>list<\/info> command.",
1515
"definition": {
1616
"arguments": {
@@ -113,7 +113,7 @@
113113
"usage": [
114114
"list [--raw] [--format FORMAT] [--short] [--] [<namespace>]"
115115
],
116-
"description": "Lists commands",
116+
"description": "List commands",
117117
"help": "The <info>list<\/info> command lists all commands:\n\n <info>app\/console list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n <info>app\/console list test<\/info>\n\nYou can also output the information in other formats by using the <comment>--format<\/comment> option:\n\n <info>app\/console list --format=xml<\/info>\n\nIt's also possible to get raw list of commands (useful for embedding command runner):\n\n <info>app\/console list --raw<\/info>",
118118
"definition": {
119119
"arguments": {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ My Symfony application v1.0
2020
`help`
2121
------
2222

23-
Displays help for a command
23+
Display help for a command
2424

2525
### Usage
2626

@@ -131,7 +131,7 @@ Do not ask any interactive question
131131
`list`
132132
------
133133

134-
Lists commands
134+
List commands
135135

136136
### Usage
137137

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ My Symfony application <info>v1.0</info>
1212
<info>-v|vv|vvv, --verbose</info> Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
1313

1414
<comment>Available commands:</comment>
15-
<info>help</info> Displays help for a command
16-
<info>list</info> Lists commands
15+
<info>help</info> Display help for a command
16+
<info>list</info> List commands
1717
<comment>descriptor</comment>
1818
<info>descriptor:command1</info> [alias1|alias2] command 1 description
1919
<info>descriptor:command2</info> command 2 description

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<usages>
66
<usage>help [--format FORMAT] [--raw] [--] [&lt;command_name&gt;]</usage>
77
</usages>
8-
<description>Displays help for a command</description>
8+
<description>Display help for a command</description>
99
<help>The &lt;info&gt;help&lt;/info&gt; command displays help for a given command:
1010

1111
&lt;info&gt;app/console help list&lt;/info&gt;
@@ -60,7 +60,7 @@
6060
<usages>
6161
<usage>list [--raw] [--format FORMAT] [--short] [--] [&lt;namespace&gt;]</usage>
6262
</usages>
63-
<description>Lists commands</description>
63+
<description>List commands</description>
6464
<help>The &lt;info&gt;list&lt;/info&gt; command lists all commands:
6565

6666
&lt;info&gt;app/console list&lt;/info&gt;

‎src/Symfony/Component/Console/Tests/Fixtures/application_mbstring.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ MbString åpplicätion
1111
`help`
1212
------
1313

14-
Displays help for a command
14+
Display help for a command
1515

1616
### Usage
1717

@@ -122,7 +122,7 @@ Do not ask any interactive question
122122
`list`
123123
------
124124

125-
Lists commands
125+
List commands
126126

127127
### Usage
128128

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MbString åpplicätion
1212
<info>-v|vv|vvv, --verbose</info> Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
1313

1414
<comment>Available commands:</comment>
15-
<info>help</info> Displays help for a command
16-
<info>list</info> Lists commands
15+
<info>help</info> Display help for a command
16+
<info>list</info> List commands
1717
<comment>descriptor</comment>
1818
<info>descriptor:åèä</info> command åèä description

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ Options:
1212
-v|vv|vvv, --verbose Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
1313

1414
Available commands:
15-
help Displays help for a command
16-
list Lists commands
15+
help Display help for a command
16+
list List commands

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Description:
2-
Lists commands
2+
List commands
33

44
Usage:
55
list [options] [--] [<namespace>]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Description:
2-
Lists commands
2+
List commands
33

44
Usage:
55
list [options] [--] [<namespace>]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Description:
2-
Displays help for a command
2+
Display help for a command
33

44
Usage:
55
help [options] [--] [<command_name>]

0 commit comments

Comments
 (0)
0