diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/spl/tests/spl_autoload_001.phpt | 2 | ||||
| -rw-r--r-- | ext/spl/tests/spl_autoload_005.phpt | 2 | ||||
| -rw-r--r-- | ext/spl/tests/spl_autoload_007.phpt | 16 | ||||
| -rw-r--r-- | ext/spl/tests/spl_autoload_008.phpt | 4 | ||||
| -rw-r--r-- | ext/standard/tests/array/array_filter_variation9.phpt | 4 | ||||
| -rw-r--r-- | ext/standard/tests/array/array_map_object1.phpt | 10 | ||||
| -rw-r--r-- | ext/standard/tests/array/array_map_object2.phpt | 4 | ||||
| -rw-r--r-- | ext/standard/tests/array/array_map_object3.phpt | 4 | ||||
| -rw-r--r-- | ext/standard/tests/array/array_map_variation12.phpt | 2 | ||||
| -rw-r--r-- | ext/standard/tests/array/array_map_variation14.phpt | 4 | ||||
| -rw-r--r-- | ext/standard/tests/array/array_map_variation15.phpt | 2 | ||||
| -rw-r--r-- | ext/standard/tests/array/array_map_variation16.phpt | 16 | ||||
| -rw-r--r-- | ext/standard/tests/array/array_map_variation17.phpt | 40 |
13 files changed, 55 insertions, 55 deletions
diff --git a/ext/spl/tests/spl_autoload_001.phpt b/ext/spl/tests/spl_autoload_001.phpt index c7f5e573f3..befb965709 100644 --- a/ext/spl/tests/spl_autoload_001.phpt +++ b/ext/spl/tests/spl_autoload_001.phpt @@ -100,4 +100,4 @@ TestFunc2(TestClass) %stestclass.class.inc bool(true) ===NOFUNCTION=== -spl_autoload_register(): Argument #1 ($callback) must be a valid callback, function "unavailable_autoload_function" not found or invalid function name +spl_autoload_register(): Argument #1 ($callback) must be a valid callback or null, function "unavailable_autoload_function" not found or invalid function name diff --git a/ext/spl/tests/spl_autoload_005.phpt b/ext/spl/tests/spl_autoload_005.phpt index 6eb8510325..0f2c5ed2c3 100644 --- a/ext/spl/tests/spl_autoload_005.phpt +++ b/ext/spl/tests/spl_autoload_005.phpt @@ -43,7 +43,7 @@ catch(Exception $e) ?> --EXPECT-- -spl_autoload_register(): Argument #1 ($callback) must be a valid callback, non-static method MyAutoLoader::autoLoad() cannot be called statically +spl_autoload_register(): Argument #1 ($callback) must be a valid callback or null, non-static method MyAutoLoader::autoLoad() cannot be called statically MyAutoLoader::autoLoad(TestClass) MyAutoLoader::autoThrow(TestClass) Exception: Unavailable diff --git a/ext/spl/tests/spl_autoload_007.phpt b/ext/spl/tests/spl_autoload_007.phpt index 589ce74b7f..0a8183dfb4 100644 --- a/ext/spl/tests/spl_autoload_007.phpt +++ b/ext/spl/tests/spl_autoload_007.phpt @@ -52,16 +52,16 @@ foreach($funcs as $idx => $func) ?> --EXPECTF-- string(22) "MyAutoLoader::notExist" -spl_autoload_register(): Argument #1 ($callback) must be a valid callback, class MyAutoLoader does not have a method "notExist" +spl_autoload_register(): Argument #1 ($callback) must be a valid callback or null, class MyAutoLoader does not have a method "notExist" string(22) "MyAutoLoader::noAccess" -spl_autoload_register(): Argument #1 ($callback) must be a valid callback, cannot access protected method MyAutoLoader::noAccess() +spl_autoload_register(): Argument #1 ($callback) must be a valid callback or null, cannot access protected method MyAutoLoader::noAccess() string(22) "MyAutoLoader::autoLoad" ok string(22) "MyAutoLoader::dynaLoad" -spl_autoload_register(): Argument #1 ($callback) must be a valid callback, non-static method MyAutoLoader::dynaLoad() cannot be called statically +spl_autoload_register(): Argument #1 ($callback) must be a valid callback or null, non-static method MyAutoLoader::dynaLoad() cannot be called statically array(2) { [0]=> @@ -69,7 +69,7 @@ array(2) { [1]=> string(8) "notExist" } -spl_autoload_register(): Argument #1 ($callback) must be a valid callback, class MyAutoLoader does not have a method "notExist" +spl_autoload_register(): Argument #1 ($callback) must be a valid callback or null, class MyAutoLoader does not have a method "notExist" array(2) { [0]=> @@ -77,7 +77,7 @@ array(2) { [1]=> string(8) "noAccess" } -spl_autoload_register(): Argument #1 ($callback) must be a valid callback, cannot access protected method MyAutoLoader::noAccess() +spl_autoload_register(): Argument #1 ($callback) must be a valid callback or null, cannot access protected method MyAutoLoader::noAccess() array(2) { [0]=> @@ -93,7 +93,7 @@ array(2) { [1]=> string(8) "dynaLoad" } -spl_autoload_register(): Argument #1 ($callback) must be a valid callback, non-static method MyAutoLoader::dynaLoad() cannot be called statically +spl_autoload_register(): Argument #1 ($callback) must be a valid callback or null, non-static method MyAutoLoader::dynaLoad() cannot be called statically array(2) { [0]=> @@ -102,7 +102,7 @@ array(2) { [1]=> string(8) "notExist" } -spl_autoload_register(): Argument #1 ($callback) must be a valid callback, class MyAutoLoader does not have a method "notExist" +spl_autoload_register(): Argument #1 ($callback) must be a valid callback or null, class MyAutoLoader does not have a method "notExist" array(2) { [0]=> @@ -111,7 +111,7 @@ array(2) { [1]=> string(8) "noAccess" } -spl_autoload_register(): Argument #1 ($callback) must be a valid callback, cannot access protected method MyAutoLoader::noAccess() +spl_autoload_register(): Argument #1 ($callback) must be a valid callback or null, cannot access protected method MyAutoLoader::noAccess() array(2) { [0]=> diff --git a/ext/spl/tests/spl_autoload_008.phpt b/ext/spl/tests/spl_autoload_008.phpt index 99f61cd561..738c691ddf 100644 --- a/ext/spl/tests/spl_autoload_008.phpt +++ b/ext/spl/tests/spl_autoload_008.phpt @@ -81,7 +81,7 @@ Exception: Bla int(0) ====2==== string(22) "MyAutoLoader::dynaLoad" -TypeError: spl_autoload_register(): Argument #1 ($callback) must be a valid callback, non-static method MyAutoLoader::dynaLoad() cannot be called statically +TypeError: spl_autoload_register(): Argument #1 ($callback) must be a valid callback or null, non-static method MyAutoLoader::dynaLoad() cannot be called statically int(0) ====3==== array(2) { @@ -101,7 +101,7 @@ array(2) { [1]=> string(8) "dynaLoad" } -TypeError: spl_autoload_register(): Argument #1 ($callback) must be a valid callback, non-static method MyAutoLoader::dynaLoad() cannot be called statically +TypeError: spl_autoload_register(): Argument #1 ($callback) must be a valid callback or null, non-static method MyAutoLoader::dynaLoad() cannot be called statically int(0) ====5==== array(2) { diff --git a/ext/standard/tests/array/array_filter_variation9.phpt b/ext/standard/tests/array/array_filter_variation9.phpt index d9abf7dac1..d9c1f9258f 100644 --- a/ext/standard/tests/array/array_filter_variation9.phpt +++ b/ext/standard/tests/array/array_filter_variation9.phpt @@ -62,6 +62,6 @@ array(6) { [5]=> int(1000) } -array_filter(): Argument #2 ($callback) must be a valid callback, function "echo" not found or invalid function name -array_filter(): Argument #2 ($callback) must be a valid callback, function "exit" not found or invalid function name +array_filter(): Argument #2 ($callback) must be a valid callback or null, function "echo" not found or invalid function name +array_filter(): Argument #2 ($callback) must be a valid callback or null, function "exit" not found or invalid function name Done diff --git a/ext/standard/tests/array/array_map_object1.phpt b/ext/standard/tests/array/array_map_object1.phpt index b5da9798e4..88ebe2414b 100644 --- a/ext/standard/tests/array/array_map_object1.phpt +++ b/ext/standard/tests/array/array_map_object1.phpt @@ -132,15 +132,15 @@ array(2) { -- simple class with private variable and method -- SimpleClassPri::add -array_map(): Argument #1 ($callback) must be a valid callback, cannot access private method SimpleClassPri::add() +array_map(): Argument #1 ($callback) must be a valid callback or null, cannot access private method SimpleClassPri::add() -- simple class with protected variable and method -- SimpleClassPro::mul -array_map(): Argument #1 ($callback) must be a valid callback, cannot access protected method SimpleClassPro::mul() +array_map(): Argument #1 ($callback) must be a valid callback or null, cannot access protected method SimpleClassPro::mul() -- class without members -- EmptyClass -array_map(): Argument #1 ($callback) must be a valid callback, array must have exactly two members +array_map(): Argument #1 ($callback) must be a valid callback or null, array must have exactly two members -- abstract class -- ChildClass::emptyFunction @@ -173,9 +173,9 @@ array(2) { int(4) } StaticClass::cube -array_map(): Argument #1 ($callback) must be a valid callback, cannot access private method StaticClass::cube() +array_map(): Argument #1 ($callback) must be a valid callback or null, cannot access private method StaticClass::cube() StaticClass::retVal -array_map(): Argument #1 ($callback) must be a valid callback, cannot access protected method StaticClass::retVal() +array_map(): Argument #1 ($callback) must be a valid callback or null, cannot access protected method StaticClass::retVal() -- class implementing an interface -- InterClass::square array(2) { diff --git a/ext/standard/tests/array/array_map_object2.phpt b/ext/standard/tests/array/array_map_object2.phpt index 53524fc819..3b9666ce50 100644 --- a/ext/standard/tests/array/array_map_object2.phpt +++ b/ext/standard/tests/array/array_map_object2.phpt @@ -39,7 +39,7 @@ echo "Done"; --EXPECT-- *** Testing array_map() : with non-existent class and method *** -- with non-existent class -- -array_map(): Argument #1 ($callback) must be a valid callback, class "non-existent" not found +array_map(): Argument #1 ($callback) must be a valid callback or null, class "non-existent" not found -- with existent class and non-existent method -- -array_map(): Argument #1 ($callback) must be a valid callback, class SimpleClass does not have a method "non-existent" +array_map(): Argument #1 ($callback) must be a valid callback or null, class SimpleClass does not have a method "non-existent" Done diff --git a/ext/standard/tests/array/array_map_object3.phpt b/ext/standard/tests/array/array_map_object3.phpt index b5528c9e7c..55a97a317f 100644 --- a/ext/standard/tests/array/array_map_object3.phpt +++ b/ext/standard/tests/array/array_map_object3.phpt @@ -76,7 +76,7 @@ array(3) { int(7) } -- accessing child method from parent class -- -array_map(): Argument #1 ($callback) must be a valid callback, class ParentClass does not have a method "staticChild" +array_map(): Argument #1 ($callback) must be a valid callback or null, class ParentClass does not have a method "staticChild" -- accessing parent method using child class object -- array(3) { [0]=> @@ -87,5 +87,5 @@ array(3) { int(7) } -- accessing child method using parent class object -- -array_map(): Argument #1 ($callback) must be a valid callback, class ParentClass does not have a method "staticChild" +array_map(): Argument #1 ($callback) must be a valid callback or null, class ParentClass does not have a method "staticChild" Done diff --git a/ext/standard/tests/array/array_map_variation12.phpt b/ext/standard/tests/array/array_map_variation12.phpt index b642bd0cb5..d3fa62e93d 100644 --- a/ext/standard/tests/array/array_map_variation12.phpt +++ b/ext/standard/tests/array/array_map_variation12.phpt @@ -44,5 +44,5 @@ array(3) { -- with built-in function 'pow' and one parameter -- pow() expects exactly 2 arguments, 1 given -- with language construct -- -array_map(): Argument #1 ($callback) must be a valid callback, function "echo" not found or invalid function name +array_map(): Argument #1 ($callback) must be a valid callback or null, function "echo" not found or invalid function name Done diff --git a/ext/standard/tests/array/array_map_variation14.phpt b/ext/standard/tests/array/array_map_variation14.phpt index 2670537b46..d1f0b517ea 100644 --- a/ext/standard/tests/array/array_map_variation14.phpt +++ b/ext/standard/tests/array/array_map_variation14.phpt @@ -118,7 +118,7 @@ array(2) { int(2) } -- with empty string -- -array_map(): Argument #1 ($callback) must be a valid callback, function "" not found or invalid function name +array_map(): Argument #1 ($callback) must be a valid callback or null, function "" not found or invalid function name -- with empty array -- -array_map(): Argument #1 ($callback) must be a valid callback, array must have exactly two members +array_map(): Argument #1 ($callback) must be a valid callback or null, array must have exactly two members Done diff --git a/ext/standard/tests/array/array_map_variation15.phpt b/ext/standard/tests/array/array_map_variation15.phpt index f10be3cc32..d053a72046 100644 --- a/ext/standard/tests/array/array_map_variation15.phpt +++ b/ext/standard/tests/array/array_map_variation15.phpt @@ -23,5 +23,5 @@ echo "Done"; ?> --EXPECT-- *** Testing array_map() : non existent 'callback' function *** -array_map(): Argument #1 ($callback) must be a valid callback, function "non_existent" not found or invalid function name +array_map(): Argument #1 ($callback) must be a valid callback or null, function "non_existent" not found or invalid function name Done diff --git a/ext/standard/tests/array/array_map_variation16.phpt b/ext/standard/tests/array/array_map_variation16.phpt index 21034375b9..b7c6690040 100644 --- a/ext/standard/tests/array/array_map_variation16.phpt +++ b/ext/standard/tests/array/array_map_variation16.phpt @@ -38,19 +38,19 @@ echo "Done"; --EXPECT-- *** Testing array_map() : non-permmited built-in functions *** -- Iteration 1 -- -array_map(): Argument #1 ($callback) must be a valid callback, function "echo" not found or invalid function name +array_map(): Argument #1 ($callback) must be a valid callback or null, function "echo" not found or invalid function name -- Iteration 2 -- -array_map(): Argument #1 ($callback) must be a valid callback, function "array" not found or invalid function name +array_map(): Argument #1 ($callback) must be a valid callback or null, function "array" not found or invalid function name -- Iteration 3 -- -array_map(): Argument #1 ($callback) must be a valid callback, function "empty" not found or invalid function name +array_map(): Argument #1 ($callback) must be a valid callback or null, function "empty" not found or invalid function name -- Iteration 4 -- -array_map(): Argument #1 ($callback) must be a valid callback, function "eval" not found or invalid function name +array_map(): Argument #1 ($callback) must be a valid callback or null, function "eval" not found or invalid function name -- Iteration 5 -- -array_map(): Argument #1 ($callback) must be a valid callback, function "exit" not found or invalid function name +array_map(): Argument #1 ($callback) must be a valid callback or null, function "exit" not found or invalid function name -- Iteration 6 -- -array_map(): Argument #1 ($callback) must be a valid callback, function "isset" not found or invalid function name +array_map(): Argument #1 ($callback) must be a valid callback or null, function "isset" not found or invalid function name -- Iteration 7 -- -array_map(): Argument #1 ($callback) must be a valid callback, function "list" not found or invalid function name +array_map(): Argument #1 ($callback) must be a valid callback or null, function "list" not found or invalid function name -- Iteration 8 -- -array_map(): Argument #1 ($callback) must be a valid callback, function "print" not found or invalid function name +array_map(): Argument #1 ($callback) must be a valid callback or null, function "print" not found or invalid function name Done diff --git a/ext/standard/tests/array/array_map_variation17.phpt b/ext/standard/tests/array/array_map_variation17.phpt index a3aeb9f22a..78b8d8c5c8 100644 --- a/ext/standard/tests/array/array_map_variation17.phpt +++ b/ext/standard/tests/array/array_map_variation17.phpt @@ -76,62 +76,62 @@ echo "Done"; *** Testing array_map() : unexpected values for 'callback' argument *** -- Iteration 1 -- -array_map(): Argument #1 ($callback) must be a valid callback, no array or string given +array_map(): Argument #1 ($callback) must be a valid callback or null, no array or string given -- Iteration 2 -- -array_map(): Argument #1 ($callback) must be a valid callback, no array or string given +array_map(): Argument #1 ($callback) must be a valid callback or null, no array or string given -- Iteration 3 -- -array_map(): Argument #1 ($callback) must be a valid callback, no array or string given +array_map(): Argument #1 ($callback) must be a valid callback or null, no array or string given -- Iteration 4 -- -array_map(): Argument #1 ($callback) must be a valid callback, no array or string given +array_map(): Argument #1 ($callback) must be a valid callback or null, no array or string given -- Iteration 5 -- -array_map(): Argument #1 ($callback) must be a valid callback, no array or string given +array_map(): Argument #1 ($callback) must be a valid callback or null, no array or string given -- Iteration 6 -- -array_map(): Argument #1 ($callback) must be a valid callback, no array or string given +array_map(): Argument #1 ($callback) must be a valid callback or null, no array or string given -- Iteration 7 -- -array_map(): Argument #1 ($callback) must be a valid callback, no array or string given +array_map(): Argument #1 ($callback) must be a valid callback or null, no array or string given -- Iteration 8 -- -array_map(): Argument #1 ($callback) must be a valid callback, no array or string given +array_map(): Argument #1 ($callback) must be a valid callback or null, no array or string given -- Iteration 9 -- -array_map(): Argument #1 ($callback) must be a valid callback, no array or string given +array_map(): Argument #1 ($callback) must be a valid callback or null, no array or string given -- Iteration 10 -- -array_map(): Argument #1 ($callback) must be a valid callback, no array or string given +array_map(): Argument #1 ($callback) must be a valid callback or null, no array or string given -- Iteration 11 -- -array_map(): Argument #1 ($callback) must be a valid callback, no array or string given +array_map(): Argument #1 ($callback) must be a valid callback or null, no array or string given -- Iteration 12 -- -array_map(): Argument #1 ($callback) must be a valid callback, no array or string given +array_map(): Argument #1 ($callback) must be a valid callback or null, no array or string given -- Iteration 13 -- -array_map(): Argument #1 ($callback) must be a valid callback, no array or string given +array_map(): Argument #1 ($callback) must be a valid callback or null, no array or string given -- Iteration 14 -- -array_map(): Argument #1 ($callback) must be a valid callback, function "" not found or invalid function name +array_map(): Argument #1 ($callback) must be a valid callback or null, function "" not found or invalid function name -- Iteration 15 -- -array_map(): Argument #1 ($callback) must be a valid callback, function "" not found or invalid function name +array_map(): Argument #1 ($callback) must be a valid callback or null, function "" not found or invalid function name -- Iteration 16 -- -array_map(): Argument #1 ($callback) must be a valid callback, array must have exactly two members +array_map(): Argument #1 ($callback) must be a valid callback or null, array must have exactly two members -- Iteration 17 -- -array_map(): Argument #1 ($callback) must be a valid callback, first array member is not a valid class name or object +array_map(): Argument #1 ($callback) must be a valid callback or null, first array member is not a valid class name or object -- Iteration 18 -- -array_map(): Argument #1 ($callback) must be a valid callback, first array member is not a valid class name or object +array_map(): Argument #1 ($callback) must be a valid callback or null, first array member is not a valid class name or object -- Iteration 19 -- -array_map(): Argument #1 ($callback) must be a valid callback, no array or string given +array_map(): Argument #1 ($callback) must be a valid callback or null, no array or string given -- Iteration 20 -- -array_map(): Argument #1 ($callback) must be a valid callback, no array or string given +array_map(): Argument #1 ($callback) must be a valid callback or null, no array or string given Done |