From 73c041ee8ca8f55bda65bec787f4508a0c0eaaa8 Mon Sep 17 00:00:00 2001
From: Raghubansh Kumar <kraghuba@php.net>
Date: Mon, 17 Dec 2007 13:00:52 +0000
Subject: [PATCH] fix tests

---
 .../tests/array/array_walk_error1.phpt        |   6 +-
 .../tests/array/array_walk_error2.phpt        |  14 +-
 .../array/array_walk_recursive_error1.phpt    |   6 +-
 .../array/array_walk_recursive_error2.phpt    |  12 +-
 .../array_walk_recursive_variation2.phpt      | 204 +++++++++---------
 .../array_walk_recursive_variation8.phpt      |   6 +-
 .../tests/array/array_walk_variation2.phpt    | 202 ++++++++---------
 .../tests/array/array_walk_variation8.phpt    |   6 +-
 8 files changed, 228 insertions(+), 228 deletions(-)

diff --git a/ext/standard/tests/array/array_walk_error1.phpt b/ext/standard/tests/array/array_walk_error1.phpt
index ef988d76ac..398d2046c6 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,7 +44,7 @@ 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
 --UEXPECTF--
 *** Testing array_walk() : error conditions ***
@@ -59,5 +59,5 @@ NULL
 -- Testing array_walk() function with non existent callback function  --
 
 Warning: array_walk() expects parameter 2 to be valid callback, Unicode 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 79c3919343..f9c3b23bae 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 arigument 4 for callback2() in %s on line %d
+Warning: Missing argument 4 for callback2() in %s on line %d
 
 callback2() invoked 
-bool(false)
+bool(true)
 
 callback1() invoked 
 bool(true)
@@ -63,12 +63,12 @@ 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)
+callback2() invoked 
+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 1041d10ef1..446b138cb8 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])
@@ -44,7 +44,7 @@ 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
 --UEXPECTF--
 *** Testing array_walk_recursive() : error conditions ***
@@ -59,5 +59,5 @@ NULL
 -- Testing array_walk_recursive() function with non existent callback function  --
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, Unicode 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 1c42b61837..89ed061ee5 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)
@@ -63,12 +63,12 @@ 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)
+callback2() invoked 
+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 2f48f786b6..41afb9978c 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])
@@ -22,7 +22,7 @@ unset ($unset_var);
 $user_data = 20;
 
 // get resource variable
-$fp = fopen(__FILE__, 'r'),
+$fp = fopen(__FILE__, 'r');
 
 // class definition
 class MyClass
@@ -96,354 +96,354 @@ 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
 --UEXPECTF--
 *** Testing array_walk_recursive() : unexpected values for 'funcname' argument ***
 -- 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, Unicode string given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, Unicode string given in %s on line %d
-bool(false)
+NULL
 -- Iteration 21 --
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, Unicode string given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, Unicode 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 2b44e10b73..692aa96fb4 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,7 +38,7 @@ 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
 --UEXPECTF--
 *** Testing array_walk_recursive() : built-in function as callback ***
@@ -49,5 +49,5 @@ bool(true)
 -- With 'echo' language construct --
 
 Warning: array_walk_recursive() expects parameter 2 to be valid callback, Unicode 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 24d6f1883b..7426d04aa7 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])
@@ -96,354 +96,354 @@ 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
 --UEXPECTF--
 *** Testing array_walk() : unexpected values for 'funcname' argument ***
 -- 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, Unicode string given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk() expects parameter 2 to be valid callback, Unicode string given in %s on line %d
-bool(false)
+NULL
 -- Iteration 21 --
 
 Warning: array_walk() expects parameter 2 to be valid callback, Unicode string given in %s on line %d
-bool(false)
+NULL
 
 Warning: array_walk() expects parameter 2 to be valid callback, Unicode 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 e8c5ea4c50..2a718d24ea 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,7 +38,7 @@ 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
 --UEXPECTF--
 *** Testing array_walk() : built-in function as callback ***
@@ -49,5 +49,5 @@ bool(true)
 -- With 'echo' language construct --
 
 Warning: array_walk() expects parameter 2 to be valid callback, Unicode string given in %s on line %d
-bool(false)
+NULL
 Done
-- 
2.50.1