Skip to content

Commit 6e30ef7

Browse files
committed
Merge branch '3.4' into 4.4
* 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
2 parents 3675676 + 91bdbf8 commit 6e30ef7

5 files changed

+8
-8
lines changed

Tests/BinaryFileResponseTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ public function testDeleteFileAfterSend()
309309
$response->prepare($request);
310310
$response->sendContent();
311311

312-
$this->assertFileNotExists($path);
312+
$this->assertFileDoesNotExist($path);
313313
}
314314

315315
public function testAcceptRangeOnUnsafeMethods()

Tests/File/FileTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function testMove()
6060
$this->assertInstanceOf('Symfony\Component\HttpFoundation\File\File', $movedFile);
6161

6262
$this->assertFileExists($targetPath);
63-
$this->assertFileNotExists($path);
63+
$this->assertFileDoesNotExist($path);
6464
$this->assertEquals(realpath($targetPath), $movedFile->getRealPath());
6565

6666
@unlink($targetPath);
@@ -79,7 +79,7 @@ public function testMoveWithNewName()
7979
$movedFile = $file->move($targetDir, 'test.newname.gif');
8080

8181
$this->assertFileExists($targetPath);
82-
$this->assertFileNotExists($path);
82+
$this->assertFileDoesNotExist($path);
8383
$this->assertEquals(realpath($targetPath), $movedFile->getRealPath());
8484

8585
@unlink($targetPath);
@@ -114,7 +114,7 @@ public function testMoveWithNonLatinName($filename, $sanitizedFilename)
114114
$this->assertInstanceOf('Symfony\Component\HttpFoundation\File\File', $movedFile);
115115

116116
$this->assertFileExists($targetPath);
117-
$this->assertFileNotExists($path);
117+
$this->assertFileDoesNotExist($path);
118118
$this->assertEquals(realpath($targetPath), $movedFile->getRealPath());
119119

120120
@unlink($targetPath);
@@ -134,7 +134,7 @@ public function testMoveToAnUnexistentDirectory()
134134
$movedFile = $file->move($targetDir);
135135

136136
$this->assertFileExists($targetPath);
137-
$this->assertFileNotExists($sourcePath);
137+
$this->assertFileDoesNotExist($sourcePath);
138138
$this->assertEquals(realpath($targetPath), $movedFile->getRealPath());
139139

140140
@unlink($sourcePath);

Tests/File/UploadedFileTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ public function testMoveLocalFileIsAllowedInTestMode()
223223
$movedFile = $file->move(__DIR__.'/Fixtures/directory');
224224

225225
$this->assertFileExists($targetPath);
226-
$this->assertFileNotExists($path);
226+
$this->assertFileDoesNotExist($path);
227227
$this->assertEquals(realpath($targetPath), $movedFile->getRealPath());
228228

229229
@unlink($targetPath);

Tests/RedirectResponseTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public function testGenerateMetaRedirect()
2020
{
2121
$response = new RedirectResponse('foo.bar');
2222

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()));
2424
}
2525

2626
public function testRedirectResponseConstructorEmptyUrl()

Tests/ResponseHeaderBagTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,6 @@ public function testDateHeaderWillBeRecreatedWhenHeadersAreReplaced()
309309

310310
private function assertSetCookieHeader(string $expected, ResponseHeaderBag $actual)
311311
{
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));
313313
}
314314
}

0 commit comments

Comments
 (0)