- killed off UEXPECT

diff --git a/ext/standard/tests/dir/chdir_basic.phpt b/ext/standard/tests/dir/chdir_basic.phpt
index b78f8b163ed42007fb110ee4b1c2ea56bd11536a..91294a33d47b4fc5bb1f7fc8eb10a29a1b1fdb5e 100644 (file)
--- a/ext/standard/tests/dir/chdir_basic.phpt
+++ b/ext/standard/tests/dir/chdir_basic.phpt
@@ -43,17 +43,6 @@ rmdir("$file_path/level_one");
 --EXPECTF--
 *** Testing chdir() : basic functionality ***
 
--- 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"

diff --git a/ext/standard/tests/dir/chdir_error1.phpt b/ext/standard/tests/dir/chdir_error1.phpt
index 47951d5ca96b78c62f8ed5dac1e10f803544db80..8d72e958a23ed3cdcdc6dbbb50d3229da71b2939 100644 (file)
--- a/ext/standard/tests/dir/chdir_error1.phpt
+++ b/ext/standard/tests/dir/chdir_error1.phpt
@@ -37,16 +37,3 @@ NULL
 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===

diff --git a/ext/standard/tests/dir/chdir_error2.phpt b/ext/standard/tests/dir/chdir_error2.phpt
index 2c3afa105f57f067cdc681e8566e1a09b3d4f065..a3bbb63e6d6c86a907b4b3ccd6b8b14953e22dab 100644 (file)
--- a/ext/standard/tests/dir/chdir_error2.phpt
+++ b/ext/standard/tests/dir/chdir_error2.phpt
@@ -24,9 +24,3 @@ var_dump(chdir($directory));
 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===

diff --git a/ext/standard/tests/dir/chdir_variation1.phpt b/ext/standard/tests/dir/chdir_variation1.phpt
index 23d46df792b1ca57dd9940637164527cd7b96899..5be53fd845ab83aa9cca31e34c3b7bba9a9a615a 100644 (file)
--- a/ext/standard/tests/dir/chdir_variation1.phpt
+++ b/ext/standard/tests/dir/chdir_variation1.phpt
@@ -235,127 +235,3 @@ bool(false)
 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===

diff --git a/ext/standard/tests/dir/chdir_variation2.phpt b/ext/standard/tests/dir/chdir_variation2.phpt
index 95ef6e69332831f730f83766666aa249c5aab09e..c32b948ff2a7c10ead34f39bed9fe688639333b7 100644 (file)
--- a/ext/standard/tests/dir/chdir_variation2.phpt
+++ b/ext/standard/tests/dir/chdir_variation2.phpt
@@ -69,42 +69,6 @@ rmdir("$file_path/level_one");
 --EXPECTF--
 *** Testing chdir() : usage variations ***
 
--- $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)

diff --git a/ext/standard/tests/dir/closedir_basic.phpt b/ext/standard/tests/dir/closedir_basic.phpt
index 7f988b9907f802743a057f2d0ee194edcef38d13..49080bb6a2d8fe9755301f1165ea866924d60735 100644 (file)
--- a/ext/standard/tests/dir/closedir_basic.phpt
+++ b/ext/standard/tests/dir/closedir_basic.phpt
@@ -54,16 +54,3 @@ NULL
 -- 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===

diff --git a/ext/standard/tests/dir/closedir_error.phpt b/ext/standard/tests/dir/closedir_error.phpt
index 242edfcd912ca0d1730fc23ab2e256c479adedf9..1a8a043d0ae24f3a76cadbe8038dab218388e4ee 100644 (file)
--- a/ext/standard/tests/dir/closedir_error.phpt
+++ b/ext/standard/tests/dir/closedir_error.phpt
@@ -43,11 +43,3 @@ rmdir($dir_path);
 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===

