Fix CS

fabpot · fabpot · commit eefc100b1d93 · 2022-07-20T11:59:04.000+02:00
diff --git a/Config/FileLocator.php b/Config/FileLocator.php
@@ -28,7 +28,7 @@ class FileLocator extends BaseFileLocator
      */
     private $path;
 
-    public function __construct(KernelInterface $kernel/*, string $path = null, array $paths = [], bool $triggerDeprecation = true*/)
+    public function __construct(KernelInterface $kernel/* , string $path = null, array $paths = [], bool $triggerDeprecation = true */)
     {
         $this->kernel = $kernel;
 
diff --git a/DataCollector/AjaxDataCollector.php b/DataCollector/AjaxDataCollector.php
@@ -28,7 +28,7 @@ class AjaxDataCollector extends DataCollector
      *
      * @param \Throwable|null $exception
      */
-    public function collect(Request $request, Response $response/*, \Throwable $exception = null*/)
+    public function collect(Request $request, Response $response/* , \Throwable $exception = null */)
     {
         // all collecting is done client side
     }
diff --git a/DataCollector/ConfigDataCollector.php b/DataCollector/ConfigDataCollector.php
@@ -57,7 +57,7 @@ public function setKernel(KernelInterface $kernel = null)
      *
      * @param \Throwable|null $exception
      */
-    public function collect(Request $request, Response $response/*, \Throwable $exception = null*/)
+    public function collect(Request $request, Response $response/* , \Throwable $exception = null */)
     {
         $eom = \DateTime::createFromFormat('d/m/Y', '01/'.Kernel::END_OF_MAINTENANCE);
         $eol = \DateTime::createFromFormat('d/m/Y', '01/'.Kernel::END_OF_LIFE);
diff --git a/DataCollector/DataCollectorInterface.php b/DataCollector/DataCollectorInterface.php
@@ -27,7 +27,7 @@ interface DataCollectorInterface extends ResetInterface
      *
      * @param \Throwable|null $exception
      */
-    public function collect(Request $request, Response $response/*, \Throwable $exception = null*/);
+    public function collect(Request $request, Response $response/* , \Throwable $exception = null */);
 
     /**
      * Returns the name of the collector.
diff --git a/DataCollector/DumpDataCollector.php b/DataCollector/DumpDataCollector.php
@@ -105,7 +105,7 @@ public function dump(Data $data)
      *
      * @param \Throwable|null $exception
      */
-    public function collect(Request $request, Response $response/*, \Throwable $exception = null*/)
+    public function collect(Request $request, Response $response/* , \Throwable $exception = null */)
     {
         if (!$this->dataCount) {
             $this->data = [];
diff --git a/DataCollector/EventDataCollector.php b/DataCollector/EventDataCollector.php
@@ -43,7 +43,7 @@ public function __construct(EventDispatcherInterface $dispatcher = null, Request
      *
      * @param \Throwable|null $exception
      */
-    public function collect(Request $request, Response $response/*, \Throwable $exception = null*/)
+    public function collect(Request $request, Response $response/* , \Throwable $exception = null */)
     {
         $this->currentRequest = $this->requestStack && $this->requestStack->getMasterRequest() !== $request ? $request : null;
         $this->data = [
diff --git a/DataCollector/ExceptionDataCollector.php b/DataCollector/ExceptionDataCollector.php
@@ -29,7 +29,7 @@ class ExceptionDataCollector extends DataCollector
      *
      * @param \Throwable|null $exception
      */
-    public function collect(Request $request, Response $response/*, \Throwable $exception = null*/)
+    public function collect(Request $request, Response $response/* , \Throwable $exception = null */)
     {
         $exception = 2 < \func_num_args() ? func_get_arg(2) : null;
 
diff --git a/DataCollector/LoggerDataCollector.php b/DataCollector/LoggerDataCollector.php
@@ -44,7 +44,7 @@ public function __construct($logger = null, string $containerPathPrefix = null,
      *
      * @param \Throwable|null $exception
      */
-    public function collect(Request $request, Response $response/*, \Throwable $exception = null*/)
+    public function collect(Request $request, Response $response/* , \Throwable $exception = null */)
     {
         $this->currentRequest = $this->requestStack && $this->requestStack->getMasterRequest() !== $request ? $request : null;
     }
diff --git a/DataCollector/MemoryDataCollector.php b/DataCollector/MemoryDataCollector.php
@@ -33,7 +33,7 @@ public function __construct()
      *
      * @param \Throwable|null $exception
      */
-    public function collect(Request $request, Response $response/*, \Throwable $exception = null*/)
+    public function collect(Request $request, Response $response/* , \Throwable $exception = null */)
     {
         $this->updateMemoryUsage();
     }
@@ -114,8 +114,11 @@ private function convertToBytes(string $memoryLimit)
 
         switch (substr($memoryLimit, -1)) {
             case 't': $max *= 1024;
+            // no break
             case 'g': $max *= 1024;
+            // no break
             case 'm': $max *= 1024;
+            // no break
             case 'k': $max *= 1024;
         }
 
diff --git a/DataCollector/RequestDataCollector.php b/DataCollector/RequestDataCollector.php
@@ -39,7 +39,7 @@ public function __construct()
      *
      * @param \Throwable|null $exception
      */
-    public function collect(Request $request, Response $response/*, \Throwable $exception = null*/)
+    public function collect(Request $request, Response $response/* , \Throwable $exception = null */)
     {
         // attributes are serialized and as they can be anything, they need to be converted to strings.
         $attributes = [];
diff --git a/DataCollector/RouterDataCollector.php b/DataCollector/RouterDataCollector.php
@@ -38,7 +38,7 @@ public function __construct()
      *
      * @final since Symfony 4.4
      */
-    public function collect(Request $request, Response $response/*, \Throwable $exception = null*/)
+    public function collect(Request $request, Response $response/* , \Throwable $exception = null */)
     {
         if ($response instanceof RedirectResponse) {
             $this->data['redirect'] = true;
diff --git a/DataCollector/TimeDataCollector.php b/DataCollector/TimeDataCollector.php
@@ -38,7 +38,7 @@ public function __construct(KernelInterface $kernel = null, Stopwatch $stopwatch
      *
      * @param \Throwable|null $exception
      */
-    public function collect(Request $request, Response $response/*, \Throwable $exception = null*/)
+    public function collect(Request $request, Response $response/* , \Throwable $exception = null */)
     {
         if (null !== $this->kernel) {
             $startTime = $this->kernel->getStartTime();
diff --git a/Kernel.php b/Kernel.php
@@ -237,7 +237,7 @@ public function getBundle($name)
     /**
      * {@inheritdoc}
      */
-    public function locateResource($name/*, $dir = null, $first = true, $triggerDeprecation = true*/)
+    public function locateResource($name/* , $dir = null, $first = true, $triggerDeprecation = true */)
     {
         if (2 <= \func_num_args()) {
             $dir = func_get_arg(1);
diff --git a/KernelInterface.php b/KernelInterface.php
@@ -87,7 +87,7 @@ public function getBundle($name);
      * @throws \InvalidArgumentException if the file cannot be found or the name is not valid
      * @throws \RuntimeException         if the name contains invalid/unsafe characters
      */
-    public function locateResource($name/*, $dir = null, $first = true*/);
+    public function locateResource($name/* , $dir = null, $first = true */);
 
     /**
      * Gets the name of the kernel.
diff --git a/Profiler/Profiler.php b/Profiler/Profiler.php
@@ -143,7 +143,7 @@ public function find($ip, $url, $limit, $method, $start, $end, $statusCode = nul
      *
      * @return Profile|null A Profile instance or null if the profiler is disabled
      */
-    public function collect(Request $request, Response $response/*, \Throwable $exception = null*/)
+    public function collect(Request $request, Response $response/* , \Throwable $exception = null */)
     {
         $exception = 2 < \func_num_args() ? func_get_arg(2) : null;
 
diff --git a/Tests/EventListener/SessionListenerTest.php b/Tests/EventListener/SessionListenerTest.php
@@ -87,7 +87,7 @@ public function testResponseIsPrivateIfSessionStarted()
         $this->assertTrue($response->headers->hasCacheControlDirective('private'));
         $this->assertTrue($response->headers->hasCacheControlDirective('must-revalidate'));
         $this->assertSame('0', $response->headers->getCacheControlDirective('max-age'));
-        $this->assertLessThanOrEqual((new \DateTime('now', new \DateTimeZone('UTC'))), (new \DateTime($response->headers->get('Expires'))));
+        $this->assertLessThanOrEqual(new \DateTime('now', new \DateTimeZone('UTC')), new \DateTime($response->headers->get('Expires')));
         $this->assertFalse($response->headers->has(AbstractSessionListener::NO_AUTO_CACHE_CONTROL_HEADER));
     }
 
@@ -193,7 +193,7 @@ public function testSurrogateMasterRequestIsPublic()
         $this->assertSame('0', $response->headers->getCacheControlDirective('max-age'));
 
         $this->assertTrue($response->headers->has('Expires'));
-        $this->assertLessThanOrEqual((new \DateTime('now', new \DateTimeZone('UTC'))), (new \DateTime($response->headers->get('Expires'))));
+        $this->assertLessThanOrEqual(new \DateTime('now', new \DateTimeZone('UTC')), new \DateTime($response->headers->get('Expires')));
     }
 
     public function testGetSessionIsCalledOnce()

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class FileLocator extends BaseFileLocator`
`28`	`28`	`*/`
`29`	`29`	`private $path;`
`30`	`30`
`31`		`- public function __construct(KernelInterface $kernel/, string $path = null, array $paths = [], bool $triggerDeprecation = true/)`
	`31`	`+ public function __construct(KernelInterface $kernel/* , string $path = null, array $paths = [], bool $triggerDeprecation = true */)`
`32`	`32`	`{`
`33`	`33`	`$this->kernel = $kernel;`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class AjaxDataCollector extends DataCollector`
`28`	`28`	`*`
`29`	`29`	`* @param \Throwable\|null $exception`
`30`	`30`	`*/`
`31`		`- public function collect(Request $request, Response $response/, \Throwable $exception = null/)`
	`31`	`+ public function collect(Request $request, Response $response/* , \Throwable $exception = null */)`
`32`	`32`	`{`
`33`	`33`	`// all collecting is done client side`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function setKernel(KernelInterface $kernel = null)`
`57`	`57`	`*`
`58`	`58`	`* @param \Throwable\|null $exception`
`59`	`59`	`*/`
`60`		`- public function collect(Request $request, Response $response/, \Throwable $exception = null/)`
	`60`	`+ public function collect(Request $request, Response $response/* , \Throwable $exception = null */)`
`61`	`61`	`{`
`62`	`62`	`$eom = \DateTime::createFromFormat('d/m/Y', '01/'.Kernel::END_OF_MAINTENANCE);`
`63`	`63`	`$eol = \DateTime::createFromFormat('d/m/Y', '01/'.Kernel::END_OF_LIFE);`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ interface DataCollectorInterface extends ResetInterface`
`27`	`27`	`*`
`28`	`28`	`* @param \Throwable\|null $exception`
`29`	`29`	`*/`
`30`		`- public function collect(Request $request, Response $response/, \Throwable $exception = null/);`
	`30`	`+ public function collect(Request $request, Response $response/* , \Throwable $exception = null */);`
`31`	`31`
`32`	`32`	`/**`
`33`	`33`	`* Returns the name of the collector.`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public function dump(Data $data)`
`105`	`105`	`*`
`106`	`106`	`* @param \Throwable\|null $exception`
`107`	`107`	`*/`
`108`		`- public function collect(Request $request, Response $response/, \Throwable $exception = null/)`
	`108`	`+ public function collect(Request $request, Response $response/* , \Throwable $exception = null */)`
`109`	`109`	`{`
`110`	`110`	`if (!$this->dataCount) {`
`111`	`111`	`$this->data = [];`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function __construct(EventDispatcherInterface $dispatcher = null, Request`
`43`	`43`	`*`
`44`	`44`	`* @param \Throwable\|null $exception`
`45`	`45`	`*/`
`46`		`- public function collect(Request $request, Response $response/, \Throwable $exception = null/)`
	`46`	`+ public function collect(Request $request, Response $response/* , \Throwable $exception = null */)`
`47`	`47`	`{`
`48`	`48`	`$this->currentRequest = $this->requestStack && $this->requestStack->getMasterRequest() !== $request ? $request : null;`
`49`	`49`	`$this->data = [`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class ExceptionDataCollector extends DataCollector`
`29`	`29`	`*`
`30`	`30`	`* @param \Throwable\|null $exception`
`31`	`31`	`*/`
`32`		`- public function collect(Request $request, Response $response/, \Throwable $exception = null/)`
	`32`	`+ public function collect(Request $request, Response $response/* , \Throwable $exception = null */)`
`33`	`33`	`{`
`34`	`34`	`$exception = 2 < \func_num_args() ? func_get_arg(2) : null;`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function __construct($logger = null, string $containerPathPrefix = null,`
`44`	`44`	`*`
`45`	`45`	`* @param \Throwable\|null $exception`
`46`	`46`	`*/`
`47`		`- public function collect(Request $request, Response $response/, \Throwable $exception = null/)`
	`47`	`+ public function collect(Request $request, Response $response/* , \Throwable $exception = null */)`
`48`	`48`	`{`
`49`	`49`	`$this->currentRequest = $this->requestStack && $this->requestStack->getMasterRequest() !== $request ? $request : null;`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function __construct()`
`33`	`33`	`*`
`34`	`34`	`* @param \Throwable\|null $exception`
`35`	`35`	`*/`
`36`		`- public function collect(Request $request, Response $response/, \Throwable $exception = null/)`
	`36`	`+ public function collect(Request $request, Response $response/* , \Throwable $exception = null */)`
`37`	`37`	`{`
`38`	`38`	`$this->updateMemoryUsage();`
`39`	`39`	`}`
`@@ -114,8 +114,11 @@ private function convertToBytes(string $memoryLimit)`
`114`	`114`
`115`	`115`	`switch (substr($memoryLimit, -1)) {`
`116`	`116`	`case 't': $max *= 1024;`
	`117`	`+ // no break`
`117`	`118`	`case 'g': $max *= 1024;`
	`119`	`+ // no break`
`118`	`120`	`case 'm': $max *= 1024;`
	`121`	`+ // no break`
`119`	`122`	`case 'k': $max *= 1024;`
`120`	`123`	`}`
`121`	`124`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function __construct()`
`39`	`39`	`*`
`40`	`40`	`* @param \Throwable\|null $exception`
`41`	`41`	`*/`
`42`		`- public function collect(Request $request, Response $response/, \Throwable $exception = null/)`
	`42`	`+ public function collect(Request $request, Response $response/* , \Throwable $exception = null */)`
`43`	`43`	`{`
`44`	`44`	`// attributes are serialized and as they can be anything, they need to be converted to strings.`
`45`	`45`	`$attributes = [];`