Fix argument type allocation

Author: danog

src/types/zval.rs

@@ -56,19 +56,20 @@ impl Zval {
         return self
             .reference()
             .or_else(|| self.indirect())
-            .or(Some(self))
-            .unwrap();
+            .unwrap_or(self)
     }
 
     /// Dereference the zval mutable, if it is a reference.
     pub fn dereference_mut(&mut self) -> &mut Self {
         if self.is_reference() {
+            #[allow(clippy::unwrap_used)]
             return self.reference_mut().unwrap();
         }
         if self.is_indirect() {
+            #[allow(clippy::unwrap_used)]
             return self.indirect_mut().unwrap();
         }
-        return self;
+        self
     }
 
     /// Returns the value of the zval if it is a long.

src/zend/_type.rs

@@ -1,5 +1,5 @@
 use std::{
-    ffi::{c_void, CString},
+    ffi::c_void,
     ptr,
 };
 
@@ -8,7 +8,7 @@ use crate::{
         zend_type, IS_MIXED, MAY_BE_ANY, MAY_BE_BOOL, _IS_BOOL, _ZEND_IS_VARIADIC_BIT,
         _ZEND_SEND_MODE_SHIFT, _ZEND_TYPE_NAME_BIT, _ZEND_TYPE_NULLABLE_BIT,
     },
-    flags::DataType,
+    flags::DataType, types::ZendStr,
 };
 
 /// Internal Zend type.
@@ -82,7 +82,7 @@ impl ZendType {
         allow_null: bool,
     ) -> Option<Self> {
         Some(Self {
-            ptr: CString::new(class_name).ok()?.into_raw() as *mut c_void,
+            ptr: ZendStr::new(class_name, true).as_ptr() as *mut c_void,
             type_mask: _ZEND_TYPE_NAME_BIT
                 | (if allow_null {
                     _ZEND_TYPE_NULLABLE_BIT