diff --git a/ext/standard/tests/dir/closedir_variation1.phpt b/ext/standard/tests/dir/closedir_variation1.phpt
index e2271f8f18fc4ec39664991ba1021f675bc1aed3..d5c843996d0e05556d015ad961c90f8c410d402b 100644 (file)
--- a/ext/standard/tests/dir/closedir_variation1.phpt
+++ b/ext/standard/tests/dir/closedir_variation1.phpt
@@ -210,126 +210,3 @@ bool(false)
 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===

diff --git a/ext/standard/tests/dir/closedir_variation2.phpt b/ext/standard/tests/dir/closedir_variation2.phpt
index e17008ff524efa1e1e87555b99beae751697d4b3..015176c84dee7309c5751ed85b078079d95e91f9 100644 (file)
--- a/ext/standard/tests/dir/closedir_variation2.phpt
+++ b/ext/standard/tests/dir/closedir_variation2.phpt
@@ -49,16 +49,3 @@ Warning: closedir(): %d is not a valid Directory resource in %s on line %d
 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===

diff --git a/ext/standard/tests/dir/closedir_variation3.phpt b/ext/standard/tests/dir/closedir_variation3.phpt
index c505d06db575887a3a6423afadc2786dbb3440f6..b9b5e67e7a4f11d5fd7da00971db481cc05bf72a 100644 (file)
--- a/ext/standard/tests/dir/closedir_variation3.phpt
+++ b/ext/standard/tests/dir/closedir_variation3.phpt
@@ -42,17 +42,3 @@ bool(false)
 -- 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===

diff --git a/ext/standard/tests/dir/dir_basic.phpt b/ext/standard/tests/dir/dir_basic.phpt
index 504832ad30d57ebcf81b42946bb993c249321aa9..af276a1c448ec6d803a1ee75220aaa58d41ad455 100644 (file)
--- a/ext/standard/tests/dir/dir_basic.phpt
+++ b/ext/standard/tests/dir/dir_basic.phpt
@@ -55,38 +55,6 @@ rmdir($dir_path);
 --EXPECTF--
 *** 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"

diff --git a/ext/standard/tests/dir/dir_error.phpt b/ext/standard/tests/dir/dir_error.phpt
index 4603bf36efb6820da5875826968610ef10518e44..f2ef25cc87cf88d29a17d4438d69e17d7f67196f 100644 (file)
--- a/ext/standard/tests/dir/dir_error.phpt
+++ b/ext/standard/tests/dir/dir_error.phpt
@@ -32,14 +32,3 @@ NULL
 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

diff --git a/ext/standard/tests/dir/dir_variation1.phpt b/ext/standard/tests/dir/dir_variation1.phpt
index e1eaa90c7162178f1e8291fcd42c50986bc30a80..59970b28ed2a9899df8958eb19a1f12acf74382c 100644 (file)
--- a/ext/standard/tests/dir/dir_variation1.phpt
+++ b/ext/standard/tests/dir/dir_variation1.phpt
@@ -171,90 +171,3 @@ bool(false)
 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

diff --git a/ext/standard/tests/dir/dir_variation2.phpt b/ext/standard/tests/dir/dir_variation2.phpt
index c858d8113a89df523f9452fbe7f5089cbb48150e..f97d79692b4c47a9bc02368346e6ddea70ac058f 100644 (file)
--- a/ext/standard/tests/dir/dir_variation2.phpt
+++ b/ext/standard/tests/dir/dir_variation2.phpt
@@ -189,121 +189,6 @@ NULL
 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, 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

diff --git a/ext/standard/tests/dir/dir_variation3.phpt b/ext/standard/tests/dir/dir_variation3.phpt
index 0af648d4d65063948a7a1ee4c9af02b0bfb7da22..d1c21e18929fda12250db937afab16d5ea81f66f 100644 (file)
--- a/ext/standard/tests/dir/dir_variation3.phpt
+++ b/ext/standard/tests/dir/dir_variation3.phpt
@@ -94,118 +94,6 @@ rmdir($dir_path);
 *** Testing dir() : different directory permissions ***
 -- 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"

