com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/phar/tests/bug64931/bug64931.phpt
| From: | Anatol Belski | Date: | Tue, 29 Mar 2016 13:50:21 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/phar/tests/bug64931/bug64931.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-91538@lists.php.net to get a copy of this message | ||
Commit: 249a8fd9ae2324c84ede7ecfca6f6026e6d87df6
Author: Anatol Belski <ab@php.net> Tue, 29 Mar 2016 14:20:30 +0200
Parents: 2b7c1bed1d8fdd164f6175147376ea10ec566ce0
Branches: PHP-7.0.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=249a8fd9ae2324c84ede7ecfca6f6026e6d87df6
Log:
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix dir separator in test
Changed paths:
M ext/phar/tests/bug64931/bug64931.phpt
Diff:
diff --git a/ext/phar/tests/bug64931/bug64931.phpt b/ext/phar/tests/bug64931/bug64931.phpt
index 29e0c7b..630746c 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===