Merge pull request #20 from jmjoy/0.2.x-dev

Author: jmjoy

examples/hello/Cargo.toml

@@ -12,10 +12,10 @@ license = "Unlicense"
 crate-type = ["cdylib"]
 
 [dependencies]
-phper = { version = "0.2.0-alpha.3", path = "../../phper" }
+phper = { version = "0.2.0", path = "../../phper" }
 
 [dev-dependencies]
-phper-test = { version = "0.2.0-alpha.3", path = "../../phper-test" }
+phper-test = { version = "0.2.0", path = "../../phper-test" }
 
 [build-dependencies]
-phper-build = { version = "0.2.0-alpha.3", path = "../../phper-build" }
+phper-build = { version = "0.2.0", path = "../../phper-build" }

examples/http-client/Cargo.toml

@@ -15,9 +15,9 @@ crate-type = ["cdylib"]
 anyhow = "1.0.40"
 bytes = "1.0.1"
 indexmap = "1.6.2"
-phper = { version = "0.2.0-alpha.3", path = "../../phper" }
+phper = { version = "0.2.0", path = "../../phper" }
 reqwest = { version = "0.11.3", features = ["blocking", "cookies"] }
 thiserror = "1.0.24"
 
 [dev-dependencies]
-phper-test = { version = "0.2.0-alpha.3", path = "../../phper-test" }
+phper-test = { version = "0.2.0", path = "../../phper-test" }

examples/http-client/src/client.rs

@@ -1,5 +1,7 @@
 use crate::{
-    errors::HttpClientError, replace_and_get, replace_and_set, request::REQUEST_BUILDER_CLASS_NAME,
+    errors::HttpClientError,
+    request::REQUEST_BUILDER_CLASS_NAME,
+    utils::{replace_and_get, replace_and_set},
 };
 use phper::{
     classes::{ClassEntry, DynamicClass, Visibility},
@@ -50,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)
         },
@@ -79,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)
         },
@@ -95,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/errors.rs

@@ -1,13 +1,12 @@
-use phper::{
-    classes::{ClassEntry, DynamicClass, StatelessClassEntry},
-    errors::Throwable,
-};
+use phper::classes::{ClassEntry, DynamicClass};
 
 const EXCEPTION_CLASS_NAME: &'static str = "HttpClient\\HttpClientException";
 
-#[derive(thiserror::Error, Debug)]
+#[derive(Debug, thiserror::Error, phper::Throwable)]
+#[throwable_class(EXCEPTION_CLASS_NAME)]
 pub enum HttpClientError {
     #[error(transparent)]
+    #[throwable(transparent)]
     Phper(#[from] phper::Error),
 
     #[error(transparent)]
@@ -20,15 +19,6 @@ pub enum HttpClientError {
     ResponseHadRead,
 }
 
-impl Throwable for HttpClientError {
-    fn class_entry(&self) -> &StatelessClassEntry {
-        match self {
-            HttpClientError::Phper(e) => e.class_entry(),
-            _ => ClassEntry::from_globals(EXCEPTION_CLASS_NAME).unwrap(),
-        }
-    }
-}
-
 pub fn make_exception_class() -> DynamicClass<()> {
     let mut exception_class = DynamicClass::new(EXCEPTION_CLASS_NAME);
     exception_class.extends("Exception");

examples/http-client/src/lib.rs

@@ -5,12 +5,12 @@ use crate::{
     response::make_response_class,
 };
 use phper::{modules::Module, php_get_module};
-use std::mem::replace;
 
 pub mod client;
 pub mod errors;
 pub mod request;
 pub mod response;
+pub mod utils;
 
 #[php_get_module]
 pub fn get_module() -> Module {
@@ -28,12 +28,3 @@ pub fn get_module() -> Module {
 
     module
 }
-
-fn replace_and_set<T>(t: &mut T, init: T, f: impl FnOnce(T) -> T) {
-    let x = f(replace(t, init));
-    let _ = replace(t, x);
-}
-
-fn replace_and_get<T, R>(t: &mut T, init: T, f: impl FnOnce(T) -> R) -> R {
-    f(replace(t, init))
-}

examples/http-client/src/request.rs

@@ -1,4 +1,4 @@
-use crate::{errors::HttpClientError, replace_and_get, response::RESPONSE_CLASS_NAME};
+use crate::{errors::HttpClientError, response::RESPONSE_CLASS_NAME, utils::replace_and_get};
 use phper::{
     classes::{ClassEntry, DynamicClass, Visibility},
     objects::Object,
@@ -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)
         },

examples/http-client/src/response.rs

@@ -1,4 +1,4 @@
-use crate::{errors::HttpClientError, replace_and_get};
+use crate::{errors::HttpClientError, utils::replace_and_get};
 use indexmap::map::IndexMap;
 use phper::{
     classes::{DynamicClass, Visibility},

examples/http-client/src/utils.rs

@@ -0,0 +1,10 @@
+use std::mem::replace;
+
+pub fn replace_and_set<T>(t: &mut T, init: T, f: impl FnOnce(T) -> T) {
+    let x = f(replace(t, init));
+    let _ = replace(t, x);
+}
+
+pub fn replace_and_get<T, R>(t: &mut T, init: T, f: impl FnOnce(T) -> R) -> R {
+    f(replace(t, init))
+}

examples/logging/Cargo.toml

@@ -12,10 +12,10 @@ license = "Unlicense"
 crate-type = ["cdylib"]
 
 [dependencies]
-phper = { version = "0.2.0-alpha.3", path = "../../phper" }
+phper = { version = "0.2.0", path = "../../phper" }
 
 [dev-dependencies]
-phper-test = { version = "0.2.0-alpha.3", path = "../../phper-test" }
+phper-test = { version = "0.2.0", path = "../../phper-test" }
 
 [build-dependencies]
-phper-build = { version = "0.2.0-alpha.3", path = "../../phper-build" }
+phper-build = { version = "0.2.0", path = "../../phper-build" }

phper-alloc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "phper-alloc"
-version = "0.2.0-alpha.3"
+version = "0.2.0"
 authors = ["jmjoy <[email protected]>"]
 edition = "2018"
 description = "Alloc related items for phper crate."
@@ -11,7 +11,7 @@ keywords = ["php", "alloc"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-phper-sys = { version = "0.2.0-alpha.3", path = "../phper-sys" }
+phper-sys = { version = "0.2.0", path = "../phper-sys" }
 
 [build-dependencies]
-phper-build = { version = "0.2.0-alpha.3", path = "../phper-build" }
+phper-build = { version = "0.2.0", path = "../phper-build" }