diff --git a/ext/standard/tests/dir/dir_variation4.phpt b/ext/standard/tests/dir/dir_variation4.phpt
index 05da85c70d86bb001487a4c29ba33d0cdb364c7d..ba69fa2f4f2c1ceab797169d8d2f0e7f28aa41f9 100644 (file)
--- a/ext/standard/tests/dir/dir_variation4.phpt
+++ b/ext/standard/tests/dir/dir_variation4.phpt
@@ -53,25 +53,6 @@ rmdir($dir_path);
 ?>
 --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"

diff --git a/ext/standard/tests/dir/dir_variation5.phpt b/ext/standard/tests/dir/dir_variation5.phpt
index 875f70d2f0bfeb2d5136b598a1c1a6bfe7618ad0..2399c634c5479137010ca868b8cf5200886387cc 100644 (file)
--- a/ext/standard/tests/dir/dir_variation5.phpt
+++ b/ext/standard/tests/dir/dir_variation5.phpt
@@ -27,9 +27,3 @@ echo "Done";
 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

diff --git a/ext/standard/tests/dir/dir_variation6.phpt b/ext/standard/tests/dir/dir_variation6.phpt
index 331e0fd9b316559b5e6ca4a5ce47460cb015af52..e42057ed1541921559bbfb672def9086b408ac34 100644 (file)
--- a/ext/standard/tests/dir/dir_variation6.phpt
+++ b/ext/standard/tests/dir/dir_variation6.phpt
@@ -49,14 +49,3 @@ bool(false)
 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

diff --git a/ext/standard/tests/dir/dir_variation7.phpt b/ext/standard/tests/dir/dir_variation7.phpt
index 72163602c57aa5bfcfe849797e76ea3db2005c0a..3ab5722c9db8aa8a9b166deae7ef7ec67c5d3d87 100644 (file)
--- a/ext/standard/tests/dir/dir_variation7.phpt
+++ b/ext/standard/tests/dir/dir_variation7.phpt
@@ -92,14 +92,3 @@ bool(false)
 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

diff --git a/ext/standard/tests/dir/dir_variation8.phpt b/ext/standard/tests/dir/dir_variation8.phpt
index d410126bcbff8df82b224b92c37622e34d7c5e0d..41217500d4aa5b31a3e82b39a01f8ccb7863b870 100644 (file)
--- a/ext/standard/tests/dir/dir_variation8.phpt
+++ b/ext/standard/tests/dir/dir_variation8.phpt
@@ -61,20 +61,3 @@ bool(false)
 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

diff --git a/ext/standard/tests/dir/dir_variation9.phpt b/ext/standard/tests/dir/dir_variation9.phpt
index b85e12bfc0324038f4483d1c5ab613c7755f722f..1cc9ca37499efcc0c6d91bb6216e7844170155e1 100644 (file)
--- a/ext/standard/tests/dir/dir_variation9.phpt
+++ b/ext/standard/tests/dir/dir_variation9.phpt
@@ -69,49 +69,6 @@ rmdir($dir_path2);
 --EXPECTF--
 *** Testing dir() : checking with valid and invalid paths ***
 
--- 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"]=>

diff --git a/ext/standard/tests/dir/getcwd_basic.phpt b/ext/standard/tests/dir/getcwd_basic.phpt
index 5a78dc78204eb5ef0141ce193154a91a114a87c0..fa8cd8f0952582500f31ffbce278636bbd509f3d 100644 (file)
--- a/ext/standard/tests/dir/getcwd_basic.phpt
+++ b/ext/standard/tests/dir/getcwd_basic.phpt
@@ -29,11 +29,6 @@ rmdir($directory);
 ?>
 --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===

