Merge pull request #14 from jmjoy/0.2.0-alpha.3-dev

Author: jmjoy

.github/workflows/ci.yml

@@ -7,10 +7,11 @@ on:
     branches: [ "**" ]
 
 env:
-  #  RUST_LOG: debug
+  RUST_LOG: debug
   CARGO_TERM_COLOR: always
-  RUST_BACKTRACE: 1
+  RUST_BACKTRACE: "1"
   RUSTFLAGS: "-D warnings"
+  LLVM_CONFIG_PATH: llvm-config-10
 
 jobs:
   ci:
@@ -33,6 +34,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
+      - name: Install libclang
+        run: sudo apt-get install -y llvm-10-dev libclang-10-dev
+
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:

.gitignore

@@ -3,4 +3,4 @@
 Cargo.lock
 /.cargo
 /vendor
-/core
+core

README.md

@@ -53,7 +53,7 @@ A library that allows us to write PHP extensions using pure Rust and using safe
 
 ```bash
 # If you are using debian like linux system:
-sudo apt install libclang-10-dev php-cli
+sudo apt install llvm-10-dev libclang-10-dev php-cli
 ```
 
 2. Create you cargo project, suppose your application is called myapp.

examples/hello/Cargo.toml

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

examples/hello/src/lib.rs

