Modernized deprecated PHPUnit assertion calls

derrabus · fabpot · commit 91bdbf8c8824 · 2020-08-09T10:13:48.000+02:00
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
@@ -83,7 +83,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);
@@ -102,7 +102,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);
@@ -137,7 +137,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);
@@ -157,7 +157,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
@@ -177,7 +177,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 testRedirectResponseConstructorNullUrl()
diff --git a/Tests/ResponseHeaderBagTest.php b/Tests/ResponseHeaderBagTest.php
@@ -362,6 +362,6 @@ public function testDateHeaderWillBeRecreatedWhenHeadersAreReplaced()
 
     private function assertSetCookieHeader($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 testRedirectResponseConstructorNullUrl()`
Original file line number	Diff line number	Diff line change
`@@ -362,6 +362,6 @@ public function testDateHeaderWillBeRecreatedWhenHeadersAreReplaced()`
`362`	`362`
`363`	`363`	`private function assertSetCookieHeader($expected, ResponseHeaderBag $actual)`
`364`	`364`	`{`
`365`		`- $this->assertRegExp('#^Set-Cookie:\s+'.preg_quote($expected, '#').'$#m', str_replace("\r\n", "\n", (string) $actual));`
	`365`	`+ $this->assertMatchesRegularExpression('#^Set-Cookie:\s+'.preg_quote($expected, '#').'$#m', str_replace("\r\n", "\n", (string) $actual));`
`366`	`366`	`}`
`367`	`367`	`}`