From: Rasmus Lerdorf Date: Sat, 2 Feb 2008 00:29:17 +0000 (+0000) Subject: Fix some tests X-Git-Tag: RELEASE_1_3_1~182 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b9954bef45d19f1f448f65179b5548630635cc41;p=php Fix some tests --- diff --git a/ext/standard/tests/general_functions/010.phpt b/ext/standard/tests/general_functions/010.phpt index 8d1075f842..e6b973055a 100644 --- a/ext/standard/tests/general_functions/010.phpt +++ b/ext/standard/tests/general_functions/010.phpt @@ -16,10 +16,10 @@ var_dump(register_shutdown_function(array("test","__call"))); echo "Done\n"; ?> --EXPECTF-- -Strict Standards: Non-static method test::__call() cannot be called statically in %s on line %d +Strict Standards: Non-static method test::__call() should not be called statically in %s on line %d NULL Done -Strict Standards: Non-static method test::__call() cannot be called statically in Unknown on line 0 +Strict Standards: Non-static method test::__call() should not be called statically in Unknown on line 0 Fatal error: Non-static method test::__call() cannot be called statically in Unknown on line 0 diff --git a/ext/standard/tests/general_functions/bug32647.phpt b/ext/standard/tests/general_functions/bug32647.phpt index 677e6b26f7..8508597130 100644 --- a/ext/standard/tests/general_functions/bug32647.phpt +++ b/ext/standard/tests/general_functions/bug32647.phpt @@ -49,13 +49,13 @@ Warning: register_shutdown_function(): Invalid shutdown callback 'Array' passed Warning: register_shutdown_function(): Invalid shutdown callback 'bar' passed in %s on line %d -Strict Standards: Non-static method bar::barfoo() cannot be called statically in %sbug32647.php on line %d +Strict Standards: Non-static method bar::barfoo() should not be called statically in %sbug32647.php on line %d Warning: register_shutdown_function(): Invalid shutdown callback 'bar::foobar' passed in %sbug32647.php on line %d foo! -Strict Standards: Non-static method bar::barfoo() cannot be called statically in Unknown on line 0 +Strict Standards: Non-static method bar::barfoo() should not be called statically in Unknown on line 0 -Strict Standards: Non-static method bar::barfoo() cannot be called statically in Unknown on line 0 +Strict Standards: Non-static method bar::barfoo() should not be called statically in Unknown on line 0 bar! bar! diff --git a/ext/standard/tests/general_functions/bug40398.phpt b/ext/standard/tests/general_functions/bug40398.phpt index d64a9fdf20..bd3ffd3720 100755 --- a/ext/standard/tests/general_functions/bug40398.phpt +++ b/ext/standard/tests/general_functions/bug40398.phpt @@ -78,11 +78,11 @@ new Derived_6('6'); Base::__construct(1) Base::__construct(2) -Warning: call_user_func_array() expects parameter 1 to be valid callback, string given in %sbug40398.php on line %d +Strict Standards: call_user_func_array() expects parameter 1 to be a valid callback, non-static method Base::__construct() cannot be called statically, assuming $this from compatible context Derived_%d in %s on line %d -Warning: call_user_func_array() expects parameter 1 to be valid callback, string given in %sbug40398.php on line %d +Strict Standards: call_user_func_array() expects parameter 1 to be a valid callback, non-static method Base::__construct() cannot be called statically, assuming $this from compatible context Derived_%d in %s on line %d -Warning: call_user_func_array() expects parameter 1 to be valid callback, array given in %sbug40398.php on line %d +Strict Standards: call_user_func_array() expects parameter 1 to be a valid callback, non-static method Base::__construct() cannot be called statically, assuming $this from compatible context Derived_%d in %s on line %d -Warning: call_user_func_array() expects parameter 1 to be valid callback, array given in %sbug40398.php on line %d +Strict Standards: call_user_func_array() expects parameter 1 to be a valid callback, non-static method Base::__construct() cannot be called statically, assuming $this from compatible context Derived_%d in %s on line %d ===DONE=== diff --git a/ext/standard/tests/general_functions/is_callable.phpt b/ext/standard/tests/general_functions/is_callable.phpt index b15703fed8..965f5b4550 100644 --- a/ext/standard/tests/general_functions/is_callable.phpt +++ b/ext/standard/tests/general_functions/is_callable.phpt @@ -479,15 +479,15 @@ bool(false) object_class::func -- Innerloop iteration 10 of Outerloop iteration 1 -- -Strict Standards: Non-static method object_class::foo1() cannot be called statically in %s on line %d +Strict Standards: Non-static method object_class::foo1() should not be called statically in %s on line %d bool(true) bool(true) -Strict Standards: Non-static method object_class::foo1() cannot be called statically in %s on line %d +Strict Standards: Non-static method object_class::foo1() should not be called statically in %s on line %d bool(true) bool(true) -Strict Standards: Non-static method object_class::foo1() cannot be called statically in %s on line %d +Strict Standards: Non-static method object_class::foo1() should not be called statically in %s on line %d bool(true) object_class::foo1 --- Outerloop iteration 2 --- @@ -556,15 +556,15 @@ bool(false) no_member_class::func -- Innerloop iteration 10 of Outerloop iteration 2 -- -Strict Standards: Non-static method object_class::foo1() cannot be called statically in %s on line %d +Strict Standards: Non-static method object_class::foo1() should not be called statically in %s on line %d bool(true) bool(true) -Strict Standards: Non-static method object_class::foo1() cannot be called statically in %s on line %d +Strict Standards: Non-static method object_class::foo1() should not be called statically in %s on line %d bool(true) bool(true) -Strict Standards: Non-static method object_class::foo1() cannot be called statically in %s on line %d +Strict Standards: Non-static method object_class::foo1() should not be called statically in %s on line %d bool(true) object_class::foo1 --- Outerloop iteration 3 --- @@ -633,15 +633,15 @@ bool(true) contains_object_class::func -- Innerloop iteration 10 of Outerloop iteration 3 -- -Strict Standards: Non-static method object_class::foo1() cannot be called statically in %s on line %d +Strict Standards: Non-static method object_class::foo1() should not be called statically in %s on line %d bool(true) bool(true) -Strict Standards: Non-static method object_class::foo1() cannot be called statically in %s on line %d +Strict Standards: Non-static method object_class::foo1() should not be called statically in %s on line %d bool(true) bool(true) -Strict Standards: Non-static method object_class::foo1() cannot be called statically in %s on line %d +Strict Standards: Non-static method object_class::foo1() should not be called statically in %s on line %d bool(true) object_class::foo1 --- Outerloop iteration 4 --- @@ -710,15 +710,15 @@ bool(true) contains_object_class::func -- Innerloop iteration 10 of Outerloop iteration 4 -- -Strict Standards: Non-static method object_class::foo1() cannot be called statically in %s on line %d +Strict Standards: Non-static method object_class::foo1() should not be called statically in %s on line %d bool(true) bool(true) -Strict Standards: Non-static method object_class::foo1() cannot be called statically in %s on line %d +Strict Standards: Non-static method object_class::foo1() should not be called statically in %s on line %d bool(true) bool(true) -Strict Standards: Non-static method object_class::foo1() cannot be called statically in %s on line %d +Strict Standards: Non-static method object_class::foo1() should not be called statically in %s on line %d bool(true) object_class::foo1 --- Outerloop iteration 5 --- @@ -787,15 +787,15 @@ bool(false) object_class::func -- Innerloop iteration 10 of Outerloop iteration 5 -- -Strict Standards: Non-static method object_class::foo1() cannot be called statically in %s on line %d +Strict Standards: Non-static method object_class::foo1() should not be called statically in %s on line %d bool(true) bool(true) -Strict Standards: Non-static method object_class::foo1() cannot be called statically in %s on line %d +Strict Standards: Non-static method object_class::foo1() should not be called statically in %s on line %d bool(true) bool(true) -Strict Standards: Non-static method object_class::foo1() cannot be called statically in %s on line %d +Strict Standards: Non-static method object_class::foo1() should not be called statically in %s on line %d bool(true) object_class::foo1 --- Outerloop iteration 6 --- @@ -864,15 +864,15 @@ bool(false) no_member_class::func -- Innerloop iteration 10 of Outerloop iteration 6 -- -Strict Standards: Non-static method object_class::foo1() cannot be called statically in %s on line %d +Strict Standards: Non-static method object_class::foo1() should not be called statically in %s on line %d bool(true) bool(true) -Strict Standards: Non-static method object_class::foo1() cannot be called statically in %s on line %d +Strict Standards: Non-static method object_class::foo1() should not be called statically in %s on line %d bool(true) bool(true) -Strict Standards: Non-static method object_class::foo1() cannot be called statically in %s on line %d +Strict Standards: Non-static method object_class::foo1() should not be called statically in %s on line %d bool(true) object_class::foo1 --- Outerloop iteration 7 --- @@ -941,15 +941,15 @@ bool(false) object_class::func -- Innerloop iteration 10 of Outerloop iteration 7 -- -Strict Standards: Non-static method object_class::foo1() cannot be called statically in %s on line %d +Strict Standards: Non-static method object_class::foo1() should not be called statically in %s on line %d bool(true) bool(true) -Strict Standards: Non-static method object_class::foo1() cannot be called statically in %s on line %d +Strict Standards: Non-static method object_class::foo1() should not be called statically in %s on line %d bool(true) bool(true) -Strict Standards: Non-static method object_class::foo1() cannot be called statically in %s on line %d +Strict Standards: Non-static method object_class::foo1() should not be called statically in %s on line %d bool(true) object_class::foo1 --- Outerloop iteration 8 --- @@ -1018,15 +1018,15 @@ bool(false) Array -- Innerloop iteration 10 of Outerloop iteration 8 -- -Strict Standards: Non-static method object_class::foo1() cannot be called statically in %s on line %d +Strict Standards: Non-static method object_class::foo1() should not be called statically in %s on line %d bool(true) bool(true) -Strict Standards: Non-static method object_class::foo1() cannot be called statically in %s on line %d +Strict Standards: Non-static method object_class::foo1() should not be called statically in %s on line %d bool(true) bool(true) -Strict Standards: Non-static method object_class::foo1() cannot be called statically in %s on line %d +Strict Standards: Non-static method object_class::foo1() should not be called statically in %s on line %d bool(true) object_class::foo1