Merge branch '6.0' into 6.1

nicolas-grekas · nicolas-grekas · commit 6a7dc25c5600 · 2022-08-17T17:29:58.000+02:00
* 6.0:
  [HttpFoundation] Fix tests on PHP 8.2 (bis)
diff --git a/Tests/ResponseFunctionalTest.php b/Tests/ResponseFunctionalTest.php
@@ -44,6 +44,7 @@ public static function tearDownAfterClass(): void
     public function testCookie($fixture)
     {
         $result = file_get_contents(sprintf('http://localhost:8054/%s.php', $fixture));
+        $result = preg_replace_callback('/expires=[^;]++/', function ($m) { return str_replace('-', ' ', $m[0]); }, $result);
         $this->assertStringMatchesFormatFile(__DIR__.sprintf('/Fixtures/response-functional/%s.expected', $fixture), $result);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ public static function tearDownAfterClass(): void`
`44`	`44`	`public function testCookie($fixture)`
`45`	`45`	`{`
`46`	`46`	`$result = file_get_contents(sprintf('http://localhost:8054/%s.php', $fixture));`
	`47`	`+ $result = preg_replace_callback('/expires=[^;]++/', function ($m) { return str_replace('-', ' ', $m[0]); }, $result);`
`47`	`48`	`$this->assertStringMatchesFormatFile(__DIR__.sprintf('/Fixtures/response-functional/%s.expected', $fixture), $result);`
`48`	`49`	`}`
`49`	`50`