Skip to content

Commit feaed97

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: [CS] Respect PSR2 4.2 [Form] fix `empty_data` option in expanded `ChoiceType` [Console] removed unneeded private methods sync min email validator version [TwigBridge] Fix inconsistency in LintCommand help explicitly forbid e-mail validator 2.0 or higher Fixed SymfonyQuestionHelper multi-choice with defaults [DoctrineBridge] Don't use object IDs in DoctrineChoiceLoader when passing a value closure Differentiate between the first time a progress bar is displayed and subsequent times finished previous commit No more exception for malformed input name fix post_max_size_message translation [Process] Fix pipes cleaning on Windows Avoid phpunit 5.4 warnings on getMock [Form] Add exception to FormRenderer about non-unique block names [Form] Consider a violation even if the form is not submitted
2 parents 360f333 + bc7fdd2 commit feaed97

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

Command/LintCommand.php

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,18 +66,19 @@ protected function configure()
6666
The <info>%command.name%</info> command lints a template and outputs to STDOUT
6767
the first encountered syntax error.
6868
69-
You can validate the syntax of a file:
69+
You can validate the syntax of contents passed from STDIN:
7070
71-
<info>php %command.full_name% filename</info>
71+
<info>cat filename | php %command.full_name%</info>
7272
73-
Or of a whole directory:
73+
Or the syntax of a file:
74+
75+
<info>php %command.full_name% filename</info>
7476
75-
<info>php %command.full_name% dirname</info>
76-
<info>php %command.full_name% dirname --format=json</info>
77+
Or of a whole directory:
7778
78-
You can also pass the template contents from STDIN:
79+
<info>php %command.full_name% dirname</info>
80+
<info>php %command.full_name% dirname --format=json</info>
7981
80-
<info>cat filename | php %command.full_name%</info>
8182
EOF
8283
)
8384
;

0 commit comments

Comments
 (0)