From 5b0a79cfbad2a93d85ecc2b043ceb1350bd69b48 Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Sat, 2 Feb 2008 03:15:46 +0000 Subject: [PATCH] Fix tests (new error message) --- ext/standard/tests/array/array_map_variation12.phpt | 8 ++++---- ext/standard/tests/array/array_map_variation14.phpt | 2 +- ext/standard/tests/array/array_map_variation15.phpt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ext/standard/tests/array/array_map_variation12.phpt b/ext/standard/tests/array/array_map_variation12.phpt index 7b8a2e0b09..5c6d9fb97a 100644 --- a/ext/standard/tests/array/array_map_variation12.phpt +++ b/ext/standard/tests/array/array_map_variation12.phpt @@ -40,11 +40,11 @@ array(3) { } -- with built-in function 'pow' and one parameter -- -Warning: pow() expects exactly 2 parameters, 1 given in %s on line %d%d +Warning: pow() expects exactly 2 parameters, 1 given in %s on line %d -Warning: pow() expects exactly 2 parameters, 1 given in %s on line %d%d +Warning: pow() expects exactly 2 parameters, 1 given in %s on line %d -Warning: pow() expects exactly 2 parameters, 1 given in %s on line %d%d +Warning: pow() expects exactly 2 parameters, 1 given in %s on line %d array(3) { [0]=> NULL @@ -55,6 +55,6 @@ array(3) { } -- with language construct -- -Warning: array_map() expects parameter 1 to be valid callback, string given in %s on line %d%d +Warning: array_map() expects parameter 1 to be a valid callback, function 'echo' not found or invalid function name in %s on line %d NULL Done diff --git a/ext/standard/tests/array/array_map_variation14.phpt b/ext/standard/tests/array/array_map_variation14.phpt index 8177a34819..771d3f949e 100644 --- a/ext/standard/tests/array/array_map_variation14.phpt +++ b/ext/standard/tests/array/array_map_variation14.phpt @@ -116,7 +116,7 @@ array(2) { } -- with empty string -- -Warning: array_map() expects parameter 1 to be a valid callback, function '(null)' not found or invalid function name in %s on line %d +Warning: array_map() expects parameter 1 to be a valid callback, function '' not found or invalid function name in %s on line %d NULL -- with empty array -- diff --git a/ext/standard/tests/array/array_map_variation15.phpt b/ext/standard/tests/array/array_map_variation15.phpt index c7be3b7ded..b29af47713 100644 --- a/ext/standard/tests/array/array_map_variation15.phpt +++ b/ext/standard/tests/array/array_map_variation15.phpt @@ -25,6 +25,6 @@ echo "Done"; --EXPECTF-- *** Testing array_map() : non existent 'callback' function *** -Warning: array_map() expects parameter 1 to be valid callback, string given in %s on line %d%d +Warning: array_map() expects parameter 1 to be a valid callback, function 'non_existent' not found or invalid function name in %s on line %d NULL Done -- 2.40.0