Fix object constructor and destructor.

Author: jmjoy

examples/http-client/src/client.rs

@@ -52,7 +52,7 @@ pub fn make_client_builder_class() -> DynamicClass<ClientBuilder> {
             let state = this.as_mut_state();
             let client = replace_and_get(state, ClientBuilder::new(), ClientBuilder::build)?;
             let mut object = ClassEntry::<Option<Client>>::from_globals(HTTP_CLIENT_CLASS_NAME)?
-                .new_object_without_construct();
+                .init_object()?;
             *object.as_mut_state() = Some(client);
             Ok::<_, HttpClientError>(object)
         },
@@ -81,7 +81,7 @@ pub fn make_client_class() -> DynamicClass<Option<Client>> {
             let request_builder = client.get(url);
             let mut object =
                 ClassEntry::<Option<RequestBuilder>>::from_globals(REQUEST_BUILDER_CLASS_NAME)?
-                    .new_object_without_construct();
+                    .init_object()?;
             *object.as_mut_state() = Some(request_builder);
             Ok::<_, HttpClientError>(object)
         },
@@ -97,7 +97,7 @@ pub fn make_client_class() -> DynamicClass<Option<Client>> {
             let request_builder = client.post(url);
             let mut object =
                 ClassEntry::<Option<RequestBuilder>>::from_globals(REQUEST_BUILDER_CLASS_NAME)?
-                    .new_object_without_construct();
+                    .init_object()?;
             *object.as_mut_state() = Some(request_builder);
             Ok::<_, HttpClientError>(object)
         },

examples/http-client/src/request.rs

