From: Xinchen Hui <laruence@gmail.com>
Date: Wed, 5 Mar 2014 04:05:28 +0000 (+0800)
Subject: Fixed warning mesgs
X-Git-Tag: POST_PHPNG_MERGE~412^2~421^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=91a1e7b90b2ae97cf8078bf4095075a828dc966c;p=php

Fixed warning mesgs
---

diff --git a/ext/standard/tests/file/fclose_variation1.phpt b/ext/standard/tests/file/fclose_variation1.phpt
index 43a6c343d0..ba3631e50d 100644
--- a/ext/standard/tests/file/fclose_variation1.phpt
+++ b/ext/standard/tests/file/fclose_variation1.phpt
@@ -10,6 +10,6 @@ fclose($s);
 echo fread($s2, strlen("<?php"));
 echo "\nDone.\n";
 --EXPECTF--
-Warning: fread(): %d is not a valid stream resource in %s on line %d
+Warning: fread(): supplied resource is not a valid stream resource in %s on line %d
 
 Done.
diff --git a/ext/standard/tests/file/feof_basic.phpt b/ext/standard/tests/file/feof_basic.phpt
index ff1d179f6f..78774e58e9 100644
--- a/ext/standard/tests/file/feof_basic.phpt
+++ b/ext/standard/tests/file/feof_basic.phpt
@@ -97,5 +97,5 @@ bool(false)
 bool(false)
 *** closing file, testing eof ***
 
-Warning: feof(): %d is not a valid stream resource in %s on line %d
+Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
 Done
diff --git a/ext/standard/tests/file/fgetc_variation2.phpt b/ext/standard/tests/file/fgetc_variation2.phpt
index 380c1aa268..169f00ac2c 100644
--- a/ext/standard/tests/file/fgetc_variation2.phpt
+++ b/ext/standard/tests/file/fgetc_variation2.phpt
@@ -41,7 +41,7 @@ echo "Done";
 *** Testing fgetc() : usage variations ***
 -- Testing fgetc() with closed handle --
 
-Warning: fgetc(): %d is not a valid stream resource in %s on line %d
+Warning: fgetc(): supplied resource is not a valid stream resource in %s on line %d
 bool(false)
 -- Testing fgetc() with unset handle --
 
diff --git a/ext/standard/tests/file/flock.phpt b/ext/standard/tests/file/flock.phpt
index efc059cff5..55aae4ab5a 100644
--- a/ext/standard/tests/file/flock.phpt
+++ b/ext/standard/tests/file/flock.phpt
@@ -43,7 +43,7 @@ NULL
 Warning: flock() expects parameter 1 to be resource, string given in %s on line %d
 NULL
 
-Warning: flock(): %d is not a valid stream resource in %s on line %d
+Warning: flock(): supplied resource is not a valid stream resource in %s on line %d
 bool(false)
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/flock_error.phpt b/ext/standard/tests/file/flock_error.phpt
index fe61e2a173..4fa1094967 100644
--- a/ext/standard/tests/file/flock_error.phpt
+++ b/ext/standard/tests/file/flock_error.phpt
@@ -94,7 +94,7 @@ NULL
 Warning: flock() expects parameter 2 to be long, string given in %s on line %d
 NULL
 
-Warning: flock(): %d is not a valid stream resource in %s on line %d
+Warning: flock(): supplied resource is not a valid stream resource in %s on line %d
 bool(false)
 
 Warning: flock() expects parameter 1 to be resource, string given in %s on line %d
diff --git a/ext/standard/tests/file/fread_error.phpt b/ext/standard/tests/file/fread_error.phpt
index 45a5ad1aa9..16c828ec51 100644
--- a/ext/standard/tests/file/fread_error.phpt
+++ b/ext/standard/tests/file/fread_error.phpt
@@ -103,7 +103,7 @@ bool(false)
 
 Notice: Undefined variable: file_content_type in %s on line %d
 
