From 8da563ed9adbbaa529574fe1d4709dbe3cf1c108 Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Mon, 6 Jun 2011 22:36:54 +0000 Subject: [PATCH] - Test fixes --- ext/standard/tests/dir/chdir_variation1.phpt | 4 +-- .../tests/dir/scandir_variation1.phpt | 4 +-- ext/standard/tests/file/007_error.phpt | 4 +-- ext/standard/tests/file/bug39863.phpt | 3 +- ext/standard/tests/file/chmod_variation3.phpt | 10 +++--- .../tests/file/disk_free_space_variation.phpt | 32 ++++++++++++++----- .../file/disk_total_space_variation.phpt | 18 ++++++++--- .../tests/file/filegroup_variation2.phpt | 2 +- .../tests/file/filegroup_variation3.phpt | 8 +++-- .../tests/file/fileinode_variation2.phpt | 2 +- .../tests/file/fileinode_variation3.phpt | 8 +++-- .../tests/file/fileowner_variation2.phpt | 2 +- .../tests/file/fileowner_variation3.phpt | 8 +++-- .../tests/file/fileperms_variation2.phpt | 2 +- .../tests/file/fileperms_variation3.phpt | 8 +++-- 15 files changed, 78 insertions(+), 37 deletions(-) diff --git a/ext/standard/tests/dir/chdir_variation1.phpt b/ext/standard/tests/dir/chdir_variation1.phpt index a7cf857f7f..8b4d4b90e2 100644 --- 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 84b3565f7e..34aa72dacd 100644 --- 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 78a9d4ac33..671a6c1733 100644 --- 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 6913655ee4..edbb90de07 100644 --- a/ext/standard/tests/file/bug39863.phpt +++ b/ext/standard/tests/file/bug39863.phpt @@ -16,7 +16,8 @@ else { ?> ===DONE=== ---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 df18ccf986..89f20f4a64 100644 --- 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 c1809986fd..debc84b14e 100644 --- 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 c03ba594bd..4cf4110f56 100644 --- 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 d5b7b1bac8..98d84765c4 100644 --- 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 dd875a082b..b61f8984d5 100644 --- 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 7d71ef4ab2..eb0fc96010 100644 --- 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 c81b573246..ab8afd601d 100644 --- 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 07eb6ec8b6..b904b6b366 100644 --- 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 2a322b6dbc..e46d82c1af 100644 --- 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 ad809a1559..a7cfdb6b22 100644 --- 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 38101e363c..9c59cf7cdb 100644 --- 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 *** -- 2.40.0