Fix Object clone bug.

Author: jmjoy

phper-sys/php_wrapper.c

@@ -116,6 +116,7 @@ void phper_zval_obj(zval *z, zend_object *o) {
     ZVAL_OBJ(z, o);
 }
 
+#if PHP_VERSION_ID < 80000
 static zend_string *phper_zend_string_concat3(
         const char *str1, size_t str1_len,
         const char *str2, size_t str2_len,
@@ -131,6 +132,7 @@ static zend_string *phper_zend_string_concat3(
 
     return res;
 }
+#endif
 
 zend_string *phper_get_function_or_method_name(const zend_function *func) {
     #if PHP_VERSION_ID >= 80000

phper/src/classes.rs

@@ -2,7 +2,7 @@
 
 use crate::{
     errors::ClassNotFoundError,
-    functions::{Argument, Callable, FunctionEntity, FunctionEntry, Method},
+    functions::{Argument, FunctionEntity, FunctionEntry, Method},
     objects::Object,
     sys::*,
     utils::ensure_end_with_zero,

phper/src/functions.rs

@@ -1,18 +1,16 @@
 //! Apis relate to [crate::sys::zend_function_entry].
 
-use std::{mem::zeroed, os::raw::c_char, sync::atomic::AtomicPtr};
+use std::{mem::zeroed, os::raw::c_char};
 
 use crate::{
-    alloc::EBox,
-    classes::ClassEntry,
     errors::ArgumentCountError,
     objects::Object,
     strings::ZendString,
     sys::*,
     utils::ensure_end_with_zero,
     values::{ExecuteData, SetVal, Val},
 };
-use std::{marker::PhantomData, mem::transmute, slice::from_raw_parts, str, str::Utf8Error};
+use std::{marker::PhantomData, str::Utf8Error};
 
 pub(crate) trait Callable {
     fn call(&self, execute_data: &mut ExecuteData, arguments: &mut [Val], return_value: &mut Val);
@@ -122,7 +120,7 @@ impl FunctionEntity {
         let translator = CallableTranslator {
             callable: self.handler.as_ref(),
         };
-        let mut last_arg_info: zend_internal_arg_info = translator.internal_arg_info;
+        let last_arg_info: zend_internal_arg_info = translator.internal_arg_info;
         infos.push(last_arg_info);
 
         zend_function_entry {

phper/src/modules.rs

@@ -3,7 +3,7 @@
 use crate::{
     c_str_ptr,
     classes::{ClassEntity, Classifiable},
-    functions::{Argument, Callable, Function, FunctionEntity},
+    functions::{Argument, Function, FunctionEntity},
     ini::{IniEntity, IniValue, Policy, StrPtrBox},
     sys::*,
     utils::ensure_end_with_zero,

phper/src/objects.rs

@@ -7,7 +7,7 @@ use crate::{
     sys::*,
     values::Val,
 };
-use std::{marker::PhantomData, mem::zeroed, ptr::null_mut};
+use std::{marker::PhantomData, ptr::null_mut};
 
 /// Wrapper of [crate::sys::zend_object].
 #[repr(transparent)]
@@ -60,7 +60,7 @@ impl<T> Object<T> {
             }
             #[cfg(phper_major_version = "7")]
             {
-                let mut zv = zeroed::<zval>();
+                let mut zv = std::mem::zeroed::<zval>();
                 phper_zval_obj(&mut zv, self.as_ptr() as *mut _);
                 zend_read_property(
                     self.inner.ce,
@@ -92,7 +92,7 @@ impl<T> Object<T> {
             }
             #[cfg(phper_major_version = "7")]
             {
-                let mut zv = zeroed::<zval>();
+                let mut zv = std::mem::zeroed::<zval>();
                 phper_zval_obj(&mut zv, self.as_mut_ptr());
                 zend_update_property(
                     self.inner.ce,
@@ -107,7 +107,19 @@ impl<T> Object<T> {
 
     pub fn clone_obj(&self) -> EBox<Self> {
         unsafe {
-            let new_obj = zend_objects_clone_obj(self.as_ptr() as *mut _).cast();
+            let new_obj = {
+                #[cfg(phper_major_version = "8")]
+                {
+                    zend_objects_clone_obj(self.as_ptr() as *mut _).cast()
+                }
+                #[cfg(phper_major_version = "7")]
+                {
+                    let mut zv = std::mem::zeroed::<zval>();
+                    phper_zval_obj(&mut zv, self.as_ptr() as *mut _);
+                    zend_objects_clone_obj(&mut zv).cast()
+                }
+            };
+
             EBox::from_raw(new_obj)
         }
     }