summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2016-03-29 14:20:49 +0200
committerAnatol Belski <ab@php.net>2016-03-29 14:20:49 +0200
commit20a87bd007ceb3388f50935430e4fc9dc49c25c1 (patch)
tree8f27a9dcaaafddd5f11b25f13f6617d82bfb4122
parent5640263b236cc3807af02a0589acf8550c92b491 (diff)
parentc7f7139985b9b6a3f95790afbe7f86f7b010aabe (diff)
downloadphp-git-20a87bd007ceb3388f50935430e4fc9dc49c25c1.tar.gz
Merge branch 'PHP-7.0'
* PHP-7.0: 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===