Design module args api.

Author: jmjoy

examples/simple/src/lib.rs

@@ -5,7 +5,7 @@ use phper::sys::{OnUpdateString, zend_class_entry, zend_register_internal_class,
 use phper::zend::api::{FunctionEntries, ModuleGlobals, function_entry_end};
 use phper::zend::compile::{InternalArgInfos, internal_arg_info_begin};
 use phper::zend::ini::{IniEntryDefs, ini_entry_def_end};
-use phper::zend::modules::{ModuleEntry, create_zend_module_entry};
+use phper::zend::modules::{ModuleEntry, create_zend_module_entry, ModuleArgs};
 use phper::zend::types::{ExecuteData, Val, SetVal, Value, ClassEntry};
 use phper::{
     php_function, php_minit, php_minit_function, php_mshutdown, php_mshutdown_function,
@@ -32,40 +32,35 @@ static INI_ENTRIES: IniEntryDefs<3> = IniEntryDefs::new([
 ]);
 
 #[php_minit_function]
-fn m_init_simple(type_: c_int, module_number: c_int) -> bool {
-    unsafe {
-        zend_register_ini_entries(INI_ENTRIES.as_ptr(), module_number);
-
-        MY_CLASS_CE.init(c_str_ptr!("MyClass"), &MY_CLASS_METHODS);
-        MY_CLASS_CE.declare_property("foo", 3, ZEND_ACC_PUBLIC);
-    }
+fn m_init_simple(args: ModuleArgs) -> bool {
+    args.register_ini_entries(&INI_ENTRIES);
+    MY_CLASS_CE.init(c_str_ptr!("MyClass"), &MY_CLASS_METHODS);
+    MY_CLASS_CE.declare_property("foo", 3, ZEND_ACC_PUBLIC);
     true
 }
 
 #[php_mshutdown_function]
-fn m_shutdown_simple(type_: c_int, module_number: c_int) -> bool {
-    unsafe {
-        zend_unregister_ini_entries(module_number);
-    }
+fn m_shutdown_simple(args: ModuleArgs) -> bool {
+    args.unregister_ini_entries();
     true
 }
 
 #[php_rinit_function]
-fn r_init_simple(type_: c_int, module_number: c_int) -> bool {
+fn r_init_simple(args: ModuleArgs) -> bool {
     true
 }
 
 #[php_rshutdown_function]
-fn r_shutdown_simple(type_: c_int, module_number: c_int) -> bool {
+fn r_shutdown_simple(args: ModuleArgs) -> bool {
     true
 }
 
 #[php_minfo_function]
 fn m_info_simple(zend_module: *mut ::phper::sys::zend_module_entry) {
     unsafe {
         php_info_print_table_start();
-        php_info_print_table_row(2, if SIMPLE_ENABLE.get() { c_str_ptr!("1") } else { c_str_ptr!("0") });
-        php_info_print_table_row(2, c_str_ptr!("simple.text"), SIMPLE_TEXT.as_ptr());
+        php_info_print_table_row(2, c_str_ptr!("simple.enable"), if SIMPLE_ENABLE.get() { c_str_ptr!("1") } else { c_str_ptr!("0") });
+        php_info_print_table_row(2, c_str_ptr!("simple.text"), SIMPLE_TEXT.get());
         php_info_print_table_end();
     }
 }

phper-macros/src/inner.rs

@@ -30,9 +30,9 @@ pub(crate) fn hook_fn(input: TokenStream, prefix: impl ToString) -> TokenStream
                 #body
             }
 
-            let internal: fn(::std::os::raw::c_int, ::std::os::raw::c_int) -> bool = internal;
+            let internal: fn(::phper::zend::modules::ModuleArgs) -> bool = internal;
 
-            if internal(type_, module_number) {
+            if internal(::phper::zend::modules::ModuleArgs::new(type_, module_number)) {
                 ::phper::sys::ZEND_RESULT_CODE_SUCCESS
             } else {
                 ::phper::sys::ZEND_RESULT_CODE_FAILURE

phper/src/zend/modules.rs

@@ -8,6 +8,9 @@ use crate::sys::USING_ZTS;
 use crate::sys::PHP_MODULE_BUILD_ID;
 use crate::sys::zend_function_entry;
 use std::ptr::{null, null_mut};
+use crate::zend::ini::IniEntryDefs;
+use crate::sys::zend_register_ini_entries;
+use crate::sys::zend_unregister_ini_entries;
 
 pub const fn create_zend_module_entry(
     name: *const c_char,
@@ -67,3 +70,30 @@ impl ModuleEntry {
 }
 
 unsafe impl Sync for ModuleEntry {}
+
+pub struct ModuleArgs {
+    type_: c_int,
+    module_number: c_int,
+}
+
+impl ModuleArgs {
+    pub const fn new(type_: c_int, module_number: c_int) -> Self {
+        Self {
+            type_,
+            module_number
+        }
+    }
+
+    pub fn register_ini_entries<const N: usize>(&self, ini_entries: &IniEntryDefs<N>) {
+        unsafe {
+            zend_register_ini_entries(ini_entries.as_ptr(), self.module_number);
+        }
+    }
+
+    pub fn unregister_ini_entries(&self) {
+        unsafe {
+            zend_unregister_ini_entries(self.module_number);
+        }
+    }
+}
+