diff options
Diffstat (limited to 'ext')
-rwxr-xr-x | ext/spl/php_spl.c | 4 | ||||
-rwxr-xr-x | ext/spl/tests/dit_001.phpt | 2 | ||||
-rwxr-xr-x | ext/spl/tests/spl_autoload_007.phpt | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index 14a90d8f84..d6122d3f15 100755 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -378,7 +378,7 @@ PHP_FUNCTION(spl_autoload_call) 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 @@ PHP_FUNCTION(spl_autoload_register) 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); diff --git a/ext/spl/tests/dit_001.phpt b/ext/spl/tests/dit_001.phpt index 3ea531593c..5ab7f5ed2e 100755 --- a/ext/spl/tests/dit_001.phpt +++ b/ext/spl/tests/dit_001.phpt @@ -15,7 +15,7 @@ var_dump(is_string($d)); 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) "" diff --git a/ext/spl/tests/spl_autoload_007.phpt b/ext/spl/tests/spl_autoload_007.phpt index 26a1a2b1fe..4018a74788 100755 --- a/ext/spl/tests/spl_autoload_007.phpt +++ b/ext/spl/tests/spl_autoload_007.phpt @@ -76,7 +76,7 @@ array(2) { [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 @@ array(2) { [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 @@ array(2) { [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 @@ array(2) { [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]=> |