diff --git a/ext/standard/tests/dir/getcwd_error.phpt b/ext/standard/tests/dir/getcwd_error.phpt
index c5569f6f691394420ae08980dda28b9b836ae8d2..153f303677966db905d1655b26013c6c7226e9b8 100644 (file)
--- a/ext/standard/tests/dir/getcwd_error.phpt
+++ b/ext/standard/tests/dir/getcwd_error.phpt
@@ -27,11 +27,3 @@ var_dump( getcwd($extra_arg) );
 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===

diff --git a/ext/standard/tests/dir/opendir_basic.phpt b/ext/standard/tests/dir/opendir_basic.phpt
index 5b8efcb6acbf976c2b357b079f8aaf19d82e4dcd..17ada17ea675989705ebe6e2de4db6eea7255bfd 100644 (file)
--- a/ext/standard/tests/dir/opendir_basic.phpt
+++ b/ext/standard/tests/dir/opendir_basic.phpt
@@ -60,17 +60,3 @@ resource(%d) of type (stream)
 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===

diff --git a/ext/standard/tests/dir/opendir_error1.phpt b/ext/standard/tests/dir/opendir_error1.phpt
index 8732d4530faa4dd536e607c5ad2fe44706d8ba54..92b8eee1bd71a666f31ed55fe0cbcd752bb818be 100644 (file)
--- a/ext/standard/tests/dir/opendir_error1.phpt
+++ b/ext/standard/tests/dir/opendir_error1.phpt
@@ -45,16 +45,3 @@ NULL
 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===

diff --git a/ext/standard/tests/dir/opendir_error2.phpt b/ext/standard/tests/dir/opendir_error2.phpt
index 9f37a072edaca930502c2a2cce963b625615d0de..0762be2ad3095bb2449c90efb00588ade8bf8869 100644 (file)
--- a/ext/standard/tests/dir/opendir_error2.phpt
+++ b/ext/standard/tests/dir/opendir_error2.phpt
@@ -35,16 +35,3 @@ bool(false)
 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===

diff --git a/ext/standard/tests/dir/opendir_variation1.phpt b/ext/standard/tests/dir/opendir_variation1.phpt
index 6b9e7b22844107a1eae46fa6ec78db81f93c6d52..f39607dee7fd00042a5f296a8ca1f9755e7066ee 100644 (file)
--- a/ext/standard/tests/dir/opendir_variation1.phpt
+++ b/ext/standard/tests/dir/opendir_variation1.phpt
@@ -218,111 +218,3 @@ bool(false)
 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===

diff --git a/ext/standard/tests/dir/opendir_variation2.phpt b/ext/standard/tests/dir/opendir_variation2.phpt
index 235b8a95d03cd74f52c0fb5da17e392c026a3035..757088225ee18ffd46aa28dc18eea6302489e768 100644 (file)
--- a/ext/standard/tests/dir/opendir_variation2.phpt
+++ b/ext/standard/tests/dir/opendir_variation2.phpt
@@ -189,134 +189,6 @@ NULL
 
 -- 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
 

diff --git a/ext/standard/tests/dir/opendir_variation3.phpt b/ext/standard/tests/dir/opendir_variation3.phpt
index cd74170f83d802e96ec81d3942e5ae550006bdd3..3de0dd3701a334c62a52c01d86ef3dd89975f02e 100644 (file)
--- a/ext/standard/tests/dir/opendir_variation3.phpt
+++ b/ext/standard/tests/dir/opendir_variation3.phpt
@@ -48,14 +48,3 @@ resource(%d) of type (stream)
 
 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===

diff --git a/ext/standard/tests/dir/opendir_variation4.phpt b/ext/standard/tests/dir/opendir_variation4.phpt
index 53f9bfda4af974a42ed25ac6743f1f778bacd687..b20641740b94abcf5b1f8cc5ac408ea8890fe28b 100644 (file)
--- a/ext/standard/tests/dir/opendir_variation4.phpt
+++ b/ext/standard/tests/dir/opendir_variation4.phpt
@@ -105,32 +105,3 @@ resource(%d) of type (stream)
 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===

