Merge branch '2.7' into 2.8

* 2.7:
  CS fixes
  Remove trailing space
  CS: apply rules
  [Yaml] Clean some messages + add test case
  [Form] Fix UrlType transforms valid protocols
  [SecurityBundle] Changed encoder configuration example to bcrypt

Author: nicolas-grekas

src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php

@@ -138,7 +138,6 @@ public function configureOptions(OptionsResolver $resolver)
         $type = $this;
 
         $choiceLoader = function (Options $options) use ($choiceListFactory, &$choiceLoaders, $type) {
-
             // Unless the choices are given explicitly, load them on demand
             if (null === $options['choices']) {
                 $hash = null;

src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php

@@ -44,7 +44,7 @@ protected function setUp()
         $this->extension->expects($this->any())
             ->method('getObjectManagerElementName')
             ->will($this->returnCallback(function ($name) {
-                 return 'doctrine.orm.'.$name;
+                return 'doctrine.orm.'.$name;
             }));
     }
 

src/Symfony/Bridge/Twig/Command/DebugCommand.php

@@ -61,7 +61,7 @@ protected function configure()
                 new InputOption('format', null, InputOption::VALUE_REQUIRED, 'The output format (text or json)', 'text'),
             ))
             ->setDescription('Shows a list of twig functions, filters, globals and tests')
-            ->setHelp(<<<EOF
+            ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command outputs a list of twig functions,
 filters, globals and tests. Output can be filtered with an optional argument.
 

src/Symfony/Bridge/Twig/Command/LintCommand.php

@@ -62,7 +62,7 @@ protected function configure()
             ->setDescription('Lints a template and outputs encountered errors')
             ->addOption('format', null, InputOption::VALUE_REQUIRED, 'The output format', 'txt')
             ->addArgument('filename', InputArgument::IS_ARRAY)
-            ->setHelp(<<<EOF
+            ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command lints a template and outputs to STDOUT
 the first encountered syntax error.
 

src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php

@@ -39,7 +39,7 @@ protected function configure()
                 new InputArgument('name', InputArgument::OPTIONAL, 'The bundle name or the extension alias'),
             ))
             ->setDescription('Dumps the current configuration for an extension')
-            ->setHelp(<<<EOF
+            ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command dumps the current configuration for an
 extension/bundle.
 

src/Symfony/Bundle/FrameworkBundle/Command/EventDispatcherDebugCommand.php

@@ -39,7 +39,7 @@ protected function configure()
                 new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw description'),
             ))
             ->setDescription('Displays configured listeners for an application')
-            ->setHelp(<<<EOF
+            ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command displays all configured listeners:
 
   <info>php %command.full_name%</info>

src/Symfony/Bundle/FrameworkBundle/Command/ServerStartCommand.php

@@ -41,7 +41,7 @@ protected function configure()
             ))
             ->setName('server:start')
             ->setDescription('Starts PHP built-in web server in the background')
-            ->setHelp(<<<EOF
+            ->setHelp(<<<'EOF'
 The <info>%command.name%</info> runs PHP's built-in web server:
 
   <info>php %command.full_name%</info>

src/Symfony/Bundle/FrameworkBundle/Command/ServerStopCommand.php

@@ -36,7 +36,7 @@ protected function configure()
             ))
             ->setName('server:stop')
             ->setDescription('Stops PHP\'s built-in web server that was started with the server:start command')
-            ->setHelp(<<<EOF
+            ->setHelp(<<<'EOF'
 The <info>%command.name%</info> stops PHP's built-in web server:
 
   <info>php %command.full_name%</info>

src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php

@@ -53,7 +53,7 @@ protected function configure()
                 new InputOption('all', null, InputOption::VALUE_NONE, 'Load messages from all registered bundles'),
             ))
             ->setDescription('Displays translation messages information')
-            ->setHelp(<<<EOF
+            ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command helps finding unused or missing translation
 messages and comparing them with the fallback ones by inspecting the
 templates and translation files of a given bundle or the app folder.

src/Symfony/Bundle/FrameworkBundle/Command/YamlLintCommand.php

@@ -35,7 +35,7 @@ protected function configure()
             ->setDescription('Lints a file and outputs encountered errors')
             ->addArgument('filename', null, 'A file or a directory or STDIN')
             ->addOption('format', null, InputOption::VALUE_REQUIRED, 'The output format', 'txt')
-            ->setHelp(<<<EOF
+            ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command lints a YAML file and outputs to STDOUT
 the first encountered syntax error.