helly Thu Mar 23 19:55:16 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/spl php_spl.c
/php-src/ext/spl/tests spl_autoload_008.phpt
Log:
- MFH
. spl_autoload_register() return bool to denote success/failure
. spl_autoload_unregister() acept any callable
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/php_spl.c?r1=1.52.2.27&r2=1.52.2.28&diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.52.2.27 php-src/ext/spl/php_spl.c:1.52.2.28
--- php-src/ext/spl/php_spl.c:1.52.2.27 Mon Feb 20 22:21:54 2006
+++ php-src/ext/spl/php_spl.c Thu Mar 23 19:55:16 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_spl.c,v 1.52.2.27 2006/02/20 22:21:54 helly Exp $ */
+/* $Id: php_spl.c,v 1.52.2.28 2006/03/23 19:55:16 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -375,7 +375,7 @@
}
} /* }}} */
-/* {{{ proto void spl_autoload_register([string autoload_function =
"spl_autoload" [, throw = true]])
+/* {{{ proto bool spl_autoload_register([mixed autoload_function =
"spl_autoload" [, throw = true]])
Register given function as __autoload() implementation */
PHP_FUNCTION(spl_autoload_register)
{
@@ -399,7 +399,7 @@
if (do_throw) {
zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC, "Function
spl_autoload_call() cannot be registered");
}
- return;
+ RETURN_FALSE;
}
}
}
@@ -411,25 +411,25 @@
zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC, "Passed array
specifies a non static method but no object");
}
efree(func_name);
- return;
+ RETURN_FALSE;
}
else if (do_throw) {
zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC, "Passed array does
not specify %s %smethod", alfi.func_ptr ? "a callable" : "an existing",
!obj_ptr ? "static " : "");
}
efree(func_name);
- return;
+ RETURN_FALSE;
} else if (Z_TYPE_P(zcallable) == IS_STRING) {
if (do_throw) {
zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC, "Function '%s' not
%s", func_name, alfi.func_ptr ? "callable" : "found");
}
efree(func_name);
- return;
+ RETURN_FALSE;
} else {
if (do_throw) {
zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC, "Illegal value
passed");
}
efree(func_name);
- return;
+ RETURN_FALSE;
}
}
@@ -442,7 +442,7 @@
} else {
alfi.obj = NULL;
}
-
+
if (!SPL_G(autoload_functions)) {
ALLOC_HASHTABLE(SPL_G(autoload_functions));
zend_hash_init(SPL_G(autoload_functions), 1, NULL,
(dtor_func_t) autoload_func_info_dtor, 0);
@@ -469,25 +469,34 @@
} else {
zend_hash_find(EG(function_table), "spl_autoload",
sizeof("spl_autoload"), (void **) &EG(autoload_func));
}
+ RETURN_TRUE;
} /* }}} */
-/* {{{ proto bool spl_autoload_unregister(string autoload_function)
+/* {{{ proto bool spl_autoload_unregister(mixed autoload_function)
Unregister given function as __autoload() implementation */
PHP_FUNCTION(spl_autoload_unregister)
{
- char *func_name, *lc_name;
- int func_name_len, success = FAILURE;
+ char *func_name;
+ int func_name_len;
+ zval *zcallable;
+ int success = FAILURE;
zend_function *spl_func_ptr;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &func_name,
&func_name_len) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &zcallable)
== FAILURE) {
return;
}
- lc_name = do_alloca(func_name_len + 1);
- zend_str_tolower_copy(lc_name, func_name, func_name_len);
+ if (!zend_is_callable_ex(zcallable, IS_CALLABLE_CHECK_SYNTAX_ONLY,
&func_name, &func_name_len, NULL, NULL, NULL TSRMLS_CC)) {
+ if (func_name) {
+ efree(func_name);
+ }
+ RETURN_FALSE;
+ }
+
+ zend_str_tolower(func_name, func_name_len);
if (SPL_G(autoload_functions)) {
- if (func_name_len == sizeof("spl_autoload_call")-1 &&
!strcmp(lc_name, "spl_autoload_call")) {
+ if (func_name_len == sizeof("spl_autoload_call")-1 &&
!strcmp(func_name, "spl_autoload_call")) {
/* remove all */
zend_hash_destroy(SPL_G(autoload_functions));
FREE_HASHTABLE(SPL_G(autoload_functions));
@@ -496,9 +505,9 @@
success = SUCCESS;
} else {
/* remove specific */
- success = zend_hash_del(SPL_G(autoload_functions),
lc_name, func_name_len+1);
+ success = zend_hash_del(SPL_G(autoload_functions),
func_name, func_name_len+1);
}
- } else if (func_name_len == sizeof("spl_autoload")-1 &&
!strcmp(lc_name, "spl_autoload")) {
+ } else if (func_name_len == sizeof("spl_autoload")-1 &&
!strcmp(func_name, "spl_autoload")) {
/* register single spl_autoload() */
zend_hash_find(EG(function_table), "spl_autoload",
sizeof("spl_autoload"), (void **) &spl_func_ptr);
@@ -508,8 +517,7 @@
}
}
- free_alloca(lc_name);
-
+ efree(func_name);
RETURN_BOOL(success == SUCCESS);
} /* }}} */
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/tests/spl_autoload_008.phpt?r1=1.1.2.2&r2=1.1.2.3&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.2
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.2 Thu Mar 23 12:21:40 2006
+++ php-src/ext/spl/tests/spl_autoload_008.phpt Thu Mar 23 19:55:16 2006
@@ -60,12 +60,6 @@
echo get_class($e) . ": " . $e->getMessage() . "\n";
}
- if (is_array($func)) {
- if (is_object($func[0])) {
- $func[0] = get_class($func[0]);
- }
- $func = join('::', $func);
- }
spl_autoload_unregister($func);
var_dump(count(spl_autoload_functions()));
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
