All tests passed in ext/standard/tests/dir now

diff --git a/ext/standard/tests/dir/closedir_variation2.phpt b/ext/standard/tests/dir/closedir_variation2.phpt
index 015176c84dee7309c5751ed85b078079d95e91f9..2437868d6294fd624ce0c32c5c715b04f8f56443 100644 (file)
--- a/ext/standard/tests/dir/closedir_variation2.phpt
+++ b/ext/standard/tests/dir/closedir_variation2.phpt
@@ -45,7 +45,7 @@ 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
+Warning: closedir(): supplied resource 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/dir_basic.phpt b/ext/standard/tests/dir/dir_basic.phpt
index dba49dba08a8db94ad6fe937f0b5642b257ac14a..da364b9b60bd8cb4b56930281a4d55cd593d2faa 100644 (file)
--- a/ext/standard/tests/dir/dir_basic.phpt
+++ b/ext/standard/tests/dir/dir_basic.phpt
@@ -81,6 +81,6 @@ object(Directory)#%d (2) {
 }
 
 Test read after closing the dir:
-Warning: Directory::read(): %d is not a valid Directory resource in %s on line %d
+Warning: Directory::read(): supplied resource is not a valid Directory resource in %s on line %d
 bool(false)
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/dir/rewinddir_variation2.phpt b/ext/standard/tests/dir/rewinddir_variation2.phpt
index 7594cc220e8b705791c73d58e550b8918c313876..6b06a56d9501c5ced62da6a5b57744005f495909 100644 (file)
--- a/ext/standard/tests/dir/rewinddir_variation2.phpt
+++ b/ext/standard/tests/dir/rewinddir_variation2.phpt
@@ -40,6 +40,6 @@ string(%d) "%s"
 
 -- Call to rewinddir() --
 
-Warning: rewinddir(): %d is not a valid Directory resource in %s on line %d
+Warning: rewinddir(): supplied resource is not a valid Directory resource in %s on line %d
 bool(false)
 ===DONE===