- Test fixes

diff --git a/ext/standard/tests/dir/chdir_variation1.phpt b/ext/standard/tests/dir/chdir_variation1.phpt
index a7cf857f7fb3a53515fd76926fff78b7ef977c44..8b4d4b90e2d92cf043a2f83fd945e659204dca49 100644 (file)
--- a/ext/standard/tests/dir/chdir_variation1.phpt
+++ b/ext/standard/tests/dir/chdir_variation1.phpt
@@ -201,7 +201,7 @@ bool(false)
 
 -- Iteration 18 --
 
-Warning: chdir() expects parameter 1 to be string, array given in %s on line %d
+Warning: chdir() expects parameter 1 to be valid path, array given in %s on line %d
 bool(false)
 
 -- Iteration 19 --
@@ -230,6 +230,6 @@ bool(false)
 
 -- Iteration 25 --
 
-Warning: chdir() expects parameter 1 to be string, resource given in %s on line %d
+Warning: chdir() expects parameter 1 to be valid path, resource given 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 84b3565f7e06353203ea817039a33da503406765..34aa72dacda2f22c256f6fd8e77905dd54b9db31 100644 (file)
--- a/ext/standard/tests/dir/scandir_variation1.phpt
+++ b/ext/standard/tests/dir/scandir_variation1.phpt
@@ -205,7 +205,7 @@ bool(false)
 
 -- Iteration 18 --
 
-Warning: scandir() expects parameter 1 to be string, array given in %s on line %d
+Warning: scandir() expects parameter 1 to be valid path, array given in %s on line %d
 NULL
 
 -- Iteration 19 --
@@ -248,6 +248,6 @@ bool(false)
 
 -- Iteration 25 --
 
-Warning: scandir() expects parameter 1 to be string, resource given in %s on line %d
+Warning: scandir() expects parameter 1 to be valid path, resource given in %s on line %d
 NULL
 ===DONE===

diff --git a/ext/standard/tests/file/007_error.phpt b/ext/standard/tests/file/007_error.phpt
index 78a9d4ac330b881b57e185ac6f28e7b42a824dfd..671a6c17334d09272fd058f7f1bd634b4d993171 100644 (file)
--- a/ext/standard/tests/file/007_error.phpt
+++ b/ext/standard/tests/file/007_error.phpt
@@ -145,7 +145,7 @@ Warning: feof() expects parameter 1 to be resource, boolean given in %s on line
 bool(false)
 -- Iteration 5 --
 
-Warning: fopen() expects parameter 1 to be string, array given in %s on line %d
+Warning: fopen() expects parameter 1 to be valid path, array given in %s on line %d
 bool(false)
 
 Warning: fclose() expects parameter 1 to be resource, array given in %s on line %d
@@ -155,7 +155,7 @@ Warning: feof() expects parameter 1 to be resource, array given in %s on line %d
 bool(false)
 -- Iteration 6 --
 
-Warning: fopen() expects parameter 1 to be string, object given in %s on line %d
+Warning: fopen() expects parameter 1 to be valid path, object given in %s on line %d
 bool(false)
 
 Warning: fclose() expects parameter 1 to be resource, object given in %s on line %d

