Remove cmd mod and adjust phper-test.

README.md

@@ -68,16 +68,6 @@ The framework that allows us to write PHP extensions using pure and safe Rust wh
    phper = "<LATEST VERSION>"
    ```
 
-1. Add these code to `main.rs`.
-
-   ```rust,no_run
-   use phper::cmd::make;
-
-   fn main() {
-       make();
-   }
-   ```
-
 1. Create the `build.rs` ( Adapting MacOS ).
 
    ```rust,no_run
@@ -98,7 +88,7 @@ The framework that allows us to write PHP extensions using pure and safe Rust wh
    #[php_get_module]
    pub fn get_module() -> Module {
        let mut module = Module::new(
-           env!("CARGO_PKG_NAME"),
+           env!("CARGO_CRATE_NAME"),
            env!("CARGO_PKG_VERSION"),
            env!("CARGO_PKG_AUTHORS"),
        );
@@ -119,10 +109,7 @@ The framework that allows us to write PHP extensions using pure and safe Rust wh
    cargo build --release
 
    # Install to php extension path.
-   cargo run --release -- install
-   # Or if you install php globally, you should use sudo.
-   # sudo ./target/release/myapp install
-
+   cp target/release/libmyapp.so `${PHP_CONFIG:=php-config} --extension-dir`
    ```
 
 1. Edit your `php.ini`, add the below line.

examples/hello/README.md

@@ -24,7 +24,7 @@ cargo test --release
 ## Install
 
 ```bash
-cargo run --release -- install
+cp target/release/libhello.so `${PHP_CONFIG:=php-config} --extension-dir`
 ```
 
 ## License

examples/hello/src/lib.rs

@@ -34,7 +34,7 @@ fn throw_exception(_: &mut [ZVal]) -> phper::Result<()> {
 #[php_get_module]
 pub fn get_module() -> Module {
     let mut module = Module::new(
-        env!("CARGO_PKG_NAME"),
+        env!("CARGO_CRATE_NAME"),
         env!("CARGO_PKG_VERSION"),
         env!("CARGO_PKG_AUTHORS"),
     );

examples/hello/tests/integration.rs

@@ -8,13 +8,22 @@
 // NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
 // See the Mulan PSL v2 for more details.
 
-use phper_test::{cli::test_php_scripts_with_lib, utils::get_lib_path};
-use std::{env, path::Path};
+use phper_test::{cli::test_php_scripts, utils::get_lib_path};
+use std::{
+    env,
+    path::{Path, PathBuf},
+};
 
 #[test]
 fn test_php() {
-    test_php_scripts_with_lib(
-        get_lib_path(env!("CARGO_BIN_EXE_hello")),
+    test_php_scripts(
+        get_lib_path(
+            PathBuf::from(env!("CARGO_MANIFEST_DIR"))
+                .join("..")
+                .join("..")
+                .join("target"),
+            "hello",
+        ),
         &[&Path::new(env!("CARGO_MANIFEST_DIR"))
             .join("tests")
             .join("php")

examples/http-client/README.md

@@ -26,7 +26,7 @@ cargo test --release
 ## Install
 
 ```bash
-cargo run --release -- install
+cp target/release/libhttp_client.so `${PHP_CONFIG:=php-config} --extension-dir`
 ```
 
 ## License

examples/http-client/src/lib.rs

@@ -25,7 +25,7 @@ pub mod utils;
 #[php_get_module]
 pub fn get_module() -> Module {
     let mut module = Module::new(
-        env!("CARGO_PKG_NAME"),
+        env!("CARGO_CRATE_NAME"),
         env!("CARGO_PKG_VERSION"),
         env!("CARGO_PKG_AUTHORS"),
     );

examples/http-client/tests/integration.rs

@@ -8,13 +8,22 @@
 // NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
 // See the Mulan PSL v2 for more details.
 
-use phper_test::{cli::test_php_scripts_with_lib, utils::get_lib_path};
-use std::{env, path::Path};
+use phper_test::{cli::test_php_scripts, utils::get_lib_path};
+use std::{
+    env,
+    path::{Path, PathBuf},
+};
 
 #[test]
 fn test_php() {
-    test_php_scripts_with_lib(
-        get_lib_path(env!("CARGO_BIN_EXE_http-client")),
+    test_php_scripts(
+        get_lib_path(
+            PathBuf::from(env!("CARGO_MANIFEST_DIR"))
+                .join("..")
+                .join("..")
+                .join("target"),
+            "http_client",
+        ),
         &[&Path::new(env!("CARGO_MANIFEST_DIR"))
             .join("tests")
             .join("php")

examples/http-server/README.md

@@ -26,7 +26,7 @@ cargo test --release
 ## Install
 
 ```bash
-cargo run --release -- install
+cp target/release/libhttp_server.so `${PHP_CONFIG:=php-config} --extension-dir`
 ```
 
 ## License

examples/http-server/src/lib.rs

@@ -25,7 +25,7 @@ pub mod utils;
 #[php_get_module]
 pub fn get_module() -> Module {
     let mut module = Module::new(
-        env!("CARGO_PKG_NAME"),
+        env!("CARGO_CRATE_NAME"),
         env!("CARGO_PKG_VERSION"),
         env!("CARGO_PKG_AUTHORS"),
     );

examples/http-server/tests/integration.rs

@@ -9,15 +9,26 @@
 // See the Mulan PSL v2 for more details.
 
 use hyper::header::CONTENT_TYPE;
-use phper_test::{cli::test_long_term_php_script_with_condition_and_lib, utils::get_lib_path};
+use phper_test::{cli::test_long_term_php_script_with_condition, utils::get_lib_path};
 use reqwest::Client;
-use std::{env, path::Path, thread::sleep, time::Duration};
+use std::{
+    env,
+    path::{Path, PathBuf},
+    thread::sleep,
+    time::Duration,
+};
 use tokio::runtime;
 
 #[test]
 fn test_php() {
-    test_long_term_php_script_with_condition_and_lib(
-        get_lib_path(env!("CARGO_BIN_EXE_http-server")),
+    test_long_term_php_script_with_condition(
+        get_lib_path(
+            PathBuf::from(env!("CARGO_MANIFEST_DIR"))
+                .join("..")
+                .join("..")
+                .join("target"),
+            "http_server",
+        ),
         Path::new(env!("CARGO_MANIFEST_DIR"))
             .join("tests")
             .join("php")

examples/logging/README.md

@@ -24,7 +24,7 @@ cargo test --release
 ## Install
 
 ```bash
-cargo run --release -- install
+cp target/release/liblogging.so `${PHP_CONFIG:=php-config} --extension-dir`
 ```
 
 ## License

examples/logging/src/lib.rs

@@ -17,7 +17,7 @@ use phper::{
 #[php_get_module]
 pub fn get_module() -> Module {
     let mut module = Module::new(
-        env!("CARGO_PKG_NAME"),
+        env!("CARGO_CRATE_NAME"),
         env!("CARGO_PKG_VERSION"),
         env!("CARGO_PKG_AUTHORS"),
     );

examples/logging/tests/integration.rs

@@ -8,17 +8,27 @@
 // NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
 // See the Mulan PSL v2 for more details.
 
-use phper_test::{cli::test_php_scripts_with_condition_and_lib, utils::get_lib_path};
-use std::{env, path::Path, str};
+use phper_test::{cli::test_php_scripts_with_condition, utils::get_lib_path};
+use std::{
+    env,
+    path::{Path, PathBuf},
+    str,
+};
 
 #[test]
 fn test_php() {
     let base_dir = Path::new(env!("CARGO_MANIFEST_DIR"))
         .join("tests")
         .join("php");
 
-    test_php_scripts_with_condition_and_lib(
-        get_lib_path(env!("CARGO_BIN_EXE_logging")),
+    test_php_scripts_with_condition(
+        get_lib_path(
+            PathBuf::from(env!("CARGO_MANIFEST_DIR"))
+                .join("..")
+                .join("..")
+                .join("target"),
+            "logging",
+        ),
         &[
             (&base_dir.join("test_php_say.php"), &|output| {
                 let stdout = str::from_utf8(&output.stdout).unwrap();

phper-macros/src/lib.rs

@@ -62,7 +62,7 @@ pub fn c_str_ptr(input: TokenStream) -> TokenStream {
 /// #[php_get_module]
 /// pub fn get_module() -> Module {
 ///     let mut module = Module::new(
-///         env!("CARGO_PKG_NAME"),
+///         env!("CARGO_CRATE_NAME"),
 ///         env!("CARGO_PKG_VERSION"),
 ///         env!("CARGO_PKG_AUTHORS"),
 ///     );