diff options
| author | Anatol Belski <ab@php.net> | 2015-05-22 21:27:19 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-05-22 21:27:19 +0200 |
| commit | 0bc3a74334473c2371b7a9bb427783588290badd (patch) | |
| tree | e4d6a3d2708eae2bec914d02812dd6fee807ff6c | |
| parent | 2e2cbcc926f8492dcaa2ca0a4e384c8d20edc851 (diff) | |
| parent | d9c266f4c91ab4cbee1c334f078c63519ab21395 (diff) | |
| download | php-git-0bc3a74334473c2371b7a9bb427783588290badd.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix test
| -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 03c87e34ca..934c5f6b73 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%ebug69441.phar"' in %s%ebug69441.php:%d +exception 'UnexpectedValueException' with message 'phar error: corrupted central directory entry, no magic signature in zip-based phar "%sbug69441.phar"' in %sbug69441.php:%d Stack trace: #0 %s%ebug69441.php(%d): Phar->__construct('%s', 0) #1 {main} |