cvs: php-src /ext/mysqli mysqli.c mysqli_fe.c

georg Wed Jun 23 12:47:26 2004 EDT Modified files: /php-src/ext/mysqli mysqli.c mysqli_fe.c Log: added php_mysqli_construct_get to support __construct in extended classes http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli.c?r1=1.40&r2=1.41&ty=u Index: php-src/ext/mysqli/mysqli.c diff -u php-src/ext/mysqli/mysqli.c:1.40 php-src/ext/mysqli/mysqli.c:1.41 --- php-src/ext/mysqli/mysqli.c:1.40 Sun Jun 6 02:40:19 2004 +++ php-src/ext/mysqli/mysqli.c Wed Jun 23 12:47:25 2004 @@ -15,7 +15,7 @@ | Author: Georg Richter <georg@php.net> | +----------------------------------------------------------------------+ - $Id: mysqli.c,v 1.40 2004/06/06 06:40:19 sebastian Exp $ + $Id: mysqli.c,v 1.41 2004/06/23 16:47:25 georg Exp $ */ #ifdef HAVE_CONFIG_H @@ -269,6 +269,27 @@ } /* }}} */ +static union _zend_function *php_mysqli_constructor_get(zval *object TSRMLS_DC) +{ + mysqli_object *obj = (mysqli_object *)zend_objects_get_address(object TSRMLS_CC); + + if (obj->zo.ce != mysqli_link_class_entry) { + return obj->zo.ce->constructor; + } else { + static zend_internal_function f; + + f.function_name = mysqli_link_class_entry->name; + f.scope = mysqli_link_class_entry; + f.arg_info = NULL; + f.num_args = 0; + f.fn_flags = 0; + + f.type = ZEND_INTERNAL_FUNCTION; + f.handler = ZEND_FN(mysqli_connect); + + return (union _zend_function*)&f; + } +} /* {{{ mysqli_objects_new */ PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry *class_type TSRMLS_DC) @@ -374,6 +395,7 @@ mysqli_object_handlers.read_property = mysqli_read_property; mysqli_object_handlers.write_property = mysqli_write_property; mysqli_object_handlers.get_property_ptr_ptr = NULL; + mysqli_object_handlers.get_constructor = php_mysqli_constructor_get; zend_hash_init(&classes, 0, NULL, NULL, 1); http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_fe.c?r1=1.38&r2=1.39&ty=u Index: php-src/ext/mysqli/mysqli_fe.c diff -u php-src/ext/mysqli/mysqli_fe.c:1.38 php-src/ext/mysqli/mysqli_fe.c:1.39 --- php-src/ext/mysqli/mysqli_fe.c:1.38 Mon Jun 7 04:34:52 2004 +++ php-src/ext/mysqli/mysqli_fe.c Wed Jun 23 12:47:25 2004 @@ -15,7 +15,7 @@ | Author: Georg Richter <georg@php.net> | +----------------------------------------------------------------------+ - $Id: mysqli_fe.c,v 1.38 2004/06/07 08:34:52 georg Exp $ + $Id: mysqli_fe.c,v 1.39 2004/06/23 16:47:25 georg Exp $ */ #ifdef HAVE_CONFIG_H @@ -206,7 +206,6 @@ PHP_FALIAS(set_local_infile_default,mysqli_set_local_infile_default,NULL) PHP_FALIAS(set_local_infile_handler,mysqli_set_local_infile_handler,NULL) PHP_FALIAS(master_query,mysqli_master_query,NULL) - PHP_FALIAS(mysqli, mysqli_connect, NULL) PHP_FALIAS(multi_query,mysqli_multi_query,NULL) PHP_FALIAS(more_results,mysqli_more_results, NULL) PHP_FALIAS(next_result, mysqli_next_result, NULL)