com php-src: fixed the tests, related to the basename behaviour, bug #66395: ext/standard/tests/file/pathinfo_basic1-win32 .phpt
ext/standard/tests/file/pathinfo_basic2-win32 .phpt
| From: | Anatol Belski | Date: | Sun, 07 Sep 2014 18:11:49 +0000 |
| Subject: | com php-src: fixed the tests, related to the basename behaviour, bug #66395: ext/standard/tests/file/pathinfo_basic1-win32 .phpt ext/standard/tests/file/pathinfo_basic2-win32 .phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81450@lists.php.net to get a copy of this message | ||
Commit: e254ba32d57b6a706e90af521995ec4ccfac4dd4
Author: Anatol Belski <ab@php.net> Sun, 7 Sep 2014 20:11:49 +0200
Parents: cfa2b3bf637502e4dbdc4eaeb71d7c7ce1f4d014
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e254ba32d57b6a706e90af521995ec4ccfac4dd4
Log:
fixed the tests, related to the basename behaviour, bug #66395
Bugs:
https://bugs.php.net/66395
Changed paths:
M ext/standard/tests/file/pathinfo_basic1-win32.phpt
M ext/standard/tests/file/pathinfo_basic2-win32.phpt
Diff:
diff --git a/ext/standard/tests/file/pathinfo_basic1-win32.phpt
b/ext/standard/tests/file/pathinfo_basic1-win32.phpt
index 9e84b99..f783a6b 100644
--- a/ext/standard/tests/file/pathinfo_basic1-win32.phpt
+++ b/ext/standard/tests/file/pathinfo_basic1-win32.phpt
@@ -99,42 +99,42 @@ array(3) {
}
-- Iteration 3 --
string(2) "c:"
-string(2) "c:"
+string(1) "c"
string(0) ""
-string(2) "c:"
+string(1) "c"
array(3) {
["dirname"]=>
string(2) "c:"
["basename"]=>
- string(2) "c:"
+ string(1) "c"
["filename"]=>
- string(2) "c:"
+ string(1) "c"
}
-- Iteration 4 --
string(3) "c:\"
-string(2) "c:"
+string(1) "c"
string(0) ""
-string(2) "c:"
+string(1) "c"
array(3) {
["dirname"]=>
string(3) "c:\"
["basename"]=>
- string(2) "c:"
+ string(1) "c"
["filename"]=>
- string(2) "c:"
+ string(1) "c"
}
-- Iteration 5 --
string(3) "c:\"
-string(2) "c:"
+string(1) "c"
string(0) ""
-string(2) "c:"
+string(1) "c"
array(3) {
["dirname"]=>
string(3) "c:\"
["basename"]=>
- string(2) "c:"
+ string(1) "c"
["filename"]=>
- string(2) "c:"
+ string(1) "c"
}
-- Iteration 6 --
string(1) "."
diff --git a/ext/standard/tests/file/pathinfo_basic2-win32.phpt
b/ext/standard/tests/file/pathinfo_basic2-win32.phpt
index c88bc25..4c2fd2c 100644
--- a/ext/standard/tests/file/pathinfo_basic2-win32.phpt
+++ b/ext/standard/tests/file/pathinfo_basic2-win32.phpt
@@ -168,18 +168,18 @@ array(3) {
}
-- Iteration 9 --
string(3) "c:."
-string(11) "c:afile.txt"
+string(9) "afile..txt"
string(3) "txt"
-string(7) "c:afile"
+string(5) "afile"
array(4) {
["dirname"]=>
string(3) "c:."
["basename"]=>
- string(11) "c:afile.txt"
+ string(9) "afile.txt"
["extension"]=>
string(3) "txt"
["filename"]=>
- string(7) "c:afile"
+ string(5) "afile"
}
-- Iteration 10 --
string(12) "..\.\..\test"
@@ -267,4 +267,4 @@ array(3) {
["filename"]=>
string(5) "afile"
}
-Done
\ No newline at end of file
+Done