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

DataCollector/Util/ValueExporter.php

@@ -19,9 +19,9 @@ class ValueExporter
     /**
      * Converts a PHP value to a string.
      *
-     * @param mixed   $value The PHP value
-     * @param int     $depth only for internal usage
-     * @param bool    $deep  only for internal usage
+     * @param mixed $value The PHP value
+     * @param int   $depth only for internal usage
+     * @param bool  $deep  only for internal usage
      *
      * @return string The string representation of the given value
      */

Event/KernelEvent.php

@@ -90,7 +90,7 @@ public function getRequestType()
     /**
      * Checks if this is a master request.
      *
-     * @return bool    True if the request is a master request
+     * @return bool True if the request is a master request
      *
      * @api
      */

EventListener/DumpListener.php

@@ -28,8 +28,8 @@ class DumpListener implements EventSubscriberInterface
     private $dumper;
 
     /**
-     * @param ClonerInterface      $cloner    Cloner service.
-     * @param DataDumperInterface  $dumper    Dumper service.
+     * @param ClonerInterface     $cloner Cloner service.
+     * @param DataDumperInterface $dumper Dumper service.
      */
     public function __construct(ClonerInterface $cloner, DataDumperInterface $dumper)
     {

EventListener/ExceptionListener.php

@@ -104,7 +104,7 @@ protected function logException(\Exception $exception, $message, $original = tru
      * Clones the request for the exception.
      *
      * @param \Exception $exception The thrown exception.
-     * @param Request $request The original request.
+     * @param Request    $request   The original request.
      *
      * @return Request $request The cloned request.
      */

EventListener/SaveSessionListener.php

@@ -13,7 +13,6 @@
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
 
 /**

Exception/UnprocessableEntityHttpException.php

@@ -21,9 +21,9 @@ class UnprocessableEntityHttpException extends HttpException
     /**
      * Constructor.
      *
-     * @param string     $message   The internal exception message
-     * @param \Exception $previous  The previous exception
-     * @param int        $code      The internal exception code
+     * @param string     $message  The internal exception message
+     * @param \Exception $previous The previous exception
+     * @param int        $code     The internal exception code
      */
     public function __construct($message = null, \Exception $previous = null, $code = 0)
     {

HttpCache/Esi.php

@@ -73,7 +73,7 @@ public function hasSurrogateCapability(Request $request)
      *
      * @param Request $request A Request instance
      *
-     * @return bool    true if one surrogate has ESI/1.0 capability, false otherwise
+     * @return bool true if one surrogate has ESI/1.0 capability, false otherwise
      *
      * @deprecated Deprecated since version 2.6, to be removed in 3.0. Use hasSurrogateCapability() instead
      */
@@ -142,7 +142,7 @@ public function needsParsing(Response $response)
      *
      * @param Response $response A Response instance
      *
-     * @return bool    true if the Response needs to be parsed, false otherwise
+     * @return bool true if the Response needs to be parsed, false otherwise
      *
      * @deprecated Deprecated since version 2.6, to be removed in 3.0. Use needsParsing() instead
      */

HttpCache/HttpCache.php

@@ -167,6 +167,7 @@ public function getSurrogate()
      * Gets the Esi instance
      *
      * @throws \LogicException
+     *
      * @return Esi An Esi instance
      *
      * @deprecated Deprecated since version 2.6, to be removed in 3.0. Use getSurrogate() instead

HttpCache/SurrogateInterface.php

@@ -35,7 +35,7 @@ public function createCacheStrategy();
      *
      * @param Request $request A Request instance
      *
-     * @return bool    true if one surrogate has Surrogate capability, false otherwise
+     * @return bool true if one surrogate has Surrogate capability, false otherwise
      */
     public function hasSurrogateCapability(Request $request);
 
@@ -60,17 +60,17 @@ public function addSurrogateControl(Response $response);
      *
      * @param Response $response A Response instance
      *
-     * @return bool    true if the Response needs to be parsed, false otherwise
+     * @return bool true if the Response needs to be parsed, false otherwise
      */
     public function needsParsing(Response $response);
 
     /**
      * Renders a Surrogate tag.
      *
-     * @param string  $uri          A URI
-     * @param string  $alt          An alternate URI
-     * @param bool    $ignoreErrors Whether to ignore errors or not
-     * @param string  $comment      A comment to add as an esi:include tag
+     * @param string $uri          A URI
+     * @param string $alt          An alternate URI
+     * @param bool   $ignoreErrors Whether to ignore errors or not
+     * @param string $comment      A comment to add as an esi:include tag
      *
      * @return string
      */

Tests/Bundle/BundleTest.php

@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\HttpKernel\Tests\Bundle;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionAbsentBundle\ExtensionAbsentBundle;
 use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\Command\FooCommand;
 use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\ExtensionPresentBundle;