Merge branch '2.8' into 3.1

nicolas-grekas · nicolas-grekas · commit 2aedef0fa278 · 2016-11-03T09:04:31.000+01:00
* 2.8:
  CS fixes
  Remove trailing space
  CS: apply rules
  [Yaml] Clean some messages + add test case
  [Console] simplified code
  [Form] Fix UrlType transforms valid protocols
  [SecurityBundle] Changed encoder configuration example to bcrypt
diff --git a/Command/ConfigDebugCommand.php b/Command/ConfigDebugCommand.php
@@ -36,7 +36,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.
 
diff --git a/Command/EventDispatcherDebugCommand.php b/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>
diff --git a/Command/ServerStartCommand.php b/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>
diff --git a/Command/ServerStopCommand.php b/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>
diff --git a/Command/TranslationDebugCommand.php b/Command/TranslationDebugCommand.php
@@ -50,7 +50,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.
diff --git a/Command/YamlLintCommand.php b/Command/YamlLintCommand.php
@@ -34,7 +34,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.
 
diff --git a/Resources/views/Form/number_widget.html.php b/Resources/views/Form/number_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple',  array('type' => isset($type) ? $type : 'text')) ?>
+<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'text')) ?>
diff --git a/Resources/views/Form/password_widget.html.php b/Resources/views/Form/password_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple',  array('type' => isset($type) ? $type : 'password')) ?>
+<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'password')) ?>
diff --git a/Resources/views/Form/percent_widget.html.php b/Resources/views/Form/percent_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple',  array('type' => isset($type) ? $type : 'text')) ?> %
+<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'text')) ?> %
diff --git a/Resources/views/Form/reset_widget.html.php b/Resources/views/Form/reset_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'button_widget',  array('type' => isset($type) ? $type : 'reset')) ?>
+<?php echo $view['form']->block($form, 'button_widget', array('type' => isset($type) ? $type : 'reset')) ?>
diff --git a/Resources/views/Form/search_widget.html.php b/Resources/views/Form/search_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple',  array('type' => isset($type) ? $type : 'search')) ?>
+<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'search')) ?>
diff --git a/Resources/views/Form/submit_widget.html.php b/Resources/views/Form/submit_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'button_widget',  array('type' => isset($type) ? $type : 'submit')) ?>
+<?php echo $view['form']->block($form, 'button_widget', array('type' => isset($type) ? $type : 'submit')) ?>
diff --git a/Resources/views/Form/url_widget.html.php b/Resources/views/Form/url_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple',  array('type' => isset($type) ? $type : 'url')) ?>
+<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'url')) ?>
diff --git a/Routing/Router.php b/Routing/Router.php
@@ -160,7 +160,6 @@ private function resolve($value)
                 gettype($resolved)
                 )
             );
-
         }, $value);
 
         return str_replace('%%', '%', $escapedValue);
diff --git a/Tests/Command/RouterMatchCommandTest.php b/Tests/Command/RouterMatchCommandTest.php
@@ -88,7 +88,6 @@ private function getContainer()
             ->will($this->returnValueMap(array(
                 array('router', 1, $router),
                 array('controller_name_converter', 1, $loader),
-
             )));
 
         return $container;
diff --git a/Tests/Command/TranslationDebugCommandTest.php b/Tests/Command/TranslationDebugCommandTest.php
@@ -136,7 +136,7 @@ private function getContainer($extractedMessages = array(), $loadedMessages = ar
             ->method('extract')
             ->will(
                 $this->returnCallback(function ($path, $catalogue) use ($extractedMessages) {
-                  $catalogue->add($extractedMessages);
+                    $catalogue->add($extractedMessages);
                 })
             );
 
@@ -146,7 +146,7 @@ private function getContainer($extractedMessages = array(), $loadedMessages = ar
             ->method('loadMessages')
             ->will(
                 $this->returnCallback(function ($path, $catalogue) use ($loadedMessages) {
-                  $catalogue->add($loadedMessages);
+                    $catalogue->add($loadedMessages);
                 })
             );
 
diff --git a/Tests/Command/TranslationUpdateCommandTest.php b/Tests/Command/TranslationUpdateCommandTest.php
@@ -91,7 +91,7 @@ private function getContainer($extractedMessages = array(), $loadedMessages = ar
             ->method('extract')
             ->will(
                 $this->returnCallback(function ($path, $catalogue) use ($extractedMessages) {
-                  $catalogue->add($extractedMessages);
+                    $catalogue->add($extractedMessages);
                 })
             );
 
@@ -101,7 +101,7 @@ private function getContainer($extractedMessages = array(), $loadedMessages = ar
             ->method('loadMessages')
             ->will(
                 $this->returnCallback(function ($path, $catalogue) use ($loadedMessages) {
-                  $catalogue->add($loadedMessages);
+                    $catalogue->add($loadedMessages);
                 })
             );
 
diff --git a/Tests/Console/Descriptor/AbstractDescriptorTest.php b/Tests/Console/Descriptor/AbstractDescriptorTest.php
@@ -129,6 +129,7 @@ public function getDescribeCallableTestData()
     }
 
     abstract protected function getDescriptor();
+
     abstract protected function getFormat();
 
     private function assertDescription($expectedDescription, $describedObject, array $options = array())
diff --git a/Tests/Console/Descriptor/ObjectsProvider.php b/Tests/Console/Descriptor/ObjectsProvider.php
@@ -158,9 +158,11 @@ class CallableClass
     public function __invoke()
     {
     }
+
     public static function staticMethod()
     {
     }
+
     public function method()
     {
     }
diff --git a/Tests/Fixtures/Resources/views/translation.html.php b/Tests/Fixtures/Resources/views/translation.html.php
@@ -1,7 +1,7 @@
 This template is used for translation message extraction tests
 <?php echo $view['translator']->trans('single-quoted key') ?>
 <?php echo $view['translator']->trans('double-quoted key') ?>
-<?php echo $view['translator']->trans(<<<EOF
+<?php echo $view['translator']->trans(<<<'EOF'
 heredoc key
 EOF
 ) ?>

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'text')) ?>`
	`1`	`+<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'text')) ?>`