Add http-client example.

Author: jmjoy

.gitignore

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

Cargo.toml

@@ -10,5 +10,5 @@ members = [
     # internal
     "examples/hello",
     "examples/log",
-#    "examples/mini-curl",
+    "examples/http-client",
 ]

examples/http-client/Cargo.toml

@@ -0,0 +1,18 @@
+[package]
+name = "mini-curl"
+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]
+phper = { version = "0.2.0-alpha.2", path = "../../phper" }
+
+[dev-dependencies]
+phper-test = { version = "0.2.0-alpha.2", path = "../../phper-test" }

examples/http-client/src/lib.rs

@@ -0,0 +1,14 @@
+use phper::{modules::Module, php_get_module};
+
+#[php_get_module]
+pub fn get_module() -> Module {
+    let mut module = Module::new(
+        env!("CARGO_PKG_NAME"),
+        env!("CARGO_PKG_VERSION"),
+        env!("CARGO_PKG_AUTHORS"),
+    );
+
+    // ...
+
+    module
+}

examples/http-client/src/main.rs

@@ -0,0 +1,5 @@
+use phper::cmd::make;
+
+fn main() {
+    make();
+}

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

@@ -0,0 +1,7 @@
+<?php
+
+ini_set("display_errors", "On");
+ini_set("display_startup_errors", "On");
+error_reporting(E_ALL);
+
+phpinfo();

examples/log/tests/integration.rs

@@ -1,6 +1,5 @@
 use phper_test::test_php_scripts_with_condition;
-use std::{env, path::Path, str};
-use std::process::Output;
+use std::{env, path::Path, process::Output, str};
 
 #[test]
 fn test_php() {
@@ -11,48 +10,33 @@ fn test_php() {
     test_php_scripts_with_condition(
         env!("CARGO_BIN_EXE_log"),
         &[
-            (
-                &base_dir.join("test_php_say.php"),
-                &|output| {
-                    let stdout = str::from_utf8(&output.stdout).unwrap();
-                    stdout == "Hello, world!" && output.status.success()
-                },
-            ),
-            (
-                &base_dir.join("test_php_notice.php"),
-                &|output| {
-                    let stdout = str::from_utf8(&output.stdout).unwrap();
-                    stdout.contains("Notice:")
-                        && stdout.contains("Something happened: just for test")
-                        && output.status.success()
-                },
-            ),
-            (
-                &base_dir.join("test_php_warning.php"),
-                &|output| {
-                    let stdout = str::from_utf8(&output.stdout).unwrap();
-                    stdout.contains("Warning:")
-                        && stdout.contains("Something warning: just for test")
-                        && output.status.success()
-                },
-            ),
-            (
-                &base_dir.join("test_php_error.php"),
-                &|output| {
-                    let stdout = str::from_utf8(&output.stdout).unwrap();
-                    stdout.contains("Fatal error:")
-                        && stdout.contains("Something gone failed: just for test")
-                },
-            ),
-            (
-                &base_dir.join("test_php_deprecated.php"),
-                &|output| {
-                    let stdout = str::from_utf8(&output.stdout).unwrap();
-                    stdout.contains("Deprecated:")
-                        && stdout.contains("Something deprecated: just for test")
-                        && output.status.success()
-                },
-            ),
+            (&base_dir.join("test_php_say.php"), &|output| {
+                let stdout = str::from_utf8(&output.stdout).unwrap();
+                stdout == "Hello, world!" && output.status.success()
+            }),
+            (&base_dir.join("test_php_notice.php"), &|output| {
+                let stdout = str::from_utf8(&output.stdout).unwrap();
+                stdout.contains("Notice:")
+                    && stdout.contains("Something happened: just for test")
+                    && output.status.success()
+            }),
+            (&base_dir.join("test_php_warning.php"), &|output| {
+                let stdout = str::from_utf8(&output.stdout).unwrap();
+                stdout.contains("Warning:")
+                    && stdout.contains("Something warning: just for test")
+                    && output.status.success()
+            }),
+            (&base_dir.join("test_php_error.php"), &|output| {
+                let stdout = str::from_utf8(&output.stdout).unwrap();
+                stdout.contains("Fatal error:")
+                    && stdout.contains("Something gone failed: just for test")
+            }),
+            (&base_dir.join("test_php_deprecated.php"), &|output| {
+                let stdout = str::from_utf8(&output.stdout).unwrap();
+                stdout.contains("Deprecated:")
+                    && stdout.contains("Something deprecated: just for test")
+                    && output.status.success()
+            }),
         ],
     );
 }

phper-macros/src/lib.rs

@@ -51,14 +51,18 @@ pub fn c_str_ptr(input: TokenStream) -> TokenStream {
 /// use phper::{php_get_module, modules::Module};
 ///
 /// #[php_get_module]
-/// pub fn get_module(module: &mut Module) {
-///     // set module metadata
-///     module.set_name(env!("CARGO_PKG_NAME"));
-///     module.set_version(env!("CARGO_PKG_VERSION"));
-///     module.set_author(env!("CARGO_PKG_AUTHORS"));
+/// pub fn get_module() -> Module {
+///     let mut module = Module::new(
+///         env!("CARGO_PKG_NAME"),
+///         env!("CARGO_PKG_VERSION"),
+///         env!("CARGO_PKG_AUTHORS"),
+///     );
 ///
 ///     // ...
+///
+///     module
 /// }
+///
 /// ```
 #[proc_macro_attribute]
 pub fn php_get_module(attr: TokenStream, input: TokenStream) -> TokenStream {

phper/src/cmd.rs

@@ -35,6 +35,7 @@ pub fn try_make() -> crate::Result<()> {
             let extension_dir = CStr::from_bytes_with_nul(PHP_EXTENSION_DIR)?.to_str()?;
             println!("Installing shared extensions:     {}", extension_dir);
             let ext_path = Path::new(extension_dir).join(ext_name);
+            fs::create_dir_all(extension_dir)?;
             fs::copy(lib_path, ext_path)?;
         }
     }
@@ -52,7 +53,11 @@ fn get_lib_path_and_ext_name() -> crate::Result<(PathBuf, OsString)> {
 
     let mut exe_name = OsString::new();
     exe_name.push("lib");
-    exe_name.push(exe_stem);
+    let lib_stem = exe_stem
+        .to_str()
+        .context("failed to generate target lib name")?
+        .replace("-", "_");
+    exe_name.push(lib_stem);
     exe_name.push(".so");
 
     let mut ext_name = OsString::new();