Format codes.

Author: jmjoy

examples/http-client/src/client.rs

@@ -2,13 +2,12 @@ use crate::{
     errors::HttpClientError,
     response::{ReadiedResponse, RESPONSE_CLASS_NAME},
 };
-use anyhow::Context;
+
 use phper::{classes::DynamicClass, functions::Argument, objects::Object};
 use reqwest::{
     blocking::{Client, ClientBuilder},
-    Response,
 };
-use std::{mem::MaybeUninit, time::Duration};
+use std::{time::Duration};
 
 const HTTP_CLIENT_CLASS_NAME: &'static str = "HttpClient\\HttpClient";
 

examples/http-client/src/errors.rs

@@ -1,6 +1,6 @@
 use phper::{
     classes::{ClassEntry, DynamicClass, StatelessClassEntry},
-    errors::{Error::ClassNotFound, Throwable},
+    errors::{Throwable},
 };
 
 const EXCEPTION_CLASS_NAME: &'static str = "HttpClient\\HttpClientException";

examples/http-client/src/lib.rs

@@ -1,8 +1,7 @@
 use crate::{
     client::make_client_class, errors::make_exception_class, response::make_response_class,
 };
-use anyhow::Context;
-use phper::{classes::DynamicClass, modules::Module, php_get_module};
+use phper::{modules::Module, php_get_module};
 
 pub mod client;
 pub mod errors;

examples/http-client/src/response.rs

@@ -1,11 +1,9 @@
 use bytes::Bytes;
 use indexmap::map::IndexMap;
-use phper::{arrays::Array, classes::DynamicClass};
-use reqwest::{blocking::Response, header::HeaderMap, StatusCode};
+use phper::{classes::DynamicClass};
+use reqwest::{header::HeaderMap, StatusCode};
 use std::{
-    collections::BTreeMap,
     convert::Infallible,
-    mem::{zeroed, MaybeUninit},
     net::SocketAddr,
 };
 
