felipe Sat Feb 2 03:20:51 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/spl/tests spl_autoload_008.phpt spl_autoload_007.phpt spl_autoload_005.phpt spl_autoload_001.phpt spl_004.phpt Log: Fix tests (new error message) http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/spl_autoload_008.phpt?r1=1.1.2.3&r2=1.1.2.3.4.1&diff_format=u Index: php-src/ext/spl/tests/spl_autoload_008.phpt diff -u php-src/ext/spl/tests/spl_autoload_008.phpt:1.1.2.3 php-src/ext/spl/tests/spl_autoload_008.phpt:1.1.2.3.4.1 --- php-src/ext/spl/tests/spl_autoload_008.phpt:1.1.2.3 Thu Mar 23 19:55:16 2006 +++ php-src/ext/spl/tests/spl_autoload_008.phpt Sat Feb 2 03:20:51 2008 @@ -82,7 +82,7 @@ int(0) ====2==== string(22) "MyAutoLoader::dynaLoad" -LogicException: Function 'MyAutoLoader::dynaLoad' not callable +LogicException: Function 'MyAutoLoader::dynaLoad' not callable (non-static method MyAutoLoader::dynaLoad() should not be called statically) int(0) ====3==== array(2) { @@ -102,7 +102,7 @@ [1]=> string(8) "dynaLoad" } -LogicException: Passed array specifies a non static method but no object +LogicException: Passed array specifies a non static method but no object (non-static method MyAutoLoader::dynaLoad() should not be called statically) int(0) ====5==== array(2) { http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/spl_autoload_007.phpt?r1=1.1.2.2&r2=1.1.2.2.4.1&diff_format=u Index: php-src/ext/spl/tests/spl_autoload_007.phpt diff -u php-src/ext/spl/tests/spl_autoload_007.phpt:1.1.2.2 php-src/ext/spl/tests/spl_autoload_007.phpt:1.1.2.2.4.1 --- php-src/ext/spl/tests/spl_autoload_007.phpt:1.1.2.2 Wed Dec 21 22:22:33 2005 +++ php-src/ext/spl/tests/spl_autoload_007.phpt Sat Feb 2 03:20:51 2008 @@ -59,16 +59,16 @@ <?php exit(0); ?> --EXPECTF-- string(22) "MyAutoLoader::notExist" -Function 'MyAutoLoader::notExist' not found +Function 'MyAutoLoader::notExist' not found (class 'MyAutoLoader' does not have a method 'notexist') string(22) "MyAutoLoader::noAccess" -Function 'MyAutoLoader::noAccess' not callable +Function 'MyAutoLoader::noAccess' not callable (cannot access protected method MyAutoLoader::noAccess()) string(22) "MyAutoLoader::autoLoad" ok string(22) "MyAutoLoader::dynaLoad" -Function 'MyAutoLoader::dynaLoad' not callable +Function 'MyAutoLoader::dynaLoad' not callable (non-static method MyAutoLoader::dynaLoad() should not be called statically) array(2) { [0]=> @@ -76,7 +76,7 @@ [1]=> string(8) "notExist" } -Passed array does not specify an existing static method +Passed array does not specify an existing static method, (class 'MyAutoLoader' does not have a method 'notexist') array(2) { [0]=> @@ -84,7 +84,7 @@ [1]=> string(8) "noAccess" } -Passed array does not specify a callable static method +Passed array does not specify a callable static method, (cannot access protected method MyAutoLoader::noAccess()) array(2) { [0]=> @@ -100,7 +100,7 @@ [1]=> string(8) "dynaLoad" } -Passed array specifies a non static method but no object +Passed array specifies a non static method but no object (non-static method MyAutoLoader::dynaLoad() should not be called statically) array(2) { [0]=> @@ -109,7 +109,7 @@ [1]=> string(8) "notExist" } -Passed array does not specify an existing method +Passed array does not specify an existing method, (class 'MyAutoLoader' does not have a method 'notexist') array(2) { [0]=> @@ -118,7 +118,7 @@ [1]=> string(8) "noAccess" } -Passed array does not specify a callable method +Passed array does not specify a callable method, (cannot access protected method MyAutoLoader::noAccess()) array(2) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/spl_autoload_005.phpt?r1=1.1.2.3&r2=1.1.2.3.4.1&diff_format=u Index: php-src/ext/spl/tests/spl_autoload_005.phpt diff -u php-src/ext/spl/tests/spl_autoload_005.phpt:1.1.2.3 php-src/ext/spl/tests/spl_autoload_005.phpt:1.1.2.3.4.1 --- php-src/ext/spl/tests/spl_autoload_005.phpt:1.1.2.3 Wed Dec 21 22:22:33 2005 +++ php-src/ext/spl/tests/spl_autoload_005.phpt Sat Feb 2 03:20:51 2008 @@ -50,7 +50,7 @@ ===DONE=== <?php exit(0); ?> --EXPECTF-- -Exception: Passed array specifies a non static method but no object +Exception: Passed array specifies a non static method but no object (non-static method MyAutoLoader::autoLoad() should not be called statically) MyAutoLoader::autoLoad(TestClass) MyAutoLoader::autoThrow(TestClass) Exception: Unavailable http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/spl_autoload_001.phpt?r1=1.3.2.2&r2=1.3.2.2.4.1&diff_format=u Index: php-src/ext/spl/tests/spl_autoload_001.phpt diff -u php-src/ext/spl/tests/spl_autoload_001.phpt:1.3.2.2 php-src/ext/spl/tests/spl_autoload_001.phpt:1.3.2.2.4.1 --- php-src/ext/spl/tests/spl_autoload_001.phpt:1.3.2.2 Wed Dec 21 22:22:33 2005 +++ php-src/ext/spl/tests/spl_autoload_001.phpt Sat Feb 2 03:20:51 2008 @@ -108,15 +108,15 @@ --EXPECTF-- ===EMPTY=== string(9) ".inc,.php" -%stestclass.inc +/home/felipe/php5/ext/spl/tests/testclass.inc Exception: Class TestClass could not be loaded ===()=== Exception: Class TestClass could not be loaded ===(1)=== Exception: Class TestClass could not be loaded ===(.inc,,.php.inc)=== -%stestclass -%stestclass.php.inc +/home/felipe/php5/ext/spl/tests/testclass +/home/felipe/php5/ext/spl/tests/testclass.php.inc Exception: Class TestClass could not be loaded ===()=== Exception: Class TestClass could not be loaded @@ -131,8 +131,8 @@ ===LOAD=== TestFunc1(TestClass) TestFunc2(TestClass) -%stestclass.class.inc +/home/felipe/php5/ext/spl/tests/testclass.class.inc bool(true) ===NOFUNCTION=== -Exception: Function 'unavailable_autoload_function' not found +Exception: Function 'unavailable_autoload_function' not found (function 'unavailable_autoload_function' not found or invalid function name) ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/spl_004.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u Index: php-src/ext/spl/tests/spl_004.phpt diff -u php-src/ext/spl/tests/spl_004.phpt:1.1.2.2.2.1 php-src/ext/spl/tests/spl_004.phpt:1.1.2.2.2.2 --- php-src/ext/spl/tests/spl_004.phpt:1.1.2.2.2.1 Fri Nov 2 19:41:10 2007 +++ php-src/ext/spl/tests/spl_004.phpt Sat Feb 2 03:20:51 2008 @@ -79,7 +79,7 @@ Error: Argument 3 passed to iterator_apply() must be an array, integer given Error: iterator_apply() expects parameter 3 to be array, integer given NULL -Error: iterator_apply() expects parameter 2 to be valid callback,%sstring given +Error: iterator_apply() expects parameter 2 to be a valid callback, function 'non_existing_functon' not found or invalid function name NULL Error: iterator_apply() expects at most 3 parameters, 4 given NULL
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php