summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/standard/tests/file/copy_variation4.phptbin4654 -> 4467 bytes
-rw-r--r--ext/standard/tests/file/disk_free_space_variation.phpt16
-rw-r--r--ext/standard/tests/file/file_get_contents_variation8-win32.phpt2
-rw-r--r--ext/standard/tests/file/file_get_contents_variation8.phpt2
-rw-r--r--ext/standard/tests/file/file_put_contents_variation8.phptbin2302 -> 2228 bytes
-rw-r--r--ext/standard/tests/file/filegroup_variation3.phpt4
-rw-r--r--ext/standard/tests/file/fileinode_variation3.phpt4
-rw-r--r--ext/standard/tests/file/fileowner_variation3.phpt4
-rw-r--r--ext/standard/tests/file/fileperms_variation3.phpt4
-rw-r--r--ext/standard/tests/file/fnmatch_variation.phpt30
-rwxr-xr-xext/standard/tests/file/glob_variation.phpt23
-rw-r--r--ext/standard/tests/file/is_dir_variation4.phpt4
-rw-r--r--ext/standard/tests/file/is_executable_variation1.phpt4
-rw-r--r--ext/standard/tests/file/is_file_variation4.phpt4
-rw-r--r--ext/standard/tests/file/is_readable_variation1.phpt6
-rw-r--r--ext/standard/tests/file/is_writable_variation1.phpt12
-rw-r--r--ext/standard/tests/file/mkdir_rmdir_variation2.phpt4
-rw-r--r--ext/standard/tests/file/readfile_variation10-win32.phpt14
-rw-r--r--ext/standard/tests/file/readfile_variation10.phptbin1786 -> 1847 bytes
-rw-r--r--ext/standard/tests/file/rename_variation13-win32.phptbin3947 -> 3805 bytes
-rw-r--r--ext/standard/tests/file/rename_variation13.phpt4
-rwxr-xr-xext/standard/tests/file/stream_rfc2397_006.phpt4
-rw-r--r--ext/standard/tests/file/tempnam_variation3-win32.phpt5
-rw-r--r--ext/standard/tests/file/tempnam_variation3.phpt6
-rw-r--r--ext/standard/tests/file/tempnam_variation7-win32.phpt6
-rw-r--r--ext/standard/tests/file/tempnam_variation7.phpt6
-rw-r--r--tests/classes/constants_error_004.phpt2
27 files changed, 81 insertions, 89 deletions
diff --git a/ext/standard/tests/file/copy_variation4.phpt b/ext/standard/tests/file/copy_variation4.phpt
index 48386743f3..32756c1ede 100644
--- a/ext/standard/tests/file/copy_variation4.phpt
+++ b/ext/standard/tests/file/copy_variation4.phpt
Binary files differ
diff --git a/ext/standard/tests/file/disk_free_space_variation.phpt b/ext/standard/tests/file/disk_free_space_variation.phpt
index c1809986fd..178f857aba 100644
--- a/ext/standard/tests/file/disk_free_space_variation.phpt
+++ b/ext/standard/tests/file/disk_free_space_variation.phpt
@@ -105,19 +105,19 @@ float(%d)
float(%d)
-- Iteration 9 --
-float(%d)
-float(%d)
+bool(false)
+bool(false)
-- Iteration 10 --
-float(%d)
-float(%d)
+bool(false)
+bool(false)
-- Iteration 11 --
-float(%d)
-float(%d)
+bool(false)
+bool(false)
-- Iteration 12 --
-float(%d)
-float(%d)
+bool(false)
+bool(false)
--- Done ---
diff --git a/ext/standard/tests/file/file_get_contents_variation8-win32.phpt b/ext/standard/tests/file/file_get_contents_variation8-win32.phpt
index 43d742a67c..c0074ff38a 100644
--- a/ext/standard/tests/file/file_get_contents_variation8-win32.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation8-win32.phpt
@@ -76,8 +76,6 @@ Warning: file_get_contents( ): failed to open stream: Permission denied in %s on
bool(false)
-- Filename: \0 --
-
-Warning: file_get_contents(): Filename cannot be empty in %s on line %d
bool(false)
-- Filename: array() --
diff --git a/ext/standard/tests/file/file_get_contents_variation8.phpt b/ext/standard/tests/file/file_get_contents_variation8.phpt
index dca75a02ef..84621e1bd8 100644
--- a/ext/standard/tests/file/file_get_contents_variation8.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation8.phpt
@@ -68,8 +68,6 @@ bool(false)
Warning: file_get_contents( ): failed to open stream: No such file or directory in %s on line %d
bool(false)
-- Iteration 6 --
-
-Warning: file_get_contents(): Filename cannot be empty in %s on line %d
bool(false)
-- Iteration 7 --
diff --git a/ext/standard/tests/file/file_put_contents_variation8.phpt b/ext/standard/tests/file/file_put_contents_variation8.phpt
index 1e27e71334..c35ace47b2 100644
--- a/ext/standard/tests/file/file_put_contents_variation8.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation8.phpt
Binary files differ
diff --git a/ext/standard/tests/file/filegroup_variation3.phpt b/ext/standard/tests/file/filegroup_variation3.phpt
index dd875a082b..c41f383632 100644
--- a/ext/standard/tests/file/filegroup_variation3.phpt
+++ b/ext/standard/tests/file/filegroup_variation3.phpt
@@ -74,8 +74,8 @@ bool(false)
Warning: filegroup(): stat failed for %s/filegroup_variation3/filegroup*.tmp in %s on line %d
bool(false)
- Iteration 7 -
-int(%d)
+bool(false)
- Iteration 8 -
-int(%d)
+bool(false)
*** Done ***
diff --git a/ext/standard/tests/file/fileinode_variation3.phpt b/ext/standard/tests/file/fileinode_variation3.phpt
index c81b573246..23cf3c7c7e 100644
--- a/ext/standard/tests/file/fileinode_variation3.phpt
+++ b/ext/standard/tests/file/fileinode_variation3.phpt
@@ -75,8 +75,8 @@ bool(false)
Warning: fileinode(): stat failed for %s/fileinode_variation3/fileinode*.tmp in %s on line %d
bool(false)
- Iteration 7 -
-int(%d)
+bool(false)
- Iteration 8 -
-int(%d)
+bool(false)
*** Done ***
diff --git a/ext/standard/tests/file/fileowner_variation3.phpt b/ext/standard/tests/file/fileowner_variation3.phpt
index 2a322b6dbc..b2691e923d 100644
--- a/ext/standard/tests/file/fileowner_variation3.phpt
+++ b/ext/standard/tests/file/fileowner_variation3.phpt
@@ -75,8 +75,8 @@ bool(false)
Warning: fileowner(): stat failed for %s/fileowner_variation3/fileowner*.tmp in %s on line %d
bool(false)
- Iteration 7 -
-int(%d)
+bool(false)
- Iteration 8 -
-int(%d)
+bool(false)
*** Done ***
diff --git a/ext/standard/tests/file/fileperms_variation3.phpt b/ext/standard/tests/file/fileperms_variation3.phpt
index 38101e363c..1e7396a503 100644
--- a/ext/standard/tests/file/fileperms_variation3.phpt
+++ b/ext/standard/tests/file/fileperms_variation3.phpt
@@ -74,8 +74,8 @@ bool(false)
Warning: fileperms(): stat failed for %s/fileperms_variation3/fileperms*.tmp in %s on line %d
bool(false)
- Iteration 7 -
-int(%d)
+bool(false)
- Iteration 8 -
-int(%d)
+bool(false)
*** Done ***
diff --git a/ext/standard/tests/file/fnmatch_variation.phpt b/ext/standard/tests/file/fnmatch_variation.phpt
index e65bdd0555..13afebb6f0 100644
--- a/ext/standard/tests/file/fnmatch_variation.phpt
+++ b/ext/standard/tests/file/fnmatch_variation.phpt
@@ -259,21 +259,21 @@ bool(true)
--- With Strings ---
-- Iteration 0 --
bool(true)
-bool(true)
+bool(false)
bool(true)
bool(false)
bool(false)
bool(true)
-- Iteration 1 --
-bool(true)
-bool(true)
-bool(true)
bool(false)
bool(false)
-bool(true)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
-- Iteration 2 --
bool(true)
-bool(true)
+bool(false)
bool(true)
bool(false)
bool(false)
@@ -282,7 +282,7 @@ bool(true)
bool(false)
bool(false)
bool(false)
-bool(true)
+bool(false)
bool(false)
bool(false)
-- Iteration 4 --
@@ -294,7 +294,7 @@ bool(true)
bool(false)
-- Iteration 5 --
bool(true)
-bool(true)
+bool(false)
bool(true)
bool(false)
bool(false)
@@ -397,28 +397,28 @@ bool(true)
bool(true)
bool(true)
bool(true)
-bool(true)
+bool(false)
bool(false)
bool(false)
-- Iteration 1 --
bool(true)
bool(true)
bool(true)
-bool(true)
+bool(false)
bool(false)
bool(false)
-- Iteration 2 --
bool(true)
bool(true)
bool(true)
-bool(true)
+bool(false)
bool(false)
bool(false)
-- Iteration 3 --
-bool(true)
-bool(true)
-bool(true)
-bool(true)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
bool(false)
bool(false)
-- Iteration 4 --
diff --git a/ext/standard/tests/file/glob_variation.phpt b/ext/standard/tests/file/glob_variation.phpt
index 52c0dc8e47..64d3d8a2db 100755
--- a/ext/standard/tests/file/glob_variation.phpt
+++ b/ext/standard/tests/file/glob_variation.phpt
@@ -325,20 +325,12 @@ array(0) {
}
-- Iteration 8 --
-array(0) {
-}
-array(0) {
-}
-array(0) {
-}
-array(1) {
- [0]=>
- string(%d) "%s/glob_variation/WONDER5"
-}
-array(0) {
-}
-array(0) {
-}
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
-- Iteration 9 --
array(0) {
@@ -441,8 +433,7 @@ array(1) {
array(0) {
}
-- Iteration 8 --
-array(0) {
-}
+bool(false)
-- Iteration 9 --
array(0) {
}
diff --git a/ext/standard/tests/file/is_dir_variation4.phpt b/ext/standard/tests/file/is_dir_variation4.phpt
index a68fe0b005..b83d185b65 100644
--- a/ext/standard/tests/file/is_dir_variation4.phpt
+++ b/ext/standard/tests/file/is_dir_variation4.phpt
@@ -77,9 +77,9 @@ bool(true)
bool(false)
-- Iteration 9 --
-bool(true)
+bool(false)
-- Iteration 10 --
-bool(true)
+bool(false)
*** Done ***
diff --git a/ext/standard/tests/file/is_executable_variation1.phpt b/ext/standard/tests/file/is_executable_variation1.phpt
index 9969911ee1..bc826b9493 100644
--- a/ext/standard/tests/file/is_executable_variation1.phpt
+++ b/ext/standard/tests/file/is_executable_variation1.phpt
@@ -76,9 +76,9 @@ bool(false)
-- Iteration 5 --
bool(false)
-- Iteration 6 --
-bool(true)
+bool(false)
-- Iteration 7 --
-bool(true)
+bool(false)
-- Iteration 8 --
bool(false)
-- Iteration 9 --
diff --git a/ext/standard/tests/file/is_file_variation4.phpt b/ext/standard/tests/file/is_file_variation4.phpt
index 55aeedfaad..fbdf438945 100644
--- a/ext/standard/tests/file/is_file_variation4.phpt
+++ b/ext/standard/tests/file/is_file_variation4.phpt
@@ -67,8 +67,8 @@ bool(false)
- Iteration 6 -
bool(false)
- Iteration 7 -
-bool(true)
+bool(false)
- Iteration 8 -
-bool(true)
+bool(false)
*** Done ***
diff --git a/ext/standard/tests/file/is_readable_variation1.phpt b/ext/standard/tests/file/is_readable_variation1.phpt
index a1310327b8..74935743ce 100644
--- a/ext/standard/tests/file/is_readable_variation1.phpt
+++ b/ext/standard/tests/file/is_readable_variation1.phpt
@@ -87,11 +87,11 @@ bool(false)
-- Iteration 6 --
bool(false)
-- Iteration 7 --
-bool(true)
+bool(false)
-- Iteration 8 --
-bool(true)
+bool(false)
-- Iteration 9 --
-bool(true)
+bool(false)
-- Iteration 10 --
bool(true)
-- Iteration 11 --
diff --git a/ext/standard/tests/file/is_writable_variation1.phpt b/ext/standard/tests/file/is_writable_variation1.phpt
index bf3e7e1171..1f3cbf599e 100644
--- a/ext/standard/tests/file/is_writable_variation1.phpt
+++ b/ext/standard/tests/file/is_writable_variation1.phpt
@@ -96,14 +96,14 @@ bool(false)
bool(false)
bool(false)
-- Iteration 7 --
-bool(true)
-bool(true)
+bool(false)
+bool(false)
-- Iteration 8 --
-bool(true)
-bool(true)
+bool(false)
+bool(false)
-- Iteration 9 --
-bool(true)
-bool(true)
+bool(false)
+bool(false)
-- Iteration 10 --
bool(true)
bool(true)
diff --git a/ext/standard/tests/file/mkdir_rmdir_variation2.phpt b/ext/standard/tests/file/mkdir_rmdir_variation2.phpt
index e7c41c4a9d..101e890419 100644
--- a/ext/standard/tests/file/mkdir_rmdir_variation2.phpt
+++ b/ext/standard/tests/file/mkdir_rmdir_variation2.phpt
@@ -64,8 +64,8 @@ Warning: rmdir(%s/mkdir_variation2/): %s on line %d
bool(false)
*** Testing mkdir() and rmdir() for binary safe functionality ***
-bool(true)
-bool(true)
+bool(false)
+bool(false)
*** Testing mkdir() with miscelleneous input ***
bool(true)
diff --git a/ext/standard/tests/file/readfile_variation10-win32.phpt b/ext/standard/tests/file/readfile_variation10-win32.phpt
index 6453b9808d..1624194897 100644
--- a/ext/standard/tests/file/readfile_variation10-win32.phpt
+++ b/ext/standard/tests/file/readfile_variation10-win32.phpt
@@ -37,7 +37,7 @@ $names_arr = array(
foreach($names_arr as $key => $value) {
echo "\n-- Filename: $key --\n";
- readfile($value);
+ var_dump(readfile($value));
};
?>
@@ -48,40 +48,48 @@ foreach($names_arr as $key => $value) {
-- Filename: -1 --
Warning: readfile(-1): failed to open stream: No such file or directory in %s on line %d
+bool(false)
-- Filename: TRUE --
Warning: readfile(1): failed to open stream: No such file or directory in %s on line %d
+bool(false)
-- Filename: FALSE --
Warning: readfile(): Filename cannot be empty in %s on line %d
+bool(false)
-- Filename: NULL --
Warning: readfile(): Filename cannot be empty in %s on line %d
+bool(false)
-- Filename: "" --
Warning: readfile(): Filename cannot be empty in %s on line %d
+bool(false)
-- Filename: " " --
Warning: readfile( ): failed to open stream: Permission denied in %s on line %d
+bool(false)
-- Filename: \0 --
-
-Warning: readfile(): Filename cannot be empty in %s on line %d
+bool(false)
-- Filename: array() --
Warning: readfile() expects parameter 1 to be string, array given in %s on line %d
+bool(false)
-- Filename: /no/such/file/dir --
Warning: readfile(/no/such/file/dir): failed to open stream: No such file or directory in %s on line %d
+bool(false)
-- Filename: php/php --
Warning: readfile(php/php): failed to open stream: No such file or directory in %s on line %d
+bool(false)
===Done=== \ No newline at end of file
diff --git a/ext/standard/tests/file/readfile_variation10.phpt b/ext/standard/tests/file/readfile_variation10.phpt
index a48150aee0..2caa2de1d2 100644
--- a/ext/standard/tests/file/readfile_variation10.phpt
+++ b/ext/standard/tests/file/readfile_variation10.phpt
Binary files differ
diff --git a/ext/standard/tests/file/rename_variation13-win32.phpt b/ext/standard/tests/file/rename_variation13-win32.phpt
index a86025889d..2cd9dbdd94 100644
--- a/ext/standard/tests/file/rename_variation13-win32.phpt
+++ b/ext/standard/tests/file/rename_variation13-win32.phpt
Binary files differ
diff --git a/ext/standard/tests/file/rename_variation13.phpt b/ext/standard/tests/file/rename_variation13.phpt
index 24697d5105..2c35198a10 100644
--- a/ext/standard/tests/file/rename_variation13.phpt
+++ b/ext/standard/tests/file/rename_variation13.phpt
@@ -98,11 +98,7 @@ bool(true)
Warning: rename( ,%s/renameVar13/afile.tmp): No such file or directory in %s on line %d
bool(false)
-- testing '%s' --
-
-Warning: rename(%s/renameVar13/afile.tmp,): %s in %s on line %d
bool(false)
-
-Warning: rename(,%s/renameVar13/afile.tmp): %s in %s on line %d
bool(false)
-- testing 'Array' --
diff --git a/ext/standard/tests/file/stream_rfc2397_006.phpt b/ext/standard/tests/file/stream_rfc2397_006.phpt
index dab6cd5612..b1b3111cf0 100755
--- a/ext/standard/tests/file/stream_rfc2397_006.phpt
+++ b/ext/standard/tests/file/stream_rfc2397_006.phpt
@@ -21,8 +21,8 @@ foreach($streams as $stream)
===DONE===
<?php exit(0); ?>
--EXPECTF--
-string(0) ""
-string(6) "foobar"
+bool(false)
+bool(false)
string(13) "foobar foobar"
Warning: file_get_contents(data:;base64,#Zm9vYmFyIGZvb2Jhc=): failed to open stream: rfc2397: unable to decode in %sstream_rfc2397_006.php on line %d
diff --git a/ext/standard/tests/file/tempnam_variation3-win32.phpt b/ext/standard/tests/file/tempnam_variation3-win32.phpt
index fb457cb6ab..a51a10ab2b 100644
--- a/ext/standard/tests/file/tempnam_variation3-win32.phpt
+++ b/ext/standard/tests/file/tempnam_variation3-win32.phpt
@@ -31,8 +31,8 @@ $names_arr = array(
NULL,
"",
" ",
- "\0",
/* Invalid args */
+ "\0",
array(),
/* Valid args*/
@@ -102,7 +102,8 @@ OK
Failed, not created in the correct directory %s vs %s
0
-- Iteration 6 --
-OK
+Failed, not created in the correct directory %s vs %s
+0
-- Iteration 7 --
Warning: tempnam() expects parameter 2 to be string, array given in %s\ext\standard\tests\file\tempnam_variation3-win32.php on line %d
diff --git a/ext/standard/tests/file/tempnam_variation3.phpt b/ext/standard/tests/file/tempnam_variation3.phpt
index 69ab16c896..4a0e86173a 100644
--- a/ext/standard/tests/file/tempnam_variation3.phpt
+++ b/ext/standard/tests/file/tempnam_variation3.phpt
@@ -100,9 +100,9 @@ File name is => %s/%s
File permissions are => 100600
File created in => directory specified
-- Iteration 6 --
-File name is => %s/%s
-File permissions are => 100600
-File created in => directory specified
+-- File is not created --
+
+Warning: unlink(): %s in %s on line %d
-- Iteration 7 --
Warning: tempnam() expects parameter 2 to be string, array given in %s on line %d
diff --git a/ext/standard/tests/file/tempnam_variation7-win32.phpt b/ext/standard/tests/file/tempnam_variation7-win32.phpt
index 34e352a497..8ea839e2a7 100644
--- a/ext/standard/tests/file/tempnam_variation7-win32.phpt
+++ b/ext/standard/tests/file/tempnam_variation7-win32.phpt
@@ -89,9 +89,9 @@ File name is => %s%et%s
File permissions are => 100666
File created in => temp dir
-- Iteration 6 --
-File name is => %s%et%s
-File permissions are => 100666
-File created in => temp dir
+-- File is not created --
+
+Warning: unlink(): %s in %s on line %d
-- Iteration 7 --
Warning: tempnam() expects parameter 1 to be string, array given in %s on line %d
diff --git a/ext/standard/tests/file/tempnam_variation7.phpt b/ext/standard/tests/file/tempnam_variation7.phpt
index 18d074d28d..16f94f0a1b 100644
--- a/ext/standard/tests/file/tempnam_variation7.phpt
+++ b/ext/standard/tests/file/tempnam_variation7.phpt
@@ -94,9 +94,9 @@ File name is => %s%etempnam_variation3.tmp%s
File permissions are => 100600
File created in => temp dir
-- Iteration 6 --
-File name is => %s%etempnam_variation3.tmp%s
-File permissions are => 100600
-File created in => temp dir
+-- File is not created --
+
+Warning: unlink(): %s in %s on line %d
-- Iteration 7 --
Warning: tempnam() expects parameter 1 to be string, array given in %s on line %d
diff --git a/tests/classes/constants_error_004.phpt b/tests/classes/constants_error_004.phpt
index 732c530e85..03e67258a6 100644
--- a/tests/classes/constants_error_004.phpt
+++ b/tests/classes/constants_error_004.phpt
@@ -10,4 +10,4 @@ Class constant whose initial value refereces a non-existent class
$a = new C();
?>
--EXPECTF--
-Fatal error: Undefined class constant 'D::hello' in %s on line %d
+Fatal error: Class 'D' not found in %s on line %d