From: Xinchen Hui <laruence@gmail.com>
Date: Sun, 9 Mar 2014 12:10:02 +0000 (+0800)
Subject: All tests passed in ext/standard/tests/dir now
X-Git-Tag: POST_PHPNG_MERGE~412^2~348
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=43eaced19f4d1fc0e5010221c386af47228c1ecc;p=php

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 015176c84d..2437868d62 100644
--- 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 dba49dba08..da364b9b60 100644
--- 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 7594cc220e..6b06a56d95 100644
--- 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===