Merge branch '3.4' into 4.4

fabpot · fabpot · commit 6e30ef7b533c · 2020-08-10T09:27:51.000+02:00
* 3.4:
  Add Tagalog translations for validator messages 94, 95, 96 and 99
  PHPUnit's assertContains() performs strict comparisons now.
  [ClassLoader][Routing] Fix namespace parsing on php 8.
  Fix deprecated libxml_disable_entity_loader
  Made reference to PHPUnit\Util\XML::loadfile php5-compatible.
  [Validator] Add missing translations for german and vietnamese
  Modernized deprecated PHPUnit assertion calls
  [Console] The message of "class not found" errors has changed in php 8.
  The PHPUnit\Util\XML class has been removed in PHPUnit 9.3.
  [Console] Make sure we pass a numeric array of arguments to call_user_func_array().
  [Serializer] Fix that it will never reach DOMNode
  [Validator] sync translations
  [VarDumper] Improve previous fix on light array coloration
  [Cache] Fix #37667
diff --git a/Tests/BinaryFileResponseTest.php b/Tests/BinaryFileResponseTest.php
@@ -309,7 +309,7 @@ public function testDeleteFileAfterSend()
         $response->prepare($request);
         $response->sendContent();
 
-        $this->assertFileNotExists($path);
+        $this->assertFileDoesNotExist($path);
     }
 
     public function testAcceptRangeOnUnsafeMethods()
diff --git a/Tests/File/FileTest.php b/Tests/File/FileTest.php
@@ -60,7 +60,7 @@ public function testMove()
         $this->assertInstanceOf('Symfony\Component\HttpFoundation\File\File', $movedFile);
 
         $this->assertFileExists($targetPath);
-        $this->assertFileNotExists($path);
+        $this->assertFileDoesNotExist($path);
         $this->assertEquals(realpath($targetPath), $movedFile->getRealPath());
 
         @unlink($targetPath);
@@ -79,7 +79,7 @@ public function testMoveWithNewName()
         $movedFile = $file->move($targetDir, 'test.newname.gif');
 
         $this->assertFileExists($targetPath);
-        $this->assertFileNotExists($path);
+        $this->assertFileDoesNotExist($path);
         $this->assertEquals(realpath($targetPath), $movedFile->getRealPath());
 
         @unlink($targetPath);
@@ -114,7 +114,7 @@ public function testMoveWithNonLatinName($filename, $sanitizedFilename)
         $this->assertInstanceOf('Symfony\Component\HttpFoundation\File\File', $movedFile);
 
         $this->assertFileExists($targetPath);
-        $this->assertFileNotExists($path);
+        $this->assertFileDoesNotExist($path);
         $this->assertEquals(realpath($targetPath), $movedFile->getRealPath());
 
         @unlink($targetPath);
@@ -134,7 +134,7 @@ public function testMoveToAnUnexistentDirectory()
         $movedFile = $file->move($targetDir);
 
         $this->assertFileExists($targetPath);
-        $this->assertFileNotExists($sourcePath);
+        $this->assertFileDoesNotExist($sourcePath);
         $this->assertEquals(realpath($targetPath), $movedFile->getRealPath());
 
         @unlink($sourcePath);
diff --git a/Tests/File/UploadedFileTest.php b/Tests/File/UploadedFileTest.php
@@ -223,7 +223,7 @@ public function testMoveLocalFileIsAllowedInTestMode()
         $movedFile = $file->move(__DIR__.'/Fixtures/directory');
 
         $this->assertFileExists($targetPath);
-        $this->assertFileNotExists($path);
+        $this->assertFileDoesNotExist($path);
         $this->assertEquals(realpath($targetPath), $movedFile->getRealPath());
 
         @unlink($targetPath);
diff --git a/Tests/RedirectResponseTest.php b/Tests/RedirectResponseTest.php
@@ -20,7 +20,7 @@ public function testGenerateMetaRedirect()
     {
         $response = new RedirectResponse('foo.bar');
 
-        $this->assertRegExp('#<meta http-equiv="refresh" content="\d+;url=\'foo\.bar\'" />#', preg_replace('/\s+/', ' ', $response->getContent()));
+        $this->assertMatchesRegularExpression('#<meta http-equiv="refresh" content="\d+;url=\'foo\.bar\'" />#', preg_replace('/\s+/', ' ', $response->getContent()));
     }
 
     public function testRedirectResponseConstructorEmptyUrl()
diff --git a/Tests/ResponseHeaderBagTest.php b/Tests/ResponseHeaderBagTest.php
@@ -309,6 +309,6 @@ public function testDateHeaderWillBeRecreatedWhenHeadersAreReplaced()
 
     private function assertSetCookieHeader(string $expected, ResponseHeaderBag $actual)
     {
-        $this->assertRegExp('#^Set-Cookie:\s+'.preg_quote($expected, '#').'$#m', str_replace("\r\n", "\n", (string) $actual));
+        $this->assertMatchesRegularExpression('#^Set-Cookie:\s+'.preg_quote($expected, '#').'$#m', str_replace("\r\n", "\n", (string) $actual));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ public function testDeleteFileAfterSend()`
`309`	`309`	`$response->prepare($request);`
`310`	`310`	`$response->sendContent();`
`311`	`311`
`312`		`- $this->assertFileNotExists($path);`
	`312`	`+ $this->assertFileDoesNotExist($path);`
`313`	`313`	`}`
`314`	`314`
`315`	`315`	`public function testAcceptRangeOnUnsafeMethods()`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public function testGenerateMetaRedirect()`
`20`	`20`	`{`
`21`	`21`	`$response = new RedirectResponse('foo.bar');`
`22`	`22`
`23`		`- $this->assertRegExp('#<meta http-equiv="refresh" content="\d+;url=\'foo\.bar\'" />#', preg_replace('/\s+/', ' ', $response->getContent()));`
	`23`	`+ $this->assertMatchesRegularExpression('#<meta http-equiv="refresh" content="\d+;url=\'foo\.bar\'" />#', preg_replace('/\s+/', ' ', $response->getContent()));`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public function testRedirectResponseConstructorEmptyUrl()`
Original file line number	Diff line number	Diff line change
`@@ -309,6 +309,6 @@ public function testDateHeaderWillBeRecreatedWhenHeadersAreReplaced()`
`309`	`309`
`310`	`310`	`private function assertSetCookieHeader(string $expected, ResponseHeaderBag $actual)`
`311`	`311`	`{`
`312`		`- $this->assertRegExp('#^Set-Cookie:\s+'.preg_quote($expected, '#').'$#m', str_replace("\r\n", "\n", (string) $actual));`
	`312`	`+ $this->assertMatchesRegularExpression('#^Set-Cookie:\s+'.preg_quote($expected, '#').'$#m', str_replace("\r\n", "\n", (string) $actual));`
`313`	`313`	`}`
`314`	`314`	`}`