cvs: php-src /ext/standard/tests/dir chdir_basic.phpt chdir_error1.phpt chdir_error2.phpt chdir_variation1.phpt chdir_variation2.phpt
closedir_basic.phpt closedir_error.phpt closedir_variation1.phpt closedir_variation2.phpt closedir_variation3.phpt dir_basic.phpt dir_error.phpt
dir_variation1.phpt dir_variation2.phpt dir_variation3.phpt dir_variation4.phpt dir_variation5.phpt dir_variation6.phpt dir_variation7.phpt
dir_variation8.phpt dir_variation9.phpt getcwd_basic.phpt getcwd_error.phpt opendir_basic.phpt opendir_error1.phpt opendir_error2.phpt
opendir_variation1.phpt opendir_variation2.phpt opendir_variation3.phpt opendir_variation4.phpt opendir_variation5.phpt opendir_variation6.phpt
opendir_variation7.phpt readdir_basic.phpt readdir_error.phpt readdir_variation1.phpt readdir_variation2.phpt readdir_variation3.phpt
readdir_variation4.phpt readdir_variation5.phpt readdir_variation6.phpt readdir_variation7.phpt rewinddir_basic.phpt rewinddir_error.phpt rewinddir_!
variation1.phpt rewinddir_variation2.phpt rewinddir_variation3.phpt scandir_basic.phpt scandir_error1.phpt scandir_error2.phpt scandir_variation1.phpt
scandir_variation2.phpt scandir_variation3.phpt scandir_variation4.phpt scandir_variation5.phpt scandir_variation6.phpt scandir_variation7.phpt
scandir_variation8.phpt scandir_variation9.phpt

