Fix some compatibility problems.

Author: jmjoy

examples/hello/tests/php/test.php

@@ -15,7 +15,7 @@
 }
 
 assert_eq(hello_get_all_ini(), [
-    "hello.enable" => true,
+    "hello.enable" => false,
     "hello.description" => "hello world.",
 ]);
 
@@ -27,6 +27,6 @@
 
 function assert_eq($left, $right) {
     if ($left !== $right) {
-        throw new Exception("left != right,\n left: {$left},\n right: {$right};");
+        throw new Exception(sprintf("left != right,\n left: %s,\n right: %s", var_export($left, true), var_export($right, true)));
     }
 }

phper-sys/php_wrapper.c

@@ -64,4 +64,8 @@ zend_string *phper_zend_string_alloc(size_t len, int persistent) {
 
 void phper_zend_string_release(zend_string *s) {
     return zend_string_release(s);
-}
+}
+
+void phper_zend_hash_str_update(HashTable *ht, const char *key, size_t len, zval *pData) {
+    zend_hash_str_update(ht, key, len, pData);
+}

phper-sys/php_wrapper.h

@@ -27,4 +27,8 @@ zend_string *phper_zend_string_init(const char *str, size_t len, int persistent)
 zend_string *phper_zend_string_alloc(size_t len, int persistent);
 void phper_zend_string_release(zend_string *s);
 
+void phper_zend_hash_str_update(HashTable *ht, const char *key, size_t len, zval *pData);
+
+
+
 #endif //PHPER_PHP_WRAPPER_H

phper-test/src/lib.rs

@@ -88,11 +88,15 @@ fn php_context() -> &'static Context {
             "echo php_ini_scanned_files();",
         ]);
 
-        ini_content.push_str(&read_to_string(ini_file).unwrap());
-        for file in ini_files.split(',') {
-            let file = file.trim();
-            if !file.is_empty() {
-                ini_content.push_str(&read_to_string(file).unwrap());
+        if !ini_file.is_empty() {
+            ini_content.push_str(&read_to_string(ini_file).unwrap());
+        }
+        if !ini_files.is_empty() {
+            for file in ini_files.split(',') {
+                let file = file.trim();
+                if !file.is_empty() {
+                    ini_content.push_str(&read_to_string(file).unwrap());
+                }
             }
         }
 

phper/src/arrays.rs

@@ -12,7 +12,7 @@ impl Array {
     pub fn new() -> Self {
         let mut inner = Box::new(unsafe { zeroed::<zend_array>() });
         unsafe {
-            _zend_hash_init(&mut *inner, 0, None, 1);
+            _zend_hash_init(&mut *inner, 0, None, true.into());
         }
         Self { inner }
     }
@@ -24,7 +24,7 @@ impl Array {
     pub fn insert(&mut self, key: impl AsRef<str>, value: &mut Val) {
         let key = key.as_ref();
         unsafe {
-            zend_hash_str_update(
+            phper_zend_hash_str_update(
                 self.inner.deref_mut(),
                 key.as_ptr().cast(),
                 key.len(),

phper/src/classes.rs

@@ -181,7 +181,7 @@ impl This {
                 self.val as *mut _,
                 name.as_ptr().cast(),
                 name.len(),
-                0,
+                false.into(),
                 null_mut(),
             );
             Val::from_mut(prop)

phper/src/functions.rs

@@ -170,7 +170,12 @@ pub(crate) unsafe extern "C" fn invoke(
             execute_data.common_required_num_args(),
             execute_data.num_args()
         );
-        php_error_docref(null(), E_WARNING as i32, s.as_ptr().cast());
+        php_error_docref1(
+            null(),
+            "\0".as_ptr().cast(),
+            E_WARNING as i32,
+            s.as_ptr().cast(),
+        );
         return_value.set(());
         return;
     }
@@ -190,10 +195,21 @@ pub(crate) unsafe extern "C" fn invoke(
 
 pub const fn create_zend_arg_info(
     name: *const c_char,
-    pass_by_ref: bool,
+    _pass_by_ref: bool,
 ) -> zend_internal_arg_info {
+    #[cfg(phper_php_version = "8.0")]
+    {
+        zend_internal_arg_info {
+            name,
+            type_: zend_type {
+                ptr: null_mut(),
+                type_mask: 0,
+            },
+            default_value: null_mut(),
+        }
+    }
+
     #[cfg(any(
-        phper_php_version = "8.0",
         phper_php_version = "7.4",
         phper_php_version = "7.3",
         phper_php_version = "7.2"
@@ -202,7 +218,7 @@ pub const fn create_zend_arg_info(
         zend_internal_arg_info {
             name,
             type_: 0 as crate::sys::zend_type,
-            pass_by_reference: pass_by_ref as zend_uchar,
+            pass_by_reference: _pass_by_ref as zend_uchar,
             is_variadic: 0,
         }
     }
@@ -214,7 +230,7 @@ pub const fn create_zend_arg_info(
             class_name: std::ptr::null(),
             type_hint: 0,
             allow_null: 0,
-            pass_by_reference: pass_by_ref as zend_uchar,
+            pass_by_reference: _pass_by_ref as zend_uchar,
             is_variadic: 0,
         }
     }

phper/src/values.rs

@@ -1,5 +1,5 @@
 use crate::{arrays::Array, errors::Throwable, sys::*};
-use std::{mem::zeroed, os::raw::c_int, slice::from_raw_parts, str, sync::atomic::Ordering};
+use std::{mem::zeroed, slice::from_raw_parts, str, sync::atomic::Ordering};
 
 #[repr(transparent)]
 pub struct ExecuteData {
@@ -26,8 +26,8 @@ impl ExecuteData {
     }
 
     #[inline]
-    pub unsafe fn common_required_num_args(&self) -> u32 {
-        (*self.inner.func).common.required_num_args
+    pub unsafe fn common_required_num_args(&self) -> u16 {
+        (*self.inner.func).common.required_num_args as u16
     }
 
     #[inline]
@@ -36,8 +36,8 @@ impl ExecuteData {
     }
 
     #[inline]
-    pub unsafe fn num_args(&self) -> u32 {
-        self.inner.This.u2.num_args
+    pub unsafe fn num_args(&self) -> u16 {
+        self.inner.This.u2.num_args as u16
     }
 
     #[inline]
@@ -48,7 +48,7 @@ impl ExecuteData {
     pub unsafe fn get_parameters_array(&mut self) -> Vec<Val> {
         let num_args = self.num_args();
         let mut arguments = vec![zeroed::<zval>(); num_args as usize];
-        _zend_get_parameters_array_ex(num_args as c_int, arguments.as_mut_ptr());
+        _zend_get_parameters_array_ex(num_args.into(), arguments.as_mut_ptr());
         arguments.into_iter().map(Val::from_inner).collect()
     }
 }