Modify test_php_scripts_with_condition.

jmjoy · jmjoy · commit de94e490cdb0 · 2021-04-29T18:18:26.000+08:00
diff --git a/examples/hello/src/lib.rs b/examples/hello/src/lib.rs
@@ -24,7 +24,11 @@ fn throw_exception(_: &mut [Val]) -> phper::Result<()> {
 
 #[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"));
+    let mut module = Module::new(
+        env!("CARGO_PKG_NAME"),
+        env!("CARGO_PKG_VERSION"),
+        env!("CARGO_PKG_AUTHORS"),
+    );
 
     // register module ini
     module.add_bool_ini("hello.enable", false, Policy::All);
diff --git a/examples/hello/tests/integration.rs b/examples/hello/tests/integration.rs
@@ -5,7 +5,7 @@ use std::{env, path::Path};
 fn test_php() {
     test_php_scripts(
         env!("CARGO_BIN_EXE_hello"),
-        &[Path::new(env!("CARGO_MANIFEST_DIR"))
+        &[&Path::new(env!("CARGO_MANIFEST_DIR"))
             .join("tests")
             .join("php")
             .join("test.php")],
diff --git a/examples/log/src/lib.rs b/examples/log/src/lib.rs
@@ -5,7 +5,11 @@ use phper::{
 
 #[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"));
+    let mut module = Module::new(
+        env!("CARGO_PKG_NAME"),
+        env!("CARGO_PKG_VERSION"),
+        env!("CARGO_PKG_AUTHORS"),
+    );
 
     module.add_function(
         "log_say",
diff --git a/examples/log/tests/integration.rs b/examples/log/tests/integration.rs
@@ -5,68 +5,64 @@ use std::{env, path::Path, str};
 fn test_php() {
     test_php_scripts_with_condition(
         env!("CARGO_BIN_EXE_log"),
-        &[Path::new(env!("CARGO_MANIFEST_DIR"))
-            .join("tests")
-            .join("php")
-            .join("test_php_say.php")],
-        |output| {
-            let stdout = str::from_utf8(&output.stdout).unwrap();
-            stdout == "Hello, world!" && output.status.success()
-        },
-    );
-
-    test_php_scripts_with_condition(
-        env!("CARGO_BIN_EXE_log"),
-        &[Path::new(env!("CARGO_MANIFEST_DIR"))
-            .join("tests")
-            .join("php")
-            .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()
-        },
-    );
-
-    test_php_scripts_with_condition(
-        env!("CARGO_BIN_EXE_log"),
-        &[Path::new(env!("CARGO_MANIFEST_DIR"))
-            .join("tests")
-            .join("php")
-            .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()
-        },
-    );
-
-    test_php_scripts_with_condition(
-        env!("CARGO_BIN_EXE_log"),
-        &[Path::new(env!("CARGO_MANIFEST_DIR"))
-            .join("tests")
-            .join("php")
-            .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")
-        },
-    );
-
-    test_php_scripts_with_condition(
-        env!("CARGO_BIN_EXE_log"),
-        &[Path::new(env!("CARGO_MANIFEST_DIR"))
-            .join("tests")
-            .join("php")
-            .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()
-        },
+        &[
+            (
+                &Path::new(env!("CARGO_MANIFEST_DIR"))
+                    .join("tests")
+                    .join("php")
+                    .join("test_php_say.php"),
+                &|output| {
+                    let stdout = str::from_utf8(&output.stdout).unwrap();
+                    stdout == "Hello, world!" && output.status.success()
+                },
+            ),
+            (
+                &Path::new(env!("CARGO_MANIFEST_DIR"))
+                    .join("tests")
+                    .join("php")
+                    .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()
+                },
+            ),
+            (
+                &Path::new(env!("CARGO_MANIFEST_DIR"))
+                    .join("tests")
+                    .join("php")
+                    .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()
+                },
+            ),
+            (
+                &Path::new(env!("CARGO_MANIFEST_DIR"))
+                    .join("tests")
+                    .join("php")
+                    .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")
+                },
+            ),
+            (
+                &Path::new(env!("CARGO_MANIFEST_DIR"))
+                    .join("tests")
+                    .join("php")
+                    .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()
+                },
+            ),
+        ],
     );
 }
diff --git a/phper-test/src/lib.rs b/phper-test/src/lib.rs
@@ -10,14 +10,18 @@ use std::{
 };
 use tempfile::NamedTempFile;
 
-pub fn test_php_scripts(exe_path: impl AsRef<Path>, scripts: &[impl AsRef<Path>]) {
-    test_php_scripts_with_condition(exe_path, scripts, |output| output.status.success());
+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);
 }
 
 pub fn test_php_scripts_with_condition(
     exe_path: impl AsRef<Path>,
-    scripts: &[impl AsRef<Path>],
-    condition: impl Fn(Output) -> bool,
+    scripts: &[(&dyn AsRef<Path>, &dyn Fn(Output) -> bool)],
 ) {
     let context = php_context();
 
@@ -33,7 +37,7 @@ pub fn test_php_scripts_with_condition(
         .write_fmt(format_args!("extension={}\n", lib_path.to_str().unwrap()))
         .unwrap();
 
-    for script in scripts {
+    for (script, condition) in scripts {
         let script = script.as_ref();
         let mut cmd = Command::new(&context.php_bin);
         let args = &[
diff --git a/phper/src/arrays.rs b/phper/src/arrays.rs
@@ -31,7 +31,12 @@ impl Array {
     pub fn insert(&mut self, key: impl AsRef<str>, value: &mut Val) {
         let key = key.as_ref();
         unsafe {
-            phper_zend_hash_str_update(self.inner, key.as_ptr().cast(), key.len(), value.as_mut_ptr());
+            phper_zend_hash_str_update(
+                self.inner,
+                key.as_ptr().cast(),
+                key.len(),
+                value.as_mut_ptr(),
+            );
         }
     }
 
diff --git a/phper/src/modules.rs b/phper/src/modules.rs
@@ -15,9 +15,11 @@ use std::{
     mem::{size_of, zeroed},
     os::raw::{c_int, c_uchar, c_uint, c_ushort},
     ptr::{null, null_mut},
-    sync::RwLock,
+    sync::{
+        atomic::{AtomicPtr, Ordering},
+        RwLock,
+    },
 };
-use std::sync::atomic::{AtomicPtr, Ordering};
 
 static GLOBAL_MODULE: AtomicPtr<Module> = AtomicPtr::new(null_mut());
 
diff --git a/phper/src/values.rs b/phper/src/values.rs
@@ -197,7 +197,12 @@ impl SetVal for Array {
         unsafe {
             let mut new_val = Val::empty();
             phper_zval_arr(new_val.as_mut_ptr(), self.into_raw());
-            phper_zval_zval(val.as_mut_ptr(), new_val.as_mut_ptr(), true.into(), false.into());
+            phper_zval_zval(
+                val.as_mut_ptr(),
+                new_val.as_mut_ptr(),
+                true.into(),
+                false.into(),
+            );
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,12 @@ impl Array {`
`31`	`31`	`pub fn insert(&mut self, key: impl AsRef<str>, value: &mut Val) {`
`32`	`32`	`let key = key.as_ref();`
`33`	`33`	`unsafe {`
`34`		`- phper_zend_hash_str_update(self.inner, key.as_ptr().cast(), key.len(), value.as_mut_ptr());`
	`34`	`+ phper_zend_hash_str_update(`
	`35`	`+ self.inner,`
	`36`	`+ key.as_ptr().cast(),`
	`37`	`+ key.len(),`
	`38`	`+ value.as_mut_ptr(),`
	`39`	`+ );`
`35`	`40`	`}`
`36`	`41`	`}`
`37`	`42`
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,12 @@ impl SetVal for Array {`
`197`	`197`	`unsafe {`
`198`	`198`	`let mut new_val = Val::empty();`
`199`	`199`	`phper_zval_arr(new_val.as_mut_ptr(), self.into_raw());`
`200`		`- phper_zval_zval(val.as_mut_ptr(), new_val.as_mut_ptr(), true.into(), false.into());`
	`200`	`+ phper_zval_zval(`
	`201`	`+ val.as_mut_ptr(),`
	`202`	`+ new_val.as_mut_ptr(),`
	`203`	`+ true.into(),`
	`204`	`+ false.into(),`
	`205`	`+ );`
`201`	`206`	`}`
`202`	`207`	`}`
`203`	`208`	`}`