Skip to content

Commit b01e8c3

Browse files
committed
Merge branch '6.0' into 6.1
* 6.0: Fix CS Fix CS
2 parents b8fea45 + 0b27f30 commit b01e8c3

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

DataCollector/MemoryDataCollector.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,11 @@ private function convertToBytes(string $memoryLimit): int|float
9494

9595
switch (substr($memoryLimit, -1)) {
9696
case 't': $max *= 1024;
97+
// no break
9798
case 'g': $max *= 1024;
99+
// no break
98100
case 'm': $max *= 1024;
101+
// no break
99102
case 'k': $max *= 1024;
100103
}
101104

Tests/EventListener/SessionListenerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ public function testResponseIsPrivateIfSessionStarted()
457457
$this->assertTrue($response->headers->hasCacheControlDirective('private'));
458458
$this->assertTrue($response->headers->hasCacheControlDirective('must-revalidate'));
459459
$this->assertSame('0', $response->headers->getCacheControlDirective('max-age'));
460-
$this->assertLessThanOrEqual((new \DateTime('now', new \DateTimeZone('UTC'))), (new \DateTime($response->headers->get('Expires'))));
460+
$this->assertLessThanOrEqual(new \DateTime('now', new \DateTimeZone('UTC')), new \DateTime($response->headers->get('Expires')));
461461
$this->assertFalse($response->headers->has(AbstractSessionListener::NO_AUTO_CACHE_CONTROL_HEADER));
462462
}
463463

@@ -591,7 +591,7 @@ public function testSurrogateMainRequestIsPublic()
591591
$this->assertSame('0', $response->headers->getCacheControlDirective('max-age'));
592592

593593
$this->assertTrue($response->headers->has('Expires'));
594-
$this->assertLessThanOrEqual((new \DateTime('now', new \DateTimeZone('UTC'))), (new \DateTime($response->headers->get('Expires'))));
594+
$this->assertLessThanOrEqual(new \DateTime('now', new \DateTimeZone('UTC')), new \DateTime($response->headers->get('Expires')));
595595
}
596596

597597
public function testGetSessionIsCalledOnce()

0 commit comments

Comments
 (0)