32
32
#include "zend_exceptions.h"
33
33
#include "ext/spl/spl_exceptions.h"
34
34
#include "zend_interfaces.h"
35
+ #include "mysqli_arginfo.h"
35
36
36
37
ZEND_DECLARE_MODULE_GLOBALS (mysqli )
37
38
static PHP_GINIT_FUNCTION (mysqli );
@@ -572,13 +573,13 @@ PHP_MINIT_FUNCTION(mysqli)
572
573
le_pmysqli = zend_register_list_destructors_ex (NULL , php_mysqli_dtor ,
573
574
"MySqli persistent connection" , module_number );
574
575
575
- INIT_CLASS_ENTRY (cex , "mysqli_sql_exception" , mysqli_exception_methods );
576
+ INIT_CLASS_ENTRY (cex , "mysqli_sql_exception" , class_mysqli_sql_exception_methods );
576
577
mysqli_exception_class_entry = zend_register_internal_class_ex (& cex , spl_ce_RuntimeException );
577
578
mysqli_exception_class_entry -> ce_flags |= ZEND_ACC_FINAL ;
578
579
zend_declare_property_long (mysqli_exception_class_entry , "code" , sizeof ("code" )- 1 , 0 , ZEND_ACC_PROTECTED );
579
580
zend_declare_property_string (mysqli_exception_class_entry , "sqlstate" , sizeof ("sqlstate" )- 1 , "00000" , ZEND_ACC_PROTECTED );
580
581
581
- REGISTER_MYSQLI_CLASS_ENTRY ("mysqli_driver" , mysqli_driver_class_entry , mysqli_driver_methods );
582
+ REGISTER_MYSQLI_CLASS_ENTRY ("mysqli_driver" , mysqli_driver_class_entry , class_mysqli_driver_methods );
582
583
ce = mysqli_driver_class_entry ;
583
584
zend_hash_init (& mysqli_driver_properties , 0 , NULL , free_prop_handler , 1 );
584
585
MYSQLI_ADD_PROPERTIES (& mysqli_driver_properties , mysqli_driver_property_entries );
@@ -591,7 +592,7 @@ PHP_MINIT_FUNCTION(mysqli)
591
592
ce -> ce_flags |= ZEND_ACC_FINAL ;
592
593
zend_hash_add_ptr (& classes , ce -> name , & mysqli_driver_properties );
593
594
594
- REGISTER_MYSQLI_CLASS_ENTRY ("mysqli" , mysqli_link_class_entry , mysqli_link_methods );
595
+ REGISTER_MYSQLI_CLASS_ENTRY ("mysqli" , mysqli_link_class_entry , class_mysqli_methods );
595
596
ce = mysqli_link_class_entry ;
596
597
zend_hash_init (& mysqli_link_properties , 0 , NULL , free_prop_handler , 1 );
597
598
MYSQLI_ADD_PROPERTIES (& mysqli_link_properties , mysqli_link_property_entries );
@@ -615,7 +616,7 @@ PHP_MINIT_FUNCTION(mysqli)
615
616
zend_declare_property_null (ce , "warning_count" , sizeof ("warning_count" ) - 1 , ZEND_ACC_PUBLIC );
616
617
zend_hash_add_ptr (& classes , ce -> name , & mysqli_link_properties );
617
618
618
- REGISTER_MYSQLI_CLASS_ENTRY ("mysqli_warning" , mysqli_warning_class_entry , mysqli_warning_methods );
619
+ REGISTER_MYSQLI_CLASS_ENTRY ("mysqli_warning" , mysqli_warning_class_entry , class_mysqli_warning_methods );
619
620
ce = mysqli_warning_class_entry ;
620
621
ce -> ce_flags |= ZEND_ACC_FINAL ;
621
622
zend_hash_init (& mysqli_warning_properties , 0 , NULL , free_prop_handler , 1 );
@@ -625,7 +626,7 @@ PHP_MINIT_FUNCTION(mysqli)
625
626
zend_declare_property_null (ce , "errno" , sizeof ("errno" ) - 1 , ZEND_ACC_PUBLIC );
626
627
zend_hash_add_ptr (& classes , ce -> name , & mysqli_warning_properties );
627
628
628
- REGISTER_MYSQLI_CLASS_ENTRY ("mysqli_result" , mysqli_result_class_entry , mysqli_result_methods );
629
+ REGISTER_MYSQLI_CLASS_ENTRY ("mysqli_result" , mysqli_result_class_entry , class_mysqli_result_methods );
629
630
ce = mysqli_result_class_entry ;
630
631
zend_hash_init (& mysqli_result_properties , 0 , NULL , free_prop_handler , 1 );
631
632
MYSQLI_ADD_PROPERTIES (& mysqli_result_properties , mysqli_result_property_entries );
@@ -638,7 +639,7 @@ PHP_MINIT_FUNCTION(mysqli)
638
639
zend_class_implements (mysqli_result_class_entry , 1 , zend_ce_traversable );
639
640
zend_hash_add_ptr (& classes , ce -> name , & mysqli_result_properties );
640
641
641
- REGISTER_MYSQLI_CLASS_ENTRY ("mysqli_stmt" , mysqli_stmt_class_entry , mysqli_stmt_methods );
642
+ REGISTER_MYSQLI_CLASS_ENTRY ("mysqli_stmt" , mysqli_stmt_class_entry , class_mysqli_stmt_methods );
642
643
ce = mysqli_stmt_class_entry ;
643
644
zend_hash_init (& mysqli_stmt_properties , 0 , NULL , free_prop_handler , 1 );
644
645
MYSQLI_ADD_PROPERTIES (& mysqli_stmt_properties , mysqli_stmt_property_entries );
@@ -975,7 +976,7 @@ zend_module_entry mysqli_module_entry = {
975
976
STANDARD_MODULE_HEADER_EX , NULL ,
976
977
mysqli_deps ,
977
978
"mysqli" ,
978
- mysqli_functions ,
979
+ ext_functions ,
979
980
PHP_MINIT (mysqli ),
980
981
PHP_MSHUTDOWN (mysqli ),
981
982
PHP_RINIT (mysqli ),
0 commit comments