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

Author: jmjoy

Cargo.toml

@@ -10,6 +10,7 @@ members = [
     # internal
     "examples/hello",
     "examples/http-client",
+    "examples/http-server",
     "examples/logging",
     "tests/integration",
 ]

examples/http-client/README.md

@@ -1,4 +1,4 @@
-# hello
+# http-client
 
 Http client example.
 

examples/http-client/src/client.rs

@@ -22,11 +22,11 @@ pub fn make_client_builder_class() -> DynamicClass<ClientBuilder> {
         Visibility::Public,
         |this, arguments| {
             let ms = arguments[0].as_long()?;
-            let state = this.as_mut_state();
-            replace_and_set(state, ClientBuilder::new(), |builder| {
+            let state: &mut ClientBuilder = this.as_mut_state();
+            replace_and_set(state, |builder| {
                 builder.timeout(Duration::from_millis(ms as u64))
             });
-            Ok::<_, HttpClientError>(())
+            Ok::<_, HttpClientError>(this.duplicate())
         },
         vec![Argument::by_val("ms")],
     );
@@ -37,10 +37,8 @@ pub fn make_client_builder_class() -> DynamicClass<ClientBuilder> {
         |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>(())
+            replace_and_set(state, |builder| builder.cookie_store(enable));
+            Ok::<_, HttpClientError>(this.duplicate())
         },
         vec![Argument::by_val("enable")],
     );
@@ -50,7 +48,7 @@ pub fn make_client_builder_class() -> DynamicClass<ClientBuilder> {
         Visibility::Public,
         |this, _arguments| {
             let state = this.as_mut_state();
-            let client = replace_and_get(state, ClientBuilder::new(), ClientBuilder::build)?;
+            let client = replace_and_get(state, ClientBuilder::build)?;
             let mut object = ClassEntry::<Option<Client>>::from_globals(HTTP_CLIENT_CLASS_NAME)?
                 .init_object()?;
             *object.as_mut_state() = Some(client);
@@ -63,7 +61,7 @@ pub fn make_client_builder_class() -> DynamicClass<ClientBuilder> {
 }
 
 pub fn make_client_class() -> DynamicClass<Option<Client>> {
-    let mut class = DynamicClass::new_with_none(HTTP_CLIENT_CLASS_NAME);
+    let mut class = DynamicClass::new_with_default(HTTP_CLIENT_CLASS_NAME);
 
     class.add_method(
         "__construct",

examples/http-client/src/request.rs

@@ -8,7 +8,7 @@ use reqwest::blocking::{RequestBuilder, Response};
 pub const REQUEST_BUILDER_CLASS_NAME: &'static str = "HttpClient\\RequestBuilder";
 
 pub fn make_request_builder_class() -> DynamicClass<Option<RequestBuilder>> {
-    let mut class = DynamicClass::new_with_none(REQUEST_BUILDER_CLASS_NAME);
+    let mut class = DynamicClass::new_with_default(REQUEST_BUILDER_CLASS_NAME);
 
     class.add_method(
         "__construct",
@@ -22,7 +22,7 @@ pub fn make_request_builder_class() -> DynamicClass<Option<RequestBuilder>> {
         Visibility::Public,
         |this, _arguments| {
             let state = this.as_mut_state();
-            let response = replace_and_get(state, None, |builder| builder.unwrap().send())?;
+            let response = replace_and_get(state, |builder| builder.unwrap().send())?;
             let mut object =
                 ClassEntry::<Option<Response>>::from_globals(RESPONSE_CLASS_NAME)?.init_object()?;
             *object.as_mut_state() = Some(response);

examples/http-client/src/response.rs

@@ -9,14 +9,14 @@ use reqwest::blocking::Response;
 pub const RESPONSE_CLASS_NAME: &'static str = "HttpClient\\Response";
 
 pub fn make_response_class() -> DynamicClass<Option<Response>> {
-    let mut class = DynamicClass::new_with_none(RESPONSE_CLASS_NAME);
+    let mut class = DynamicClass::new_with_default(RESPONSE_CLASS_NAME);
 
     class.add_method(
         "body",
         Visibility::Public,
         |this: &mut Object<Option<Response>>, _arguments| {
             let response = this.as_mut_state();
-            let body = replace_and_get(response, None, |response| {
+            let body = replace_and_get(response, |response| {
                 response
                     .ok_or(HttpClientError::ResponseHadRead)
                     .and_then(|response| response.bytes().map_err(Into::into))

examples/http-client/src/utils.rs

@@ -1,10 +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));
+pub fn replace_and_set<T: Default>(t: &mut T, f: impl FnOnce(T) -> T) {
+    let x = f(replace(t, Default::default()));
     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))
+pub fn replace_and_get<T: Default, R>(t: &mut T, f: impl FnOnce(T) -> R) -> R {
+    f(replace(t, Default::default()))
 }

examples/http-client/tests/php/test.php

@@ -8,13 +8,12 @@
 ini_set("display_startup_errors", "On");
 error_reporting(E_ALL);
 
-$client_builder = new HttpClientBuilder();
-$client_builder->timeout(15000);
-$client_builder->cookie_store(true);
-$client = $client_builder->build();
+$client = (new HttpClientBuilder())
+    ->timeout(15000)
+    ->cookie_store(true)
+    ->build();
 
-$request_builder = $client->get("https://httpbin.org/ip");
-$response = $request_builder->send();
+$response = $client->get("https://httpbin.org/ip")->send();
 var_dump([
     "status" => $response->status(),
     "headers" => $response->headers(),

examples/http-server/Cargo.toml

@@ -0,0 +1,22 @@
+[package]
+name = "http-server"
+version = "0.0.0"
+authors = ["jmjoy <[email protected]>"]
+edition = "2018"
+publish = false
+license = "Unlicense"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+hyper = { version = "0.14.8", features = ["http1", "runtime", "server"] }
+phper = { version = "0.2.0", path = "../../phper" }
+thiserror = "1.0.24"
+tokio = { version = "1.6.0", features = ["full"] }
+
+[dev-dependencies]
+phper-test = { version = "0.2.0", path = "../../phper-test" }
+reqwest = "0.11.3"

examples/http-server/LICENSE

@@ -0,0 +1 @@
+../../LICENSE

examples/http-server/README.md

@@ -0,0 +1,32 @@
+# http-server
+
+Http server example.
+
+## Environment
+
+```bash
+# Specify if php isn't installed globally.
+export PHP_CONFIG = <Your path of php-config>
+```
+
+## Build
+
+```bash
+cargo build --release
+```
+
+## Test
+
+```bash
+cargo test --release
+```
+
+## Install
+
+```bash
+cargo run --release -- install
+```
+
+## License
+
+[Unlicense](https://github.com/jmjoy/phper/blob/master/LICENSE).