diff --git a/ext/standard/tests/dir/opendir_variation5.phpt b/ext/standard/tests/dir/opendir_variation5.phpt
index 47f93f721e9db561f0f8640439ae2a76003b5cb8..f9bb38c68ecfa160266e60b5487e0655c997f9cd 100644 (file)
--- a/ext/standard/tests/dir/opendir_variation5.phpt
+++ b/ext/standard/tests/dir/opendir_variation5.phpt
@@ -101,16 +101,3 @@ bool(false)
 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===

diff --git a/ext/standard/tests/dir/opendir_variation6.phpt b/ext/standard/tests/dir/opendir_variation6.phpt
index 23606643872cb0cd6035424d410be41eed73b60a..01e8225d59354aedcbe6cb4c733ecc87da891722 100644 (file)
--- a/ext/standard/tests/dir/opendir_variation6.phpt
+++ b/ext/standard/tests/dir/opendir_variation6.phpt
@@ -59,22 +59,3 @@ bool(false)
 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===

diff --git a/ext/standard/tests/dir/opendir_variation7.phpt b/ext/standard/tests/dir/opendir_variation7.phpt
index 08910b4f1087e01909895decabe2f018ef815865..2ad41b1d31036fe3618b5a7c96e3e5afb0df5850 100644 (file)
--- a/ext/standard/tests/dir/opendir_variation7.phpt
+++ b/ext/standard/tests/dir/opendir_variation7.phpt
@@ -125,46 +125,3 @@ resource(%d) of type (stream)
 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===

diff --git a/ext/standard/tests/dir/readdir_basic.phpt b/ext/standard/tests/dir/readdir_basic.phpt
index f941235c4d4478cd3aa7bb41610838818efdae32..3493e7882caea5f444b06133e76c9d0a49382b62 100644 (file)
--- a/ext/standard/tests/dir/readdir_basic.phpt
+++ b/ext/standard/tests/dir/readdir_basic.phpt
@@ -54,25 +54,6 @@ rmdir($path);
 --EXPECTF--
 *** Testing readdir() : basic functionality ***
 
--- 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) "."

diff --git a/ext/standard/tests/dir/readdir_error.phpt b/ext/standard/tests/dir/readdir_error.phpt
index 24b51cffa628e787ab63b6b367fc2aa3b5561b2e..4b4011a136a8ea3e22a5a74eb10d40706dc926eb 100644 (file)
--- a/ext/standard/tests/dir/readdir_error.phpt
+++ b/ext/standard/tests/dir/readdir_error.phpt
@@ -41,11 +41,3 @@ rmdir($path);
 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===

diff --git a/ext/standard/tests/dir/readdir_variation1.phpt b/ext/standard/tests/dir/readdir_variation1.phpt
index b70f47bcef1fb19f362025ed5e8e4b1dd74778b9..b9cd85b2887dbaeb2e8a3a0ee2c368c64688cfb3 100644 (file)
--- a/ext/standard/tests/dir/readdir_variation1.phpt
+++ b/ext/standard/tests/dir/readdir_variation1.phpt
@@ -208,126 +208,3 @@ bool(false)
 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===

diff --git a/ext/standard/tests/dir/readdir_variation2.phpt b/ext/standard/tests/dir/readdir_variation2.phpt
index 9b7432f69fd7529eee77eebc55ed46236addebbb..84742984b152048717b286bd5c10a76ef4ffadcc 100644 (file)
--- a/ext/standard/tests/dir/readdir_variation2.phpt
+++ b/ext/standard/tests/dir/readdir_variation2.phpt
@@ -30,14 +30,7 @@ closedir($dir_handle);
 $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() --

diff --git a/ext/standard/tests/dir/readdir_variation3.phpt b/ext/standard/tests/dir/readdir_variation3.phpt
index 1eca801ab5c1dd58714baa402447779815523a47..1cd38bd57fe07c658b4f72c8cda6d06fdff7f7ee 100644 (file)
--- a/ext/standard/tests/dir/readdir_variation3.phpt
+++ b/ext/standard/tests/dir/readdir_variation3.phpt
@@ -50,22 +50,7 @@ $path_sub = $path_top . '/sub_folder';
 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]=>

