Skip to content

Commit 5dbf982

Browse files
minor #33523 Fix lint commands frozen on empty stdin (chalasr)
This PR was merged into the 4.4 branch. Discussion ---------- Fix lint commands frozen on empty stdin | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Running e.g. `lint:yaml -` with no piped content makes the command hangs currently, this makes it fail instead. Also fixes the command help which we forgot to update Commits ------- b60e0c1454 Fix lint commands frozen on empty stdin
2 parents 99b57c7 + 514f481 commit 5dbf982

File tree

2 files changed

+2
-36
lines changed

2 files changed

+2
-36
lines changed

Tests/Command/XliffLintCommandTest.php

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,29 +35,12 @@ public function testGetHelp()
3535
{
3636
$command = new XliffLintCommand();
3737
$expected = <<<EOF
38-
The <info>%command.name%</info> command lints a XLIFF file and outputs to STDOUT
39-
the first encountered syntax error.
40-
41-
You can validates XLIFF contents passed from STDIN:
42-
43-
<info>cat filename | php %command.full_name%</info>
44-
45-
You can also validate the syntax of a file:
46-
47-
<info>php %command.full_name% filename</info>
48-
49-
Or of a whole directory:
50-
51-
<info>php %command.full_name% dirname</info>
52-
<info>php %command.full_name% dirname --format=json</info>
53-
5438
Or find all files in a bundle:
5539
5640
<info>php %command.full_name% @AcmeDemoBundle</info>
57-
5841
EOF;
5942

60-
$this->assertEquals($expected, $command->getHelp());
43+
$this->assertStringContainsString($expected, $command->getHelp());
6144
}
6245

6346
public function testLintFilesFromBundleDirectory()

Tests/Command/YamlLintCommandTest.php

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -72,29 +72,12 @@ public function testGetHelp()
7272
{
7373
$command = new YamlLintCommand();
7474
$expected = <<<EOF
75-
The <info>%command.name%</info> command lints a YAML file and outputs to STDOUT
76-
the first encountered syntax error.
77-
78-
You can validates YAML contents passed from STDIN:
79-
80-
<info>cat filename | php %command.full_name%</info>
81-
82-
You can also validate the syntax of a file:
83-
84-
<info>php %command.full_name% filename</info>
85-
86-
Or of a whole directory:
87-
88-
<info>php %command.full_name% dirname</info>
89-
<info>php %command.full_name% dirname --format=json</info>
90-
9175
Or find all files in a bundle:
9276
9377
<info>php %command.full_name% @AcmeDemoBundle</info>
94-
9578
EOF;
9679

97-
$this->assertEquals($expected, $command->getHelp());
80+
$this->assertStringContainsString($expected, $command->getHelp());
9881
}
9982

10083
public function testLintFilesFromBundleDirectory()

0 commit comments

Comments
 (0)