From: Raghubansh Kumar <kraghuba@php.net>
Date: Mon, 17 Dec 2007 13:02:27 +0000 (+0000)
Subject: fix tests
X-Git-Tag: RELEASE_1_3_1~490
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f5f92c19409634a9d7417b727fecdd8fab692317;p=php

fix tests
---

diff --git a/ext/standard/tests/array/array_walk_error1.phpt b/ext/standard/tests/array/array_walk_error1.phpt
index ac64cbfd1f..39092c5261 100644
--- a/ext/standard/tests/array/array_walk_error1.phpt
+++ b/ext/standard/tests/array/array_walk_error1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test array_walk() function : error conditions(Bug#43558)
+Test array_walk() function : error conditions
 --FILE--
 <?php
 /* Prototype  : bool array_walk(array $input, string $funcname [, mixed $userdata])
@@ -44,5 +44,5 @@ NULL
 -- Testing array_walk() function with non existent callback function  --
 
 Warning: array_walk() expects parameter 2 to be valid callback, string given in %s on line %d
-bool(false)
+NULL
 Done
diff --git a/ext/standard/tests/array/array_walk_error2.phpt b/ext/standard/tests/array/array_walk_error2.phpt
index e1bd2a5d46..654637ab5a 100644
--- a/ext/standard/tests/array/array_walk_error2.phpt
+++ b/ext/standard/tests/array/array_walk_error2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test array_walk() function : error conditions - callback parameters(Bug#43558)
+Test array_walk() function : error conditions - callback parameters
 --FILE--
 <?php
 /* Prototype  : bool array_walk(array $input, string $funcname [, mixed $userdata])
@@ -40,12 +40,12 @@ echo "Done";
 Warning: Missing argument 3 for callback1() in %s on line %d
 
 callback1() invoked 
-bool(false)
+bool(true)
 
 Warning: Missing argument 4 for callback2() in %s on line %d
 
 callback2() invoked 
-bool(false)
+bool(true)
 
 callback1() invoked 
 bool(true)
diff --git a/ext/standard/tests/array/array_walk_recursive_error1.phpt b/ext/standard/tests/array/array_walk_recursive_error1.phpt
index f533da8392..365771c614 100644
--- a/ext/standard/tests/array/array_walk_recursive_error1.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_error1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test array_walk_recursive() function : error conditions(Bug#43558)
+Test array_walk_recursive() function : error conditions
 --FILE--
 <?php
 /* Prototype  : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata])
@@ -45,5 +45,5 @@ NULL
 -- Testing array_walk_recursive() function with non existent callback function  --
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, string given in %s on line %d
-bool(false)
+NULL
 Done
diff --git a/ext/standard/tests/array/array_walk_recursive_error2.phpt b/ext/standard/tests/array/array_walk_recursive_error2.phpt
index a1527c28ed..d628e9327a 100644
--- a/ext/standard/tests/array/array_walk_recursive_error2.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_error2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test array_walk_recursive() function : error conditions - callback parameters(Bug#43558)
+Test array_walk_recursive() function : error conditions - callback parameters
 --FILE--
 <?php
 /* Prototype  : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata])
@@ -40,12 +40,12 @@ echo "Done";
 Warning: Missing argument 3 for callback1() in %s on line %d
 
 callback1() invoked 
-bool(false)
+bool(true)
 
 Warning: Missing argument 4 for callback2() in %s on line %d
 
 callback2() invoked 
-bool(false)
+bool(true)
 
 callback1() invoked 
 bool(true)
diff --git a/ext/standard/tests/array/array_walk_recursive_variation2.phpt b/ext/standard/tests/array/array_walk_recursive_variation2.phpt
index a20589d9f0..12bddb490e 100644
--- a/ext/standard/tests/array/array_walk_recursive_variation2.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_variation2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test array_walk_recursive() function : usage variations - unexpected values in place of 'funcname' argument(Bug#43558)
+Test array_walk_recursive() function : usage variations - unexpected values in place of 'funcname' argument
 --FILE--
 <?php
 /* Prototype  : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata])
@@ -93,176 +93,176 @@ echo "Done"
 -- Iteration 1 --
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d
-bool(false)
+NULL
 -- Iteration 2 --
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d
-bool(false)
+NULL
 -- Iteration 3 --
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d
-bool(false)
+NULL
 -- Iteration 4 --
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d
-bool(false)
+NULL
 -- Iteration 5 --
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d
-bool(false)
+NULL
 -- Iteration 6 --
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d
-bool(false)
+NULL
 -- Iteration 7 --
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d
-bool(false)
+NULL
 -- Iteration 8 --
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d
-bool(false)
+NULL
 -- Iteration 9 --
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d
-bool(false)
+NULL
 -- Iteration 10 --
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, array given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, array given in %s on line %d
-bool(false)
+NULL
 -- Iteration 11 --
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, array given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, array given in %s on line %d
-bool(false)
+NULL
 -- Iteration 12 --
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, array given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, array given in %s on line %d
-bool(false)
+NULL
 -- Iteration 13 --
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, array given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, array given in %s on line %d
-bool(false)
+NULL
 -- Iteration 14 --
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, null given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, null given in %s on line %d
-bool(false)
+NULL
 -- Iteration 15 --
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, null given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, null given in %s on line %d
-bool(false)
+NULL
 -- Iteration 16 --
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, boolean given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, boolean given in %s on line %d
-bool(false)
+NULL
 -- Iteration 17 --
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, boolean given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, boolean given in %s on line %d
-bool(false)
+NULL
 -- Iteration 18 --
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, boolean given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, boolean given in %s on line %d
-bool(false)
+NULL
 -- Iteration 19 --
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, boolean given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, boolean given in %s on line %d
-bool(false)
+NULL
 -- Iteration 20 --
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, string given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, string given in %s on line %d
-bool(false)
+NULL
 -- Iteration 21 --
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, string given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, string given in %s on line %d
-bool(false)
+NULL
 -- Iteration 22 --
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, object given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, object given in %s on line %d
-bool(false)
+NULL
 -- Iteration 23 --
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, resource given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, resource given in %s on line %d
-bool(false)
+NULL
 -- Iteration 24 --
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, null given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, null given in %s on line %d
-bool(false)
+NULL
 -- Iteration 25 --
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, null given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, null given in %s on line %d
-bool(false)
+NULL
 Done
diff --git a/ext/standard/tests/array/array_walk_recursive_variation8.phpt b/ext/standard/tests/array/array_walk_recursive_variation8.phpt
index df1440eefd..605f3d0bab 100644
--- a/ext/standard/tests/array/array_walk_recursive_variation8.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_variation8.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test array_walk_recursive() function : usage variations - buit-in function as callback(Bug#43558)
+Test array_walk_recursive() function : usage variations - buit-in function as callback
 --FILE--
 <?php
 /* Prototype  : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata])
@@ -38,5 +38,5 @@ bool(true)
 -- With 'echo' language construct --
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, string given in %s on line %d
-bool(false)
+NULL
 Done
diff --git a/ext/standard/tests/array/array_walk_variation2.phpt b/ext/standard/tests/array/array_walk_variation2.phpt
index 1b76639e28..b95a63fb49 100644
--- a/ext/standard/tests/array/array_walk_variation2.phpt
+++ b/ext/standard/tests/array/array_walk_variation2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test array_walk() function : usage variations - unexpected values in place of 'funcname' argument(Bug#43558)
+Test array_walk() function : usage variations - unexpected values in place of 'funcname' argument
 --FILE--
 <?php
 /* Prototype  : bool array_walk(array $input, string $funcname [, mixed $userdata])
@@ -93,176 +93,176 @@ echo "Done"
 -- Iteration 1 --
 
 Warning: array_walk() expects parameter 2 to be valid callback, integer given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk() expects parameter 2 to be valid callback, integer given in %s on line %d
-bool(false)
+NULL
 -- Iteration 2 --
 
 Warning: array_walk() expects parameter 2 to be valid callback, integer given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk() expects parameter 2 to be valid callback, integer given in %s on line %d
-bool(false)
+NULL
 -- Iteration 3 --
 
 Warning: array_walk() expects parameter 2 to be valid callback, integer given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk() expects parameter 2 to be valid callback, integer given in %s on line %d
-bool(false)
+NULL
 -- Iteration 4 --
 
 Warning: array_walk() expects parameter 2 to be valid callback, integer given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk() expects parameter 2 to be valid callback, integer given in %s on line %d
-bool(false)
+NULL
 -- Iteration 5 --
 
 Warning: array_walk() expects parameter 2 to be valid callback, double given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk() expects parameter 2 to be valid callback, double given in %s on line %d
-bool(false)
+NULL
 -- Iteration 6 --
 
 Warning: array_walk() expects parameter 2 to be valid callback, double given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk() expects parameter 2 to be valid callback, double given in %s on line %d
-bool(false)
+NULL
 -- Iteration 7 --
 
 Warning: array_walk() expects parameter 2 to be valid callback, double given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk() expects parameter 2 to be valid callback, double given in %s on line %d
-bool(false)
+NULL
 -- Iteration 8 --
 
 Warning: array_walk() expects parameter 2 to be valid callback, double given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk() expects parameter 2 to be valid callback, double given in %s on line %d
-bool(false)
+NULL
 -- Iteration 9 --
 
 Warning: array_walk() expects parameter 2 to be valid callback, double given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk() expects parameter 2 to be valid callback, double given in %s on line %d
-bool(false)
+NULL
 -- Iteration 10 --
 
 Warning: array_walk() expects parameter 2 to be valid callback, array given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk() expects parameter 2 to be valid callback, array given in %s on line %d
-bool(false)
+NULL
 -- Iteration 11 --
 
 Warning: array_walk() expects parameter 2 to be valid callback, array given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk() expects parameter 2 to be valid callback, array given in %s on line %d
-bool(false)
+NULL
 -- Iteration 12 --
 
 Warning: array_walk() expects parameter 2 to be valid callback, array given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk() expects parameter 2 to be valid callback, array given in %s on line %d
-bool(false)
+NULL
 -- Iteration 13 --
 
 Warning: array_walk() expects parameter 2 to be valid callback, array given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk() expects parameter 2 to be valid callback, array given in %s on line %d
-bool(false)
+NULL
 -- Iteration 14 --
 
 Warning: array_walk() expects parameter 2 to be valid callback, null given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk() expects parameter 2 to be valid callback, null given in %s on line %d
-bool(false)
+NULL
 -- Iteration 15 --
 
 Warning: array_walk() expects parameter 2 to be valid callback, null given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk() expects parameter 2 to be valid callback, null given in %s on line %d
-bool(false)
+NULL
 -- Iteration 16 --
 
 Warning: array_walk() expects parameter 2 to be valid callback, boolean given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk() expects parameter 2 to be valid callback, boolean given in %s on line %d
-bool(false)
+NULL
 -- Iteration 17 --
 
 Warning: array_walk() expects parameter 2 to be valid callback, boolean given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk() expects parameter 2 to be valid callback, boolean given in %s on line %d
-bool(false)
+NULL
 -- Iteration 18 --
 
 Warning: array_walk() expects parameter 2 to be valid callback, boolean given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk() expects parameter 2 to be valid callback, boolean given in %s on line %d
-bool(false)
+NULL
 -- Iteration 19 --
 
 Warning: array_walk() expects parameter 2 to be valid callback, boolean given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk() expects parameter 2 to be valid callback, boolean given in %s on line %d
-bool(false)
+NULL
 -- Iteration 20 --
 
 Warning: array_walk() expects parameter 2 to be valid callback, string given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk() expects parameter 2 to be valid callback, string given in %s on line %d
-bool(false)
+NULL
 -- Iteration 21 --
 
 Warning: array_walk() expects parameter 2 to be valid callback, string given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk() expects parameter 2 to be valid callback, string given in %s on line %d
-bool(false)
+NULL
 -- Iteration 22 --
 
 Warning: array_walk() expects parameter 2 to be valid callback, object given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk() expects parameter 2 to be valid callback, object given in %s on line %d
-bool(false)
+NULL
 -- Iteration 23 --
 
 Warning: array_walk() expects parameter 2 to be valid callback, resource given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk() expects parameter 2 to be valid callback, resource given in %s on line %d
-bool(false)
+NULL
 -- Iteration 24 --
 
 Warning: array_walk() expects parameter 2 to be valid callback, null given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk() expects parameter 2 to be valid callback, null given in %s on line %d
-bool(false)
+NULL
 -- Iteration 25 --
 
 Warning: array_walk() expects parameter 2 to be valid callback, null given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk() expects parameter 2 to be valid callback, null given in %s on line %d
-bool(false)
+NULL
 Done
diff --git a/ext/standard/tests/array/array_walk_variation8.phpt b/ext/standard/tests/array/array_walk_variation8.phpt
index 97b1a1c86f..6c4a43df21 100644
--- a/ext/standard/tests/array/array_walk_variation8.phpt
+++ b/ext/standard/tests/array/array_walk_variation8.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test array_walk() function : usage variations - buit-in function as callback(Bug#43558)
+Test array_walk() function : usage variations - buit-in function as callback
 --FILE--
 <?php
 /* Prototype  : bool array_walk(array $input, string $funcname [, mixed $userdata])
@@ -38,5 +38,5 @@ bool(true)
 -- With 'echo' language construct --
 
 Warning: array_walk() expects parameter 2 to be valid callback, string given in %s on line %d
-bool(false)
+NULL
 Done