Fix option args

Author: danog

crates/macros/src/method.rs

@@ -1,7 +1,7 @@
 use anyhow::{anyhow, bail, Result};
 use quote::ToTokens;
 use std::collections::HashMap;
-use syn::{ReturnType, parse_quote};
+use syn::{ReturnType, parse_quote, PathArguments, GenericArgument};
 
 use crate::helpers::get_docs;
 use crate::{
@@ -380,22 +380,41 @@ fn build_args(
                         _ => bail!("Invalid parameter type."),
                     };
                     let name = param.to_string();
-
-                    if let Type::Reference(t) = &*ty.ty {
+                    
+                    let mut ty_inner = &*ty.ty;
+                    let mut is_option = false;
+
+                    if let Type::Path(t) = ty_inner {
+                        if t.path.segments[0].ident.to_string() == "Option" {
+                            if let PathArguments::AngleBracketed(t) = &t.path.segments[0].arguments {
+                                if let GenericArgument::Type(t) = &t.args[0] {
+                                    ty_inner = t;
+                                    is_option = true;
+                                }
+                            }
+                        }
+                    }
+                    let mut is_str = false;
+                    if let Type::Reference(t) = ty_inner {
                         if t.mutability.is_none() {
                             if let Type::Path(t) = &*t.elem {
-                                if t.path.is_ident("str") {
-                                    hack_tokens.append_all(
-                                        quote! { let #param = unsafe { ::core::mem::transmute::<&str, &'static str>(#param) }; }
-                                    );
-                                } else {
-                                    hack_tokens.append_all(
-                                        quote! { let #param = unsafe { ::ext_php_rs::zend::borrow_unchecked(#param) }; }
-                                    );
-                                }
+                                is_str = t.path.is_ident("str");
                             }
                         }
-                    };
+                    }
+                    hack_tokens.append_all(if is_str {
+                        if is_option {
+                            quote! { let #param = #param.and_then(|__temp| Some(unsafe { ::core::mem::transmute::<&str, &'static str>(__temp) })); }
+                        } else {
+                            quote! { let #param = unsafe { ::core::mem::transmute::<&str, &'static str>(#param) }; }
+                        }
+                    } else {
+                        if is_option {
+                            quote! { let #param = #param.and_then(|__temp| Some(unsafe { ::ext_php_rs::zend::borrow_unchecked(__temp) })); }
+                        } else {
+                            quote! { let #param = unsafe { ::ext_php_rs::zend::borrow_unchecked(#param) }; }
+                        }
+                    });
 
                     let default = defaults.get(&name);
                     let mut ty = ty.ty.clone();

src/zend/globals.rs

@@ -6,6 +6,7 @@ use lazy_static::lazy_static;
 use parking_lot::{const_rwlock, RwLock, RwLockReadGuard, RwLockWriteGuard};
 use tokio::runtime::Runtime;
 
+use crate::binary_slice::{BinarySlice, PackSlice};
 use crate::boxed::ZBox;
 use crate::ffi::{_zend_executor_globals, ext_php_rs_executor_globals};
 
@@ -158,3 +159,14 @@ unsafe impl<'original, 'unbounded, T: 'unbounded> BorrowUnchecked<'original, 'un
         unsafe { ::core::mem::transmute(self) }
     }
 }
+
+unsafe impl<'original, 'unbounded, T: 'unbounded + PackSlice> BorrowUnchecked<'original, 'unbounded>
+    for BinarySlice<'original, T>
+{
+    type Unbounded = BinarySlice<'unbounded, T>;
+
+    #[inline(always)]
+    unsafe fn borrow_unchecked(self) -> Self::Unbounded {
+        unsafe { ::core::mem::transmute(self) }
+    }
+}