Merge branch '4.4' into 5.4

fabpot · fabpot · commit 37ebab3f70f9 · 2022-07-20T13:34:24.000+02:00
* 4.4:
  Fix CS
diff --git a/Tests/EventListener/SessionListenerTest.php b/Tests/EventListener/SessionListenerTest.php
@@ -415,7 +415,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));
     }
 
@@ -568,7 +568,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()

Original file line number	Diff line number	Diff line change
`@@ -415,7 +415,7 @@ public function testResponseIsPrivateIfSessionStarted()`
`415`	`415`	`$this->assertTrue($response->headers->hasCacheControlDirective('private'));`
`416`	`416`	`$this->assertTrue($response->headers->hasCacheControlDirective('must-revalidate'));`
`417`	`417`	`$this->assertSame('0', $response->headers->getCacheControlDirective('max-age'));`
`418`		`- $this->assertLessThanOrEqual((new \DateTime('now', new \DateTimeZone('UTC'))), (new \DateTime($response->headers->get('Expires'))));`
	`418`	`+ $this->assertLessThanOrEqual(new \DateTime('now', new \DateTimeZone('UTC')), new \DateTime($response->headers->get('Expires')));`
`419`	`419`	`$this->assertFalse($response->headers->has(AbstractSessionListener::NO_AUTO_CACHE_CONTROL_HEADER));`
`420`	`420`	`}`
`421`	`421`
`@@ -568,7 +568,7 @@ public function testSurrogateMainRequestIsPublic()`
`568`	`568`	`$this->assertSame('0', $response->headers->getCacheControlDirective('max-age'));`
`569`	`569`
`570`	`570`	`$this->assertTrue($response->headers->has('Expires'));`
`571`		`- $this->assertLessThanOrEqual((new \DateTime('now', new \DateTimeZone('UTC'))), (new \DateTime($response->headers->get('Expires'))));`
	`571`	`+ $this->assertLessThanOrEqual(new \DateTime('now', new \DateTimeZone('UTC')), new \DateTime($response->headers->get('Expires')));`
`572`	`572`	`}`
`573`	`573`
`574`	`574`	`public function testGetSessionIsCalledOnce()`