Add Impl SetVal for Result tests.

Author: jmjoy

phper/src/errors.rs

@@ -51,7 +51,7 @@ pub trait Throwable: error::Error {
     fn code(&self) -> u64;
 }
 
-pub(crate) const EXCEPTION_CLASS_NAME: &'static str = "PHPerException";
+pub(crate) const EXCEPTION_CLASS_NAME: &'static str = "Phper\\OtherException";
 
 impl Throwable for Error {
     fn class_entity(&self) -> *const ClassEntity {

phper/src/values.rs

@@ -313,35 +313,33 @@ impl<T: SetVal> SetVal for Vec<T> {
 /// order of array is not guarantee.
 impl<K: AsRef<str>, V: SetVal> SetVal for HashMap<K, V> {
     fn set_val(self, val: &mut Val) {
-        unsafe {
-            phper_array_init(val.as_mut_ptr());
-            for (k, v) in self {
-                let k = k.as_ref();
-                zend_hash_str_update(
-                    (*val.as_mut_ptr()).value.arr,
-                    k.as_ptr().cast(),
-                    k.len(),
-                    Val::new(v).as_mut_ptr(),
-                );
-            }
-        }
+        map_set_val(self, val);
     }
 }
 
 /// Setting the val to an array, which preserves item order.
 impl<K: AsRef<str>, V: SetVal> SetVal for IndexMap<K, V> {
     fn set_val(self, val: &mut Val) {
-        unsafe {
-            phper_array_init(val.as_mut_ptr());
-            for (k, v) in self {
-                let k = k.as_ref();
-                zend_hash_str_update(
-                    (*val.as_mut_ptr()).value.arr,
-                    k.as_ptr().cast(),
-                    k.len(),
-                    Val::new(v).as_mut_ptr(),
-                );
-            }
+        map_set_val(self, val);
+    }
+}
+
+fn map_set_val<K, V, I>(iterator: I, val: &mut Val)
+where
+    I: IntoIterator<Item = (K, V)>,
+    K: AsRef<str>,
+    V: SetVal,
+{
+    unsafe {
+        phper_array_init(val.as_mut_ptr());
+        for (k, v) in iterator.into_iter() {
+            let k = k.as_ref();
+            zend_hash_str_update(
+                (*val.as_mut_ptr()).value.arr,
+                k.as_ptr().cast(),
+                k.len(),
+                Val::new(v).as_mut_ptr(),
+            );
         }
     }
 }

tests/integration/src/values.rs

@@ -92,6 +92,16 @@ fn integrate_returns(module: &mut Module) {
         integration_values_return_option_i64_none,
         vec![],
     );
+    module.add_function(
+        "integration_values_return_result_string_ok",
+        integration_values_return_result_string_ok,
+        vec![],
+    );
+    module.add_function(
+        "integration_values_return_result_string_err",
+        integration_values_return_result_string_err,
+        vec![],
+    );
 }
 
 fn integration_values_return_null(_: &mut [Val]) {}
@@ -174,3 +184,11 @@ fn integration_values_return_option_i64_some(_: &mut [Val]) -> Option<i64> {
 fn integration_values_return_option_i64_none(_: &mut [Val]) -> Option<i64> {
     None
 }
+
+fn integration_values_return_result_string_ok(_: &mut [Val]) -> phper::Result<String> {
+    Ok("foo".to_string())
+}
+
+fn integration_values_return_result_string_err(_: &mut [Val]) -> phper::Result<()> {
+    Err(phper::Error::other("a zhe"))
+}

tests/integration/tests/php/_common.php

@@ -6,7 +6,24 @@
 
 function assert_eq($left, $right) {
     if ($left !== $right) {
-        throw new Exception(sprintf("left != right,\n left: %s,\n right: %s", var_export($left, true), var_export($right, true)));
+        throw new AssertionError(sprintf("left != right,\n left: %s,\n right: %s", var_export($left, true), var_export($right, true)));
+    }
+}
+
+function assert_throw($callable, $expect_exception_class, $expect_exception_code, $expect_exception_message) {
+    try {
+        $callable();
+        throw new AssertionError("`{$expect_exception_message}` not throws");
+    } catch (Exception $e) {
+        if (get_class($e) != $expect_exception_class) {
+            throw new AssertionError(sprintf("expect exception class `%s`, found `%s`", $expect_exception_class, get_class($e)));
+        }
+        if ($e->getCode() != $expect_exception_code) {
+            throw new AssertionError(sprintf("expect exception code `%s`, found `%s`", $expect_exception_code, $e->getCode()));
+        }
+        if ($e->getMessage() != $expect_exception_message) {
+            throw new AssertionError(sprintf("expect exception message `%s`, found `%s`", $expect_exception_message, $e->getMessage()));
+        }
     }
 }
 

tests/integration/tests/php/values.php

@@ -19,3 +19,5 @@
 assert_eq(integration_values_return_array(), ["a" => 1, "b" => "foo"]);
 assert_eq(integration_values_return_option_i64_some(), 64);
 assert_eq(integration_values_return_option_i64_none(), null);
+assert_eq(integration_values_return_result_string_ok(), "foo");
+assert_throw("integration_values_return_result_string_err", "Phper\\OtherException", 500, "a zhe");