diff options
| author | Anatol Belski <ab@php.net> | 2016-03-29 14:20:30 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-03-29 14:20:30 +0200 |
| commit | c7f7139985b9b6a3f95790afbe7f86f7b010aabe (patch) | |
| tree | 8317e5e9a1123e226848df2b63b902d3cd53ed91 /ext/phar | |
| parent | dd0a96ae70800e800f75a58f08fc960c8eaf154b (diff) | |
| parent | 23d0065744a464ea746b804cd7bbaa17827d485e (diff) | |
| download | php-git-c7f7139985b9b6a3f95790afbe7f86f7b010aabe.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix dir separator in test
Diffstat (limited to 'ext/phar')
| -rw-r--r-- | ext/phar/tests/bug64931/bug64931.phpt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/phar/tests/bug64931/bug64931.phpt b/ext/phar/tests/bug64931/bug64931.phpt index 29e0c7b4e3..630746cdf8 100644 --- a/ext/phar/tests/bug64931/bug64931.phpt +++ b/ext/phar/tests/bug64931/bug64931.phpt @@ -55,5 +55,5 @@ CAUGHT: Cannot create any files in magic ".phar" directory CAUGHT: Cannot create any files in magic ".phar" directory CAUGHT: Cannot create any files in magic ".phar" directory -Warning: Phar::addFromString() expects parameter 1 to be a valid path, string given in %s/bug64931.php on line %d -===DONE===
\ No newline at end of file +Warning: Phar::addFromString() expects parameter 1 to be a valid path, string given in %s%ebug64931.php on line %d +===DONE=== |