helly Sat Feb 2 15:19:06 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/assert assert_variation.phpt /php-src/ext/standard/tests/general_functions 010.phpt bug40398.phpt is_callable.phpt Log: - Fix tests http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert_variation.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u Index: php-src/ext/standard/tests/assert/assert_variation.phpt diff -u php-src/ext/standard/tests/assert/assert_variation.phpt:1.1.2.2 php-src/ext/standard/tests/assert/assert_variation.phpt:1.1.2.2.2.1 --- php-src/ext/standard/tests/assert/assert_variation.phpt:1.1.2.2 Fri Jul 13 15:20:12 2007 +++ php-src/ext/standard/tests/assert/assert_variation.phpt Sat Feb 2 15:19:06 2008 @@ -107,7 +107,7 @@ 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 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/010.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&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.2.1 php-src/ext/standard/tests/general_functions/010.phpt:1.1.2.2.2.2 --- php-src/ext/standard/tests/general_functions/010.phpt:1.1.2.2.2.1 Sat Feb 2 00:29:17 2008 +++ php-src/ext/standard/tests/general_functions/010.phpt Sat Feb 2 15:19:06 2008 @@ -16,10 +16,4 @@ 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 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/bug40398.phpt?r1=1.1.2.3.2.2&r2=1.1.2.3.2.3&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.2 php-src/ext/standard/tests/general_functions/bug40398.phpt:1.1.2.3.2.3 --- php-src/ext/standard/tests/general_functions/bug40398.phpt:1.1.2.3.2.2 Sat Feb 2 00:29:17 2008 +++ php-src/ext/standard/tests/general_functions/bug40398.phpt Sat Feb 2 15:19:06 2008 @@ -79,10 +79,14 @@ 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=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/is_callable.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/is_callable.phpt diff -u 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.2.2 --- php-src/ext/standard/tests/general_functions/is_callable.phpt:1.1.2.3.2.1 Sat Feb 2 00:29:17 2008 +++ php-src/ext/standard/tests/general_functions/is_callable.phpt Sat Feb 2 15:19:06 2008 @@ -1111,9 +1111,9 @@ *** 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
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php