Modify Array to EBox<Array>.

Author: jmjoy

examples/hello/src/lib.rs

@@ -1,5 +1,4 @@
 use phper::{
-    alloc::EBox,
     arrays::Array,
     classes::DynamicClass,
     functions::Argument,
@@ -57,7 +56,7 @@ pub fn get_module() -> Module {
             let hello_description = Val::new(Module::get_str_ini("hello.description"));
             arr.insert("hello.description", hello_description);
 
-            EBox::new(arr)
+            arr
         },
         vec![],
     );

phper-sys/php_wrapper.c

@@ -125,3 +125,7 @@ zend_string *phper_get_function_or_method_name(const zend_function *func) {
     return func->common.function_name ? zend_string_copy(func->common.function_name) : zend_string_init("main", sizeof("main") - 1, 0);
     #endif
 }
+
+void phper_zval_ptr_dtor(zval *pDest) {
+    ZVAL_PTR_DTOR(pDest);
+}

phper-sys/php_wrapper.h

@@ -42,4 +42,6 @@ void phper_zval_obj(zval *z, zend_object *o);
 
 zend_string *phper_get_function_or_method_name(const zend_function *func);
 
+void phper_zval_ptr_dtor(zval *pDest);
+
 #endif //PHPER_PHP_WRAPPER_H

phper/src/arrays.rs

@@ -32,21 +32,15 @@ pub struct Array {
 }
 
 impl Array {
-    // New array in the stack.
-    pub fn new() -> Self {
+    pub fn new() -> EBox<Self> {
         unsafe {
-            let mut array = zeroed::<Array>();
-            let dtor = {
-                #[cfg(phper_major_version = "8")]
-                {
-                    zval_ptr_dtor
-                }
-                #[cfg(phper_major_version = "7")]
-                {
-                    _zval_ptr_dtor
-                }
-            };
-            _zend_hash_init(array.as_mut_ptr(), 0, Some(dtor), false.into());
+            let mut array = EBox::new(zeroed::<Array>());
+            _zend_hash_init(
+                array.as_mut_ptr(),
+                0,
+                Some(phper_zval_ptr_dtor),
+                false.into(),
+            );
             array
         }
     }
@@ -105,6 +99,14 @@ impl Array {
     pub fn len(&mut self) -> usize {
         unsafe { zend_array_count(&mut self.inner) as usize }
     }
+
+    pub fn clone(&self) -> EBox<Self> {
+        let mut other = Self::new();
+        unsafe {
+            zend_hash_copy(other.as_mut_ptr(), self.as_ptr() as *mut _, None);
+        }
+        other
+    }
 }
 
 impl EAllocatable for Array {
@@ -117,18 +119,6 @@ impl EAllocatable for Array {
 
 impl Drop for Array {
     fn drop(&mut self) {
-        unsafe {
-            zend_hash_destroy(&mut self.inner);
-        }
-    }
-}
-
-impl Clone for Array {
-    fn clone(&self) -> Self {
-        let mut other = Self::new();
-        unsafe {
-            zend_hash_copy(other.as_mut_ptr(), self.as_ptr() as *mut _, None);
-        }
-        other
+        unreachable!("Allocation on the stack is not allowed")
     }
 }

tests/integration/src/arguments.rs

@@ -46,7 +46,7 @@ fn integrate_arguments(module: &mut Module) {
             let mut a = a.clone();
             a.insert("a", Val::new(1));
             a.insert("foo", Val::new("bar"));
-            Ok(EBox::new(a))
+            Ok(a)
         },
         vec![Argument::by_val("a")],
     );

tests/integration/src/arrays.rs

@@ -9,7 +9,7 @@ pub fn integrate(module: &mut Module) {
             let foo = a1.get("foo").unwrap();
             let foo = foo.as_string()?;
 
-            let mut a2 = EBox::new(Array::new());
+            let mut a2 = Array::new();
             a2.insert("bar", Val::new("BAR"));
             let bar = a2.get("bar").unwrap();
             let bar = bar.as_string()?;
@@ -33,7 +33,7 @@ pub fn integrate(module: &mut Module) {
                     let mut arr = Array::new();
                     arr.insert(0, Val::new(0));
                     arr.insert(1, Val::new(1));
-                    EBox::new(arr)
+                    arr
                 }),
             );
             a.insert(

tests/integration/src/values.rs

@@ -184,7 +184,7 @@ fn integration_values_return_array(_: &mut [Val]) -> EBox<Array> {
     let mut arr = Array::new();
     arr.insert("a", Val::new(1));
     arr.insert("b", Val::new("foo"));
-    EBox::new(arr)
+    arr
 }
 
 fn integration_values_return_object(_: &mut [Val]) -> EBox<Object<()>> {