Merge branch 'PHP-7.4'

* PHP-7.4:
  Prevent parallel test conflicts

diff --cc ext/standard/tests/file/unlink_error-win32-mb.phpt
index b904ef4533587c8e81339e584c83b188c018da2f,54a433b861e9496a4a1df1eb17e44e1b6779aa6f..e85db00600ffbcda0124160e6659aae4dd7512ea
--- 1/ext/standard/tests/file/unlink_error-win32-mb.phpt
--- 2/ext/standard/tests/file/unlink_error-win32-mb.phpt
+++ b/ext/standard/tests/file/unlink_error-win32-mb.phpt
@@@ -8,8 -8,11 +8,8 @@@ if (substr(PHP_OS, 0, 3) != 'WIN') 
  ?>
  --FILE--
  <?php
 -/* Prototype : bool unlink ( string $filename [, resource $context] );
 -   Description : Deletes filename
 -*/
  
- $file_path = __DIR__.DIRECTORY_SEPARATOR."私はガラスを食べられます";
+ $file_path = __DIR__.DIRECTORY_SEPARATOR."unlinkErr私はガラスを食べられます";
  
  @mkdir($file_path);
  

diff --cc ext/standard/tests/file/unlink_variation1-win32-mb.phpt
Simple merge