@@ -19,13 +17,13 @@ pub struct ReadiedResponse {
 }
 
 pub fn make_response_class() -> DynamicClass<Option<ReadiedResponse>> {
-    let mut class = DynamicClass::new_with_constructor(RESPONSE_CLASS_NAME, || unsafe {
+    let mut class = DynamicClass::new_with_constructor(RESPONSE_CLASS_NAME, || {
         Ok::<Option<ReadiedResponse>, Infallible>(None)
     });
 
     class.add_method(
         "body",
-        |this, arguments| {
+        |this, _arguments| {
             let readied_response = this.as_state().as_ref().unwrap();
             let body: &[u8] = readied_response.body.as_ref();
             body.to_vec()
@@ -35,7 +33,7 @@ pub fn make_response_class() -> DynamicClass<Option<ReadiedResponse>> {
 
     class.add_method(
         "status",
-        |this, arguments| {
+        |this, _arguments| {
             let readied_response = this.as_state().as_ref().unwrap();
             readied_response.status.as_u16() as i64
         },
@@ -44,7 +42,7 @@ pub fn make_response_class() -> DynamicClass<Option<ReadiedResponse>> {
 
     class.add_method(
         "headers",
-        |this, arguments| {
+        |this, _arguments| {
             let readied_response = this.as_state().as_ref().unwrap();
             let headers_map =
                 readied_response

phper-test/src/lib.rs

@@ -89,7 +89,7 @@ pub fn test_php_scripts_with_condition(
         }
 
         println!(
-            "===== command =====\n{} {}\n\n===== stdout =====\n{}\n\n===== stderr =====\n{}\n",
+            "===== command =====\n{} {}\n===== stdout ======\n{}\n===== stderr ======\n{}",
             &context.php_bin,
             args.join(" "),
             stdout,

phper/src/classes.rs

@@ -1,5 +1,6 @@
 //! Apis relate to [crate::sys::zend_class_entry].
 
+use crate::alloc::EBox;
 use once_cell::sync::OnceCell;
 use std::{
     any::Any,
@@ -14,8 +15,6 @@ use std::{
     },
 };
 
-use phper_alloc::EBox;
-
 use crate::{
     errors::{ClassNotFoundError, StateTypeError, Throwable},
     functions::{Argument, FunctionEntity, FunctionEntry, Method},
@@ -25,7 +24,7 @@ use crate::{
     values::{SetVal, Val},
 };
 use dashmap::DashMap;
-use std::{any::TypeId, iter::Once};
+use std::{any::TypeId};
 
 pub trait Classifiable {
     fn state_constructor(&self) -> Box<StateConstructor<Box<dyn Any>>>;
@@ -71,7 +70,7 @@ impl<T: Send + Sync + 'static> DynamicClass<T> {
         F: Fn() -> Result<T, E> + Send + Sync + 'static,
         E: Throwable + 'static,
     {
-        let mut dyn_class = Self {
+        let dyn_class = Self {
             class_name: class_name.to_string(),
             state_constructor: Arc::new(move || state_constructor().map_err(|e| Box::new(e) as _)),
             method_entities: Vec::new(),
@@ -156,7 +155,7 @@ impl<T: 'static> ClassEntry<T> {
                 crate::Error::ClassNotFound(ClassNotFoundError::new(name.to_string()))
             })
         };
-        Self::check_type_id(ptr);
+        Self::check_type_id(ptr)?;
         r
     }
 
@@ -189,7 +188,11 @@ impl<T: 'static> ClassEntry<T> {
 
     pub fn create_object(&self) -> EBox<Object<T>> {
         unsafe {
-            let f = self.inner.__bindgen_anon_2.create_object.unwrap();
+            let f = self
+                .inner
+                .__bindgen_anon_2
+                .create_object
+                .unwrap_or(zend_objects_new);
             let object = f(self.as_ptr() as *mut _);
             EBox::from_raw(object.cast())
         }
@@ -244,7 +247,7 @@ impl ClassEntity {
             }
             None => zend_register_internal_class(&mut class_ce).cast(),
         };
-        // self.entry.store(class, Ordering::SeqCst);
+        self.entry.store(class.cast(), Ordering::SeqCst);
 
         (*class).inner.__bindgen_anon_2.create_object = Some(create_object);
 

phper/src/errors.rs

@@ -7,7 +7,7 @@ use crate::{
 };
 use anyhow::anyhow;
 use std::{
-    any::TypeId, convert::Infallible, error, ffi::FromBytesWithNulError, io, str::Utf8Error,
+    convert::Infallible, error, ffi::FromBytesWithNulError, io, str::Utf8Error,
 };
 
 /// PHP Throwable, can cause throwing an exception when setting to [crate::values::Val].
@@ -55,6 +55,9 @@ pub enum Error {
     #[error(transparent)]
     ArgumentCount(#[from] ArgumentCountError),
 
+    #[error(transparent)]
+    StateType(#[from] StateTypeError),
+
     #[error(transparent)]
     Other(#[from] anyhow::Error),
 }

phper/src/objects.rs

@@ -3,7 +3,6 @@
 use crate::{
     alloc::{EAllocatable, EBox},
     classes::ClassEntry,
-    errors::ClassNotFoundError,
     sys::*,
     values::Val,
 };
@@ -148,8 +147,12 @@ impl Object<()> {
 impl<T> EAllocatable for Object<T> {
     fn free(ptr: *mut Self) {
         unsafe {
-            zend_objects_store_call_destructors(ptr.cast());
-            zend_objects_store_free_object_storage(ptr.cast(), true.into());
+            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());
         }
     }
 }

phper/src/strings.rs

@@ -7,6 +7,7 @@ use crate::{
 use std::{os::raw::c_char, slice::from_raw_parts, str, str::Utf8Error};
 
 /// Wrapper of [crate::sys::zend_string].
+/// TODO Refactor to ZendString(EBox<zend_string>).
 #[repr(transparent)]
 pub struct ZendString {
     inner: zend_string,

phper/src/values.rs

@@ -294,10 +294,8 @@ impl SetVal for &str {
 
 impl SetVal for String {
     fn set_val(self, val: &mut Val) {
-        unsafe {
             let s: &str = &self;
             SetVal::set_val(s, val)
-        }
     }
 }
 
@@ -312,10 +310,8 @@ impl SetVal for &[u8] {
 
 impl SetVal for Vec<u8> {
     fn set_val(self, val: &mut Val) {
-        unsafe {
             let v: &[u8] = &self;
             SetVal::set_val(v, val)
-        }
     }
 }