diff options
| author | Anatol Belski <ab@php.net> | 2015-04-19 20:32:37 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-04-19 20:32:37 +0200 |
| commit | 0ec5477fbd5abe50f1fed27ca13865505473ffdf (patch) | |
| tree | e0e984fd7079c32606b17a6f2d801428ddc6276d | |
| parent | d66cb721d41b4a0d18dfec612f8a19e1c9b4de75 (diff) | |
| parent | 35baf7146656c7262914f0059a3a585ae51bb82a (diff) | |
| download | php-git-0ec5477fbd5abe50f1fed27ca13865505473ffdf.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
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} |