8000 minor #40392 [Security][Console] Fix tests (chalasr) · symfony/symfony@d108141 · GitHub
[go: up one dir, main page]
Skip to content

Commit d108141

Browse files
chalasrchalasr
committed
minor #40392 [Security][Console] Fix tests (chalasr)
This PR was merged into the 4.4 branch. Discussion ---------- [Security][Console] Fix tests | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Commits ------- 415e019 [Console] Fix tests
2 parents 57fb475 + 415e019 commit d108141

17 files changed

+37
-34
lines changed

‎src/Symfony/Bridge/Doctrine/Tests/Security/User/EntityUserProviderTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,4 +234,7 @@ abstract class UserLoaderRepository implements ObjectRepository, UserLoaderInter
234234

235235
abstract class PasswordUpgraderRepository implements ObjectRepository, PasswordUpgraderInterface
236236
{
237+
public function upgradePassword(UserInterface $user, string $newEncodedPassword): void
238+
{
239+
}
237240
}

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

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

231231
$this->assertSame(0, $tester->getStatusCode());
232-
$display = explode('Lists commands', $tester->getDisplay());
232+
$display = explode('List commands', $tester->getDisplay());
233233

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"paragonie/sodium_compat": "^1.8",
3737
"symfony/asset": "^3.4|^4.0|^5.0",
3838
"symfony/browser-kit": "^4.3|^5.0",
39-
"symfony/console": "^4.3.4|^5.0",
39+
"symfony/console": "^4.4.21|^5.0",
4040
"symfony/css-selector": "^3.4|^4.0|^5.0",
4141
"symfony/dom-crawler": "^4.3|^5.0",
4242
"symfony/dotenv": "^4.3.6|^5.0",
@@ -72,7 +72,7 @@
7272
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
7373
"symfony/asset": "<3.4",
7474
"symfony/browser-kit": "<4.3",
75-
"symfony/console": "<4.3",
75+
"symfony/console": "<4.4.21",
7676
"symfony/dotenv": "<4.3.6",
7777
"symfony/dom-crawler": "<4.3",
7878
"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

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

‎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>php 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>php 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] [--] [<namespace>]"
111111
],
112-
"description": "Lists commands",
112+
"description": "List commands",
113113
"help": "The <info>list<\/info> command lists all commands:\n\n <info>php app\/console list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n <info>php 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>php 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>php app\/console list --raw<\/info>",
114114
"definition": {
115115
"arguments": {

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

Lines changed: 2 additions & 2 deletions
  • 10000
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

@@ -119,7 +119,7 @@ Do not ask any interactive question
119119
`list`
120120
------
121121

122-
Lists commands
122+
List commands
123123

124124
### Usage
125125

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

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

1515
<comment>Available commands:</comment>
16-
<info>help</info> Displays help for a command
17-
<info>list</info> Lists commands
16+
<info>help</info> Display help for a command
17+
<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;php app/console help list&lt;/info&gt;
@@ -60,7 +60,7 @@
6060
<usages>
6161
<usage>list [--raw] [--format FORMAT] [--] [&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;php 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>php 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>php 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] [--] [<namespace>]"
115115
],
116-
"description": "Lists commands",
116+
"description": "List commands",
117117
"help": "The <info>list<\/info> command lists all commands:\n\n <info>php app\/console list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n <info>php 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>php 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>php 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

@@ -132,7 +132,7 @@ Do not ask any interactive question
132132
`list`
133133
------
134134

135-
Lists commands
135+
List commands
136136

137137
### Usage
138138

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

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

1515
<comment>Available commands:</comment>
16-
<info>help</info> Displays help for a command
17-
<info>list</info> Lists commands
16+
<info>help</info> Display help for a command
17+
<info>list</info> List commands
1818
<comment>descriptor</comment>
1919
<info>descriptor:command1</info> [alias1|alias2] command 1 description
2020
<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;php app/console help list&lt;/info&gt;
@@ -60,7 +60,7 @@
6060
<usages>
6161
<usage>list [--raw] [--format FORMAT] [--] [&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;php 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

@@ -123,7 +123,7 @@ Do not ask any interactive question
123123
`list`
124124
------
125125

126-
Lists commands
126+
List commands
127127

128128
### Usage
129129

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

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

1515
<comment>Available commands:</comment>
16-
<info>help</info> Displays help for a command
17-
<info>list</info> Lists commands
16+
<info>help</info> Display help for a command
17+
<info>list</info> List commands
1818
<comment>descriptor</comment>
1919
<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
@@ -13,5 +13,5 @@ Options:
1313
-v|vv|vvv, --verbose Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
1414

1515
Available commands:
16-
help Displays help for a command
17-
list Lists commands
16+
help Display help for a command
17+
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>]

0 commit comments

Comments
 (0)
0