sfox Mon May 26 23:48:29 2008 UTC Modified files: /php-src/ext/standard/tests/dir chdir_basic.phpt chdir_error1.phpt chdir_error2.phpt chdir_variation1.phpt chdir_variation2.phpt closedir_basic.phpt closedir_error.phpt closedir_variation1.phpt closedir_variation2.phpt closedir_variation3.phpt dir_basic.phpt dir_error.phpt dir_variation1.phpt dir_variation2.phpt dir_variation3.phpt dir_variation4.phpt dir_variation5.phpt dir_variation6.phpt dir_variation7.phpt dir_variation8.phpt dir_variation9.phpt getcwd_basic.phpt getcwd_error.phpt opendir_basic.phpt opendir_error1.phpt opendir_error2.phpt opendir_variation1.phpt opendir_variation2.phpt opendir_variation3.phpt opendir_variation4.phpt opendir_variation5.phpt opendir_variation6.phpt opendir_variation7.phpt readdir_basic.phpt readdir_error.phpt readdir_variation1.phpt readdir_variation2.phpt readdir_variation3.phpt readdir_variation4.phpt readdir_variation5.phpt readdir_variation6.phpt readdir_variation7.phpt rewinddir_basic.phpt rewinddir_error.phpt rewinddir_variation1.phpt rewinddir_variation2.phpt rewinddir_variation3.phpt scandir_basic.phpt scandir_error1.phpt scandir_error2.phpt scandir_variation1.phpt scandir_variation2.phpt scandir_variation3.phpt scandir_variation4.phpt scandir_variation5.phpt scandir_variation6.phpt scandir_variation7.phpt scandir_variation8.phpt scandir_variation9.phpt Log: - killed off UEXPECT

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/chdir_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/chdir_basic.phpt diff -u php-src/ext/standard/tests/dir/chdir_basic.phpt:1.2 php-src/ext/standard/tests/dir/chdir_basic.phpt:1.3 --- php-src/ext/standard/tests/dir/chdir_basic.phpt:1.2 Tue Feb 26 09:40:49 2008 +++ php-src/ext/standard/tests/dir/chdir_basic.phpt Mon May 26 23:48:29 2008 @@ -45,17 +45,6 @@ -- Testing chdir() with absolute path: -- bool(true) -string(%d) "%slevel_one" - --- Testing chdir() with relative paths: -- -bool(true) -string(%d) "%slevel_one%elevel_two" -===DONE=== ---UEXPECTF-- -*** Testing chdir() : basic functionality *** - --- Testing chdir() with absolute path: -- -bool(true) unicode(%d) "%slevel_one" -- Testing chdir() with relative paths: -- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/chdir_error1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/chdir_error1.phpt diff -u php-src/ext/standard/tests/dir/chdir_error1.phpt:1.2 php-src/ext/standard/tests/dir/chdir_error1.phpt:1.3 --- php-src/ext/standard/tests/dir/chdir_error1.phpt:1.2 Tue Feb 26 09:40:49 2008 +++ php-src/ext/standard/tests/dir/chdir_error1.phpt Mon May 26 23:48:29 2008 @@ -37,16 +37,3 @@ Warning: chdir() expects exactly 1 parameter, 2 given in %s on line %d NULL ===DONE=== ---UEXPECTF-- -*** Testing chdir() : error conditions *** - --- Testing chdir() function with Zero arguments -- - -Warning: chdir() expects exactly 1 parameter, 0 given in %s on line %d -NULL - --- Testing chdir() function with more than expected no. of arguments -- - -Warning: chdir() expects exactly 1 parameter, 2 given in %s on line %d -NULL -===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/chdir_error2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/chdir_error2.phpt diff -u php-src/ext/standard/tests/dir/chdir_error2.phpt:1.2 php-src/ext/standard/tests/dir/chdir_error2.phpt:1.3 --- php-src/ext/standard/tests/dir/chdir_error2.phpt:1.2 Tue Feb 26 09:40:49 2008 +++ php-src/ext/standard/tests/dir/chdir_error2.phpt Mon May 26 23:48:29 2008 @@ -24,9 +24,3 @@ Warning: chdir(): %s (errno %d) in %s on line %d bool(false) ===DONE=== ---UEXPECTF-- -*** Testing chdir() : error conditions *** - -Warning: chdir(): %s (errno %d) in %s on line %d -bool(false) -===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/chdir_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/chdir_variation1.phpt diff -u php-src/ext/standard/tests/dir/chdir_variation1.phpt:1.2 php-src/ext/standard/tests/dir/chdir_variation1.phpt:1.3 --- php-src/ext/standard/tests/dir/chdir_variation1.phpt:1.2 Tue Feb 26 09:40:49 2008 +++ php-src/ext/standard/tests/dir/chdir_variation1.phpt Mon May 26 23:48:29 2008 @@ -235,127 +235,3 @@ Warning: chdir(): %s (errno %d) in %s on line %d bool(false) ===DONE=== ---UEXPECTF-- -*** Testing chdir() : usage variations *** - --- Iteration 1 -- - -Warning: chdir(): %s (errno %d) in %s on line %d -bool(false) - --- Iteration 2 -- - -Warning: chdir(): %s (errno %d) in %s on line %d -bool(false) - --- Iteration 3 -- - -Warning: chdir(): %s (errno %d) in %s on line %d -bool(false) - --- Iteration 4 -- - -Warning: chdir(): %s (errno %d) in %s on line %d -bool(false) - --- Iteration 5 -- - -Warning: chdir(): %s (errno %d) in %s on line %d -bool(false) - --- Iteration 6 -- - -Warning: chdir(): %s (errno %d) in %s on line %d -bool(false) - --- Iteration 7 -- - -Warning: chdir(): %s (errno %d) in %s on line %d -bool(false) - --- Iteration 8 -- - -Warning: chdir(): %s (errno %d) in %s on line %d -bool(false) - --- Iteration 9 -- - -Warning: chdir(): %s (errno %d) in %s on line %d -bool(false) - --- Iteration 10 -- - -Warning: chdir(): %s (errno %d) in %s on line %d -bool(false) - --- Iteration 11 -- - -Warning: chdir(): %s (errno %d) in %s on line %d -bool(false) - --- Iteration 12 -- - -Warning: chdir(): %s (errno %d) in %s on line %d -bool(false) - --- Iteration 13 -- - -Warning: chdir(): %s (errno %d) in %s on line %d -bool(false) - --- Iteration 14 -- - -Warning: chdir(): %s (errno %d) in %s on line %d -bool(false) - --- Iteration 15 -- - -Warning: chdir(): %s (errno %d) in %s on line %d -bool(false) - --- Iteration 16 -- - -Warning: chdir(): %s (errno %d) in %s on line %d -bool(false) - --- Iteration 17 -- - -Warning: chdir(): %s (errno %d) in %s on line %d -bool(false) - --- Iteration 18 -- - -Notice: Array to string conversion in %s on line %d - -Warning: chdir(): %s (errno %d) in %s on line %d -bool(false) - --- Iteration 19 -- -bool(true) - --- Iteration 20 -- - -Warning: chdir(): %s (errno %d) in %s on line %d -bool(false) - --- Iteration 21 -- -bool(true) - --- Iteration 22 -- -bool(true) - --- Iteration 23 -- - -Warning: chdir(): %s (errno %d) in %s on line %d -bool(false) - --- Iteration 24 -- - -Warning: chdir(): %s (errno %d) in %s on line %d -bool(false) - --- Iteration 25 -- - -Warning: chdir(): %s (errno %d) in %s on line %d -bool(false) -===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/chdir_variation2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/chdir_variation2.phpt diff -u php-src/ext/standard/tests/dir/chdir_variation2.phpt:1.2 php-src/ext/standard/tests/dir/chdir_variation2.phpt:1.3 --- php-src/ext/standard/tests/dir/chdir_variation2.phpt:1.2 Tue Feb 26 09:40:49 2008 +++ php-src/ext/standard/tests/dir/chdir_variation2.phpt Mon May 26 23:48:29 2008 @@ -72,42 +72,6 @@ -- $directory = './level_one': -- bool(true) bool(true) -string(%d) "%slevel_one" - --- $directory = 'level_one/level_two': -- -bool(true) -bool(true) -string(%d) "%slevel_one%elevel_two" - --- $directory = '..': -- -bool(true) -string(%d) "%slevel_one" - --- $directory = 'level_two', '.': -- -bool(true) -bool(true) -string(%d) "%slevel_one%elevel_two" - --- $directory = '../': -- -bool(true) -string(%d) "%slevel_one" - --- $directory = './': -- -bool(true) -bool(true) -string(%d) "%slevel_one%elevel_two" - --- $directory = '../../'level_one': -- -bool(true) -bool(true) -string(%d) "%slevel_one" -===DONE=== ---UEXPECTF-- -*** Testing chdir() : usage variations *** - --- $directory = './level_one': -- -bool(true) -bool(true) unicode(%d) "%slevel_one" -- $directory = 'level_one/level_two': -- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/closedir_basic.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/dir/closedir_basic.phpt diff -u php-src/ext/standard/tests/dir/closedir_basic.phpt:1.3 php-src/ext/standard/tests/dir/closedir_basic.phpt:1.4 --- php-src/ext/standard/tests/dir/closedir_basic.phpt:1.3 Mon Mar 17 15:35:25 2008 +++ php-src/ext/standard/tests/dir/closedir_basic.phpt Mon May 26 23:48:29 2008 @@ -54,16 +54,3 @@ -- Check Directory Handle: -- resource(%d) of type (Unknown) ===DONE=== ---UEXPECTF-- -*** Testing closedir() : basic functionality *** - --- Call closedir() with no arguments: -- -NULL --- Check Directory Handle: -- -resource(%d) of type (Unknown) - --- Call closedir() with $dir_handle argument supplied: -- -NULL --- Check Directory Handle: -- -resource(%d) of type (Unknown) -===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/closedir_error.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/closedir_error.phpt diff -u php-src/ext/standard/tests/dir/closedir_error.phpt:1.2 php-src/ext/standard/tests/dir/closedir_error.phpt:1.3 --- php-src/ext/standard/tests/dir/closedir_error.phpt:1.2 Fri Mar 7 16:02:42 2008 +++ php-src/ext/standard/tests/dir/closedir_error.phpt Mon May 26 23:48:29 2008 @@ -43,11 +43,3 @@ Warning: Wrong parameter count for closedir() in %s on line %d NULL ===DONE=== ---UEXPECTF-- -*** Testing closedir() : error conditions *** - --- Testing closedir() function with more than expected no. of arguments -- - -Warning: Wrong parameter count for closedir() in %s on line %d -NULL -===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/closedir_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/closedir_variation1.phpt diff -u php-src/ext/standard/tests/dir/closedir_variation1.phpt:1.2 php-src/ext/standard/tests/dir/closedir_variation1.phpt:1.3 --- php-src/ext/standard/tests/dir/closedir_variation1.phpt:1.2 Fri Mar 7 16:02:42 2008 +++ php-src/ext/standard/tests/dir/closedir_variation1.phpt Mon May 26 23:48:29 2008 @@ -210,126 +210,3 @@ Warning: closedir(): supplied argument is not a valid Directory resource in %s on line %d bool(false) ===DONE=== ---UEXPECTF-- -*** Testing closedir() : usage variations *** - --- Iteration 1 -- - -Warning: closedir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 2 -- - -Warning: closedir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 3 -- - -Warning: closedir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 4 -- - -Warning: closedir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 5 -- - -Warning: closedir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 6 -- - -Warning: closedir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 7 -- - -Warning: closedir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 8 -- - -Warning: closedir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 9 -- - -Warning: closedir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 10 -- - -Warning: closedir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 11 -- - -Warning: closedir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 12 -- - -Warning: closedir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 13 -- - -Warning: closedir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 14 -- - -Warning: closedir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 15 -- - -Warning: closedir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 16 -- - -Warning: closedir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 17 -- - -Warning: closedir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 18 -- - -Warning: closedir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 19 -- - -Warning: closedir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 20 -- - -Warning: closedir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 21 -- - -Warning: closedir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 22 -- - -Warning: closedir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 23 -- - -Warning: closedir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 24 -- - -Warning: closedir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) -===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/closedir_variation2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/closedir_variation2.phpt diff -u php-src/ext/standard/tests/dir/closedir_variation2.phpt:1.2 php-src/ext/standard/tests/dir/closedir_variation2.phpt:1.3 --- php-src/ext/standard/tests/dir/closedir_variation2.phpt:1.2 Fri Mar 7 16:02:42 2008 +++ php-src/ext/standard/tests/dir/closedir_variation2.phpt Mon May 26 23:48:29 2008 @@ -49,16 +49,3 @@ bool(false) Directory Handle: resource(%d) of type (Unknown) ===DONE=== ---UEXPECTF-- -*** Testing closedir() : usage variations *** - --- Close directory handle first time: -- -NULL -Directory Handle: resource(%d) of type (Unknown) - --- Close directory handle second time: -- - -Warning: closedir(): %d is not a valid Directory resource in %s on line %d -bool(false) -Directory Handle: resource(%d) of type (Unknown) -===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/closedir_variation3.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/dir/closedir_variation3.phpt diff -u php-src/ext/standard/tests/dir/closedir_variation3.phpt:1.3 php-src/ext/standard/tests/dir/closedir_variation3.phpt:1.4 --- php-src/ext/standard/tests/dir/closedir_variation3.phpt:1.3 Tue Mar 11 10:20:06 2008 +++ php-src/ext/standard/tests/dir/closedir_variation3.phpt Mon May 26 23:48:29 2008 @@ -42,17 +42,3 @@ -- Check file pointer: -- resource(%d) of type (stream) ===DONE=== ---UEXPECTF-- -*** Testing closedir() : usage variations *** - --- Open a file using fopen() -- -resource(%d) of type (stream) - --- Try to close the file pointer using closedir() -- - -Warning: closedir(): %d is not a valid Directory resource in %s on line %d -bool(false) - --- Check file pointer: -- -resource(%d) of type (stream) -===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/dir_basic.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/dir/dir_basic.phpt diff -u php-src/ext/standard/tests/dir/dir_basic.phpt:1.1 php-src/ext/standard/tests/dir/dir_basic.phpt:1.2 --- php-src/ext/standard/tests/dir/dir_basic.phpt:1.1 Mon Dec 24 05:07:47 2007 +++ php-src/ext/standard/tests/dir/dir_basic.phpt Mon May 26 23:48:29 2008 @@ -56,38 +56,6 @@ *** Testing dir() : basic functionality *** Get Directory instance: object(Directory)#%d (2) { - ["path"]=> - string(%d) "%s/dir_basic" - ["handle"]=> - resource(%d) of type (stream) -} - -Read and rewind: -string(%d) "%s" -string(%d) "%s" -NULL - -Test using handle directly: -string(%d) "%s" -string(%d) "%s" - -Close directory: -NULL -object(Directory)#%d (2) { - ["path"]=> - string(%d) "%s/dir_basic" - ["handle"]=> - resource(%d) of type (Unknown) -} - -Test read after closing the dir: -Warning: Directory::read(): %d is not a valid Directory resource in %s on line %d -bool(false) -Done ---UEXPECTF-- -*** Testing dir() : basic functionality *** -Get Directory instance: -object(Directory)#%d (2) { [u"path"]=> unicode(%d) "%s/dir_basic" [u"handle"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/dir_error.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/dir/dir_error.phpt diff -u php-src/ext/standard/tests/dir/dir_error.phpt:1.1 php-src/ext/standard/tests/dir/dir_error.phpt:1.2 --- php-src/ext/standard/tests/dir/dir_error.phpt:1.1 Mon Dec 24 05:07:47 2007 +++ php-src/ext/standard/tests/dir/dir_error.phpt Mon May 26 23:48:29 2008 @@ -32,14 +32,3 @@ Warning: dir() expects at most 2 parameters, 3 given in %s on line %d NULL Done ---UEXPECTF-- -*** Testing dir() : error conditions *** - --- Testing dir() function with zero arguments -- -Warning: dir() expects at least 1 parameter, 0 given in %s on line %d -NULL - --- Testing dir() function with one more than expected number of arguments -- -Warning: dir() expects at most 2 parameters, 3 given in %s on line %d -NULL -Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/dir_variation1.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/dir/dir_variation1.phpt diff -u php-src/ext/standard/tests/dir/dir_variation1.phpt:1.1 php-src/ext/standard/tests/dir/dir_variation1.phpt:1.2 --- php-src/ext/standard/tests/dir/dir_variation1.phpt:1.1 Mon Dec 24 05:07:47 2007 +++ php-src/ext/standard/tests/dir/dir_variation1.phpt Mon May 26 23:48:29 2008 @@ -171,90 +171,3 @@ Warning: dir(ClassAObject): failed to open dir: %s in %s on line %d bool(false) Done ---UEXPECTF-- -*** Testing dir() : unexpected values for $directory argument *** - --- Iteration 1 -- - -Notice: Array to string conversion in %s on line %d - -Warning: dir(Array): failed to open dir: %s in %s on line %d -bool(false) - --- Iteration 2 -- - -Notice: Array to string conversion in %s on line %d - -Warning: dir(Array): failed to open dir: %s in %s on line %d -bool(false) - --- Iteration 3 -- - -Notice: Array to string conversion in %s on line %d - -Warning: dir(Array): failed to open dir: %s in %s on line %d -bool(false) - --- Iteration 4 -- - -Notice: Array to string conversion in %s on line %d - -Warning: dir(Array): failed to open dir: %s in %s on line %d -bool(false) - --- Iteration 5 -- - -Notice: Array to string conversion in %s on line %d - -Warning: dir(Array): failed to open dir: %s in %s on line %d -bool(false) - --- Iteration 6 -- -bool(false) - --- Iteration 7 -- -bool(false) - --- Iteration 8 -- - -Warning: dir(1): failed to open dir: %s in %s on line %d -bool(false) - --- Iteration 9 -- -bool(false) - --- Iteration 10 -- - -Warning: dir(1): failed to open dir: %s in %s on line %d -bool(false) - --- Iteration 11 -- -bool(false) - --- Iteration 12 -- -bool(false) - --- Iteration 13 -- -bool(false) - --- Iteration 14 -- -bool(false) - --- Iteration 15 -- -bool(false) - --- Iteration 16 -- - -Warning: dir(Resource id #%d): failed to open dir: %s in %s on line %d -bool(false) - --- Iteration 17 -- - -Warning: dir(Resource id #%d): failed to open dir: %s in %s on line %d -bool(false) - --- Iteration 18 -- - -Warning: dir(ClassAObject): failed to open dir: %s in %s on line %d -bool(false) -Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/dir_variation2.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/dir/dir_variation2.phpt diff -u php-src/ext/standard/tests/dir/dir_variation2.phpt:1.1 php-src/ext/standard/tests/dir/dir_variation2.phpt:1.2 --- php-src/ext/standard/tests/dir/dir_variation2.phpt:1.1 Mon Dec 24 05:07:47 2007 +++ php-src/ext/standard/tests/dir/dir_variation2.phpt Mon May 26 23:48:29 2008 @@ -190,121 +190,6 @@ NULL -- Iteration 21 -- -Warning: dir() expects parameter 2 to be resource, string given in %s on line %d -NULL - --- Iteration 22 -- -Warning: dir() expects parameter 2 to be resource, string given in %s on line %d -NULL - --- Iteration 23 -- -Warning: dir() expects parameter 2 to be resource, string given in %s on line %d -NULL - --- Iteration 24 -- -Warning: dir() expects parameter 2 to be resource, string given in %s on line %d -NULL - --- Iteration 25 -- -Warning: dir() expects parameter 2 to be resource, string given in %s on line %d -NULL - --- Iteration 26 -- -Warning: dir() expects parameter 2 to be resource, object given in %s on line %d -NULL - --- Iteration 27 -- -Warning: dir() expects parameter 2 to be resource, null given in %s on line %d -NULL - --- Iteration 28 -- -Warning: dir() expects parameter 2 to be resource, null given in %s on line %d -NULL -Done ---UEXPECTF-- -*** Testing dir() : unexpected values for $context argument *** - --- Iteration 1 -- -Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d -NULL - --- Iteration 2 -- -Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d -NULL - --- Iteration 3 -- -Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d -NULL - --- Iteration 4 -- -Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d -NULL - --- Iteration 5 -- -Warning: dir() expects parameter 2 to be resource, double given in %s on line %d -NULL - --- Iteration 6 -- -Warning: dir() expects parameter 2 to be resource, double given in %s on line %d -NULL - --- Iteration 7 -- -Warning: dir() expects parameter 2 to be resource, double given in %s on line %d -NULL - --- Iteration 8 -- -Warning: dir() expects parameter 2 to be resource, double given in %s on line %d -NULL - --- Iteration 9 -- -Warning: dir() expects parameter 2 to be resource, double given in %s on line %d -NULL - --- Iteration 10 -- -Warning: dir() expects parameter 2 to be resource, array given in %s on line %d -NULL - --- Iteration 11 -- -Warning: dir() expects parameter 2 to be resource, array given in %s on line %d -NULL - --- Iteration 12 -- -Warning: dir() expects parameter 2 to be resource, array given in %s on line %d -NULL - --- Iteration 13 -- -Warning: dir() expects parameter 2 to be resource, array given in %s on line %d -NULL - --- Iteration 14 -- -Warning: dir() expects parameter 2 to be resource, array given in %s on line %d -NULL - --- Iteration 15 -- -Warning: dir() expects parameter 2 to be resource, null given in %s on line %d -NULL - --- Iteration 16 -- -Warning: dir() expects parameter 2 to be resource, null given in %s on line %d -NULL - --- Iteration 17 -- -Warning: dir() expects parameter 2 to be resource, boolean given in %s on line %d -NULL - --- Iteration 18 -- -Warning: dir() expects parameter 2 to be resource, boolean given in %s on line %d -NULL - --- Iteration 19 -- -Warning: dir() expects parameter 2 to be resource, boolean given in %s on line %d -NULL - --- Iteration 20 -- -Warning: dir() expects parameter 2 to be resource, boolean given in %s on line %d -NULL - --- Iteration 21 -- Warning: dir() expects parameter 2 to be resource, Unicode string given in %s on line %d NULL http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/dir_variation3.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/dir_variation3.phpt diff -u php-src/ext/standard/tests/dir/dir_variation3.phpt:1.2 php-src/ext/standard/tests/dir/dir_variation3.phpt:1.3 --- php-src/ext/standard/tests/dir/dir_variation3.phpt:1.2 Tue Dec 25 16:14:32 2007 +++ php-src/ext/standard/tests/dir/dir_variation3.phpt Mon May 26 23:48:29 2008 @@ -95,118 +95,6 @@ -- Iteration 1 -- bool(true) object(Directory)#%d (2) { - ["path"]=> - string(%d) "%s/dir_variation3" - ["handle"]=> - resource(%d) of type (stream) -} --- reading contents -- -string(%d) "%s" - --- Iteration 2 -- -bool(true) -object(Directory)#%d (2) { - ["path"]=> - string(%d) "%s/dir_variation3" - ["handle"]=> - resource(%d) of type (stream) -} --- reading contents -- -string(%d) "%s" - --- Iteration 3 -- -bool(true) -object(Directory)#%d (2) { - ["path"]=> - string(%d) "%s/dir_variation3" - ["handle"]=> - resource(%d) of type (stream) -} --- reading contents -- -string(%d) "%s" - --- Iteration 4 -- -bool(true) -object(Directory)#%d (2) { - ["path"]=> - string(%d) "%s/dir_variation3" - ["handle"]=> - resource(%d) of type (stream) -} --- reading contents -- -string(%d) "%s" - --- Iteration 5 -- -bool(true) -object(Directory)#%d (2) { - ["path"]=> - string(%d) "%s/dir_variation3" - ["handle"]=> - resource(%d) of type (stream) -} --- reading contents -- -string(%d) "%s" - --- Iteration 6 -- -bool(true) -object(Directory)#%d (2) { - ["path"]=> - string(%d) "%s/dir_variation3" - ["handle"]=> - resource(%d) of type (stream) -} --- reading contents -- -string(%d) "%s" - --- Iteration 7 -- -bool(true) -object(Directory)#%d (2) { - ["path"]=> - string(%d) "%s/dir_variation3" - ["handle"]=> - resource(%d) of type (stream) -} --- reading contents -- -string(%d) "%s" - --- Iteration 8 -- -bool(true) -object(Directory)#%d (2) { - ["path"]=> - string(%d) "%s/dir_variation3" - ["handle"]=> - resource(%d) of type (stream) -} --- reading contents -- -string(%d) "%s" - --- Iteration 9 -- -bool(true) -object(Directory)#%d (2) { - ["path"]=> - string(%d) "%s/dir_variation3" - ["handle"]=> - resource(%d) of type (stream) -} --- reading contents -- -string(%d) "%s" - --- Iteration 10 -- -bool(true) -object(Directory)#%d (2) { - ["path"]=> - string(%d) "%s/dir_variation3" - ["handle"]=> - resource(%d) of type (stream) -} --- reading contents -- -string(%d) "%s" -Done ---UEXPECTF-- -*** Testing dir() : different directory permissions *** --- Iteration 1 -- -bool(true) -object(Directory)#%d (2) { [u"path"]=> unicode(%d) "%s/dir_variation3" [u"handle"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/dir_variation4.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/dir/dir_variation4.phpt diff -u php-src/ext/standard/tests/dir/dir_variation4.phpt:1.1 php-src/ext/standard/tests/dir/dir_variation4.phpt:1.2 --- php-src/ext/standard/tests/dir/dir_variation4.phpt:1.1 Mon Dec 24 05:07:47 2007 +++ php-src/ext/standard/tests/dir/dir_variation4.phpt Mon May 26 23:48:29 2008 @@ -54,25 +54,6 @@ --EXPECTF-- *** Testing dir() : operate on previously opened directory *** object(Directory)#%d (2) { - ["path"]=> - string(%d) "%s/dir_variation4" - ["handle"]=> - resource(%d) of type (stream) -} -object(Directory)#%d (2) { - ["path"]=> - string(%d) "%s/dir_variation4" - ["handle"]=> - resource(%d) of type (stream) -} --- reading directory contents with previous handle -- -string(%d) "%s" --- reading directory contents with current handle -- -string(%d) "%s" -Done ---UEXPECTF-- -*** Testing dir() : operate on previously opened directory *** -object(Directory)#%d (2) { [u"path"]=> unicode(%d) "%s/dir_variation4" [u"handle"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/dir_variation5.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/dir/dir_variation5.phpt diff -u php-src/ext/standard/tests/dir/dir_variation5.phpt:1.1 php-src/ext/standard/tests/dir/dir_variation5.phpt:1.2 --- php-src/ext/standard/tests/dir/dir_variation5.phpt:1.1 Mon Dec 24 05:07:47 2007 +++ php-src/ext/standard/tests/dir/dir_variation5.phpt Mon May 26 23:48:29 2008 @@ -27,9 +27,3 @@ Warning: dir(%s): failed to open dir: %s in %s on line %d bool(false) Done ---UEXPECTF-- -*** Testing dir() : open a file instead of a directory *** - -Warning: dir(%s): failed to open dir: %s in %s on line %d -bool(false) -Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/dir_variation6.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/dir/dir_variation6.phpt diff -u php-src/ext/standard/tests/dir/dir_variation6.phpt:1.1 php-src/ext/standard/tests/dir/dir_variation6.phpt:1.2 --- php-src/ext/standard/tests/dir/dir_variation6.phpt:1.1 Mon Dec 24 05:07:47 2007 +++ php-src/ext/standard/tests/dir/dir_variation6.phpt Mon May 26 23:48:29 2008 @@ -49,14 +49,3 @@ Warning: dir(%s): failed to open dir: %s in %s on line %d bool(false) Done ---UEXPECTF-- -*** Testing dir() : open a non-existent directory *** --- opening previously removed directory -- - -Warning: dir(%s): failed to open dir: %s in %s on line %d -bool(false) --- opening non-existent directory -- - -Warning: dir(%s): failed to open dir: %s in %s on line %d -bool(false) -Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/dir_variation7.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/dir/dir_variation7.phpt diff -u php-src/ext/standard/tests/dir/dir_variation7.phpt:1.3 php-src/ext/standard/tests/dir/dir_variation7.phpt:1.4 --- php-src/ext/standard/tests/dir/dir_variation7.phpt:1.3 Mon Mar 10 15:19:59 2008 +++ php-src/ext/standard/tests/dir/dir_variation7.phpt Mon May 26 23:48:29 2008 @@ -92,14 +92,3 @@ Warning: dir(%s/dir_variation7/sub_dir/child_dir): failed to open dir: %s in %s on line %d bool(false) Done ---UEXPECTF-- -*** Testing dir() : remove execute permission from the parent dir *** --- After restricting 1st level parent directory -- - -Warning: dir(%s/dir_variation7/sub_dir/child_dir): failed to open dir: %s in %s on line %d -bool(false) --- After restricting parent directory -- - -Warning: dir(%s/dir_variation7/sub_dir/child_dir): failed to open dir: %s in %s on line %d -bool(false) -Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/dir_variation8.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/dir/dir_variation8.phpt diff -u php-src/ext/standard/tests/dir/dir_variation8.phpt:1.1 php-src/ext/standard/tests/dir/dir_variation8.phpt:1.2 --- php-src/ext/standard/tests/dir/dir_variation8.phpt:1.1 Mon Dec 24 05:07:47 2007 +++ php-src/ext/standard/tests/dir/dir_variation8.phpt Mon May 26 23:48:29 2008 @@ -61,20 +61,3 @@ Warning: dir(%s/dir_variation81/sub?dir1): failed to open dir: %s in %s on line %d bool(false) Done ---UEXPECTF-- -*** Testing dir() : checking with wildcard characters *** --- wildcard = '*' -- - -Warning: dir(%s/dir_var*): failed to open dir: %s in %s on line %d -bool(false) - -Warning: dir(%s/*): failed to open dir: %s in %s on line %d -bool(false) --- wildcard = '?' -- - -Warning: dir(%s/dir_variation81/sub_dir?): failed to open dir: %s in %s on line %d -bool(false) - -Warning: dir(%s/dir_variation81/sub?dir1): failed to open dir: %s in %s on line %d -bool(false) -Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/dir_variation9.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/dir/dir_variation9.phpt diff -u php-src/ext/standard/tests/dir/dir_variation9.phpt:1.1 php-src/ext/standard/tests/dir/dir_variation9.phpt:1.2 --- php-src/ext/standard/tests/dir/dir_variation9.phpt:1.1 Mon Dec 24 05:07:47 2007 +++ php-src/ext/standard/tests/dir/dir_variation9.phpt Mon May 26 23:48:29 2008 @@ -71,49 +71,6 @@ -- With valid paths -- object(Directory)#%d (2) { - ["path"]=> - string(%d) "%s/dir_variation91/sub_dir11/sub_dir111/.." - ["handle"]=> - resource(%d) of type (stream) -} -object(Directory)#%d (2) { - ["path"]=> - string(%d) "%s/dir_variation92/sub_dir21/../../dir_variation91" - ["handle"]=> - resource(%d) of type (stream) -} -object(Directory)#%d (2) { - ["path"]=> - string(%d) "%s/dir_variation92/sub_dir21/../../dir_variation91/sub_dir11/.." - ["handle"]=> - resource(%d) of type (stream) -} -object(Directory)#%d (2) { - ["path"]=> - string(%d) "%s/dir_variation91/sub_dir11/sub_dir111/../../../dir_variation92/sub_dir21/.." - ["handle"]=> - resource(%d) of type (stream) -} - --- With invalid paths -- - -Warning: dir(%s/dir_variation91/sub_dir12/sub_dir111/..): failed to open dir: %s in %s on line %d -bool(false) - -Warning: dir(%s/dir_variation92/sub_dir21/../dir_variation91): failed to open dir: %s in %s on line %d -bool(false) - -Warning: dir(%s/dir_variation92/sub_dir21/../../dir_variation91/sub_dir12/..): failed to open dir: %s in %s on line %d -bool(false) - -Warning: dir(%s/dir_variation91/sub_dir11/sub_dir111/../../dir_variation92/sub_dir21/..): failed to open dir: %s in %s on line %d -bool(false) -Done ---UEXPECTF-- -*** Testing dir() : checking with valid and invalid paths *** - --- With valid paths -- -object(Directory)#%d (2) { [u"path"]=> unicode(%d) "%s/dir_variation91/sub_dir11/sub_dir111/.." [u"handle"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/getcwd_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/getcwd_basic.phpt diff -u php-src/ext/standard/tests/dir/getcwd_basic.phpt:1.2 php-src/ext/standard/tests/dir/getcwd_basic.phpt:1.3 --- php-src/ext/standard/tests/dir/getcwd_basic.phpt:1.2 Mon Mar 10 15:24:14 2008 +++ php-src/ext/standard/tests/dir/getcwd_basic.phpt Mon May 26 23:48:29 2008 @@ -29,11 +29,6 @@ ?> --EXPECTF-- *** Testing getcwd() : basic functionality *** -string(%d) "%s" -string(%d) "%s%egetcwd_basic" -===DONE=== ---UEXPECTF-- -*** Testing getcwd() : basic functionality *** unicode(%d) "%s" unicode(%d) "%s%egetcwd_basic" ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/getcwd_error.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/getcwd_error.phpt diff -u php-src/ext/standard/tests/dir/getcwd_error.phpt:1.2 php-src/ext/standard/tests/dir/getcwd_error.phpt:1.3 --- php-src/ext/standard/tests/dir/getcwd_error.phpt:1.2 Mon Mar 10 15:24:14 2008 +++ php-src/ext/standard/tests/dir/getcwd_error.phpt Mon May 26 23:48:29 2008 @@ -27,11 +27,3 @@ Warning: getcwd() expects exactly 0 parameters, 1 given in %s on line %d NULL ===DONE=== ---UEXPECTF-- -*** Testing getcwd() : error conditions *** - --- Testing getcwd() function with one argument -- - -Warning: getcwd() expects exactly 0 parameters, 1 given in %s on line %d -NULL -===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/opendir_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/opendir_basic.phpt diff -u php-src/ext/standard/tests/dir/opendir_basic.phpt:1.2 php-src/ext/standard/tests/dir/opendir_basic.phpt:1.3 --- php-src/ext/standard/tests/dir/opendir_basic.phpt:1.2 Tue Mar 4 10:45:40 2008 +++ php-src/ext/standard/tests/dir/opendir_basic.phpt Mon May 26 23:48:29 2008 @@ -60,17 +60,3 @@ resource(%d) of type (Unknown) resource(%d) of type (Unknown) ===DONE=== ---UEXPECTF-- -*** Testing opendir() : basic functionality *** - --- Testing opendir() with absolute path: -- -resource(%d) of type (stream) - --- Testing opendir() with relative paths: -- -bool(true) -resource(%d) of type (stream) - --- Close directory handles: -- -resource(%d) of type (Unknown) -resource(%d) of type (Unknown) -===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/opendir_error1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/opendir_error1.phpt diff -u php-src/ext/standard/tests/dir/opendir_error1.phpt:1.2 php-src/ext/standard/tests/dir/opendir_error1.phpt:1.3 --- php-src/ext/standard/tests/dir/opendir_error1.phpt:1.2 Tue Mar 4 10:45:40 2008 +++ php-src/ext/standard/tests/dir/opendir_error1.phpt Mon May 26 23:48:29 2008 @@ -45,16 +45,3 @@ Warning: opendir() expects at most 2 parameters, 3 given in %s on line %d NULL ===DONE=== ---UEXPECTF-- -*** Testing opendir() : error conditions *** - --- Testing opendir() function with Zero arguments -- - -Warning: opendir() expects at least 1 parameter, 0 given in %s on line %d -NULL - --- Testing opendir() function with more than expected no. of arguments -- - -Warning: opendir() expects at most 2 parameters, 3 given in %s on line %d -NULL -===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/opendir_error2.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/dir/opendir_error2.phpt diff -u php-src/ext/standard/tests/dir/opendir_error2.phpt:1.3 php-src/ext/standard/tests/dir/opendir_error2.phpt:1.4 --- php-src/ext/standard/tests/dir/opendir_error2.phpt:1.3 Mon Mar 10 15:19:59 2008 +++ php-src/ext/standard/tests/dir/opendir_error2.phpt Mon May 26 23:48:29 2008 @@ -35,16 +35,3 @@ Warning: opendir(idonotexist): failed to open dir: %s in %s on line %d bool(false) ===DONE=== ---UEXPECTF-- -*** Testing opendir() : error conditions *** - --- Pass a non-existent absolute path: -- - -Warning: opendir(%s/idonotexist): failed to open dir: %s in %s on line %d -bool(false) - --- Pass a non-existent relative path: -- - -Warning: opendir(idonotexist): failed to open dir: %s in %s on line %d -bool(false) -===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/opendir_variation1.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/dir/opendir_variation1.phpt diff -u php-src/ext/standard/tests/dir/opendir_variation1.phpt:1.3 php-src/ext/standard/tests/dir/opendir_variation1.phpt:1.4 --- php-src/ext/standard/tests/dir/opendir_variation1.phpt:1.3 Mon Mar 10 15:19:59 2008 +++ php-src/ext/standard/tests/dir/opendir_variation1.phpt Mon May 26 23:48:29 2008 @@ -218,111 +218,3 @@ Warning: opendir(Resource id #%d): failed to open dir: %s in %s on line %d bool(false) ===DONE=== ---UEXPECTF-- -*** Testing opendir() : usage variations *** - --- Iteration 1 -- - -Warning: opendir(0): failed to open dir: %s in %s on line %d -bool(false) - --- Iteration 2 -- - -Warning: opendir(1): failed to open dir: %s in %s on line %d -bool(false) - --- Iteration 3 -- - -Warning: opendir(12345): failed to open dir: %s in %s on line %d -bool(false) - --- Iteration 4 -- - -Warning: opendir(-2345): failed to open dir: %s in %s on line %d -bool(false) - --- Iteration 5 -- - -Warning: opendir(10.5): failed to open dir: %s in %s on line %d -bool(false) - --- Iteration 6 -- - -Warning: opendir(-10.5): failed to open dir: %s in %s on line %d -bool(false) - --- Iteration 7 -- - -Warning: opendir(123456789000): failed to open dir: %s in %s on line %d -bool(false) - --- Iteration 8 -- - -Warning: opendir(1.23456789E-9): failed to open dir: %s in %s on line %d -bool(false) - --- Iteration 9 -- - -Warning: opendir(0.5): failed to open dir: %s in %s on line %d -bool(false) - --- Iteration 10 -- -bool(false) - --- Iteration 11 -- -bool(false) - --- Iteration 12 -- - -Warning: opendir(1): failed to open dir: %s in %s on line %d -bool(false) - --- Iteration 13 -- -bool(false) - --- Iteration 14 -- - -Warning: opendir(1): failed to open dir: %s in %s on line %d -bool(false) - --- Iteration 15 -- -bool(false) - --- Iteration 16 -- -bool(false) - --- Iteration 17 -- -bool(false) - --- Iteration 18 -- - -Notice: Array to string conversion in %s on line %d - -Warning: opendir(Array): failed to open dir: %s in %s on line %d -bool(false) - --- Iteration 19 -- -resource(%d) of type (stream) - --- Iteration 20 -- - -Warning: opendir(string): failed to open dir: %s in %s on line %d -bool(false) - --- Iteration 21 -- -resource(%d) of type (stream) - --- Iteration 22 -- -resource(%d) of type (stream) - --- Iteration 23 -- -bool(false) - --- Iteration 24 -- -bool(false) - --- Iteration 25 -- - -Warning: opendir(Resource id #%d): failed to open dir: %s in %s on line %d -bool(false) -===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/opendir_variation2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/opendir_variation2.phpt diff -u php-src/ext/standard/tests/dir/opendir_variation2.phpt:1.2 php-src/ext/standard/tests/dir/opendir_variation2.phpt:1.3 --- php-src/ext/standard/tests/dir/opendir_variation2.phpt:1.2 Tue Mar 4 10:45:40 2008 +++ php-src/ext/standard/tests/dir/opendir_variation2.phpt Mon May 26 23:48:29 2008 @@ -189,134 +189,6 @@ -- Iteration 16 -- -Warning: opendir() expects parameter 2 to be resource, string given in %s on line %d -NULL - --- Iteration 17 -- - -Warning: opendir() expects parameter 2 to be resource, string given in %s on line %d -NULL - --- Iteration 18 -- - -Warning: opendir() expects parameter 2 to be resource, array given in %s on line %d -NULL - --- Iteration 19 -- - -Warning: opendir() expects parameter 2 to be resource, string given in %s on line %d -NULL - --- Iteration 20 -- - -Warning: opendir() expects parameter 2 to be resource, string given in %s on line %d -NULL - --- Iteration 21 -- - -Warning: opendir() expects parameter 2 to be resource, string given in %s on line %d -NULL - --- Iteration 22 -- - -Warning: opendir() expects parameter 2 to be resource, object given in %s on line %d -NULL - --- Iteration 23 -- - -Warning: opendir() expects parameter 2 to be resource, null given in %s on line %d -NULL - --- Iteration 24 -- - -Warning: opendir() expects parameter 2 to be resource, null given in %s on line %d -NULL - --- Iteration 25 -- - -Warning: opendir(): supplied resource is not a valid Stream-Context resource in %s on line %d -resource(%d) of type (stream) -===DONE=== ---UEXPECTF-- -*** Testing opendir() : usage variation *** - --- Iteration 1 -- - -Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d -NULL - --- Iteration 2 -- - -Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d -NULL - --- Iteration 3 -- - -Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d -NULL - --- Iteration 4 -- - -Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d -NULL - --- Iteration 5 -- - -Warning: opendir() expects parameter 2 to be resource, double given in %s on line %d -NULL - --- Iteration 6 -- - -Warning: opendir() expects parameter 2 to be resource, double given in %s on line %d -NULL - --- Iteration 7 -- - -Warning: opendir() expects parameter 2 to be resource, double given in %s on line %d -NULL - --- Iteration 8 -- - -Warning: opendir() expects parameter 2 to be resource, double given in %s on line %d -NULL - --- Iteration 9 -- - -Warning: opendir() expects parameter 2 to be resource, double given in %s on line %d -NULL - --- Iteration 10 -- - -Warning: opendir() expects parameter 2 to be resource, null given in %s on line %d -NULL - --- Iteration 11 -- - -Warning: opendir() expects parameter 2 to be resource, null given in %s on line %d -NULL - --- Iteration 12 -- - -Warning: opendir() expects parameter 2 to be resource, boolean given in %s on line %d -NULL - --- Iteration 13 -- - -Warning: opendir() expects parameter 2 to be resource, boolean given in %s on line %d -NULL - --- Iteration 14 -- - -Warning: opendir() expects parameter 2 to be resource, boolean given in %s on line %d -NULL - --- Iteration 15 -- - -Warning: opendir() expects parameter 2 to be resource, boolean given in %s on line %d -NULL - --- Iteration 16 -- - Warning: opendir() expects parameter 2 to be resource, Unicode string given in %s on line %d NULL http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/opendir_variation3.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/opendir_variation3.phpt diff -u php-src/ext/standard/tests/dir/opendir_variation3.phpt:1.2 php-src/ext/standard/tests/dir/opendir_variation3.phpt:1.3 --- php-src/ext/standard/tests/dir/opendir_variation3.phpt:1.2 Tue Mar 4 10:45:40 2008 +++ php-src/ext/standard/tests/dir/opendir_variation3.phpt Mon May 26 23:48:29 2008 @@ -48,14 +48,3 @@ New resource created ===DONE=== ---UEXPECTF-- -*** Testing opendir() : usage variation *** - --- Open directory first time: -- -resource(%d) of type (stream) - --- Open directory second time: -- -resource(%d) of type (stream) - -New resource created -===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/opendir_variation4.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/opendir_variation4.phpt diff -u php-src/ext/standard/tests/dir/opendir_variation4.phpt:1.2 php-src/ext/standard/tests/dir/opendir_variation4.phpt:1.3 --- php-src/ext/standard/tests/dir/opendir_variation4.phpt:1.2 Tue Mar 4 10:45:40 2008 +++ php-src/ext/standard/tests/dir/opendir_variation4.phpt Mon May 26 23:48:29 2008 @@ -105,32 +105,3 @@ bool(true) resource(%d) of type (stream) ===DONE=== ---UEXPECTF-- -*** Testing opendir() : usage variation *** - --- $path = './level_one': -- -bool(true) -resource(%d) of type (stream) - --- $path = 'level_one/level_two': -- -bool(true) -resource(%d) of type (stream) - --- $path = '..': -- -resource(%d) of type (stream) - --- $path = 'level_two', '.': -- -bool(true) -resource(%d) of type (stream) - --- $path = '../': -- -resource(%d) of type (stream) - --- $path = './': -- -bool(true) -resource(%d) of type (stream) - --- $path = '../../'level_one': -- -bool(true) -resource(%d) of type (stream) -===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/opendir_variation5.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/standard/tests/dir/opendir_variation5.phpt diff -u php-src/ext/standard/tests/dir/opendir_variation5.phpt:1.5 php-src/ext/standard/tests/dir/opendir_variation5.phpt:1.6 --- php-src/ext/standard/tests/dir/opendir_variation5.phpt:1.5 Mon Mar 10 15:19:59 2008 +++ php-src/ext/standard/tests/dir/opendir_variation5.phpt Mon May 26 23:48:29 2008 @@ -101,16 +101,3 @@ Warning: opendir(%s/opendir_variation5/sub_dir/child_dir): failed to open dir: %s in %s on line %d bool(false) ===DONE=== ---UEXPECTF-- -*** Testing opendir() : usage variations *** - --- After restricting 1st level parent directory -- - -Warning: opendir(%s/opendir_variation5/sub_dir/child_dir): failed to open dir: %s in %s on line %d -bool(false) - --- After restricting parent directory -- - -Warning: opendir(%s/opendir_variation5/sub_dir/child_dir): failed to open dir: %s in %s on line %d -bool(false) -===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/opendir_variation6.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/dir/opendir_variation6.phpt diff -u php-src/ext/standard/tests/dir/opendir_variation6.phpt:1.3 php-src/ext/standard/tests/dir/opendir_variation6.phpt:1.4 --- php-src/ext/standard/tests/dir/opendir_variation6.phpt:1.3 Mon Mar 10 15:19:59 2008 +++ php-src/ext/standard/tests/dir/opendir_variation6.phpt Mon May 26 23:48:29 2008 @@ -59,22 +59,3 @@ Warning: opendir(%s/opendir_variation6/sub?dir1): failed to open dir: %s in %s on line %d bool(false) ===DONE=== ---UEXPECTF-- -*** Testing opendir() : usage variations *** - --- Wildcard = '*' -- - -Warning: opendir(%s/opendir_var*): failed to open dir: %s in %s on line %d -bool(false) - -Warning: opendir(%s/*): failed to open dir: %s in %s on line %d -bool(false) - --- Wildcard = '?' -- - -Warning: opendir(%s/opendir_variation6/sub_dir?): failed to open dir: %s in %s on line %d -bool(false) - -Warning: opendir(%s/opendir_variation6/sub?dir1): failed to open dir: %s in %s on line %d -bool(false) -===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/opendir_variation7.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/opendir_variation7.phpt diff -u php-src/ext/standard/tests/dir/opendir_variation7.phpt:1.2 php-src/ext/standard/tests/dir/opendir_variation7.phpt:1.3 --- php-src/ext/standard/tests/dir/opendir_variation7.phpt:1.2 Tue Mar 4 10:45:40 2008 +++ php-src/ext/standard/tests/dir/opendir_variation7.phpt Mon May 26 23:48:29 2008 @@ -125,46 +125,3 @@ bool(true) resource(%d) of type (stream) ===DONE=== ---UEXPECTF-- -*** Testing opendir() : usage variations *** - --- Iteration 1 -- -bool(true) -resource(%d) of type (stream) - --- Iteration 2 -- -bool(true) -resource(%d) of type (stream) - --- Iteration 3 -- -bool(true) -resource(%d) of type (stream) - --- Iteration 4 -- -bool(true) -resource(%d) of type (stream) - --- Iteration 5 -- -bool(true) -resource(%d) of type (stream) - --- Iteration 6 -- -bool(true) -resource(%d) of type (stream) - --- Iteration 7 -- -bool(true) -resource(%d) of type (stream) - --- Iteration 8 -- -bool(true) -resource(%d) of type (stream) - --- Iteration 9 -- -bool(true) -resource(%d) of type (stream) - --- Iteration 10 -- -bool(true) -resource(%d) of type (stream) -===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/readdir_basic.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/dir/readdir_basic.phpt diff -u php-src/ext/standard/tests/dir/readdir_basic.phpt:1.3 php-src/ext/standard/tests/dir/readdir_basic.phpt:1.4 --- php-src/ext/standard/tests/dir/readdir_basic.phpt:1.3 Mon Mar 24 09:00:41 2008 +++ php-src/ext/standard/tests/dir/readdir_basic.phpt Mon May 26 23:48:29 2008 @@ -56,25 +56,6 @@ -- Call readdir() with $path argument -- resource(%d) of type (stream) -string(1) "." -string(2) ".." -string(18) "readdir_basic1.tmp" -string(18) "readdir_basic2.tmp" -string(18) "readdir_basic3.tmp" - --- Call readdir() without $path argument -- -resource(%d) of type (stream) -string(1) "." -string(2) ".." -string(18) "readdir_basic1.tmp" -string(18) "readdir_basic2.tmp" -string(18) "readdir_basic3.tmp" -===DONE=== ---UEXPECTF-- -*** Testing readdir() : basic functionality *** - --- Call readdir() with $path argument -- -resource(%d) of type (stream) unicode(1) "." unicode(2) ".." unicode(18) "readdir_basic1.tmp" http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/readdir_error.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/readdir_error.phpt diff -u php-src/ext/standard/tests/dir/readdir_error.phpt:1.2 php-src/ext/standard/tests/dir/readdir_error.phpt:1.3 --- php-src/ext/standard/tests/dir/readdir_error.phpt:1.2 Tue Mar 4 17:11:10 2008 +++ php-src/ext/standard/tests/dir/readdir_error.phpt Mon May 26 23:48:29 2008 @@ -41,11 +41,3 @@ Warning: Wrong parameter count for readdir() in %s on line %d NULL ===DONE=== ---UEXPECTF-- -*** Testing readdir() : error conditions *** - --- Testing readdir() function with more than expected no. of arguments -- - -Warning: Wrong parameter count for readdir() in %s on line %d -NULL -===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/readdir_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/readdir_variation1.phpt diff -u php-src/ext/standard/tests/dir/readdir_variation1.phpt:1.2 php-src/ext/standard/tests/dir/readdir_variation1.phpt:1.3 --- php-src/ext/standard/tests/dir/readdir_variation1.phpt:1.2 Tue Mar 4 17:11:10 2008 +++ php-src/ext/standard/tests/dir/readdir_variation1.phpt Mon May 26 23:48:29 2008 @@ -208,126 +208,3 @@ Warning: readdir(): supplied argument is not a valid Directory resource in %s on line %d bool(false) ===DONE=== ---UEXPECTF-- -*** Testing readdir() : usage variations *** - --- Iteration 1 -- - -Warning: readdir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 2 -- - -Warning: readdir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 3 -- - -Warning: readdir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 4 -- - -Warning: readdir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 5 -- - -Warning: readdir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 6 -- - -Warning: readdir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 7 -- - -Warning: readdir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 8 -- - -Warning: readdir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 9 -- - -Warning: readdir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 10 -- - -Warning: readdir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 11 -- - -Warning: readdir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 12 -- - -Warning: readdir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 13 -- - -Warning: readdir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 14 -- - -Warning: readdir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 15 -- - -Warning: readdir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 16 -- - -Warning: readdir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 17 -- - -Warning: readdir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 18 -- - -Warning: readdir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 19 -- - -Warning: readdir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 20 -- - -Warning: readdir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 21 -- - -Warning: readdir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 22 -- - -Warning: readdir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 23 -- - -Warning: readdir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 24 -- - -Warning: readdir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) -===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/readdir_variation2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/readdir_variation2.phpt diff -u php-src/ext/standard/tests/dir/readdir_variation2.phpt:1.2 php-src/ext/standard/tests/dir/readdir_variation2.phpt:1.3 --- php-src/ext/standard/tests/dir/readdir_variation2.phpt:1.2 Tue Mar 4 17:11:10 2008 +++ php-src/ext/standard/tests/dir/readdir_variation2.phpt Mon May 26 23:48:29 2008 @@ -30,14 +30,7 @@ $path = dirname(__FILE__) . '/readdir_variation2'; rmdir($path); ?> ---EXPECTF-- -*** Testing readdir() : usage variations *** - --- Pass an empty directory to readdir() -- -string(1) "." -string(2) ".." -===DONE=== ---UEXPECTF-- +--EXPECT-- *** Testing readdir() : usage variations *** -- Pass an empty directory to readdir() -- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/readdir_variation3.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/readdir_variation3.phpt diff -u php-src/ext/standard/tests/dir/readdir_variation3.phpt:1.2 php-src/ext/standard/tests/dir/readdir_variation3.phpt:1.3 --- php-src/ext/standard/tests/dir/readdir_variation3.phpt:1.2 Tue Mar 4 17:11:10 2008 +++ php-src/ext/standard/tests/dir/readdir_variation3.phpt Mon May 26 23:48:29 2008 @@ -50,22 +50,7 @@ rmdir($path_sub); rmdir($path_top); ?> ---EXPECTF-- -*** Testing readdir() : usage variations *** -array(5) { - [0]=> - string(1) "." - [1]=> - string(2) ".." - [2]=> - string(9) "file1.tmp" - [3]=> - string(9) "file2.tmp" - [4]=> - string(10) "sub_folder" -} -===DONE=== ---UEXPECTF-- +--EXPECT-- *** Testing readdir() : usage variations *** array(5) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/readdir_variation4.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/readdir_variation4.phpt diff -u php-src/ext/standard/tests/dir/readdir_variation4.phpt:1.2 php-src/ext/standard/tests/dir/readdir_variation4.phpt:1.3 --- php-src/ext/standard/tests/dir/readdir_variation4.phpt:1.2 Tue Mar 4 17:11:10 2008 +++ php-src/ext/standard/tests/dir/readdir_variation4.phpt Mon May 26 23:48:29 2008 @@ -145,103 +145,6 @@ -- Call to readdir() -- array(16) { [0]=> - string(9) "-10.5.tmp" - [1]=> - string(9) "-2345.tmp" - [2]=> - string(1) "." - [3]=> - string(2) ".." - [4]=> - string(4) ".tmp" - [5]=> - string(7) "0.5.tmp" - [6]=> - string(5) "0.tmp" - [7]=> - string(17) "1.23456789E-9.tmp" - [8]=> - string(5) "1.tmp" - [9]=> - string(8) "10.5.tmp" - [10]=> - string(9) "12345.tmp" - [11]=> - string(16) "123456789000.tmp" - [12]=> - string(9) "Array.tmp" - [13]=> - string(15) "double_file.tmp" - [14]=> - string(11) "hd_file.tmp" - [15]=> - string(15) "single_file.tmp" -} -===DONE=== ---UEXPECTF-- -*** Testing readdir() : usage variations *** - --- Iteration 1 -- -resource(%d) of type (stream) -int(1) - --- Iteration 2 -- -resource(%d) of type (stream) -int(1) - --- Iteration 3 -- -resource(%d) of type (stream) -int(1) - --- Iteration 4 -- -resource(%d) of type (stream) -int(1) - --- Iteration 5 -- -resource(%d) of type (stream) -int(1) - --- Iteration 6 -- -resource(%d) of type (stream) -int(1) - --- Iteration 7 -- -resource(%d) of type (stream) -int(1) - --- Iteration 8 -- -resource(%d) of type (stream) -int(1) - --- Iteration 9 -- -resource(%d) of type (stream) -int(1) - --- Iteration 10 -- -resource(%d) of type (stream) -int(1) - --- Iteration 11 -- - -Notice: Array to string conversion in %s on line %d -resource(%d) of type (stream) -int(2) - --- Iteration 12 -- -resource(%d) of type (stream) -int(2) - --- Iteration 13 -- -resource(%d) of type (stream) -int(2) - --- Iteration 14 -- -resource(%d) of type (stream) -int(2) - --- Call to readdir() -- -array(16) { - [0]=> unicode(9) "-10.5.tmp" [1]=> unicode(9) "-2345.tmp" http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/readdir_variation5.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/readdir_variation5.phpt diff -u php-src/ext/standard/tests/dir/readdir_variation5.phpt:1.2 php-src/ext/standard/tests/dir/readdir_variation5.phpt:1.3 --- php-src/ext/standard/tests/dir/readdir_variation5.phpt:1.2 Tue Mar 4 17:11:10 2008 +++ php-src/ext/standard/tests/dir/readdir_variation5.phpt Mon May 26 23:48:29 2008 @@ -86,69 +86,6 @@ bool(true) resource(%d) of type (stream) -- Calling readdir() -- -string(%d) "%s" - --- Iteration 2 -- -bool(true) -resource(%d) of type (stream) --- Calling readdir() -- -string(%d) "%s" - --- Iteration 3 -- -bool(true) -resource(%d) of type (stream) --- Calling readdir() -- -string(%d) "%s" - --- Iteration 4 -- -bool(true) -resource(%d) of type (stream) --- Calling readdir() -- -string(%d) "%s" - --- Iteration 5 -- -bool(true) -resource(%d) of type (stream) --- Calling readdir() -- -string(%d) "%s" - --- Iteration 6 -- -bool(true) -resource(%d) of type (stream) --- Calling readdir() -- -string(%d) "%s" - --- Iteration 7 -- -bool(true) -resource(%d) of type (stream) --- Calling readdir() -- -string(%d) "%s" - --- Iteration 8 -- -bool(true) -resource(%d) of type (stream) --- Calling readdir() -- -string(%d) "%s" - --- Iteration 9 -- -bool(true) -resource(%d) of type (stream) --- Calling readdir() -- -string(%d) "%s" - --- Iteration 10 -- -bool(true) -resource(%d) of type (stream) --- Calling readdir() -- -string(%d) "%s" -===DONE=== ---UEXPECTF-- -*** Testing readdir() : usage variations *** - --- Iteration 1 -- -bool(true) -resource(%d) of type (stream) --- Calling readdir() -- unicode(%d) "%s" -- Iteration 2 -- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/readdir_variation6.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/dir/readdir_variation6.phpt diff -u php-src/ext/standard/tests/dir/readdir_variation6.phpt:1.3 php-src/ext/standard/tests/dir/readdir_variation6.phpt:1.4 --- php-src/ext/standard/tests/dir/readdir_variation6.phpt:1.3 Mon Mar 24 09:00:41 2008 +++ php-src/ext/standard/tests/dir/readdir_variation6.phpt Mon May 26 23:48:29 2008 @@ -61,24 +61,7 @@ $dir_path = dirname(__FILE__) . "/readdir_variation6"; rmdir($dir_path); ?> ---EXPECTF-- -*** Testing readdir() : usage variations *** - --- Reading Directory Contents with Previous Handle -- -string(1) "." -string(2) ".." -string(23) "readdir_variation61.tmp" -string(23) "readdir_variation62.tmp" -string(23) "readdir_variation63.tmp" - --- Reading Directory Contents with Current Handle (no arguments supplied) -- -string(1) "." -string(2) ".." -string(23) "readdir_variation61.tmp" -string(23) "readdir_variation62.tmp" -string(23) "readdir_variation63.tmp" -===DONE=== ---UEXPECTF-- +--EXPECT-- *** Testing readdir() : usage variations *** -- Reading Directory Contents with Previous Handle -- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/readdir_variation7.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/readdir_variation7.phpt diff -u php-src/ext/standard/tests/dir/readdir_variation7.phpt:1.2 php-src/ext/standard/tests/dir/readdir_variation7.phpt:1.3 --- php-src/ext/standard/tests/dir/readdir_variation7.phpt:1.2 Fri Mar 7 16:21:30 2008 +++ php-src/ext/standard/tests/dir/readdir_variation7.phpt Mon May 26 23:48:29 2008 @@ -33,10 +33,3 @@ Warning: readdir(): %d is not a valid Directory resource in %s on line %d bool(false) -===DONE=== ---UEXPECTF-- -*** Testing readdir() : usage variations *** -resource(%d) of type (stream) - -Warning: readdir(): %d is not a valid Directory resource in %s on line %d -bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/rewinddir_basic.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/dir/rewinddir_basic.phpt diff -u php-src/ext/standard/tests/dir/rewinddir_basic.phpt:1.3 php-src/ext/standard/tests/dir/rewinddir_basic.phpt:1.4 --- php-src/ext/standard/tests/dir/rewinddir_basic.phpt:1.3 Mon Mar 24 18:34:44 2008 +++ php-src/ext/standard/tests/dir/rewinddir_basic.phpt Mon May 26 23:48:29 2008 @@ -69,35 +69,6 @@ resource(%d) of type (stream) -- Read and rewind first directory (argument supplied) -- -array(3) { - [0]=> - string(1) "." - [1]=> - string(2) ".." - [2]=> - string(9) "file1.tmp" -} -NULL -string(1) "." - --- Read and rewind second directory (no argument supplied) -- -array(3) { - [0]=> - string(1) "." - [1]=> - string(2) ".." - [2]=> - string(9) "file2.tmp" -} -NULL -string(1) "." -===DONE=== ---UEXPECTF-- -*** Testing rewinddir() : basic functionality *** -resource(%d) of type (stream) -resource(%d) of type (stream) - --- Read and rewind first directory (argument supplied) -- unicode(1) "." unicode(2) ".." unicode(9) "file1.tmp" http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/rewinddir_error.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/rewinddir_error.phpt diff -u php-src/ext/standard/tests/dir/rewinddir_error.phpt:1.2 php-src/ext/standard/tests/dir/rewinddir_error.phpt:1.3 --- php-src/ext/standard/tests/dir/rewinddir_error.phpt:1.2 Fri Mar 7 16:13:20 2008 +++ php-src/ext/standard/tests/dir/rewinddir_error.phpt Mon May 26 23:48:29 2008 @@ -40,11 +40,3 @@ Warning: Wrong parameter count for rewinddir() in %s on line %d NULL ===DONE=== ---UEXPECTF-- -*** Testing rewinddir() : error conditions *** - --- Testing rewinddir() function with more than expected no. of arguments -- - -Warning: Wrong parameter count for rewinddir() in %s on line %d -NULL -===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/rewinddir_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/rewinddir_variation1.phpt diff -u php-src/ext/standard/tests/dir/rewinddir_variation1.phpt:1.2 php-src/ext/standard/tests/dir/rewinddir_variation1.phpt:1.3 --- php-src/ext/standard/tests/dir/rewinddir_variation1.phpt:1.2 Fri Mar 7 16:13:20 2008 +++ php-src/ext/standard/tests/dir/rewinddir_variation1.phpt Mon May 26 23:48:29 2008 @@ -209,126 +209,3 @@ Warning: rewinddir(): supplied argument is not a valid Directory resource in %s on line %d bool(false) ===DONE=== ---UEXPECTF-- -*** Testing rewinddir() : usage variations *** - --- Iteration 1 -- - -Warning: rewinddir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 2 -- - -Warning: rewinddir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 3 -- - -Warning: rewinddir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 4 -- - -Warning: rewinddir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 5 -- - -Warning: rewinddir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 6 -- - -Warning: rewinddir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 7 -- - -Warning: rewinddir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 8 -- - -Warning: rewinddir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 9 -- - -Warning: rewinddir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 10 -- - -Warning: rewinddir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 11 -- - -Warning: rewinddir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 12 -- - -Warning: rewinddir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 13 -- - -Warning: rewinddir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 14 -- - -Warning: rewinddir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 15 -- - -Warning: rewinddir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 16 -- - -Warning: rewinddir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 17 -- - -Warning: rewinddir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 18 -- - -Warning: rewinddir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 19 -- - -Warning: rewinddir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 20 -- - -Warning: rewinddir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 21 -- - -Warning: rewinddir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 22 -- - -Warning: rewinddir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 23 -- - -Warning: rewinddir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) - --- Iteration 24 -- - -Warning: rewinddir(): supplied argument is not a valid Directory resource in %s on line %d -bool(false) -===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/rewinddir_variation2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/rewinddir_variation2.phpt diff -u php-src/ext/standard/tests/dir/rewinddir_variation2.phpt:1.2 php-src/ext/standard/tests/dir/rewinddir_variation2.phpt:1.3 --- php-src/ext/standard/tests/dir/rewinddir_variation2.phpt:1.2 Fri Mar 7 16:13:20 2008 +++ php-src/ext/standard/tests/dir/rewinddir_variation2.phpt Mon May 26 23:48:29 2008 @@ -36,18 +36,6 @@ -- Create the directory handle, read and close the directory -- resource(%d) of type (stream) -string(1) "." - --- Call to rewinddir() -- - -Warning: rewinddir(): %d is not a valid Directory resource in %s on line %d -bool(false) -===DONE=== ---UEXPECTF-- -*** Testing rewinddir() : usage variations *** - --- Create the directory handle, read and close the directory -- -resource(%d) of type (stream) unicode(1) "." -- Call to rewinddir() -- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/rewinddir_variation3.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/dir/rewinddir_variation3.phpt diff -u php-src/ext/standard/tests/dir/rewinddir_variation3.phpt:1.3 php-src/ext/standard/tests/dir/rewinddir_variation3.phpt:1.4 --- php-src/ext/standard/tests/dir/rewinddir_variation3.phpt:1.3 Tue Mar 11 10:20:06 2008 +++ php-src/ext/standard/tests/dir/rewinddir_variation3.phpt Mon May 26 23:48:29 2008 @@ -41,15 +41,3 @@ -- Check if rewinddir() has repositioned the file pointer -- rewinddir() does not work on file pointers ===DONE=== ---UEXPECTF-- -*** Testing rewinddir() : usage variations *** - --- Open a file using fopen -- -resource(%d) of type (stream) - -Warning: rewinddir(): %d is not a valid Directory resource in %s on line %d -bool(false) - --- Check if rewinddir() has repositioned the file pointer -- -rewinddir() does not work on file pointers -===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/scandir_basic.phpt diff -u php-src/ext/standard/tests/dir/scandir_basic.phpt:1.2 php-src/ext/standard/tests/dir/scandir_basic.phpt:1.3 --- php-src/ext/standard/tests/dir/scandir_basic.phpt:1.2 Mon Mar 10 14:16:32 2008 +++ php-src/ext/standard/tests/dir/scandir_basic.phpt Mon May 26 23:48:29 2008 @@ -37,38 +37,7 @@ $directory = dirname(__FILE__) . '/scandir_basic'; rmdir($directory); ?> ---EXPECTF-- -*** Testing scandir() : basic functionality *** - --- scandir() with mandatory arguments -- -array(5) { - [0]=> - string(1) "." - [1]=> - string(2) ".." - [2]=> - string(9) "file1.tmp" - [3]=> - string(9) "file2.tmp" - [4]=> - string(9) "file3.tmp" -} - --- scandir() with all arguments -- -array(5) { - [0]=> - string(9) "file3.tmp" - [1]=> - string(9) "file2.tmp" - [2]=> - string(9) "file1.tmp" - [3]=> - string(2) ".." - [4]=> - string(1) "." -} -===DONE=== ---UEXPECTF-- +--EXPECT-- *** Testing scandir() : basic functionality *** -- scandir() with mandatory arguments -- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_error1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/scandir_error1.phpt diff -u php-src/ext/standard/tests/dir/scandir_error1.phpt:1.2 php-src/ext/standard/tests/dir/scandir_error1.phpt:1.3 --- php-src/ext/standard/tests/dir/scandir_error1.phpt:1.2 Mon Mar 10 14:16:32 2008 +++ php-src/ext/standard/tests/dir/scandir_error1.phpt Mon May 26 23:48:29 2008 @@ -45,16 +45,3 @@ Warning: scandir() expects at most 3 parameters, 4 given in %s on line %d NULL ===DONE=== ---UEXPECTF-- -*** Testing scandir() : error conditions *** - --- Testing scandir() function with Zero arguments -- - -Warning: scandir() expects at least 1 parameter, 0 given in %s on line %d -NULL - --- Testing scandir() function with more than expected no. of arguments -- - -Warning: scandir() expects at most 3 parameters, 4 given in %s on line %d -NULL -===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_error2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/scandir_error2.phpt diff -u php-src/ext/standard/tests/dir/scandir_error2.phpt:1.2 php-src/ext/standard/tests/dir/scandir_error2.phpt:1.3 --- php-src/ext/standard/tests/dir/scandir_error2.phpt:1.2 Mon Mar 10 14:16:32 2008 +++ php-src/ext/standard/tests/dir/scandir_error2.phpt Mon May 26 23:48:29 2008 @@ -39,20 +39,3 @@ Warning: scandir(): (errno %d): %s in %s on line %d bool(false) ===DONE=== ---UEXPECTF-- -*** Testing scandir() : error conditions *** - --- Pass scandir() an absolute path that does not exist -- - -Warning: scandir(%s/idonotexist): failed to open dir: %s in %s on line %d - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) - --- Pass scandir() a relative path that does not exist -- - -Warning: scandir(/idonotexist): failed to open dir: %s in %s on line %d - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) -===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/scandir_variation1.phpt diff -u php-src/ext/standard/tests/dir/scandir_variation1.phpt:1.2 php-src/ext/standard/tests/dir/scandir_variation1.phpt:1.3 --- php-src/ext/standard/tests/dir/scandir_variation1.phpt:1.2 Mon Mar 10 14:16:32 2008 +++ php-src/ext/standard/tests/dir/scandir_variation1.phpt Mon May 26 23:48:29 2008 @@ -257,167 +257,3 @@ Warning: scandir(): (errno %d): %s in %s on line %d bool(false) ===DONE=== ---UEXPECTF-- -*** Testing scandir() : usage variations *** - --- Iteration 1 -- - -Warning: scandir(0): failed to open dir: %s in %s on line %d - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) - --- Iteration 2 -- - -Warning: scandir(1): failed to open dir: %s in %s on line %d - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) - --- Iteration 3 -- - -Warning: scandir(12345): failed to open dir: %s in %s on line %d - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) - --- Iteration 4 -- - -Warning: scandir(-2345): failed to open dir: %s in %s on line %d - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) - --- Iteration 5 -- - -Warning: scandir(10.5): failed to open dir: %s in %s on line %d - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) - --- Iteration 6 -- - -Warning: scandir(-10.5): failed to open dir: %s in %s on line %d - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) - --- Iteration 7 -- - -Warning: scandir(123456789000): failed to open dir: %s in %s on line %d - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) - --- Iteration 8 -- - -Warning: scandir(1.23456789E-9): failed to open dir: %s in %s on line %d - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) - --- Iteration 9 -- - -Warning: scandir(0.5): failed to open dir: %s in %s on line %d - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) - --- Iteration 10 -- - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) - --- Iteration 11 -- - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) - --- Iteration 12 -- - -Warning: scandir(1): failed to open dir: %s in %s on line %d - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) - --- Iteration 13 -- - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) - --- Iteration 14 -- - -Warning: scandir(1): failed to open dir: %s in %s on line %d - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) - --- Iteration 15 -- - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) - --- Iteration 16 -- - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) - --- Iteration 17 -- - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) - --- Iteration 18 -- - -Notice: Array to string conversion in %s on line %d - -Warning: scandir(Array): failed to open dir: %s in %s on line %d - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) - --- Iteration 19 -- - -Warning: scandir(string): failed to open dir: %s in %s on line %d - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) - --- Iteration 20 -- - -Warning: scandir(string): failed to open dir: %s in %s on line %d - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) - --- Iteration 21 -- - -Warning: scandir(hello world): failed to open dir: %s in %s on line %d - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) - --- Iteration 22 -- - -Warning: scandir(Class A object): failed to open dir: %s in %s on line %d - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) - --- Iteration 23 -- - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) - --- Iteration 24 -- - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) - --- Iteration 25 -- - -Warning: scandir(Resource id #%d): failed to open dir: %s in %s on line %d - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) -===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_variation2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/scandir_variation2.phpt diff -u php-src/ext/standard/tests/dir/scandir_variation2.phpt:1.2 php-src/ext/standard/tests/dir/scandir_variation2.phpt:1.3 --- php-src/ext/standard/tests/dir/scandir_variation2.phpt:1.2 Mon Mar 10 14:16:32 2008 +++ php-src/ext/standard/tests/dir/scandir_variation2.phpt Mon May 26 23:48:29 2008 @@ -108,185 +108,6 @@ -- Iteration 1 -- array(2) { [0]=> - string(1) "." - [1]=> - string(2) ".." -} - --- Iteration 2 -- -array(2) { - [0]=> - string(2) ".." - [1]=> - string(1) "." -} - --- Iteration 3 -- -array(2) { - [0]=> - string(2) ".." - [1]=> - string(1) "." -} - --- Iteration 4 -- -array(2) { - [0]=> - string(2) ".." - [1]=> - string(1) "." -} - --- Iteration 5 -- -array(2) { - [0]=> - string(2) ".." - [1]=> - string(1) "." -} - --- Iteration 6 -- -array(2) { - [0]=> - string(2) ".." - [1]=> - string(1) "." -} - --- Iteration 7 -- -array(2) { - [0]=> - string(2) ".." - [1]=> - string(1) "." -} - --- Iteration 8 -- -array(2) { - [0]=> - string(1) "." - [1]=> - string(2) ".." -} - --- Iteration 9 -- -array(2) { - [0]=> - string(1) "." - [1]=> - string(2) ".." -} - --- Iteration 10 -- -array(2) { - [0]=> - string(1) "." - [1]=> - string(2) ".." -} - --- Iteration 11 -- -array(2) { - [0]=> - string(1) "." - [1]=> - string(2) ".." -} - --- Iteration 12 -- -array(2) { - [0]=> - string(2) ".." - [1]=> - string(1) "." -} - --- Iteration 13 -- -array(2) { - [0]=> - string(1) "." - [1]=> - string(2) ".." -} - --- Iteration 14 -- -array(2) { - [0]=> - string(2) ".." - [1]=> - string(1) "." -} - --- Iteration 15 -- -array(2) { - [0]=> - string(1) "." - [1]=> - string(2) ".." -} - --- Iteration 16 -- - -Warning: scandir() expects parameter 2 to be long, string given in %s on line %d -NULL - --- Iteration 17 -- - -Warning: scandir() expects parameter 2 to be long, string given in %s on line %d -NULL - --- Iteration 18 -- - -Warning: scandir() expects parameter 2 to be long, array given in %s on line %d -NULL - --- Iteration 19 -- - -Warning: scandir() expects parameter 2 to be long, string given in %s on line %d -NULL - --- Iteration 20 -- - -Warning: scandir() expects parameter 2 to be long, string given in %s on line %d -NULL - --- Iteration 21 -- - -Warning: scandir() expects parameter 2 to be long, string given in %s on line %d -NULL - --- Iteration 22 -- - -Warning: scandir() expects parameter 2 to be long, object given in %s on line %d -NULL - --- Iteration 23 -- -array(2) { - [0]=> - string(1) "." - [1]=> - string(2) ".." -} - --- Iteration 24 -- -array(2) { - [0]=> - string(1) "." - [1]=> - string(2) ".." -} - --- Iteration 25 -- - -Warning: scandir() expects parameter 2 to be long, resource given in %s on line %d -NULL -===DONE=== ---UEXPECTF-- -*** Testing scandir() : usage variations *** - --- Iteration 1 -- -array(2) { - [0]=> unicode(1) "." [1]=> unicode(2) ".." http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_variation3.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/scandir_variation3.phpt diff -u php-src/ext/standard/tests/dir/scandir_variation3.phpt:1.2 php-src/ext/standard/tests/dir/scandir_variation3.phpt:1.3 --- php-src/ext/standard/tests/dir/scandir_variation3.phpt:1.2 Mon Mar 10 14:16:32 2008 +++ php-src/ext/standard/tests/dir/scandir_variation3.phpt Mon May 26 23:48:29 2008 @@ -183,139 +183,6 @@ -- Iteration 16 -- -Warning: scandir() expects parameter 3 to be resource, string given in %s on line %d -NULL - --- Iteration 17 -- - -Warning: scandir() expects parameter 3 to be resource, string given in %s on line %d -NULL - --- Iteration 18 -- - -Warning: scandir() expects parameter 3 to be resource, array given in %s on line %d -NULL - --- Iteration 19 -- - -Warning: scandir() expects parameter 3 to be resource, string given in %s on line %d -NULL - --- Iteration 20 -- - -Warning: scandir() expects parameter 3 to be resource, string given in %s on line %d -NULL - --- Iteration 21 -- - -Warning: scandir() expects parameter 3 to be resource, string given in %s on line %d -NULL - --- Iteration 22 -- - -Warning: scandir() expects parameter 3 to be resource, object given in %s on line %d -NULL - --- Iteration 23 -- - -Warning: scandir() expects parameter 3 to be resource, null given in %s on line %d -NULL - --- Iteration 24 -- - -Warning: scandir() expects parameter 3 to be resource, null given in %s on line %d -NULL - --- Iteration 25 -- - -Warning: scandir(): supplied resource is not a valid Stream-Context resource in %s on line %d -array(2) { - [0]=> - string(1) "." - [1]=> - string(2) ".." -} -===DONE=== ---UEXPECTF-- -*** Testing scandir() : usage variations *** - --- Iteration 1 -- - -Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d -NULL - --- Iteration 2 -- - -Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d -NULL - --- Iteration 3 -- - -Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d -NULL - --- Iteration 4 -- - -Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d -NULL - --- Iteration 5 -- - -Warning: scandir() expects parameter 3 to be resource, double given in %s on line %d -NULL - --- Iteration 6 -- - -Warning: scandir() expects parameter 3 to be resource, double given in %s on line %d -NULL - --- Iteration 7 -- - -Warning: scandir() expects parameter 3 to be resource, double given in %s on line %d -NULL - --- Iteration 8 -- - -Warning: scandir() expects parameter 3 to be resource, double given in %s on line %d -NULL - --- Iteration 9 -- - -Warning: scandir() expects parameter 3 to be resource, double given in %s on line %d -NULL - --- Iteration 10 -- - -Warning: scandir() expects parameter 3 to be resource, null given in %s on line %d -NULL - --- Iteration 11 -- - -Warning: scandir() expects parameter 3 to be resource, null given in %s on line %d -NULL - --- Iteration 12 -- - -Warning: scandir() expects parameter 3 to be resource, boolean given in %s on line %d -NULL - --- Iteration 13 -- - -Warning: scandir() expects parameter 3 to be resource, boolean given in %s on line %d -NULL - --- Iteration 14 -- - -Warning: scandir() expects parameter 3 to be resource, boolean given in %s on line %d -NULL - --- Iteration 15 -- - -Warning: scandir() expects parameter 3 to be resource, boolean given in %s on line %d -NULL - --- Iteration 16 -- - Warning: scandir() expects parameter 3 to be resource, Unicode string given in %s on line %d NULL http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_variation4.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/scandir_variation4.phpt diff -u php-src/ext/standard/tests/dir/scandir_variation4.phpt:1.2 php-src/ext/standard/tests/dir/scandir_variation4.phpt:1.3 --- php-src/ext/standard/tests/dir/scandir_variation4.phpt:1.2 Mon Mar 10 14:16:32 2008 +++ php-src/ext/standard/tests/dir/scandir_variation4.phpt Mon May 26 23:48:29 2008 @@ -65,109 +65,7 @@ rmdir("$dir_path/level_one/level_two"); rmdir("$dir_path/level_one"); ?> ---EXPECTF-- -*** Testing scandir() : usage variations *** - --- $path = './level_one': -- -bool(true) -array(5) { - [0]=> - string(1) "." - [1]=> - string(2) ".." - [2]=> - string(14) "level_one1.tmp" - [3]=> - string(14) "level_one2.tmp" - [4]=> - string(9) "level_two" -} - --- $path = 'level_one/level_two': -- -bool(true) -array(4) { - [0]=> - string(1) "." - [1]=> - string(2) ".." - [2]=> - string(14) "level_two1.tmp" - [3]=> - string(14) "level_two2.tmp" -} - --- $path = '..': -- -bool(true) -array(5) { - [0]=> - string(1) "." - [1]=> - string(2) ".." - [2]=> - string(14) "level_one1.tmp" - [3]=> - string(14) "level_one2.tmp" - [4]=> - string(9) "level_two" -} - --- $path = 'level_two', '.': -- -bool(true) -array(4) { - [0]=> - string(1) "." - [1]=> - string(2) ".." - [2]=> - string(14) "level_two1.tmp" - [3]=> - string(14) "level_two2.tmp" -} - --- $path = '../': -- -bool(true) -array(5) { - [0]=> - string(1) "." - [1]=> - string(2) ".." - [2]=> - string(14) "level_one1.tmp" - [3]=> - string(14) "level_one2.tmp" - [4]=> - string(9) "level_two" -} - --- $path = './': -- -bool(true) -array(4) { - [0]=> - string(1) "." - [1]=> - string(2) ".." - [2]=> - string(14) "level_two1.tmp" - [3]=> - string(14) "level_two2.tmp" -} - --- $path = '../../'level_one': -- -bool(true) -array(5) { - [0]=> - string(1) "." - [1]=> - string(2) ".." - [2]=> - string(14) "level_one1.tmp" - [3]=> - string(14) "level_one2.tmp" - [4]=> - string(9) "level_two" -} -===DONE=== ---UEXPECTF-- +--EXPECT-- *** Testing scandir() : usage variations *** -- $path = './level_one': -- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_variation5.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/scandir_variation5.phpt diff -u php-src/ext/standard/tests/dir/scandir_variation5.phpt:1.2 php-src/ext/standard/tests/dir/scandir_variation5.phpt:1.3 --- php-src/ext/standard/tests/dir/scandir_variation5.phpt:1.2 Mon Mar 10 14:16:32 2008 +++ php-src/ext/standard/tests/dir/scandir_variation5.phpt Mon May 26 23:48:29 2008 @@ -96,20 +96,3 @@ Warning: scandir(): (errno %d): %s in %s on line %d bool(false) ===DONE=== ---UEXPECTF-- -*** Testing scandir() : usage variations *** - --- After restricting 1st level parent directory -- - -Warning: scandir(%s/scandir_variation5/sub_dir/child_dir): failed to open dir: %s in %s on line %d - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) - --- After restricting parent directory -- - -Warning: scandir(%s/scandir_variation5/sub_dir/child_dir): failed to open dir: %s in %s on line %d - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) -===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_variation6.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/scandir_variation6.phpt diff -u php-src/ext/standard/tests/dir/scandir_variation6.phpt:1.2 php-src/ext/standard/tests/dir/scandir_variation6.phpt:1.3 --- php-src/ext/standard/tests/dir/scandir_variation6.phpt:1.2 Mon Mar 10 14:16:32 2008 +++ php-src/ext/standard/tests/dir/scandir_variation6.phpt Mon May 26 23:48:29 2008 @@ -68,30 +68,3 @@ Warning: scandir(): (errno %d): %s in %s on line %d bool(false) ===DONE=== ---UEXPECTF-- -*** Testing scandir() : usage variations *** - --- Wildcard = '*' -- - -Warning: scandir(%s/scandir_var*): failed to open dir: %s in %s on line %d - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) - -Warning: scandir(%s/*): failed to open dir: %s in %s on line %d - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) - --- Wildcard = '?' -- - -Warning: scandir(%s/scandir_variation6/sub_dir?): failed to open dir: %s in %s on line %d - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) - -Warning: scandir(%s/scandir_variation6/sub?dir1): failed to open dir: %s in %s on line %d - -Warning: scandir(): (errno %d): %s in %s on line %d -bool(false) -===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_variation7.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/scandir_variation7.phpt diff -u php-src/ext/standard/tests/dir/scandir_variation7.phpt:1.2 php-src/ext/standard/tests/dir/scandir_variation7.phpt:1.3 --- php-src/ext/standard/tests/dir/scandir_variation7.phpt:1.2 Mon Mar 10 14:16:32 2008 +++ php-src/ext/standard/tests/dir/scandir_variation7.phpt Mon May 26 23:48:29 2008 @@ -74,100 +74,7 @@ $dir_path = dirname(__FILE__) . "/scandir_variation7"; rmdir($dir_path); ?> ---EXPECTF-- -*** Testing scandir() : usage variations *** - --- Iteration 1 -- -bool(true) -array(2) { - [0]=> - string(1) "." - [1]=> - string(2) ".." -} - --- Iteration 2 -- -bool(true) -array(2) { - [0]=> - string(1) "." - [1]=> - string(2) ".." -} - --- Iteration 3 -- -bool(true) -array(2) { - [0]=> - string(1) "." - [1]=> - string(2) ".." -} - --- Iteration 4 -- -bool(true) -array(2) { - [0]=> - string(1) "." - [1]=> - string(2) ".." -} - --- Iteration 5 -- -bool(true) -array(2) { - [0]=> - string(1) "." - [1]=> - string(2) ".." -} - --- Iteration 6 -- -bool(true) -array(2) { - [0]=> - string(1) "." - [1]=> - string(2) ".." -} - --- Iteration 7 -- -bool(true) -array(2) { - [0]=> - string(1) "." - [1]=> - string(2) ".." -} - --- Iteration 8 -- -bool(true) -array(2) { - [0]=> - string(1) "." - [1]=> - string(2) ".." -} - --- Iteration 9 -- -bool(true) -array(2) { - [0]=> - string(1) "." - [1]=> - string(2) ".." -} - --- Iteration 10 -- -bool(true) -array(2) { - [0]=> - string(1) "." - [1]=> - string(2) ".." -} -===DONE=== ---UEXPECTF-- +--EXPECT-- *** Testing scandir() : usage variations *** -- Iteration 1 -- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_variation8.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/scandir_variation8.phpt diff -u php-src/ext/standard/tests/dir/scandir_variation8.phpt:1.2 php-src/ext/standard/tests/dir/scandir_variation8.phpt:1.3 --- php-src/ext/standard/tests/dir/scandir_variation8.phpt:1.2 Mon Mar 10 14:16:32 2008 +++ php-src/ext/standard/tests/dir/scandir_variation8.phpt Mon May 26 23:48:29 2008 @@ -121,89 +121,6 @@ -- Call to scandir() -- array(16) { [0]=> - string(9) "-10.5.tmp" - [1]=> - string(9) "-2345.tmp" - [2]=> - string(1) "." - [3]=> - string(2) ".." - [4]=> - string(4) ".tmp" - [5]=> - string(7) "0.5.tmp" - [6]=> - string(5) "0.tmp" - [7]=> - string(17) "1.23456789E-9.tmp" - [8]=> - string(5) "1.tmp" - [9]=> - string(8) "10.5.tmp" - [10]=> - string(9) "12345.tmp" - [11]=> - string(16) "123456789000.tmp" - [12]=> - string(9) "Array.tmp" - [13]=> - string(15) "double_file.tmp" - [14]=> - string(11) "hd_file.tmp" - [15]=> - string(15) "single_file.tmp" -} -===DONE=== ---UEXPECTF-- -*** Testing scandir() : usage variations *** - --- Iteration 1 -- -resource(%d) of type (stream) - --- Iteration 2 -- -resource(%d) of type (stream) - --- Iteration 3 -- -resource(%d) of type (stream) - --- Iteration 4 -- -resource(%d) of type (stream) - --- Iteration 5 -- -resource(%d) of type (stream) - --- Iteration 6 -- -resource(%d) of type (stream) - --- Iteration 7 -- -resource(%d) of type (stream) - --- Iteration 8 -- -resource(%d) of type (stream) - --- Iteration 9 -- -resource(%d) of type (stream) - --- Iteration 10 -- -resource(%d) of type (stream) - --- Iteration 11 -- - -Notice: Array to string conversion in %s on line %d -resource(%d) of type (stream) - --- Iteration 12 -- -resource(%d) of type (stream) - --- Iteration 13 -- -resource(%d) of type (stream) - --- Iteration 14 -- -resource(%d) of type (stream) - --- Call to scandir() -- -array(16) { - [0]=> unicode(9) "-10.5.tmp" [1]=> unicode(9) "-2345.tmp" http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_variation9.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/dir/scandir_variation9.phpt diff -u php-src/ext/standard/tests/dir/scandir_variation9.phpt:1.2 php-src/ext/standard/tests/dir/scandir_variation9.phpt:1.3 --- php-src/ext/standard/tests/dir/scandir_variation9.phpt:1.2 Mon Mar 10 14:16:32 2008 +++ php-src/ext/standard/tests/dir/scandir_variation9.phpt Mon May 26 23:48:29 2008 @@ -37,40 +37,7 @@ $dir = dirname(__FILE__) . '/scandir_variation9'; rmdir($dir); ?> ---EXPECTF-- -*** Testing scandir() : usage variations *** -array(4) { - [0]=> - string(9) "file2.tmp" - [1]=> - string(9) "file1.tmp" - [2]=> - string(2) ".." - [3]=> - string(1) "." -} -array(4) { - [0]=> - string(9) "file2.tmp" - [1]=> - string(9) "file1.tmp" - [2]=> - string(2) ".." - [3]=> - string(1) "." -} -array(4) { - [0]=> - string(1) "." - [1]=> - string(2) ".." - [2]=> - string(9) "file1.tmp" - [3]=> - string(9) "file2.tmp" -} -===DONE=== ---UEXPECTF-- +--EXPECT-- *** Testing scandir() : usage variations *** array(4) { [0]=>