refactor: replace EBox with ZArray and ZString in multiple files

Author: jmjoy

examples/complex/src/lib.rs

@@ -9,8 +9,7 @@
 // See the Mulan PSL v2 for more details.
 
 use phper::{
-    alloc::EBox,
-    arrays::ZArr,
+    arrays::ZArray,
     classes::{ClassEntity, Visibility},
     functions::Argument,
     ini::{Policy, ini_get},
@@ -62,7 +61,7 @@ pub fn get_module() -> Module {
         .argument(Argument::new("name"));
     module.add_function("complex_throw_exception", throw_exception);
     module.add_function("complex_get_all_ini", |_: &mut [ZVal]| {
-        let mut arr = EBox::<ZArr>::new();
+        let mut arr = ZArray::new();
 
         let complex_enable = ZVal::from(ini_get::<bool>("complex.enable"));
         arr.insert("complex.enable", complex_enable);

examples/http-client/src/response.rs

@@ -10,8 +10,7 @@
 
 use crate::errors::HttpClientError;
 use phper::{
-    alloc::EBox,
-    arrays::{InsertKey, ZArr},
+    arrays::{InsertKey, ZArray},
     classes::{ClassEntity, StateClass, Visibility},
     values::ZVal,
 };
@@ -51,19 +50,16 @@ pub fn make_response_class() -> ClassEntity<Option<Response>> {
                 .ok_or_else(|| HttpClientError::ResponseAfterRead {
                     method_name: "headers".to_owned(),
                 })?;
-        let headers_map =
-            response
-                .headers()
-                .iter()
-                .fold(EBox::<ZArr>::new(), |mut acc, (key, value)| {
-                    let arr = acc
-                        .entry(key.as_str())
-                        .or_insert(ZVal::from(EBox::<ZArr>::new()));
-                    arr.as_mut_z_arr()
-                        .unwrap()
-                        .insert(InsertKey::NextIndex, ZVal::from(value.as_bytes()));
-                    acc
-                });
+        let headers_map = response
+            .headers()
+            .iter()
+            .fold(ZArray::new(), |mut acc, (key, value)| {
+                let arr = acc.entry(key.as_str()).or_insert(ZVal::from(ZArray::new()));
+                arr.as_mut_z_arr()
+                    .unwrap()
+                    .insert(InsertKey::NextIndex, ZVal::from(value.as_bytes()));
+                acc
+            });
         Ok::<_, HttpClientError>(headers_map)
     });
 

examples/http-server/src/request.rs

@@ -9,8 +9,7 @@
 // See the Mulan PSL v2 for more details.
 
 use phper::{
-    alloc::EBox,
-    arrays::ZArr,
+    arrays::ZArray,
     classes::{ClassEntity, StateClass, Visibility},
 };
 use std::convert::Infallible;
@@ -32,7 +31,7 @@ pub fn make_request_class() -> ClassEntity<()> {
     // Register the constructor method with public visibility, initialize the
     // headers with empty array.
     class.add_method("__construct", Visibility::Public, |this, _arguments| {
-        this.set_property("headers", EBox::<ZArr>::new());
+        this.set_property("headers", ZArray::new());
         Ok::<_, Infallible>(())
     });
 

phper/src/arrays.rs

@@ -347,7 +347,6 @@ impl Debug for ZArr {
     }
 }
 
-#[allow(deprecated)]
 impl ToOwned for ZArr {
     type Owned = ZArray;
 
@@ -399,7 +398,6 @@ impl ZArray {
     }
 }
 
-#[allow(deprecated)]
 impl Default for ZArray {
     fn default() -> Self {
         Self::new()

phper/src/classes.rs

@@ -127,7 +127,6 @@ impl ClassEntry {
     ///
     /// If the `__construct` is private, or protected and the called scope isn't
     /// parent class, it will throw PHP Error.
-    #[allow(deprecated)]
     pub fn new_object(&self, arguments: impl AsMut<[ZVal]>) -> crate::Result<ZObject> {
         let mut object = self.init_object()?;
         object.call_construct(arguments)?;
@@ -137,7 +136,6 @@ impl ClassEntry {
     /// Create the object from class, without calling `__construct`.
     ///
     /// **Be careful when `__construct` is necessary.**
-    #[allow(deprecated)]
     pub fn init_object(&self) -> crate::Result<ZObject> {
         unsafe {
             let ptr = self.as_ptr() as *mut _;
@@ -333,7 +331,6 @@ impl<T: 'static> StateClass<T> {
     ///
     /// If the `__construct` is private, or protected and the called scope isn't
     /// parent class, it will throw PHP Error.
-    #[allow(deprecated)]
     pub fn new_object(&self, arguments: impl AsMut<[ZVal]>) -> crate::Result<StateObject<T>> {
         self.as_class_entry()
             .new_object(arguments)
@@ -345,7 +342,6 @@ impl<T: 'static> StateClass<T> {
     /// Create the object from class, without calling `__construct`.
     ///
     /// **Be careful when `__construct` is necessary.**
-    #[allow(deprecated)]
     pub fn init_object(&self) -> crate::Result<StateObject<T>> {
         self.as_class_entry()
             .init_object()

phper/src/enums.rs

@@ -20,14 +20,13 @@
 #![cfg(phper_enum_supported)]
 
 use crate::{
-    alloc::EBox,
     classes::{
         ClassEntry, ConstantEntity, InnerClassEntry, Interface, Visibility, add_class_constant,
     },
     errors::Throwable,
     functions::{Function, FunctionEntry, HandlerMap, MethodEntity},
     objects::ZObj,
-    strings::ZStr,
+    strings::ZString,
     sys::*,
     types::Scalar,
     utils::ensure_end_with_zero,
@@ -261,7 +260,7 @@ impl Enum {
         unsafe {
             let ce = self.as_class_entry().as_ptr() as *mut _;
             let case_name_str = case_name.as_ref();
-            let mut name_zstr = EBox::<ZStr>::new(case_name_str);
+            let mut name_zstr = ZString::new(case_name_str);
 
             // Get the enum case
             let case_obj = zend_enum_get_case(ce, name_zstr.as_mut_ptr());
@@ -297,7 +296,7 @@ impl Enum {
         unsafe {
             let ce = self.as_class_entry().as_ptr() as *mut _;
             let case_name_str = case_name.as_ref();
-            let mut name_zstr = EBox::<ZStr>::new(case_name_str);
+            let mut name_zstr = ZString::new(case_name_str);
 
             // Get the enum case
             let case_obj = zend_enum_get_case(ce, name_zstr.as_mut_ptr());
@@ -529,7 +528,7 @@ unsafe fn register_enum_case(
                 );
             }
             Scalar::String(value) => {
-                let value = EBox::<ZStr>::new_persistent(value);
+                let value = ZString::new_persistent(value);
                 let mut value = ManuallyDrop::new(ZVal::from(value));
                 zend_enum_add_case_cstr(class_ce, case_name.as_ptr(), value.as_mut_ptr());
             }

phper/src/errors.rs

@@ -10,9 +10,7 @@
 
 //! The errors for crate and php.
 
-use crate::{
-    alloc::EBox, classes::ClassEntry, objects::ZObj, sys::*, types::TypeInfo, values::ZVal,
-};
+use crate::{classes::ClassEntry, objects::ZObject, sys::*, types::TypeInfo, values::ZVal};
 use derive_more::Constructor;
 use phper_alloc::ToRefOwned;
 use std::{
@@ -107,9 +105,9 @@ pub trait Throwable: error::Error {
     ///
     /// By default, the Exception is instance of `get_class()`, the code is
     /// `get_code` and message is `get_message`;
-    fn to_object(&mut self) -> result::Result<EBox<ZObj>, Box<dyn Throwable>> {
-        let mut object = EBox::<ZObj>::new(self.get_class(), [])
-            .map_err(|e| Box::new(e) as Box<dyn Throwable>)?;
+    fn to_object(&mut self) -> result::Result<ZObject, Box<dyn Throwable>> {
+        let mut object =
+            ZObject::new(self.get_class(), []).map_err(|e| Box::new(e) as Box<dyn Throwable>)?;
         if let Some(code) = self.get_code() {
             object.set_property("code", code);
         }
@@ -133,8 +131,7 @@ impl<T: Throwable> Throwable for Box<T> {
         Throwable::get_message(self.deref())
     }
 
-    #[allow(deprecated)]
-    fn to_object(&mut self) -> result::Result<EBox<ZObj>, Box<dyn Throwable>> {
+    fn to_object(&mut self) -> result::Result<ZObject, Box<dyn Throwable>> {
         Throwable::to_object(self.deref_mut())
     }
 }
@@ -158,8 +155,7 @@ impl Throwable for Infallible {
         match *self {}
     }
 
-    #[allow(deprecated)]
-    fn to_object(&mut self) -> result::Result<EBox<ZObj>, Box<dyn Throwable>> {
+    fn to_object(&mut self) -> result::Result<ZObject, Box<dyn Throwable>> {
         match *self {}
     }
 }
@@ -278,7 +274,7 @@ impl Throwable for Error {
         }
     }
 
-    fn to_object(&mut self) -> result::Result<EBox<ZObj>, Box<dyn Throwable>> {
+    fn to_object(&mut self) -> result::Result<ZObject, Box<dyn Throwable>> {
         match self {
             Error::Io(e) => Throwable::to_object(e as &mut dyn error::Error),
             Error::Utf8(e) => Throwable::to_object(e as &mut dyn error::Error),
@@ -296,13 +292,13 @@ impl Throwable for Error {
 
 /// Wrapper of Throwable object.
 #[derive(Debug)]
-pub struct ThrowObject(EBox<ZObj>);
+pub struct ThrowObject(ZObject);
 
 impl ThrowObject {
     /// Construct from Throwable object.
     ///
     /// Failed if the object is not instance of php `Throwable`.
-    pub fn new(obj: EBox<ZObj>) -> result::Result<Self, NotImplementThrowableError> {
+    pub fn new(obj: ZObject) -> result::Result<Self, NotImplementThrowableError> {
         if !obj.get_class().is_instance_of(throwable_class()) {
             return Err(NotImplementThrowableError);
         }
@@ -322,7 +318,7 @@ impl ThrowObject {
         Self::from_result(Throwable::to_object(e))
     }
 
-    fn from_result(mut result: result::Result<EBox<ZObj>, Box<dyn Throwable>>) -> Self {
+    fn from_result(mut result: result::Result<ZObject, Box<dyn Throwable>>) -> Self {
         let mut i = 0;
 
         let obj = loop {
@@ -343,7 +339,7 @@ impl ThrowObject {
 
     /// Consumes the `ThrowObject`, returning the wrapped object.
     #[inline]
-    pub fn into_inner(self) -> EBox<ZObj> {
+    pub fn into_inner(self) -> ZObject {
         self.0
     }
 
@@ -390,7 +386,7 @@ impl Throwable for ThrowObject {
     }
 
     #[inline]
-    fn to_object(&mut self) -> result::Result<EBox<ZObj>, Box<dyn Throwable>> {
+    fn to_object(&mut self) -> result::Result<ZObject, Box<dyn Throwable>> {
         Ok(self.0.to_ref_owned())
     }
 }