Merge branch '4.4' into 5.1

fabpot · fabpot · commit 6cca6b2e4b69 · 2020-09-13T07:01:27.000+02:00
* 4.4:
  Internal classes are not legacy.
  [HttpFoundation] Skip the cookie_max_age fixture on PHP 8.
  add choice_translation_domain tests to prevent further regressions
  Update validators.tr.xlf
diff --git a/Tests/ResponseFunctionalTest.php b/Tests/ResponseFunctionalTest.php
@@ -42,6 +42,10 @@ public static function tearDownAfterClass(): void
      */
     public function testCookie($fixture)
     {
+        if (\PHP_VERSION_ID >= 80000 && 'cookie_max_age' === $fixture) {
+            $this->markTestSkipped('This fixture produces a fatal error on PHP 8.');
+        }
+
         $result = file_get_contents(sprintf('http://localhost:8054/%s.php', $fixture));
         $this->assertStringMatchesFormatFile(__DIR__.sprintf('/Fixtures/response-functional/%s.expected', $fixture), $result);
     }

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,10 @@ public static function tearDownAfterClass(): void`
`42`	`42`	`*/`
`43`	`43`	`public function testCookie($fixture)`
`44`	`44`	`{`
	`45`	`+ if (\PHP_VERSION_ID >= 80000 && 'cookie_max_age' === $fixture) {`
	`46`	`+ $this->markTestSkipped('This fixture produces a fatal error on PHP 8.');`
	`47`	`+ }`
	`48`	`+`
`45`	`49`	`$result = file_get_contents(sprintf('http://localhost:8054/%s.php', $fixture));`
`46`	`50`	`$this->assertStringMatchesFormatFile(__DIR__.sprintf('/Fixtures/response-functional/%s.expected', $fixture), $result);`
`47`	`51`	`}`