Skip to content

Commit 8976871

Browse files
committed
Merge branch '4.4' into 5.1
* 4.4: Fix typo Fix deprecated libxml_disable_entity_loader 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 6e4320f + dcb133f commit 8976871

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

Tests/FilesystemTest.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ public function testRemoveCleansFilesAndDirectoriesIteratively()
282282

283283
$this->filesystem->remove($basePath);
284284

285-
$this->assertFileNotExists($basePath);
285+
$this->assertFileDoesNotExist($basePath);
286286
}
287287

288288
public function testRemoveCleansArrayOfFilesAndDirectories()
@@ -298,8 +298,8 @@ public function testRemoveCleansArrayOfFilesAndDirectories()
298298

299299
$this->filesystem->remove($files);
300300

301-
$this->assertFileNotExists($basePath.'dir');
302-
$this->assertFileNotExists($basePath.'file');
301+
$this->assertFileDoesNotExist($basePath.'dir');
302+
$this->assertFileDoesNotExist($basePath.'file');
303303
}
304304

305305
public function testRemoveCleansTraversableObjectOfFilesAndDirectories()
@@ -315,8 +315,8 @@ public function testRemoveCleansTraversableObjectOfFilesAndDirectories()
315315

316316
$this->filesystem->remove($files);
317317

318-
$this->assertFileNotExists($basePath.'dir');
319-
$this->assertFileNotExists($basePath.'file');
318+
$this->assertFileDoesNotExist($basePath.'dir');
319+
$this->assertFileDoesNotExist($basePath.'file');
320320
}
321321

322322
public function testRemoveIgnoresNonExistingFiles()
@@ -331,7 +331,7 @@ public function testRemoveIgnoresNonExistingFiles()
331331

332332
$this->filesystem->remove($files);
333333

334-
$this->assertFileNotExists($basePath.'dir');
334+
$this->assertFileDoesNotExist($basePath.'dir');
335335
}
336336

337337
public function testRemoveCleansInvalidLinks()
@@ -355,7 +355,7 @@ public function testRemoveCleansInvalidLinks()
355355

356356
$this->filesystem->remove($basePath);
357357

358-
$this->assertFileNotExists($basePath);
358+
$this->assertFileDoesNotExist($basePath);
359359
}
360360

361361
public function testFilesExists()
@@ -793,7 +793,7 @@ public function testRename()
793793

794794
$this->filesystem->rename($file, $newPath);
795795

796-
$this->assertFileNotExists($file);
796+
$this->assertFileDoesNotExist($file);
797797
$this->assertFileExists($newPath);
798798
}
799799

@@ -819,7 +819,7 @@ public function testRenameOverwritesTheTargetIfItAlreadyExists()
819819

820820
$this->filesystem->rename($file, $newPath, true);
821821

822-
$this->assertFileNotExists($file);
822+
$this->assertFileDoesNotExist($file);
823823
$this->assertFileExists($newPath);
824824
}
825825

@@ -1345,7 +1345,7 @@ public function testMirrorContentsWithSameNameAsSourceOrTargetWithDeleteOption()
13451345

13461346
$this->assertDirectoryExists($targetPath);
13471347
$this->assertFileExists($targetPath.'source');
1348-
$this->assertFileNotExists($targetPath.'target');
1348+
$this->assertFileDoesNotExist($targetPath.'target');
13491349
}
13501350

13511351
public function testMirrorAvoidCopyingTargetDirectoryIfInSourceDirectory()
@@ -1469,7 +1469,7 @@ public function testTempnamWithPHPTempSchemeFails()
14691469
$this->assertStringStartsWith($scheme, $filename);
14701470

14711471
// The php://temp stream deletes the file after close
1472-
$this->assertFileNotExists($filename);
1472+
$this->assertFileDoesNotExist($filename);
14731473
}
14741474

14751475
public function testTempnamWithPharSchemeFails()

0 commit comments

Comments
 (0)