diff --git a/ext/standard/tests/file/bug39863.phpt b/ext/standard/tests/file/bug39863.phpt
index 6913655ee45bc9c55de7fe7c0acf3c3ce0a7678d..edbb90de07d15761a0023f22624583f50de73f2b 100644 (file)
--- a/ext/standard/tests/file/bug39863.phpt
+++ b/ext/standard/tests/file/bug39863.phpt
@@ -16,7 +16,8 @@ else {
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECT--
+--EXPECTF--
+Warning: file_exists() expects parameter 1 to be valid path, string given in %s on line %d
 PASS
 ===DONE===
 

diff --git a/ext/standard/tests/file/chmod_variation3.phpt b/ext/standard/tests/file/chmod_variation3.phpt
index df18ccf986c23a19b4f4af48ad2f5fea58500326..89f20f4a6489119802a98f9b2028b8ac110e72c8 100644 (file)
--- a/ext/standard/tests/file/chmod_variation3.phpt
+++ b/ext/standard/tests/file/chmod_variation3.phpt
@@ -143,19 +143,19 @@ Error: 2 - chmod(): No such file or directory, %s(%d)
 bool(false)
 
 --empty array--
-Error: 2 - chmod() expects parameter 1 to be string, array given, %s(%d)
+Error: 2 - chmod() expects parameter 1 to be valid path, array given, %s(%d)
 NULL
 
 --int indexed array--
-Error: 2 - chmod() expects parameter 1 to be string, array given, %s(%d)
+Error: 2 - chmod() expects parameter 1 to be valid path, array given, %s(%d)
 NULL
 
 --associative array--
-Error: 2 - chmod() expects parameter 1 to be string, array given, %s(%d)
+Error: 2 - chmod() expects parameter 1 to be valid path, array given, %s(%d)
 NULL
 
 --nested arrays--
-Error: 2 - chmod() expects parameter 1 to be string, array given, %s(%d)
+Error: 2 - chmod() expects parameter 1 to be valid path, array given, %s(%d)
 NULL
 
 --uppercase NULL--
@@ -195,7 +195,7 @@ Error: 2 - chmod(): No such file or directory, %s(%d)
 bool(false)
 
 --instance of classWithoutToString--
-Error: 2 - chmod() expects parameter 1 to be string, object given, %s(%d)
+Error: 2 - chmod() expects parameter 1 to be valid path, object given, %s(%d)
 NULL
 
 --undefined var--

diff --git a/ext/standard/tests/file/disk_free_space_variation.phpt b/ext/standard/tests/file/disk_free_space_variation.phpt
index c1809986fd8604c08df7bf06189041758d45b03e..debc84b14eff34570f97971caeabbee15e89692f 100644 (file)
--- a/ext/standard/tests/file/disk_free_space_variation.phpt
+++ b/ext/standard/tests/file/disk_free_space_variation.phpt
@@ -105,19 +105,35 @@ float(%d)
 float(%d)
 
 -- Iteration 9 --
-float(%d)
-float(%d)
+
+Warning: disk_free_space() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
+Warning: diskfreespace() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 
 -- Iteration 10 --
-float(%d)
-float(%d)
+
+Warning: disk_free_space() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
+Warning: diskfreespace() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 
 -- Iteration 11 --
-float(%d)
-float(%d)
+
+Warning: disk_free_space() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
+Warning: diskfreespace() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 
 -- Iteration 12 --
-float(%d)
-float(%d)
+
+Warning: disk_free_space() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
+
+Warning: diskfreespace() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 
 --- Done ---

diff --git a/ext/standard/tests/file/disk_total_space_variation.phpt b/ext/standard/tests/file/disk_total_space_variation.phpt
index c03ba594bdfaa29e819a1fe2bb08570b9c8e0af1..4cf4110f56b7138767efe9632f11b64e58ad692c 100644 (file)
--- a/ext/standard/tests/file/disk_total_space_variation.phpt
+++ b/ext/standard/tests/file/disk_total_space_variation.phpt
@@ -99,17 +99,25 @@ float(%d)
 float(%d)
 
 -- Iteration 9 --
-float(%d)
+
+Warning: disk_total_space() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 
 -- Iteration 10 --
-float(%d)
+
+Warning: disk_total_space() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 
 -- Iteration 11 --
-float(%d)
+
+Warning: disk_total_space() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 
 -- Iteration 12 --
-float(%d)
+
+Warning: disk_total_space() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 *** Testing with Binary Input ***
-float(%d)
+float(64246190080)
 
 --- Done ---

diff --git a/ext/standard/tests/file/filegroup_variation2.phpt b/ext/standard/tests/file/filegroup_variation2.phpt
index d5b7b1bac8372d7242b96050bdce7bf12b5a3b40..98d84765c42ab7016782556af492ac2b7e9375ed 100644 (file)
--- a/ext/standard/tests/file/filegroup_variation2.phpt
+++ b/ext/standard/tests/file/filegroup_variation2.phpt
@@ -58,7 +58,7 @@ bool(false)
 bool(false)
 bool(false)
 
-Warning: filegroup() expects parameter 1 to be string, resource given in %s on line %d
+Warning: filegroup() expects parameter 1 to be valid path, resource given in %s on line %d
 NULL
 
 Warning: filegroup(): stat failed for 1234 in %s on line %d

diff --git a/ext/standard/tests/file/filegroup_variation3.phpt b/ext/standard/tests/file/filegroup_variation3.phpt
index dd875a082b7008fb146011313899b0a59b525b13..b61f8984d54b18f4360c3a6f303edf97155454fd 100644 (file)
--- a/ext/standard/tests/file/filegroup_variation3.phpt
+++ b/ext/standard/tests/file/filegroup_variation3.phpt
@@ -74,8 +74,12 @@ bool(false)
 Warning: filegroup(): stat failed for %s/filegroup_variation3/filegroup*.tmp in %s on line %d
 bool(false)
 - Iteration 7 -
-int(%d)
+
+Warning: filegroup() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 - Iteration 8 -
-int(%d)
+
+Warning: filegroup() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 
 *** Done ***

diff --git a/ext/standard/tests/file/fileinode_variation2.phpt b/ext/standard/tests/file/fileinode_variation2.phpt
index 7d71ef4ab2e6a829305e9c67778d43b79903fbfe..eb0fc96010df4723619c55baa0afbe2f10af75ee 100644 (file)
--- a/ext/standard/tests/file/fileinode_variation2.phpt
+++ b/ext/standard/tests/file/fileinode_variation2.phpt
@@ -59,7 +59,7 @@ bool(false)
 bool(false)
 bool(false)
 
-Warning: fileinode() expects parameter 1 to be string, resource given in %s on line %d
+Warning: fileinode() expects parameter 1 to be valid path, resource given in %s on line %d
 NULL
 
 Warning: fileinode(): stat failed for 1234 in %s on line %d

diff --git a/ext/standard/tests/file/fileinode_variation3.phpt b/ext/standard/tests/file/fileinode_variation3.phpt
index c81b573246af88a355a7704896905a5ec8dec6ba..ab8afd601d1932317dc86e411cfe081765663266 100644 (file)
--- a/ext/standard/tests/file/fileinode_variation3.phpt
+++ b/ext/standard/tests/file/fileinode_variation3.phpt
@@ -75,8 +75,12 @@ bool(false)
 Warning: fileinode(): stat failed for %s/fileinode_variation3/fileinode*.tmp in %s on line %d
 bool(false)
 - Iteration 7 -
-int(%d)
+
+Warning: fileinode() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 - Iteration 8 -
-int(%d)
+
+Warning: fileinode() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 
 *** Done ***

diff --git a/ext/standard/tests/file/fileowner_variation2.phpt b/ext/standard/tests/file/fileowner_variation2.phpt
index 07eb6ec8b6f66a77fd283a20e1ba23a4bb7c4ec9..b904b6b366d0a687ad3cfd5b1c938bdc9f68fd40 100644 (file)
--- a/ext/standard/tests/file/fileowner_variation2.phpt
+++ b/ext/standard/tests/file/fileowner_variation2.phpt
@@ -59,7 +59,7 @@ bool(false)
 bool(false)
 bool(false)
 
-Warning: fileowner() expects parameter 1 to be string, resource given in %s on line %d
+Warning: fileowner() expects parameter 1 to be valid path, resource given in %s on line %d
 NULL
 
 Warning: fileowner(): stat failed for 1234 in %s on line %d

diff --git a/ext/standard/tests/file/fileowner_variation3.phpt b/ext/standard/tests/file/fileowner_variation3.phpt
index 2a322b6dbc58f26e1e83afdbb72a848c54bf1f36..e46d82c1afe51b1781bbc097e71b8e05d2457754 100644 (file)
--- a/ext/standard/tests/file/fileowner_variation3.phpt
+++ b/ext/standard/tests/file/fileowner_variation3.phpt
@@ -75,8 +75,12 @@ bool(false)
 Warning: fileowner(): stat failed for %s/fileowner_variation3/fileowner*.tmp in %s on line %d
 bool(false)
 - Iteration 7 -
-int(%d)
+
+Warning: fileowner() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 - Iteration 8 -
-int(%d)
+
+Warning: fileowner() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 
 *** Done ***

diff --git a/ext/standard/tests/file/fileperms_variation2.phpt b/ext/standard/tests/file/fileperms_variation2.phpt
index ad809a1559ee5117dc9db8590f56640b09c54fca..a7cfdb6b221129fd94223886cf0162f04dd92e5f 100644 (file)
--- a/ext/standard/tests/file/fileperms_variation2.phpt
+++ b/ext/standard/tests/file/fileperms_variation2.phpt
@@ -58,7 +58,7 @@ bool(false)
 bool(false)
 bool(false)
 
-Warning: fileperms() expects parameter 1 to be string, resource given in %s on line %d
+Warning: fileperms() expects parameter 1 to be valid path, resource given in %s on line %d
 NULL
 
 Warning: fileperms(): stat failed for 1234 in %s on line %d

diff --git a/ext/standard/tests/file/fileperms_variation3.phpt b/ext/standard/tests/file/fileperms_variation3.phpt
index 38101e363c5ac4f1b8deb625479b831598a90b4a..9c59cf7cdbc9569368a9d85c0e5a6e3c050a00b5 100644 (file)
--- a/ext/standard/tests/file/fileperms_variation3.phpt
+++ b/ext/standard/tests/file/fileperms_variation3.phpt
@@ -74,8 +74,12 @@ bool(false)
 Warning: fileperms(): stat failed for %s/fileperms_variation3/fileperms*.tmp in %s on line %d
 bool(false)
 - Iteration 7 -
-int(%d)
+
+Warning: fileperms() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 - Iteration 8 -
-int(%d)
+
+Warning: fileperms() expects parameter 1 to be valid path, string given in %s on line %d
+NULL
 
 *** Done ***