erge branch '3.1'

* 3.1:
  Remove trailing space
  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

Author: nicolas-grekas

Tests/Encoder/XmlEncoderTest.php

@@ -141,7 +141,7 @@ public function testEncodeXmlAttributes()
     public function testContext()
     {
         $array = array('person' => array('name' => 'George Abitbol'));
-        $expected = <<<XML
+        $expected = <<<'XML'
 <?xml version="1.0"?>
 <response>
   <person>
@@ -255,7 +255,7 @@ public function testEncodeTraversableWhenNormalizable()
         $serializer = new Serializer(array(new CustomNormalizer()), array('xml' => new XmlEncoder()));
         $this->encoder->setSerializer($serializer);
 
-        $expected = <<<XML
+        $expected = <<<'XML'
 <?xml version="1.0"?>
 <response><foo>normalizedFoo</foo><bar>normalizedBar</bar></response>
 
@@ -366,7 +366,7 @@ public function testDecodeArray()
 
     public function testDecodeIgnoreWhiteSpace()
     {
-        $source = <<<XML
+        $source = <<<'XML'
 <?xml version="1.0"?>
 <people>
     <person>

Tests/Normalizer/ObjectNormalizerTest.php

@@ -377,8 +377,8 @@ public function provideCallbacks()
             array(
                 array(
                     'bar' => function ($bar) {
-                            return 'baz';
-                        },
+                        return 'baz';
+                    },
                 ),
                 'baz',
                 array('foo' => '', 'bar' => 'baz', 'baz' => true),
@@ -387,8 +387,8 @@ public function provideCallbacks()
             array(
                 array(
                     'bar' => function ($bar) {
-                            return;
-                        },
+                        return;
+                    },
                 ),
                 'baz',
                 array('foo' => '', 'bar' => null, 'baz' => true),
@@ -397,8 +397,8 @@ public function provideCallbacks()
             array(
                 array(
                     'bar' => function ($bar) {
-                            return $bar->format('d-m-Y H:i:s');
-                        },
+                        return $bar->format('d-m-Y H:i:s');
+                    },
                 ),
                 new \DateTime('2011-09-10 06:30:00'),
                 array('foo' => '', 'bar' => '10-09-2011 06:30:00', 'baz' => true),
@@ -407,13 +407,13 @@ public function provideCallbacks()
             array(
                 array(
                     'bar' => function ($bars) {
-                            $foos = '';
-                            foreach ($bars as $bar) {
-                                $foos .= $bar->getFoo();
-                            }
+                        $foos = '';
+                        foreach ($bars as $bar) {
+                            $foos .= $bar->getFoo();
+                        }
 
-                            return $foos;
-                        },
+                        return $foos;
+                    },
                 ),
                 array(new ObjectConstructorDummy('baz', '', false), new ObjectConstructorDummy('quux', '', false)),
                 array('foo' => '', 'bar' => 'bazquux', 'baz' => true),
@@ -422,8 +422,8 @@ public function provideCallbacks()
             array(
                 array(
                     'bar' => function ($bars) {
-                            return count($bars);
-                        },
+                        return count($bars);
+                    },
                 ),
                 array(new ObjectConstructorDummy('baz', '', false), new ObjectConstructorDummy('quux', '', false)),
                 array('foo' => '', 'bar' => 2, 'baz' => true),