diff --git a/ext/standard/tests/dir/readdir_variation4.phpt b/ext/standard/tests/dir/readdir_variation4.phpt
index 6690e52997dd3129348be42c5bac1a7876c27d7f..1be6d22ab76af842a4c7778c8a9a6f27cc67f649 100644 (file)
--- a/ext/standard/tests/dir/readdir_variation4.phpt
+++ b/ext/standard/tests/dir/readdir_variation4.phpt
@@ -142,103 +142,6 @@ int(2)
 resource(%d) of type (stream)
 int(2)
 
--- 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]=>

diff --git a/ext/standard/tests/dir/readdir_variation5.phpt b/ext/standard/tests/dir/readdir_variation5.phpt
index 784c3ce8d56a707f71ca608ef0ed2a901a819f88..d34f9cf50508ac9118eccf167c91cc8d7b62274d 100644 (file)
--- a/ext/standard/tests/dir/readdir_variation5.phpt
+++ b/ext/standard/tests/dir/readdir_variation5.phpt
@@ -82,69 +82,6 @@ rmdir($dir_path);
 --EXPECTF--
 *** Testing readdir() : usage variations ***
 
--- Iteration 1 --
-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)

diff --git a/ext/standard/tests/dir/readdir_variation6.phpt b/ext/standard/tests/dir/readdir_variation6.phpt
index 6051bf73e252f9b99aec94c7f6c7db49f8fd8039..ed9d1f0370d8d057d6ecfed46fc66c29a80ad75f 100644 (file)
--- a/ext/standard/tests/dir/readdir_variation6.phpt
+++ b/ext/standard/tests/dir/readdir_variation6.phpt
@@ -61,24 +61,7 @@ closedir();
 $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 --

diff --git a/ext/standard/tests/dir/readdir_variation7.phpt b/ext/standard/tests/dir/readdir_variation7.phpt
index 0387f4e98a9c50cdd523b9fa59c1fe4d6ba2c897..e62e5a3b6ad283365adec0f6b7181962ac5e3e50 100644 (file)
--- a/ext/standard/tests/dir/readdir_variation7.phpt
+++ b/ext/standard/tests/dir/readdir_variation7.phpt
@@ -33,10 +33,3 @@ resource(%d) of type (stream)
 
 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)

diff --git a/ext/standard/tests/dir/rewinddir_basic.phpt b/ext/standard/tests/dir/rewinddir_basic.phpt
index 36a9f25e67f6b32ea4c5c966f4a6678b7b003fa8..f2b4235a1341cf7a05915e88ef82a51594b48704 100644 (file)
--- a/ext/standard/tests/dir/rewinddir_basic.phpt
+++ b/ext/standard/tests/dir/rewinddir_basic.phpt
@@ -68,35 +68,6 @@ rmdir($dir_path2);
 resource(%d) of type (stream)
 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) ".."

diff --git a/ext/standard/tests/dir/rewinddir_error.phpt b/ext/standard/tests/dir/rewinddir_error.phpt
index 64d5b05184ae5c80fff4ff74783b8c67e5590b01..d66b24b9398ca293b191740118e059b3c54f72a3 100644 (file)
--- a/ext/standard/tests/dir/rewinddir_error.phpt
+++ b/ext/standard/tests/dir/rewinddir_error.phpt
@@ -40,11 +40,3 @@ rmdir($dir_path);
 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===

diff --git a/ext/standard/tests/dir/rewinddir_variation1.phpt b/ext/standard/tests/dir/rewinddir_variation1.phpt
index f8b8ece806b14d634586bf76cadbcc60b4a2c86a..e1fa002c147e2594451a208a6880f1e211bd3304 100644 (file)
--- a/ext/standard/tests/dir/rewinddir_variation1.phpt
+++ b/ext/standard/tests/dir/rewinddir_variation1.phpt
@@ -209,126 +209,3 @@ bool(false)
 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===

