diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-04-17 09:58:40 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-04-17 09:58:40 +0200 |
| commit | 263b0cf71b8df45509145485f9f96182c16bc02a (patch) | |
| tree | be75b59589f7b7c9991f83ebecb39fa35137b81e | |
| parent | 176100499ab8ce3389188073ea35be0a43f622b1 (diff) | |
| parent | 346ac968b3de89263d5692a7558626b566858c9d (diff) | |
| download | php-git-263b0cf71b8df45509145485f9f96182c16bc02a.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix tests for non English environments
| -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 49361bceb0..fd552302ae 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 55884917bd..ff7b685aac 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=== |