-Warning: fread(): %d is not a valid stream resource in %s on line %d
+Warning: fread(): supplied resource is not a valid stream resource in %s on line %d
 bool(false)
 
 Warning: fread() expects parameter 1 to be resource, null given in %s on line %d
diff --git a/ext/standard/tests/file/fscanf_error.phpt b/ext/standard/tests/file/fscanf_error.phpt
index 85c0ac4bf6..f93d1b2a57 100644
--- a/ext/standard/tests/file/fscanf_error.phpt
+++ b/ext/standard/tests/file/fscanf_error.phpt
@@ -70,7 +70,7 @@ NULL
 Warning: fscanf() expects at least 2 parameters, 1 given in %s on line %d
 NULL
 
-Warning: fscanf(): %d is not a valid File-Handle resource in %s on line %d
+Warning: fscanf(): supplied resource is not a valid File-Handle resource in %s on line %d
 bool(false)
 
 Warning: fscanf(): Different numbers of variable names and field specifiers in %s on line %d
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt b/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt
index 1779383044..d955340581 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt
@@ -91,7 +91,7 @@ bool(false)
 Warning: fseek() expects parameter 1 to be resource, object given in %s on line %d
 bool(false)
 -- Testing fseek() with closed/unset file handle --
-Warning: fseek(): %d is not a valid stream resource in %s on line %d
+Warning: fseek(): supplied resource is not a valid stream resource in %s on line %d
 bool(false)
 
 Warning: fseek() expects parameter 1 to be resource, null given in %s on line %d
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt b/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt
index 1f28abc99c..d297d6c7cb 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt
@@ -87,7 +87,7 @@ bool(false)
 Warning: ftell() expects parameter 1 to be resource, object given in %s on line %d
 bool(false)
 -- Testing ftell with closed/unset file handle --
-Warning: ftell(): %d is not a valid stream resource in %s on line %d
+Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
 bool(false)
 
 Warning: ftell() expects parameter 1 to be resource, null given in %s on line %d
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt b/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt
index 3c928e6465..16a4a0f9dd 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt
@@ -87,7 +87,7 @@ bool(false)
 Warning: rewind() expects parameter 1 to be resource, object given in %s on line %d
 bool(false)
 -- Testing rewind() with closed/unset file handle --
-Warning: rewind(): %d is not a valid stream resource in %s on line %d
+Warning: rewind(): supplied resource is not a valid stream resource in %s on line %d
 bool(false)
 
 Warning: rewind() expects parameter 1 to be resource, null given in %s on line %d
diff --git a/ext/standard/tests/file/ftruncate_error.phpt b/ext/standard/tests/file/ftruncate_error.phpt
index 254ad7688d..4823a7739b 100644
--- a/ext/standard/tests/file/ftruncate_error.phpt
+++ b/ext/standard/tests/file/ftruncate_error.phpt
@@ -114,7 +114,7 @@ Warning: ftruncate() expects parameter 1 to be resource, object given in %s on l
 bool(false)
 -- Testing ftruncate() with closed/unset file handle --
 
-Warning: ftruncate(): %d is not a valid stream resource in %s on line %d
+Warning: ftruncate(): supplied resource is not a valid stream resource in %s on line %d
 bool(false)
 int(36)
 
diff --git a/ext/standard/tests/file/fwrite_error.phpt b/ext/standard/tests/file/fwrite_error.phpt
index 988d618c66..2b28429362 100644
--- a/ext/standard/tests/file/fwrite_error.phpt
+++ b/ext/standard/tests/file/fwrite_error.phpt
@@ -112,7 +112,7 @@ Warning: fwrite() expects parameter 1 to be resource, object given in %s on line
 bool(false)
 -- Testing fwrite() with closed/unset file handle --
 
-Warning: fwrite(): %d is not a valid stream resource in %s on line %d
+Warning: fwrite(): supplied resource is not a valid stream resource in %s on line %d
 bool(false)
 
 Warning: fwrite() expects parameter 1 to be resource, null given in %s on line %d