diff --git a/ext/standard/tests/dir/rewinddir_variation2.phpt b/ext/standard/tests/dir/rewinddir_variation2.phpt
index c728a4934f6f8e3564f415af9b3ad00c7926290b..09fb40ea018be4fba7cf995e8049ead8403c3e00 100644 (file)
--- a/ext/standard/tests/dir/rewinddir_variation2.phpt
+++ b/ext/standard/tests/dir/rewinddir_variation2.phpt
@@ -34,18 +34,6 @@ rmdir($dir_path);
 --EXPECTF--
 *** Testing rewinddir() : usage variations ***
 
--- 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) "."

diff --git a/ext/standard/tests/dir/rewinddir_variation3.phpt b/ext/standard/tests/dir/rewinddir_variation3.phpt
index e45a90d0d879145abb975f38d94278b91ee4cec4..2a2af89e630299b744f4945d4b64a30c1d73be75 100644 (file)
--- a/ext/standard/tests/dir/rewinddir_variation3.phpt
+++ b/ext/standard/tests/dir/rewinddir_variation3.phpt
@@ -41,15 +41,3 @@ bool(false)
 -- 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===

diff --git a/ext/standard/tests/dir/scandir_basic.phpt b/ext/standard/tests/dir/scandir_basic.phpt
index e06f3b8375b7a292ccbbe88ec04b0f60064af177..23b3422c692d75ea70ff5b05fcd60d8180b04d12 100644 (file)
--- a/ext/standard/tests/dir/scandir_basic.phpt
+++ b/ext/standard/tests/dir/scandir_basic.phpt
@@ -37,38 +37,7 @@ delete_files($directory, 3);
 $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 --

diff --git a/ext/standard/tests/dir/scandir_error1.phpt b/ext/standard/tests/dir/scandir_error1.phpt
index d1d3e0e3af58282184fc903eec1ab470a7bb74fa..7fbffba0cc88629f829319d798cf947c6ee36811 100644 (file)
--- a/ext/standard/tests/dir/scandir_error1.phpt
+++ b/ext/standard/tests/dir/scandir_error1.phpt
@@ -45,16 +45,3 @@ NULL
 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===

diff --git a/ext/standard/tests/dir/scandir_error2.phpt b/ext/standard/tests/dir/scandir_error2.phpt
index bf2432c66d08de873b47ce5bc2b48f9063880c42..1e99a578ac6ce926b8945873fd956730fb6cfa73 100644 (file)
--- a/ext/standard/tests/dir/scandir_error2.phpt
+++ b/ext/standard/tests/dir/scandir_error2.phpt
@@ -39,20 +39,3 @@ 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===
---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===

diff --git a/ext/standard/tests/dir/scandir_variation1.phpt b/ext/standard/tests/dir/scandir_variation1.phpt
index 010e4bfc3c04ff4a5ee93e88310fc58c3a551a89..bbecebe5cf3c75dd1707c8c11b7bf38619d3a36f 100644 (file)
--- a/ext/standard/tests/dir/scandir_variation1.phpt
+++ b/ext/standard/tests/dir/scandir_variation1.phpt
@@ -257,167 +257,3 @@ 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===
---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===

diff --git a/ext/standard/tests/dir/scandir_variation2.phpt b/ext/standard/tests/dir/scandir_variation2.phpt
index d32b4ec678830a800722f15c8c5a84efba77e2e0..7e2d32e6786be3ee65cdd91d7ed54fc1e146c8c5 100644 (file)
--- a/ext/standard/tests/dir/scandir_variation2.phpt
+++ b/ext/standard/tests/dir/scandir_variation2.phpt
@@ -105,185 +105,6 @@ rmdir($dir);
 --EXPECTF--
 *** Testing scandir() : usage variations ***
 
--- 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]=>

