From: Marcus Boerger <helly@php.net>
Date: Sat, 2 Feb 2008 15:19:06 +0000 (+0000)
Subject: - Fix tests
X-Git-Tag: RELEASE_1_3_1~158
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1cc463b88a48c2e83c0ad2a2c683da3f50a1b085;p=php

- Fix tests
---

diff --git a/ext/standard/tests/assert/assert_variation.phpt b/ext/standard/tests/assert/assert_variation.phpt
index 564d706c62..c49feeabd1 100644
--- 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 e6b973055a..f576c7e8d7 100644
--- 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 bd3ffd3720..3122141563 100755
--- 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 965f5b4550..a9ce04b585 100644
--- 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