diff options
| author | Anatol Belski <ab@php.net> | 2015-04-15 11:09:54 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-04-15 11:09:54 +0200 |
| commit | e53947609aa4c35cebe845f65b8e44877436a304 (patch) | |
| tree | 4a858d8fe3f4f6390a4b550004cceb5c7c2d00fd | |
| parent | caf4beab2d6700f0c655cef4d1909832b83df741 (diff) | |
| parent | 8947c7aa0d7999fe8a31f65cf64d4a87a7b95f3e (diff) | |
| download | php-git-e53947609aa4c35cebe845f65b8e44877436a304.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix dir separator in test
| -rw-r--r-- | ext/phar/tests/bug69441.phpt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/phar/tests/bug69441.phpt b/ext/phar/tests/bug69441.phpt index ed461cf1f9..fafb7855c6 100644 --- a/ext/phar/tests/bug69441.phpt +++ b/ext/phar/tests/bug69441.phpt @@ -16,6 +16,6 @@ $r = new Phar($fname, 0); --EXPECTF-- exception 'UnexpectedValueException' with message 'phar error: corrupted central directory entry, no magic signature in zip-based phar "%s/bug69441.phar"' in %s/bug69441.php:%d Stack trace: -#0 %s/bug69441.php(%d): Phar->__construct('%s', 0) +#0 %s%ebug69441.php(%d): Phar->__construct('%s', 0) #1 {main} -==DONE==
\ No newline at end of file +==DONE== |