[2.6] CS Fixes And Removed An Unused Import

Author: GrahamCampbell

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)
     {

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/DataCollector/DumpDataCollectorTest.php

@@ -29,7 +29,8 @@ public function testDump()
 
         $this->assertSame('dump', $collector->getName());
 
-        $collector->dump($data); $line = __LINE__;
+        $collector->dump($data);
+        $line = __LINE__;
         $this->assertSame(1, $collector->getDumpsCount());
 
         $dump = $collector->getDumps('html');
@@ -61,7 +62,8 @@ public function testFlush()
     {
         $data = new Data(array(array(456)));
         $collector = new DumpDataCollector();
-        $collector->dump($data); $line = __LINE__;
+        $collector->dump($data);
+        $line = __LINE__;
 
         ob_start();
         $collector = null;