diff options
| author | Anatol Belski <ab@php.net> | 2016-06-21 16:22:51 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-06-21 16:22:51 +0200 |
| commit | 1d5a4520be0c70800c019dd79d6bd71a43edbc33 (patch) | |
| tree | 1bf40d2554523872be015f03036fb5c59a12d9b9 | |
| parent | 5a9f0c77ad92b2c13ff3865529636f2c9bfb4974 (diff) | |
| parent | e3bd360ec9ec22e3057fc6e75d3dd1b11595463d (diff) | |
| download | php-git-1d5a4520be0c70800c019dd79d6bd71a43edbc33.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix test
| -rw-r--r-- | ext/phar/tests/bug72321.phpt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/phar/tests/bug72321.phpt b/ext/phar/tests/bug72321.phpt index 37aca19e82..6e63da42d9 100644 --- a/ext/phar/tests/bug72321.phpt +++ b/ext/phar/tests/bug72321.phpt @@ -21,6 +21,6 @@ DONE rmdir(__DIR__."/test72321"); ?> --EXPECTF-- -Warning: PharData::extractTo(): Not a directory in %s/bug72321.php on line %d -Extraction from phar "%s/72321_2.zip" failed: Cannot extract "AAAAAAAAxxxxBBBBCCCCCCCCxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/b/c", could not create directory "test72321/AAAAAAAAxxxxBBBBCCCCCCCCxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/b" -DONE
\ No newline at end of file +Warning: PharData::extractTo(): %s in %sbug72321.php on line %d +Extraction from phar "%s72321_2.zip" failed: Cannot extract "AAAAAAAAxxxxBBBBCCCCCCCCxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/b/c", could not create directory "test72321/AAAAAAAAxxxxBBBBCCCCCCCCxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/b" +DONE |