From 249a8fd9ae2324c84ede7ecfca6f6026e6d87df6 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Tue, 29 Mar 2016 14:20:30 +0200 Subject: Merge branch 'PHP-5.6' into PHP-7.0 * PHP-5.6: fix dir separator in test --- ext/phar/tests/bug64931/bug64931.phpt | 4 ++-- 1 file 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=== -- cgit v1.2.1