Skip to content

Commit

Permalink
Merge branch '3.4' into 4.4
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
fabpot committed Aug 10, 2020
2 parents 3675676 + 91bdbf8 commit 6e30ef7
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Tests/BinaryFileResponseTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ public function testDeleteFileAfterSend()
$response->prepare($request);
$response->sendContent();

$this->assertFileNotExists($path);
$this->assertFileDoesNotExist($path);
}

public function testAcceptRangeOnUnsafeMethods()
Expand Down
8 changes: 4 additions & 4 deletions Tests/File/FileTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion Tests/File/UploadedFileTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion Tests/RedirectResponseTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion Tests/ResponseHeaderBagTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
}

0 comments on commit 6e30ef7

Please sign in to comment.