Merge branch '2.6' into 2.7

* 2.6: (25 commits)
  Added information when an error occured during validation of an answer of a question
  Adding note about known BC issues
  Adding note about the PdoSessionHandler BC break
  [Console] fixes some typos and phpdoc.
  fix phpdoc's alignment
  [2.6] CS Fixes And Removed An Unused Import
  Minor phpcs fixes
  [ClassLoader] Fix undefined index in ClassCollectionLoader
  CS fixes
  Revert "minor #12821 Remove deprecated class (MasterB)"
  [2.3] More cs fixes
  Removed unused imports
  CS fixes
  bumped Symfony version to 2.6.2
  updated VERSION for 2.6.1
  updated CHANGELOG for 2.6.1
  bumped Symfony version to 2.5.9
  updated VERSION for 2.5.8
  update CONTRIBUTORS for 2.5.8
  updated CHANGELOG for 2.5.8
  ...

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php

Author: fabpot

Encoder/XmlEncoder.php

@@ -129,17 +129,17 @@ public function decode($data, $format, array $context = array())
         return $data;
     }
 
-    /**
-     * {@inheritdoc}
-     */
+     /**
+      * {@inheritdoc}
+      */
      public function supportsEncoding($format)
      {
          return 'xml' === $format;
      }
 
      /**
-     * {@inheritdoc}
-     */
+      * {@inheritdoc}
+      */
      public function supportsDecoding($format)
      {
          return 'xml' === $format;

Normalizer/PropertyNormalizer.php

@@ -180,7 +180,7 @@ public function supportsDenormalization($data, $type, $format = null)
     /**
      * Format an attribute name, for example to convert a snake_case name to camelCase.
      *
-     * @param  string $attributeName
+     * @param string $attributeName
      *
      * @return string
      */

Tests/Normalizer/PropertyNormalizerTest.php

@@ -151,12 +151,12 @@ public function provideCallbacks()
             array(
                 array(
                     'bar' => function ($bar) {
-                        return null;
+                        return;
                     },
                 ),
                 'baz',
                 array('foo' => '', 'bar' => null),
-                'Null an item'
+                'Null an item',
             ),
             array(
                 array(

Tests/Normalizer/TestDenormalizer.php

@@ -21,15 +21,15 @@
 class TestDenormalizer implements DenormalizerInterface
 {
     /**
-    * {@inheritdoc}
-    */
+     * {@inheritdoc}
+     */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
     }
 
     /**
-    * {@inheritdoc}
-    */
+     * {@inheritdoc}
+     */
     public function supportsDenormalization($data, $type, $format = null)
     {
         return true;

Tests/Normalizer/TestNormalizer.php

@@ -21,15 +21,15 @@
 class TestNormalizer implements NormalizerInterface
 {
     /**
-    * {@inheritdoc}
-    */
+     * {@inheritdoc}
+     */
     public function normalize($object, $format = null, array $context = array())
     {
     }
 
     /**
-    * {@inheritdoc}
-    */
+     * {@inheritdoc}
+     */
     public function supportsNormalization($data, $format = null)
     {
         return true;