diff --git a/ext/standard/tests/dir/scandir_variation3.phpt b/ext/standard/tests/dir/scandir_variation3.phpt
index 0c266992e2f1099ef94ef0c5c1d02a8ec7ca16c8..bfb525dba66712ca5c4a4b49acf24d8ea0c69417 100644 (file)
--- a/ext/standard/tests/dir/scandir_variation3.phpt
+++ b/ext/standard/tests/dir/scandir_variation3.phpt
@@ -183,139 +183,6 @@ NULL
 
 -- 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
 

diff --git a/ext/standard/tests/dir/scandir_variation4.phpt b/ext/standard/tests/dir/scandir_variation4.phpt
index eb1b8bf47ccab0161df09744f9a5149a9f4ac317..3393ec13690f4a8df77478270a2b919735743551 100644 (file)
--- a/ext/standard/tests/dir/scandir_variation4.phpt
+++ b/ext/standard/tests/dir/scandir_variation4.phpt
@@ -65,109 +65,7 @@ $dir_path = dirname(__FILE__);
 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': --

diff --git a/ext/standard/tests/dir/scandir_variation5.phpt b/ext/standard/tests/dir/scandir_variation5.phpt
index 9a41ef1840755fb3f0d1890cb9a19f020fcdcef3..d6d3c79e40a33784be0d5ccbcd06906cacb56b53 100644 (file)
--- a/ext/standard/tests/dir/scandir_variation5.phpt
+++ b/ext/standard/tests/dir/scandir_variation5.phpt
@@ -96,20 +96,3 @@ Warning: scandir(%s/scandir_variation5/sub_dir/child_dir): failed to open dir: %
 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===

diff --git a/ext/standard/tests/dir/scandir_variation6.phpt b/ext/standard/tests/dir/scandir_variation6.phpt
index b963b79537cdc347f52b0ea77819858b0061de54..5cb595fe75cc3968fcc2fe4ca731d4c1de0102a6 100644 (file)
--- a/ext/standard/tests/dir/scandir_variation6.phpt
+++ b/ext/standard/tests/dir/scandir_variation6.phpt
@@ -68,30 +68,3 @@ Warning: scandir(%s/scandir_variation6/sub?dir1): failed to open dir: %s in %s o
 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===

diff --git a/ext/standard/tests/dir/scandir_variation7.phpt b/ext/standard/tests/dir/scandir_variation7.phpt
index ab220d6a4fb0e7093fc3fb879be47ff24db13801..3b98bd22ff12393de147bc6637a317cfb5a7a262 100644 (file)
--- a/ext/standard/tests/dir/scandir_variation7.phpt
+++ b/ext/standard/tests/dir/scandir_variation7.phpt
@@ -74,100 +74,7 @@ foreach ($permission_values as $perm) {
 $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 --

diff --git a/ext/standard/tests/dir/scandir_variation8.phpt b/ext/standard/tests/dir/scandir_variation8.phpt
index d26441df1f882e5818b10f76a8d1c9ea9562a65d..e9a24c7da25f07f9d50e2053957fd7e6ec551cd2 100644 (file)
--- a/ext/standard/tests/dir/scandir_variation8.phpt
+++ b/ext/standard/tests/dir/scandir_variation8.phpt
@@ -118,89 +118,6 @@ resource(%d) of type (stream)
 -- Iteration 14 --
 resource(%d) of type (stream)
 
--- 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]=>

diff --git a/ext/standard/tests/dir/scandir_variation9.phpt b/ext/standard/tests/dir/scandir_variation9.phpt
index 8dca4782fa59fb37cae915c058b9e11466058304..0510bd10fc6a1f27b28a4fe7c18089db20a91cf7 100644 (file)
--- a/ext/standard/tests/dir/scandir_variation9.phpt
+++ b/ext/standard/tests/dir/scandir_variation9.phpt
@@ -37,40 +37,7 @@ delete_files($dir, 2);
 $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]=>