Fix object convert.

Author: jmjoy

examples/http-client/src/client.rs

@@ -31,7 +31,7 @@ pub fn make_client_builder_class() -> StatefulClass<ClientBuilder> {
         "timeout",
         Visibility::Public,
         |this, arguments| {
-            let ms = arguments[0].as_long().unwrap();
+            let ms = arguments[0].expect_long()?;
             let state: &mut ClientBuilder = this.as_mut_state();
             replace_and_set(state, |builder| {
                 builder.timeout(Duration::from_millis(ms as u64))
@@ -45,7 +45,7 @@ pub fn make_client_builder_class() -> StatefulClass<ClientBuilder> {
         "cookie_store",
         Visibility::Public,
         |this, arguments| {
-            let enable = arguments[0].as_bool().unwrap();
+            let enable = arguments[0].expect_bool()?;
             let state: &mut ClientBuilder = this.as_mut_state();
             replace_and_set(state, |builder| builder.cookie_store(enable));
             Ok::<_, HttpClientError>(this.to_ref_owned())
@@ -59,7 +59,7 @@ pub fn make_client_builder_class() -> StatefulClass<ClientBuilder> {
         |this, _arguments| {
             let state = this.as_mut_state();
             let client = replace_and_get(state, ClientBuilder::build)?;
-            let mut object = ClassEntry::from_globals(HTTP_CLIENT_CLASS_NAME)?.new_object([])?;
+            let mut object = ClassEntry::from_globals(HTTP_CLIENT_CLASS_NAME)?.init_object()?;
             unsafe {
                 *object.as_mut_state() = Some(client);
             }
@@ -83,7 +83,7 @@ pub fn make_client_class() -> StatefulClass<Option<Client>> {
             let url = arguments[0].as_z_str().unwrap().to_str().unwrap();
             let client = this.as_state().as_ref().unwrap();
             let request_builder = client.get(url);
-            let mut object = ClassEntry::from_globals(REQUEST_BUILDER_CLASS_NAME)?.new_object([])?;
+            let mut object = ClassEntry::from_globals(REQUEST_BUILDER_CLASS_NAME)?.init_object()?;
             unsafe {
                 *object.as_mut_state() = Some(request_builder);
             }
@@ -99,7 +99,7 @@ pub fn make_client_class() -> StatefulClass<Option<Client>> {
             let url = arguments[0].as_z_str().unwrap().to_str().unwrap();
             let client = this.as_state().as_ref().unwrap();
             let request_builder = client.post(url);
-            let mut object = ClassEntry::from_globals(REQUEST_BUILDER_CLASS_NAME)?.new_object([])?;
+            let mut object = ClassEntry::from_globals(REQUEST_BUILDER_CLASS_NAME)?.init_object()?;
             unsafe {
                 *object.as_mut_state() = Some(request_builder);
             }

phper/src/classes.rs

@@ -214,7 +214,7 @@ impl ClassEntry {
 
     /// Create the object from class, without calling `__construct`, be careful
     /// when `__construct` is necessary.
-    pub(crate) fn init_object(&self) -> crate::Result<ZObject> {
+    pub fn init_object(&self) -> crate::Result<ZObject> {
         unsafe {
             let ptr = self.as_ptr() as *mut _;
             let mut val = ZVal::default();

phper/src/objects.rs

@@ -186,11 +186,12 @@ impl ToRefOwned for ZObj {
     type Owned = ZObject;
 
     fn to_ref_owned(&mut self) -> Self::Owned {
-        let mut val = ZVal::default();
+        let mut val = ManuallyDrop::new(ZVal::default());
 
         unsafe {
             phper_zval_obj(val.as_mut_ptr(), self.as_mut_ptr());
             phper_z_addref_p(val.as_mut_ptr());
+            phper_z_addref_p(val.as_mut_ptr());
             ZObject::from_raw(val.as_mut_z_obj().unwrap().as_mut_ptr())
         }
     }

phper/src/values.rs

@@ -160,14 +160,6 @@ impl ZVal {
         t.into()
     }
 
-    fn get_type_name(&self) -> crate::Result<String> {
-        self.get_type_info().get_base_type_name()
-    }
-
-    fn set_type(&mut self, t: TypeInfo) {
-        self.inner.u1.type_info = t.into_raw();
-    }
-
     pub fn as_null(&self) -> Option<()> {
         self.expect_null().ok()
     }
@@ -496,10 +488,10 @@ impl From<ZArray> for ZVal {
 }
 
 impl From<ZObject> for ZVal {
-    fn from(mut obj: ZObject) -> Self {
+    fn from(obj: ZObject) -> Self {
         unsafe {
-            let val = MaybeUninit::<ZVal>::uninit();
-            phper_zval_obj(obj.as_mut_ptr().cast(), obj.into_raw());
+            let mut val = MaybeUninit::<ZVal>::uninit();
+            phper_zval_obj(val.as_mut_ptr().cast(), obj.into_raw());
             val.assume_init()
         }
     }