Merge pull request #24 from jmjoy/0.3.x-dev

Author: jmjoy

.github/workflows/ci.yml

@@ -43,8 +43,15 @@ jobs:
           php-version: ${{ matrix.php-version }}
           tools: php-config
 
+      - name: Setup php-fpm
+        run: |
+          sudo apt-get install -y php${{ matrix.php-version }}-fpm
+          sudo ln -s /usr/sbin/php-fpm${{ matrix.php-version }} /usr/sbin/php-fpm
+
       - name: PHP version
-        run: php-config || true
+        run: |
+          php-config || true
+          /usr/sbin/php-fpm --version
 
       - name: Install Rust Nightly
         uses: actions-rs/toolchain@v1
@@ -83,6 +90,9 @@ jobs:
 
       - name: Cargo doc
         uses: actions-rs/cargo@v1
+        env:
+          RUSTDOCFLAGS: "-D warnings --cfg docsrs"
         with:
-          toolchain: stable
+          toolchain: nightly
           command: doc
+          args: --workspace --no-deps --all-features

README.md

@@ -41,7 +41,7 @@ A library that allows us to write PHP extensions using pure Rust and using safe
 *sapi*
 
 - [x] cli
-- [ ] fpm
+- [x] fpm
 
 *debug*
 

examples/hello/tests/integration.rs

@@ -1,4 +1,4 @@
-use phper_test::test_php_scripts;
+use phper_test::cli::test_php_scripts;
 use std::{env, path::Path};
 
 #[test]

examples/http-client/tests/integration.rs

@@ -1,4 +1,4 @@
-use phper_test::test_php_scripts;
+use phper_test::cli::test_php_scripts;
 use std::{env, path::Path};
 
 #[test]

examples/http-server/tests/integration.rs

@@ -1,5 +1,5 @@
 use hyper::header::CONTENT_TYPE;
-use phper_test::test_long_term_php_script_with_condition;
+use phper_test::cli::test_long_term_php_script_with_condition;
 use reqwest::Client;
 use std::{env, path::Path, thread::sleep, time::Duration};
 use tokio::runtime;

examples/logging/tests/integration.rs

@@ -1,4 +1,4 @@
-use phper_test::test_php_scripts_with_condition;
+use phper_test::cli::test_php_scripts_with_condition;
 use std::{env, path::Path, str};
 
 #[test]

phper-alloc/src/lib.rs

@@ -84,3 +84,22 @@ impl<T: EAllocatable> Drop for EBox<T> {
 }
 
 unsafe impl<T: EAllocatable> Send for EBox<T> {}
+
+// TODO Write Erc for gc_refcounted holding types.
+// pub trait ERcAble {
+//     // Increment the reference count;
+//     fn incr(&mut self);
+//
+//     /// Decrement the reference count and return old count.
+//     fn decr(&mut self) -> usize;
+// }
+//
+// pub struct ERc<T> {
+//     value: T,
+// }
+//
+// impl<T> ERc<T> {
+//     pub fn new(value: T) -> Self {
+//         Self { value }
+//     }
+// }

phper-test/Cargo.toml

