rasmus Sat Feb 2 00:29:18 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/general_functions 010.phpt
bug32647.phpt
bug40398.phpt
is_callable.phpt
Log:
Fix some tests
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/010.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u
Index: php-src/ext/standard/tests/general_functions/010.phpt
diff -u php-src/ext/standard/tests/general_functions/010.phpt:1.1.2.2
php-src/ext/standard/tests/general_functions/010.phpt:1.1.2.2.2.1
--- php-src/ext/standard/tests/general_functions/010.phpt:1.1.2.2 Fri Sep
15 09:12:17 2006
+++ php-src/ext/standard/tests/general_functions/010.phpt Sat Feb 2
00:29:17 2008
@@ -16,10 +16,10 @@
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
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/bug32647.phpt?r1=1.1.6.1.2.1&r2=1.1.6.1.2.1.2.1&diff_format=u
Index: php-src/ext/standard/tests/general_functions/bug32647.phpt
diff -u php-src/ext/standard/tests/general_functions/bug32647.phpt:1.1.6.1.2.1
php-src/ext/standard/tests/general_functions/bug32647.phpt:1.1.6.1.2.1.2.1
--- php-src/ext/standard/tests/general_functions/bug32647.phpt:1.1.6.1.2.1
Fri Sep 14 15:04:19 2007
+++ php-src/ext/standard/tests/general_functions/bug32647.phpt Sat Feb 2
00:29:17 2008
@@ -49,13 +49,13 @@
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!
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/bug40398.phpt?r1=1.1.2.3.2.1&r2=1.1.2.3.2.2&diff_format=u
Index: php-src/ext/standard/tests/general_functions/bug40398.phpt
diff -u php-src/ext/standard/tests/general_functions/bug40398.phpt:1.1.2.3.2.1
php-src/ext/standard/tests/general_functions/bug40398.phpt:1.1.2.3.2.2
--- php-src/ext/standard/tests/general_functions/bug40398.phpt:1.1.2.3.2.1
Fri Nov 2 19:41:11 2007
+++ php-src/ext/standard/tests/general_functions/bug40398.phpt Sat Feb 2
00:29:17 2008
@@ -78,11 +78,11 @@
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===
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/is_callable.phpt?r1=1.1.2.3&r2=1.1.2.3.2.1&diff_format=u
Index: php-src/ext/standard/tests/general_functions/is_callable.phpt
diff -u php-src/ext/standard/tests/general_functions/is_callable.phpt:1.1.2.3
php-src/ext/standard/tests/general_functions/is_callable.phpt:1.1.2.3.2.1
--- php-src/ext/standard/tests/general_functions/is_callable.phpt:1.1.2.3
Tue Sep 11 05:21:40 2007
+++ php-src/ext/standard/tests/general_functions/is_callable.phpt Sat Feb
2 00:29:17 2008
@@ -479,15 +479,15 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