@@ -23,8 +23,8 @@ pub fn make_request_builder_class() -> DynamicClass<Option<RequestBuilder>> {
         |this, _arguments| {
             let state = this.as_mut_state();
             let response = replace_and_get(state, None, |builder| builder.unwrap().send())?;
-            let mut object = ClassEntry::<Option<Response>>::from_globals(RESPONSE_CLASS_NAME)?
-                .new_object_without_construct();
+            let mut object =
+                ClassEntry::<Option<Response>>::from_globals(RESPONSE_CLASS_NAME)?.init_object()?;
             *object.as_mut_state() = Some(response);
             Ok::<_, HttpClientError>(object)
         },

phper-sys/php_wrapper.c

@@ -152,6 +152,10 @@ zend_object* (**phper_get_create_object(zend_class_entry *ce))(zend_class_entry
     return &ce->create_object;
 }
 
+bool phper_object_init_ex(zval *arg, zend_class_entry *class_type) {
+    return object_init_ex(arg, class_type) == SUCCESS;
+}
+
 bool phper_call_user_function(HashTable *function_table, zval *object, zval *function_name, zval *retval_ptr, uint32_t param_count, zval params[]) {
     function_table = function_table;
     return call_user_function(function_table, object, function_name, retval_ptr, param_count, params) == SUCCESS;

phper-sys/php_wrapper.h

@@ -51,6 +51,7 @@ size_t phper_zend_object_properties_size(zend_class_entry *ce);
 void *phper_zend_object_alloc(size_t obj_size, zend_class_entry *ce);
 
 zend_object* (**phper_get_create_object(zend_class_entry *ce))(zend_class_entry *class_type);
+bool phper_object_init_ex(zval *arg, zend_class_entry *class_type);
 
 bool phper_call_user_function(HashTable *function_table, zval *object, zval *function_name, zval *retval_ptr, uint32_t param_count, zval params[]);
 

phper/src/classes.rs

@@ -3,7 +3,7 @@
 use crate::{
     alloc::EBox,
     arrays::Array,
-    errors::{ClassNotFoundError, StateTypeError},
+    errors::{ClassNotFoundError, InitializeObjectError, StateTypeError},
     functions::{Argument, Function, FunctionEntity, FunctionEntry, Method},
     objects::{ExtendObject, Object},
     strings::ZendString,
@@ -16,7 +16,7 @@ use once_cell::sync::OnceCell;
 use std::{
     any::{Any, TypeId},
     marker::PhantomData,
-    mem::{size_of, zeroed, ManuallyDrop},
+    mem::{forget, size_of, zeroed, ManuallyDrop},
     os::raw::c_int,
     ptr::null_mut,
     sync::{
@@ -229,25 +229,25 @@ impl<T: 'static> ClassEntry<T> {
 
     /// Create the object from class and call `__construct` with arguments.
     pub fn new_object(&self, arguments: &mut [Val]) -> crate::Result<EBox<Object<T>>> {
-        unsafe {
-            let ptr = self.as_ptr() as *mut _;
-            let f = (*phper_get_create_object(ptr)).unwrap_or(zend_objects_new);
-            let object = f(ptr);
-            let mut object: EBox<Object<T>> = EBox::from_raw(object.cast());
-            let _ = object.call_construct(arguments)?;
-            Ok(object)
-        }
+        let mut object = self.init_object()?;
+        object.call_construct(arguments)?;
+        Ok(object)
     }
 
     /// Create the object from class, without calling `__construct`, be careful when `__construct`
     /// is necessary.
-    pub fn new_object_without_construct(&self) -> EBox<Object<T>> {
+    pub fn init_object(&self) -> crate::Result<EBox<Object<T>>> {
         unsafe {
             let ptr = self.as_ptr() as *mut _;
-            let f = (*phper_get_create_object(ptr)).unwrap_or(zend_objects_new);
-            let object = f(ptr);
-            let object: EBox<Object<T>> = EBox::from_raw(object.cast());
-            object
+            let mut val = Val::undef();
+            if !phper_object_init_ex(val.as_mut_ptr(), ptr) {
+                Err(InitializeObjectError::new(self.get_name().as_str()?.to_owned()).into())
+            } else {
+                let object = (*val.as_mut_ptr()).value.obj;
+                forget(val);
+                let object: EBox<Object<T>> = EBox::from_raw(object.cast());
+                Ok(object)
+            }
         }
     }
 

phper/src/errors.rs

@@ -73,6 +73,10 @@ pub enum Error {
     #[error(transparent)]
     #[throwable(transparent)]
     CallMethod(#[from] CallMethodError),
+
+    #[error(transparent)]
+    #[throwable(transparent)]
+    InitializeObject(#[from] InitializeObjectError),
 }
 
 impl Error {
@@ -134,3 +138,11 @@ pub struct CallMethodError {
     class_name: String,
     method_name: String,
 }
+
+#[derive(Debug, thiserror::Error, crate::Throwable, Constructor)]
+#[error("Cannot instantiate class {class_name}")]
+#[throwable_class("Error")]
+#[throwable_crate]
+pub struct InitializeObjectError {
+    class_name: String,
+}

phper/src/objects.rs

@@ -184,20 +184,21 @@ impl<T: 'static> Object<T> {
         }
     }
 
-    pub(crate) fn call_construct(&mut self, arguments: &mut [Val]) -> crate::Result<Option<()>> {
+    pub(crate) fn call_construct(&mut self, arguments: &mut [Val]) -> crate::Result<bool> {
         unsafe {
-            (*self.inner.handlers)
-                .get_constructor
-                .and_then(|get_constructor| {
+            match (*self.inner.handlers).get_constructor {
+                Some(get_constructor) => {
                     let f = get_constructor(self.as_ptr() as *mut _);
                     if f.is_null() {
-                        None
+                        Ok(false)
                     } else {
                         let zend_fn = ZendFunction::from_mut_ptr(f);
-                        Some(zend_fn.call_method(self, arguments).map(|_| ()))
+                        zend_fn.call_method(self, arguments)?;
+                        Ok(true)
                     }
-                })
-                .transpose()
+                }
+                None => Ok(false),
+            }
         }
     }
 }
@@ -213,12 +214,7 @@ impl<T> EAllocatable for Object<T> {
         unsafe {
             (*ptr).inner.gc.refcount -= 1;
             if (*ptr).inner.gc.refcount == 0 {
-                let handlers = (*ptr).inner.handlers;
-                (*handlers).dtor_obj.unwrap()(ptr.cast());
-                (*handlers).free_obj.unwrap()(ptr.cast());
-
-                // zend_objects_store_call_destructors(ptr.cast());
-                // zend_objects_store_free_object_storage(ptr.cast(), true.into());
+                zend_objects_store_del(ptr.cast());
             }
         }
     }