diff options
| author | Anatol Belski <ab@php.net> | 2015-04-19 20:34:36 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-04-19 20:34:36 +0200 |
| commit | 4a38f51857e6d52849fae657d99d1f31492325a0 (patch) | |
| tree | d81ca8a05906627ffdf75b5608026f73f3dd5fc2 | |
| parent | 2c2d1a79ce6b922780c6cf3ab1e62a94462290b6 (diff) | |
| parent | 160bf9c072f8db59c8412cfee9fa45faa1d7138e (diff) | |
| download | php-git-4a38f51857e6d52849fae657d99d1f31492325a0.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
updated NEWS
fix more dir separators
| -rw-r--r-- | ext/phar/tests/bug69441.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/phar/tests/bug69441.phpt b/ext/phar/tests/bug69441.phpt index fafb7855c6..03c87e34ca 100644 --- a/ext/phar/tests/bug69441.phpt +++ b/ext/phar/tests/bug69441.phpt @@ -14,7 +14,7 @@ $r = new Phar($fname, 0); ==DONE== --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 +exception 'UnexpectedValueException' with message 'phar error: corrupted central directory entry, no magic signature in zip-based phar "%s%ebug69441.phar"' in %s%ebug69441.php:%d Stack trace: #0 %s%ebug69441.php(%d): Phar->__construct('%s', 0) #1 {main} |