added tests and fix minor bugs

Author: yoramdelangen

src/types/zval.rs

@@ -723,13 +723,16 @@ impl<'a> FromZvalMut<'a> for &'a [&'a Zval] {
     const TYPE: DataType = DataType::Array;
 
     fn from_zval_mut(zval: &'a mut Zval) -> Option<Self> {
+        let mut slice: Vec<&'a Zval> = Vec::new();
+
         // Check if the input Zval is an array and convert it into a slice of references
         if let Some(a) = zval.array() {
             // Collect references to each element in the array
-            let slice: Vec<&'a Zval> = a.values().collect();
-            Some(Box::leak(slice.into_boxed_slice()))
+            slice = a.values().collect();
         } else {
-            None
+            slice.push(zval);
         }
+
+        Some(Box::leak(slice.into_boxed_slice()))
     }
 }

tests/src/integration/variadic_args.php

@@ -0,0 +1,27 @@
+<?php
+
+require "_utils.php";
+
+$a = 'a';
+$b = 'b';
+$c = 'c';
+
+// Passing arguments as references
+$args = test_variadic_optional_args();
+assert(count($args) === 0, 'Expected no arguments to be returned');
+
+$args = test_variadic_optional_args($a);
+assert(count($args) === 1, 'Expected to have 1 argument');
+
+$args = test_variadic_optional_args($a, $b, $c);
+assert(count($args) === 3, 'Expected to have 3 argument');
+assert($args[1] === $b, 'Expected second argument to have a value of \$b aka "b"');
+assert($args[2] === $c, 'Expected third argument to have a value of \$c aka "c"');
+
+// Must have arguments.. so catch ArgumentCountError errors!
+assert_exception_thrown('test_variadic_args');
+// try {
+//     $args = test_variadic_args();
+// } catch (ArgumentCountError $e) {
+//     var_dump($e->getMessage());
+// }

tests/src/integration/variadic_args.rs

@@ -0,0 +1,4 @@
+#[test]
+fn test_variadic_optional_args() {
+    assert!(crate::integration::run_php("variadic_args.php"));
+}

tests/src/lib.rs

@@ -1,5 +1,9 @@
 #![cfg_attr(windows, feature(abi_vectorcall))]
-use ext_php_rs::{binary::Binary, prelude::*, types::ZendObject, types::Zval};
+use ext_php_rs::{
+    binary::Binary,
+    prelude::*,
+    types::{ZendObject, Zval},
+};
 use std::collections::HashMap;
 
 #[php_function]
@@ -72,6 +76,28 @@ pub fn test_callable(call: ZendCallable, a: String) -> Zval {
     call.try_call(vec![&a]).expect("Failed to call function")
 }
 
+// Rust type &[&Zval] must be converted because to Vec<Zval> because of
+// lifetime hell.
+#[php_function(optional = "params")]
+pub fn test_variadic_optional_args(params: &[&Zval]) -> Vec<Zval> {
+    params.iter().map(|x| x.shallow_clone()).collect()
+}
+
+#[php_function]
+pub fn test_variadic_args(params: &[&Zval]) -> Vec<Zval> {
+    params.iter().map(|x| x.shallow_clone()).collect()
+}
+
+// Rust type &[&Zval] must be converted because to Vec<Zval> because
+// of lifetime hell...  #[php_function] does not support lifetime.
+// error1: error[E0261]: use of undeclared lifetime name `'a`
+// error2: lifetime `'a` is missing in item created through this procedural
+// macro #[php_function]
+// pub fn test_variadic_optional2_args<'a>(params: &'a [&'a Zval]) -> &'a [&'a
+// Zval] {     println!("Hiero: {:#?}", params);
+//     params
+// }
+
 #[php_class]
 pub struct TestClass {
     string: String,
@@ -184,4 +210,5 @@ mod integration {
     mod object;
     mod string;
     mod types;
+    mod variadic_args;
 }