Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6: fix dir separator in test
andydeng · Mar 29, 2016 · 249a8fd · 249a8fd
1 parent 2b7c1be
commit 249a8fd
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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===
+Warning: Phar::addFromString() expects parameter 1 to be a valid path, string given in %s%ebug64931.php on line %d
+===DONE===