helly Mon Feb 4 17:07:07 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/spl php_spl.c /php-src/ext/spl/tests dit_001.phpt spl_autoload_007.phpt Log: - MFH Fix messages and tests http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.52.2.28.2.17.2.11&r2=1.52.2.28.2.17.2.12&diff_format=u Index: php-src/ext/spl/php_spl.c diff -u php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.11 php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.12 --- php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.11 Sat Feb 2 23:09:38 2008 +++ php-src/ext/spl/php_spl.c Mon Feb 4 17:07:06 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_spl.c,v 1.52.2.28.2.17.2.11 2008/02/02 23:09:38 helly Exp $ */ +/* $Id: php_spl.c,v 1.52.2.28.2.17.2.12 2008/02/04 17:07:06 helly Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -378,7 +378,7 @@ zend_hash_get_current_data_ex(SPL_G(autoload_functions), (void **) &alfi, &function_pos); zend_call_method(alfi->obj ? &alfi->obj : NULL, alfi->ce, &alfi->func_ptr, func_name, func_name_len, &retval, 1, class_name, NULL TSRMLS_CC); if (retval) { - zval_ptr_dtor(&retval); + zval_ptr_dtor(&retval); } if (zend_hash_exists(EG(class_table), lc_name, class_name_len + 1)) { break; @@ -435,7 +435,7 @@ RETURN_FALSE; } else if (do_throw) { - zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC, "Passed array does not specify %s %smethod, (%s)", alfi.func_ptr ? "a callable" : "an existing", !obj_ptr ? "static " : "", error); + zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC, "Passed array does not specify %s %smethod (%s)", alfi.func_ptr ? "a callable" : "an existing", !obj_ptr ? "static " : "", error); } if (error) { efree(error); http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/dit_001.phpt?r1=1.3.6.2&r2=1.3.6.3&diff_format=u Index: php-src/ext/spl/tests/dit_001.phpt diff -u php-src/ext/spl/tests/dit_001.phpt:1.3.6.2 php-src/ext/spl/tests/dit_001.phpt:1.3.6.3 --- php-src/ext/spl/tests/dit_001.phpt:1.3.6.2 Thu Jan 31 07:44:01 2008 +++ php-src/ext/spl/tests/dit_001.phpt Mon Feb 4 17:07:07 2008 @@ -15,7 +15,7 @@ object(DirectoryIterator)#%d (3) { %s"pathName"%s"SplFileInfo":private]=> %s(1) "." - %s"glob"%s"RecursiveDirectoryIterator":private]=> + %s"glob"%s"DirectoryIterator":private]=> bool(false) %s"subPathName"%s"RecursiveDirectoryIterator":private]=> %s(0) "" http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/spl_autoload_007.phpt?r1=1.1.2.2.4.1&r2=1.1.2.2.4.2&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.4.1 php-src/ext/spl/tests/spl_autoload_007.phpt:1.1.2.2.4.2 --- php-src/ext/spl/tests/spl_autoload_007.phpt:1.1.2.2.4.1 Sat Feb 2 03:20:51 2008 +++ php-src/ext/spl/tests/spl_autoload_007.phpt Mon Feb 4 17:07:07 2008 @@ -76,7 +76,7 @@ [1]=> string(8) "notExist" } -Passed array does not specify an existing static method, (class 'MyAutoLoader' does not have a method 'notexist') +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, (cannot access protected method MyAutoLoader::noAccess()) +Passed array does not specify a callable static method (cannot access protected method MyAutoLoader::noAccess()) array(2) { [0]=> @@ -109,7 +109,7 @@ [1]=> string(8) "notExist" } -Passed array does not specify an existing method, (class 'MyAutoLoader' does not have a method 'notexist') +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, (cannot access protected method MyAutoLoader::noAccess()) +Passed array does not specify a callable method (cannot access protected method MyAutoLoader::noAccess()) array(2) { [0]=>
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php