- Fix tests

diff --git a/ext/standard/tests/assert/assert_variation.phpt b/ext/standard/tests/assert/assert_variation.phpt
index 564d706c62c6c66af4c3d5b91c085f98df4b6f5a..c49feeabd12c53b4a1b03799ffc108fe3956fb45 100644 (file)
--- a/ext/standard/tests/assert/assert_variation.phpt
+++ b/ext/standard/tests/assert/assert_variation.phpt
@@ -107,7 +107,7 @@ array(2) {
 ini.get("assert.callback") => [f2]
 
 
-Strict Standards: Non-static method c1::assert() cannot be called statically in %s on line 53
+Strict Standards: Non-static method c1::assert() should not be called statically in %s on line 53
 Class assertion failed 53, "0 != 0"
 NULL
 

diff --git a/ext/standard/tests/general_functions/010.phpt b/ext/standard/tests/general_functions/010.phpt
index e6b973055a4db630d2020920284978f7409d6ea4..f576c7e8d7fc01524e662d1d8231be0fe1579cda 100644 (file)
--- a/ext/standard/tests/general_functions/010.phpt
+++ b/ext/standard/tests/general_functions/010.phpt
@@ -16,10 +16,4 @@ var_dump(register_shutdown_function(array("test","__call")));
 echo "Done\n";
 ?>
 --EXPECTF--    
-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() 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
+Fatal error: Non-static method test::__call() cannot be called statically in %s on line %d

diff --git a/ext/standard/tests/general_functions/bug40398.phpt b/ext/standard/tests/general_functions/bug40398.phpt
index bd3ffd3720b7ad501a3e81364d8a4753f2ff35ac..312214156329199e8e8056b0dbd9a758b9dba39f 100755 (executable)
--- a/ext/standard/tests/general_functions/bug40398.phpt
+++ b/ext/standard/tests/general_functions/bug40398.phpt
@@ -79,10 +79,14 @@ Base::__construct(1)
 Base::__construct(2)
 
 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
+Base::__construct(3)
 
 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
+Base::__construct(4)
 
 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
+Base::__construct(5)
 
 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
+Base::__construct(6)
 ===DONE===

diff --git a/ext/standard/tests/general_functions/is_callable.phpt b/ext/standard/tests/general_functions/is_callable.phpt
index 965f5b45507656460be28bc66c18257bc58b8e84..a9ce04b5851bf1b048b269104c080ef8adabe9fe 100644 (file)
--- a/ext/standard/tests/general_functions/is_callable.phpt
+++ b/ext/standard/tests/general_functions/is_callable.phpt
@@ -1111,9 +1111,9 @@ Resource id #5
 
 *** Testing error conditions ***
 
-Warning: Wrong parameter count for is_callable() in %s on line %d
+Warning: is_callable() expects at least 1 parameter, 0 given in %sis_callable.php on line %d
 NULL
 
-Warning: Wrong parameter count for is_callable() in %s on line %d
+Warning: is_callable() expects at most 3 parameters, 4 given in %sis_callable.php on line %d
 NULL
 Done