Merge branch '3.0' into 3.1

* 3.0:
  [CS] Respect PSR2 4.2
  [Form] fix `empty_data` option in expanded `ChoiceType`
  [Console] removed unneeded private methods
  [Security] [Guard] Improve comment with working example
  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

Author: fabpot

Command/LintCommand.php

@@ -65,18 +65,19 @@ protected function configure()
 The <info>%command.name%</info> command lints a template and outputs to STDOUT
 the first encountered syntax error.
 
-You can validate the syntax of a file:
+You can validate the syntax of contents passed from STDIN:
 
-<info>php %command.full_name% filename</info>
+  <info>cat filename | php %command.full_name%</info>
 
-Or of a whole directory:
+Or the syntax of a file:
+
+  <info>php %command.full_name% filename</info>
 
-<info>php %command.full_name% dirname</info>
-<info>php %command.full_name% dirname --format=json</info>
+Or of a whole directory:
 
-You can also pass the template contents from STDIN:
+  <info>php %command.full_name% dirname</info>
+  <info>php %command.full_name% dirname --format=json</info>
 
-<info>cat filename | php %command.full_name%</info>
 EOF
             )
         ;