diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-04-17 09:57:37 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-04-17 09:57:37 +0200 |
| commit | ec8457d982512e58db6191b7c09a1513b58b79ac (patch) | |
| tree | efc6b5a35981e614de1fa27c3baf631a87550d0f /ext/phar/tests | |
| parent | e90bce7f083d5da6149cc57eb242d1862c86af5d (diff) | |
| parent | 6fe75f9e45be60262bfe7e6bb92de445fe41c483 (diff) | |
| download | php-git-ec8457d982512e58db6191b7c09a1513b58b79ac.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix tests for non English environments
Diffstat (limited to 'ext/phar/tests')
| -rw-r--r-- | ext/phar/tests/phar_buildfromdirectory2-win.phpt | 2 | ||||
| -rw-r--r-- | ext/phar/tests/phar_gobyebye-win32.phpt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/phar/tests/phar_buildfromdirectory2-win.phpt b/ext/phar/tests/phar_buildfromdirectory2-win.phpt index b49b78d7c8..a8bb51b0d0 100644 --- a/ext/phar/tests/phar_buildfromdirectory2-win.phpt +++ b/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=== diff --git a/ext/phar/tests/phar_gobyebye-win32.phpt b/ext/phar/tests/phar_gobyebye-win32.phpt index 526a8cbf91..c875be3f22 100644 --- a/ext/phar/tests/phar_gobyebye-win32.phpt +++ b/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=== |