Add object and function methods. (#32)

* Add object handle method.

* Distince function name methods.

* Get this.

Author: jmjoy

phper-sys/php_wrapper.c

@@ -151,6 +151,10 @@ zend_string *phper_get_function_or_method_name(const zend_function *func) {
     #endif
 }
 
+zend_string *phper_get_function_name(const zend_function *func) {
+    return func->common.function_name;
+}
+
 void phper_zval_ptr_dtor(zval *zv) {
     ZVAL_PTR_DTOR(zv);
 }

phper/src/functions.rs

@@ -18,7 +18,7 @@ use crate::{
     errors::{ArgumentCountError, CallFunctionError, CallMethodError},
     exceptions::Exception,
     objects::{StatefulObj, ZObj},
-    strings::ZStr,
+    strings::{ZStr, ZString},
     sys::*,
     utils::ensure_end_with_zero,
     values::{ExecuteData, ZVal},
@@ -92,7 +92,7 @@ where
         &self, execute_data: &mut ExecuteData, arguments: &mut [ZVal], return_value: &mut ZVal,
     ) {
         unsafe {
-            let this = execute_data.get_this().unwrap();
+            let this = execute_data.get_this_mut().unwrap();
             let this = StatefulObj::from_z_obj(this);
             let r = (self.f)(this, arguments);
             *return_value = r.into();
@@ -235,13 +235,20 @@ impl ZendFunction {
         &mut self.inner
     }
 
-    pub fn get_name(&self) -> &ZStr {
+    pub fn get_function_name(&self) -> &ZStr {
         unsafe {
-            let s = phper_get_function_or_method_name(self.as_ptr());
+            let s = phper_get_function_name(self.as_ptr());
             ZStr::from_ptr(s)
         }
     }
 
+    pub fn get_function_or_method_name(&self) -> ZString {
+        unsafe {
+            let s = phper_get_function_or_method_name(self.as_ptr());
+            ZString::from_raw(s)
+        }
+    }
+
     pub(crate) fn call(
         &mut self, mut object: Option<&mut ZObj>, mut arguments: impl AsMut<[ZVal]>,
     ) -> crate::Result<ZVal> {
@@ -301,7 +308,7 @@ impl ZendFunction {
 
                 zend_call_function(&mut fci, &mut fcc) == ZEND_RESULT_CODE_SUCCESS
             },
-            || Ok(self.get_name().to_str()?.to_owned()),
+            || Ok(self.get_function_or_method_name().to_str()?.to_owned()),
             object,
         )
     }
@@ -334,7 +341,7 @@ unsafe extern "C" fn invoke(execute_data: *mut zend_execute_data, return_value:
     let num_args = execute_data.num_args() as usize;
     let required_num_args = execute_data.common_required_num_args() as usize;
     if num_args < required_num_args {
-        let func_name = execute_data.func().get_name();
+        let func_name = execute_data.func().get_function_or_method_name();
         let result = func_name
             .to_str()
             .map(|func_name| {

phper/src/objects.rs

@@ -65,6 +65,11 @@ impl ZObj {
         eo.state.downcast_mut().unwrap()
     }
 
+    #[inline]
+    pub fn handle(&self) -> u32 {
+        self.inner.handle
+    }
+
     pub fn get_class(&self) -> &ClassEntry {
         unsafe { ClassEntry::from_ptr(self.inner.ce) }
     }

phper/src/values.rs

@@ -99,12 +99,18 @@ impl ExecuteData {
         ZendFunction::from_mut_ptr(self.inner.func)
     }
 
-    /// # Safety
-    ///
-    /// The type of `T` should be careful.
-    pub unsafe fn get_this(&mut self) -> Option<&mut ZObj> {
-        let val = ZVal::from_mut_ptr(phper_get_this(&mut self.inner));
-        val.as_mut_z_obj()
+    pub fn get_this(&mut self) -> Option<&ZObj> {
+        unsafe {
+            let val = ZVal::from_ptr(phper_get_this(&mut self.inner));
+            val.as_z_obj()
+        }
+    }
+
+    pub fn get_this_mut(&mut self) -> Option<&mut ZObj> {
+        unsafe {
+            let val = ZVal::from_mut_ptr(phper_get_this(&mut self.inner));
+            val.as_mut_z_obj()
+        }
     }
 
     /// TODO Do not return owned object, because usually Val should not be drop.