@@ -1,8 +1,8 @@
 use phper::{
     arrays::Array,
-    classes::DynamicClass,
+    classes::{DynamicClass, Visibility},
     functions::Argument,
-    ini::Policy,
+    ini::{Ini, Policy},
     modules::{Module, ModuleArgs},
     objects::Object,
     php_get_module,
@@ -31,10 +31,10 @@ pub fn get_module() -> Module {
     );
 
     // register module ini
-    module.add_bool_ini("hello.enable", false, Policy::All);
-    module.add_long_ini("hello.num", 100, Policy::All);
-    module.add_real_ini("hello.ratio", 1.5, Policy::All);
-    module.add_str_ini("hello.description", "hello world.", Policy::All);
+    Ini::add("hello.enable", false, Policy::All);
+    Ini::add("hello.num", 100, Policy::All);
+    Ini::add("hello.ratio", 1.5, Policy::All);
+    Ini::add("hello.description", "hello world.".to_owned(), Policy::All);
 
     // register hook functions
     module.on_module_init(module_init);
@@ -50,10 +50,10 @@ pub fn get_module() -> Module {
         |_: &mut [Val]| {
             let mut arr = Array::new();
 
-            let hello_enable = Val::new(Module::get_bool_ini("hello.enable"));
+            let hello_enable = Val::new(Ini::get::<bool>("hello.enable"));
             arr.insert("hello.enable", hello_enable);
 
-            let hello_description = Val::new(Module::get_str_ini("hello.description"));
+            let hello_description = Val::new(Ini::get::<String>("hello.description"));
             arr.insert("hello.description", hello_description);
 
             arr
@@ -63,17 +63,19 @@ pub fn get_module() -> Module {
 
     // register classes
     let mut foo_class = DynamicClass::new("FooClass");
-    foo_class.add_property("foo", "100".to_string());
+    foo_class.add_property("foo", Visibility::Private, 100);
     foo_class.add_method(
         "getFoo",
-        |this: &mut Object<()>, _: &mut [Val]| -> phper::Result<Val> {
+        Visibility::Public,
+        |this: &mut Object<()>, _: &mut [Val]| {
             let prop = this.get_property("foo");
-            Ok(Val::new(prop.as_string_value()?))
+            Ok::<_, phper::Error>(prop.as_string_value()?)
         },
         vec![],
     );
     foo_class.add_method(
         "setFoo",
+        Visibility::Public,
         |this: &mut Object<()>, arguments: &mut [Val]| -> phper::Result<()> {
             this.set_property("foo", Val::new(arguments[0].as_string_value()?));
             Ok(())

examples/hello/tests/php/test.php

@@ -18,8 +18,7 @@
 ]);
 
 $foo = new FooClass();
-// TODO change '100' to 100.
-assert_eq($foo->getFoo(), '100');
+assert_eq($foo->getFoo(), "100");
 
 $foo->setFoo("Hello");
 assert_eq($foo->getFoo(), "Hello");

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.2", path = "../../phper" }
-reqwest = { version = "0.11.3", features = ["blocking"] }
+phper = { version = "0.2.0-alpha.3", path = "../../phper" }
+reqwest = { version = "0.11.3", features = ["blocking", "cookies"] }
 thiserror = "1.0.24"
 
 [dev-dependencies]
-phper-test = { version = "0.2.0-alpha.2", path = "../../phper-test" }
+phper-test = { version = "0.2.0-alpha.3", path = "../../phper-test" }

examples/http-client/src/client.rs

@@ -1,41 +1,103 @@
 use crate::{
-    errors::HttpClientError,
-    response::{ReadiedResponse, RESPONSE_CLASS_NAME},
+    errors::HttpClientError, replace_and_get, replace_and_set, request::REQUEST_BUILDER_CLASS_NAME,
 };
-
-use phper::{classes::DynamicClass, functions::Argument, objects::Object};
-use reqwest::blocking::{Client, ClientBuilder};
+use phper::{
+    classes::{ClassEntry, DynamicClass, Visibility},
+    functions::Argument,
+    objects::Object,
+};
+use reqwest::blocking::{Client, ClientBuilder, RequestBuilder};
 use std::time::Duration;
 
+const HTTP_CLIENT_BUILDER_CLASS_NAME: &'static str = "HttpClient\\HttpClientBuilder";
 const HTTP_CLIENT_CLASS_NAME: &'static str = "HttpClient\\HttpClient";
 
-pub fn make_client_class() -> DynamicClass<Client> {
-    let mut class = DynamicClass::new_with_constructor(HTTP_CLIENT_CLASS_NAME, || {
-        let client = ClientBuilder::new()
-            .timeout(Duration::from_secs(15))
-            .build()?;
-        Ok::<_, HttpClientError>(client)
-    });
+pub fn make_client_builder_class() -> DynamicClass<ClientBuilder> {
+    let mut class = DynamicClass::new_with_default(HTTP_CLIENT_BUILDER_CLASS_NAME);
 
     class.add_method(
-        "get",
+        "timeout",
+        Visibility::Public,
         |this, arguments| {
-            let url = arguments[0].as_string()?;
-            let client = this.as_state();
-            let response = client.get(url).send()?;
+            let ms = arguments[0].as_long()?;
+            let state = this.as_mut_state();
+            replace_and_set(state, ClientBuilder::new(), |builder| {
+                builder.timeout(Duration::from_millis(ms as u64))
+            });
+            Ok::<_, HttpClientError>(())
+        },
+        vec![Argument::by_val("ms")],
+    );
+
+    class.add_method(
+        "cookie_store",
+        Visibility::Public,
+        |this, arguments| {
+            let enable = arguments[0].as_bool()?;
+            let state = this.as_mut_state();
+            replace_and_set(state, ClientBuilder::new(), |builder| {
+                builder.cookie_store(enable)
+            });
+            Ok::<_, HttpClientError>(())
+        },
+        vec![Argument::by_val("enable")],
+    );
 
-            let readied_response = ReadiedResponse {
-                status: response.status(),
-                remote_addr: response.remote_addr(),
-                headers: response.headers().clone(),
-                body: response.bytes()?,
-            };
+    class.add_method(
+        "build",
+        Visibility::Public,
+        |this, _arguments| {
+            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();
+            *object.as_mut_state() = Some(client);
+            Ok::<_, HttpClientError>(object)
+        },
+        vec![],
+    );
 
-            let mut response_object =
-                Object::<Option<ReadiedResponse>>::new_by_class_name(RESPONSE_CLASS_NAME)?;
-            *response_object.as_mut_state() = Some(readied_response);
+    class
+}
 
-            Ok::<_, HttpClientError>(response_object)
+pub fn make_client_class() -> DynamicClass<Option<Client>> {
+    let mut class = DynamicClass::new_with_none(HTTP_CLIENT_CLASS_NAME);
+
+    class.add_method(
+        "__construct",
+        Visibility::Private,
+        |_: &mut Object<Option<Client>>, _| {},
+        vec![],
+    );
+
+    class.add_method(
+        "get",
+        Visibility::Public,
+        |this, arguments| {
+            let url = arguments[0].as_string()?;
+            let client = this.as_state().as_ref().unwrap();
+            let request_builder = client.get(url);
+            let mut object =
+                ClassEntry::<Option<RequestBuilder>>::from_globals(REQUEST_BUILDER_CLASS_NAME)?
+                    .new_object();
+            *object.as_mut_state() = Some(request_builder);
+            Ok::<_, HttpClientError>(object)
+        },
+        vec![Argument::by_val("url")],
+    );
+
+    class.add_method(
+        "post",
+        Visibility::Public,
+        |this, arguments| {
+            let url = arguments[0].as_string()?;
+            let client = this.as_state().as_ref().unwrap();
+            let request_builder = client.post(url);
+            let mut object =
+                ClassEntry::<Option<RequestBuilder>>::from_globals(REQUEST_BUILDER_CLASS_NAME)?
+                    .new_object();
+            *object.as_mut_state() = Some(request_builder);
+            Ok::<_, HttpClientError>(object)
         },
         vec![Argument::by_val("url")],
     );

examples/http-client/src/errors.rs

@@ -12,11 +12,20 @@ pub enum HttpClientError {
 
     #[error(transparent)]
     Reqwest(#[from] reqwest::Error),
+
+    #[error("should call '{method_name}()' before call 'body()'")]
+    ResponseAfterRead { method_name: String },
+
+    #[error("should not call 'body()' multi time")]
+    ResponseHadRead,
 }
 
 impl Throwable for HttpClientError {
     fn class_entry(&self) -> &StatelessClassEntry {
-        ClassEntry::from_globals(EXCEPTION_CLASS_NAME).unwrap()
+        match self {
+            HttpClientError::Phper(e) => e.class_entry(),
+            _ => ClassEntry::from_globals(EXCEPTION_CLASS_NAME).unwrap(),
+        }
     }
 }
 

examples/http-client/src/lib.rs

@@ -1,10 +1,15 @@
 use crate::{
-    client::make_client_class, errors::make_exception_class, response::make_response_class,
+    client::{make_client_builder_class, make_client_class},
+    errors::make_exception_class,
+    request::make_request_builder_class,
+    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;
 
 #[php_get_module]
@@ -15,9 +20,20 @@ pub fn get_module() -> Module {
         env!("CARGO_PKG_AUTHORS"),
     );
 
-    module.add_class(make_client_class());
     module.add_class(make_exception_class());
+    module.add_class(make_client_class());
+    module.add_class(make_client_builder_class());
+    module.add_class(make_request_builder_class());
     module.add_class(make_response_class());
 
     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))
+}