Pass the tests/integration tests.

jmjoy · jmjoy · commit 44a9f5a275ab · 2022-06-26T16:44:24.000+08:00
diff --git a/examples/hello/tests/integration.rs b/examples/hello/tests/integration.rs
@@ -8,7 +8,10 @@
 // NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
 // See the Mulan PSL v2 for more details.
 
-use phper_test::{cli::{test_php_scripts, test_php_scripts_with_lib}, utils::get_lib_path_by_example};
+use phper_test::{
+    cli::{test_php_scripts, test_php_scripts_with_lib},
+    utils::get_lib_path_by_example,
+};
 use std::{env, path::Path};
 
 #[test]
diff --git a/examples/http-client/tests/integration.rs b/examples/http-client/tests/integration.rs
@@ -8,7 +8,10 @@
 // NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
 // See the Mulan PSL v2 for more details.
 
-use phper_test::{cli::{test_php_scripts, test_php_scripts_with_lib}, utils::get_lib_path_by_example};
+use phper_test::{
+    cli::{test_php_scripts, test_php_scripts_with_lib},
+    utils::get_lib_path_by_example,
+};
 use std::{env, path::Path};
 
 #[test]
diff --git a/examples/http-server/tests/integration.rs b/examples/http-server/tests/integration.rs
@@ -9,15 +9,20 @@
 // See the Mulan PSL v2 for more details.
 
 use hyper::header::CONTENT_TYPE;
