Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix tests for non English environments

Author: cmb69

ext/phar/tests/phar_buildfromdirectory2-win.phpt

@@ -26,5 +26,5 @@ __HALT_COMPILER();
 ?>
 --EXPECTF--
 %s(24) "UnexpectedValueException"
-RecursiveDirectoryIterator::__construct(1,1): The system cannot find the file specified. (code: 2)
+RecursiveDirectoryIterator::__construct(1,1): %s (code: 2)
 ===DONE===

ext/phar/tests/phar_gobyebye-win32.phpt

@@ -42,7 +42,7 @@ bool(false)
 bool(false)
 bool(false)
 
-Warning: opendir(foo/hi,foo/hi): The system cannot find the path specified. (code: 3) in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d
+Warning: opendir(foo/hi,foo/hi): %s (code: 3) in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d
 
 Warning: opendir(foo/hi): failed to open dir: No such file or directory in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d
 ===DONE===