@@ -10,6 +10,13 @@ keywords = ["php", "binding"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[features]
+fpm = ["fastcgi-client", "tokio/full"]
+
 [dependencies]
+fastcgi-client = { version = "0.7.0", optional = true }
+libc = "0.2.97"
 once_cell = "1.5.2"
+phper-macros = { version = "0.3.0", path = "../phper-macros" }
 tempfile = "3.1.0"
+tokio = { version = "1.7.0", optional = true }

phper-test/etc/php-fpm.conf

@@ -0,0 +1,10 @@
+[global]
+error_log = /tmp/.php-fpm.log
+
+[www]
+user = $USER
+group = $USER
+listen = 127.0.0.1:9000
+pm = static
+pm.max_children = 6
+pm.max_requests = 500

phper-test/src/cli.rs

@@ -0,0 +1,99 @@
+//! Test tools for php cli program.
+
+use std::{
+    panic::{catch_unwind, resume_unwind, UnwindSafe},
+    path::Path,
+    process::{Child, Output},
+};
+
+use crate::{context::Context, utils};
+
+/// Check your extension by executing the php script, if the all executing return success, than the test is pass.
+///
+/// - `exec_path` is the path of the make executable, which will be used to detect the path of
+/// extension lib.
+///
+/// - `scripts` is the path of your php test scripts.
+///
+/// See [example hello integration test](https://github.com/jmjoy/phper/blob/master/examples/hello/tests/integration.rs).
+pub fn test_php_scripts(exe_path: impl AsRef<Path>, scripts: &[&dyn AsRef<Path>]) {
+    let condition = |output: Output| output.status.success();
+    let scripts = scripts
+        .into_iter()
+        .map(|s| (*s, &condition as _))
+        .collect::<Vec<_>>();
+    test_php_scripts_with_condition(exe_path, &*scripts);
+}
+
+/// Check your extension by executing the php script, if the all your specified checkers are pass, than the test is pass.
+///
+/// - `exec_path` is the path of the make executable, which will be used to detect the path of
+/// extension lib.
+///
+/// - `scripts` is the slice of the tuple, format is `(path of your php test script, checker function or closure)`.
+///
+/// See [example logging integration test](https://github.com/jmjoy/phper/blob/master/examples/logging/tests/integration.rs).
+pub fn test_php_scripts_with_condition(
+    exe_path: impl AsRef<Path>,
+    scripts: &[(&dyn AsRef<Path>, &dyn Fn(Output) -> bool)],
+) {
+    let context = Context::get_global();
+    let lib_path = utils::get_lib_path(exe_path);
+    let tmp_php_ini_file = context.create_tmp_php_ini_file(&lib_path);
+
+    for (script, condition) in scripts {
+        let mut cmd = context.create_command_with_tmp_php_ini_args(&tmp_php_ini_file, script);
+
+        let output = cmd.output().unwrap();
+        let path = script.as_ref().to_str().unwrap();
+
+        let mut stdout = String::from_utf8(output.stdout.clone()).unwrap();
+        if stdout.is_empty() {
+            stdout.push_str("<empty>");
+        }
+
+        let mut stderr = String::from_utf8(output.stderr.clone()).unwrap();
+        if stderr.is_empty() {
+            stderr.push_str("<empty>");
+        }
+
+        println!(
+            "===== command =====\n{} {}\n===== stdout ======\n{}\n===== stderr ======\n{}",
+            &context.php_bin,
+            cmd.get_args().join(" "),
+            stdout,
+            stderr,
+        );
+        #[cfg(target_os = "linux")]
+        if output.status.code().is_none() {
+            use std::os::unix::process::ExitStatusExt;
+            println!(
+                "===== signal ======\nExitStatusExt is None, the signal is: {:?}",
+                output.status.signal()
+            );
+        }
+
+        if !condition(output) {
+            panic!("test php file `{}` failed", path);
+        }
+    }
+}
+
+/// Check your extension by executing the long term php script such as http server, if the all your
+/// specified checkers are pass, than the test is pass.
+pub fn test_long_term_php_script_with_condition(
+    exe_path: impl AsRef<Path>,
+    script: impl AsRef<Path>,
+    condition: impl FnOnce(&Child) + UnwindSafe,
+) {
+    let context = Context::get_global();
+    let lib_path = utils::get_lib_path(exe_path);
+    let tmp_php_ini_file = context.create_tmp_php_ini_file(lib_path);
+    let mut command = context.create_command_with_tmp_php_ini_args(&tmp_php_ini_file, script);
+    let mut child = command.spawn().unwrap();
+    let r = catch_unwind(|| condition(&child));
+    child.kill().unwrap();
+    if let Err(e) = r {
+        resume_unwind(e);
+    }
+}