summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2016-03-29 14:20:30 +0200
committerAnatol Belski <ab@php.net>2016-03-29 15:50:21 +0200
commit249a8fd9ae2324c84ede7ecfca6f6026e6d87df6 (patch)
tree0c7173679afeae9f5e401ca11d2101a26714b1eb
parent2b7c1bed1d8fdd164f6175147376ea10ec566ce0 (diff)
downloadphp-git-PHP-7.0.5.tar.gz
Merge branch 'PHP-5.6' into PHP-7.0php-7.0.5PHP-7.0.5
* PHP-5.6: fix dir separator in test
-rw-r--r--ext/phar/tests/bug64931/bug64931.phpt4
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===