-use phper_test::{cli::{test_long_term_php_script_with_condition, test_long_term_php_script_with_condition_and_lib}, utils::get_lib_path_by_example};
+use phper_test::{
+    cli::{
+        test_long_term_php_script_with_condition, test_long_term_php_script_with_condition_and_lib,
+    },
+    utils::get_lib_path_by_example,
+};
 use reqwest::Client;
 use std::{env, path::Path, thread::sleep, time::Duration};
 use tokio::runtime;
 
 #[test]
 fn test_php() {
     test_long_term_php_script_with_condition_and_lib(
-get_lib_path_by_example(env!("CARGO_BIN_EXE_http-server")),
+        get_lib_path_by_example(env!("CARGO_BIN_EXE_http-server")),
         Path::new(env!("CARGO_MANIFEST_DIR"))
             .join("tests")
             .join("php")
diff --git a/examples/logging/tests/integration.rs b/examples/logging/tests/integration.rs
@@ -8,7 +8,10 @@
 // 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, test_php_scripts_with_condition_and_lib}, utils::get_lib_path_by_example};
+use phper_test::{
+    cli::{test_php_scripts_with_condition, test_php_scripts_with_condition_and_lib},
+    utils::get_lib_path_by_example,
+};
 use std::{env, path::Path, str};
 
 #[test]
@@ -18,7 +21,7 @@ fn test_php() {
         .join("php");
 
     test_php_scripts_with_condition_and_lib(
-    get_lib_path_by_example(env!("CARGO_BIN_EXE_logging")),
+        get_lib_path_by_example(env!("CARGO_BIN_EXE_logging")),
         &[
             (&base_dir.join("test_php_say.php"), &|output| {
                 let stdout = str::from_utf8(&output.stdout).unwrap();
diff --git a/phper-test/src/context.rs b/phper-test/src/context.rs
@@ -99,15 +99,27 @@ impl Context {
     #[cfg(feature = "fpm")]
     #[cfg_attr(docsrs, doc(cfg(feature = "fpm")))]
     pub fn find_php_fpm(&self) -> Option<String> {
-        Path::new(&self.php_bin)
-            .parent()
-            .and_then(Path::parent)
-            .and_then(|p| {
-                let mut p = p.to_path_buf();
-                p.push("sbin");
-                p.push("php-fpm");
-                p.as_path().to_str().map(|s| s.to_string())
-            })
+        use std::ffi::OsStr;
+
+        let php_bin = Path::new(&self.php_bin);
+        php_bin.parent().and_then(Path::parent).and_then(|p| {
+            php_bin
+                .file_name()
+                .and_then(OsStr::to_str)
+                .and_then(|name| {
+                    let mut p = p.to_path_buf();
+                    p.push("sbin");
+                    p.push(&format!(
+                        "php-fpm{}",
+                        if name.starts_with("php") {
+                            name.chars().skip(3).collect::<String>()
+                        } else {
+                            "".to_owned()
+                        }
+                    ));
+                    p.as_path().to_str().map(ToOwned::to_owned)
+                })
+        })
     }
 
     #[cfg(feature = "fpm")]
diff --git a/phper/src/functions.rs b/phper/src/functions.rs
@@ -411,14 +411,14 @@ pub(crate) const fn create_zend_arg_info(
 /// # Examples
 ///
 /// ```
-/// use phper::{arrays::Array, functions::call, values::Val};
+/// use phper::{arrays::ZArray, functions::call, values::ZVal};
 ///
 /// fn json_encode() -> phper::Result<()> {
-///     let mut arr = Array::new();
-///     arr.insert("a", Val::new(1));
-///     arr.insert("b", Val::new(2));
-///     let ret = call("json_encode", &mut [Val::new(arr)])?;
-///     assert_eq!(ret.as_string()?, r#"{"a":1,"b":2}"#);
+///     let mut arr = ZArray::new();
+///     arr.insert("a", ZVal::from(1));
+///     arr.insert("b", ZVal::from(2));
+///     let ret = call("json_encode", &mut [ZVal::from(arr)])?;
+///     assert_eq!(ret.expect_z_str()?.to_str(), Ok(r#"{"a":1,"b":2}"#));
 ///     Ok(())
 /// }
 /// ```
diff --git a/phper/src/objects.rs b/phper/src/objects.rs
@@ -141,7 +141,7 @@ impl ZObj {
     /// # Examples
     ///
     /// ```
-    /// use phper::{alloc::EBox, classes::StatelessClassEntry, values::Val};
+    /// use phper::{alloc::EBox, classes::ClassEntry, values::ZVal};
     ///
     /// fn example() -> phper::Result<EBox<Val>> {
     ///     let mut memcached = StatelessClassEntry::from_globals("Memcached")?.new_object(&mut [])?;
diff --git a/tests/integration/src/values.rs b/tests/integration/src/values.rs
@@ -10,7 +10,7 @@
 
 use phper::{
     alloc::{ebox, EBox},
-    arrays::ZArray,
+    arrays::{InsertKey, ZArray},
     modules::Module,
     objects::ZObject,
     values::ZVal,
@@ -61,6 +61,11 @@ fn integrate_returns(module: &mut Module) {
         integration_values_return_array,
         vec![],
     );
+    module.add_function(
+        "integration_values_return_kv_array",
+        integration_values_return_kv_array,
+        vec![],
+    );
     module.add_function(
         "integration_values_return_object",
         integration_values_return_object,
@@ -76,6 +81,11 @@ fn integrate_returns(module: &mut Module) {
         integration_values_return_option_i64_none,
         vec![],
     );
+    module.add_function(
+        "integration_values_return_ebox_i64",
+        integration_values_return_ebox_i64,
+        vec![],
+    );
     module.add_function(
         "integration_values_return_result_string_ok",
         integration_values_return_result_string_ok,
@@ -119,11 +129,19 @@ fn integration_values_return_string(_: &mut [ZVal]) -> String {
     "foo".to_string()
 }
 
-fn integration_values_return_array(_: &mut [ZVal]) -> EBox<ZArray> {
+fn integration_values_return_array(_: &mut [ZVal]) -> ZArray {
+    let mut arr = ZArray::new();
+    arr.insert(InsertKey::NextIndex, ZVal::from("a"));
+    arr.insert(InsertKey::NextIndex, ZVal::from("b"));
+    arr.insert(InsertKey::NextIndex, ZVal::from("c"));
+    arr
+}
+
+fn integration_values_return_kv_array(_: &mut [ZVal]) -> ZArray {
     let mut arr = ZArray::new();
     arr.insert("a", ZVal::from(1));
     arr.insert("b", ZVal::from("foo"));
-    ebox!(arr)
+    arr
 }
 
 fn integration_values_return_object(_: &mut [ZVal]) -> ZObject {
@@ -140,6 +158,10 @@ fn integration_values_return_option_i64_none(_: &mut [ZVal]) -> Option<i64> {
     None
 }
 
+fn integration_values_return_ebox_i64(_: &mut [ZVal]) -> EBox<i64> {
+    ebox!(64)
+}
+
 fn integration_values_return_result_string_ok(_: &mut [ZVal]) -> phper::Result<String> {
     Ok("foo".to_string())
 }
diff --git a/tests/integration/tests/php/values.php b/tests/integration/tests/php/values.php
@@ -20,15 +20,12 @@
 assert_eq(integration_values_return_f64(), 64.0);
 assert_eq(integration_values_return_str(), "foo");
 assert_eq(integration_values_return_string(), "foo");
-assert_eq(integration_values_return_i64_vec(), [0, 1, 2]);
-assert_eq(integration_values_return_string_vec(), ["a", "b", "c"]);
-assert_eq(array_ksort(integration_values_return_i64_map()), ["a" => 0, "b" => 1, "c" => 2]);
-assert_eq(array_ksort(integration_values_return_string_map()), ["a" => "x", "b" => "y", "c" => "z"]);
-assert_eq(integration_values_return_i64_index_map(), ["a" => 0, "b" => 1, "c" => 2]);
-assert_eq(integration_values_return_array(), ["a" => 1, "b" => "foo"]);
+assert_eq(integration_values_return_array(), ["a", "b", "c"]);
+assert_eq(integration_values_return_kv_array(), ["a" => 1, "b" => "foo"]);
 assert_object(integration_values_return_object(), "stdClass", ["foo" => "bar"]);
 assert_eq(integration_values_return_option_i64_some(), 64);
 assert_eq(integration_values_return_option_i64_none(), null);
+assert_eq(integration_values_return_ebox_i64(), 64);
 assert_eq(integration_values_return_result_string_ok(), "foo");
 assert_throw("integration_values_return_result_string_err", "ErrorException", 0, "a zhe");
 assert_eq(integration_values_return_val(), "foo");
