Merge branch '5.4' into 6.0

* 5.4:
  Fix CS
  Fix CS

Author: fabpot

DataCollector/MemoryDataCollector.php

@@ -94,8 +94,11 @@ private function convertToBytes(string $memoryLimit): int|float
 
         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;
         }
 

Tests/EventListener/SessionListenerTest.php

@@ -459,7 +459,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));
     }
 
@@ -593,7 +593,7 @@ public function testSurrogateMainRequestIsPublic()
         $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()