fix: Remove deprecated hash key constants and update array iteration logic for PHPER 8.5 compatibility

Author: jmjoy

phper-sys/php_wrapper.c

@@ -54,9 +54,6 @@ phper_init_class_entry_handler(zend_class_entry *class_ce, void *argument);
 #define ZEND_CALL_MAY_HAVE_UNDEF (1 << 26)
 #endif
 
-const int PHPER_HASH_KEY_IS_STRING = (int) HASH_KEY_IS_STRING;
-const int PHPER_HASH_KEY_IS_LONG   = (int) HASH_KEY_IS_LONG;
-
 // ==================================================
 // zval apis:
 // ==================================================

phper/Cargo.toml

@@ -44,6 +44,7 @@ unexpected_cfgs = { level = "warn", check-cfg = [
     'cfg(phper_minor_version, values("2"))',
     'cfg(phper_minor_version, values("3"))',
     'cfg(phper_minor_version, values("4"))',
+    'cfg(phper_minor_version, values("5"))',
     'cfg(phper_zts)',
     'cfg(phper_enum_supported)',
 ] }

phper/src/arrays.rs

@@ -11,6 +11,7 @@
 //! Apis relate to [zend_array].
 
 use crate::{alloc::EBox, strings::ZStr, sys::*, values::ZVal};
+use cfg_if::cfg_if;
 use derive_more::From;
 use phper_alloc::ToRefOwned;
 use std::{
@@ -463,16 +464,37 @@ impl<'a> Iterator for RawIter<'a> {
                 &mut self.pos,
             ) as u32;
 
-            let iter_key = if result == HASH_KEY_IS_STRING {
+            const IS_STRING: u32 = {
+                cfg_if! {
+                    if #[cfg(all(phper_major_version = "8", phper_minor_version = "5"))] {
+                        zend_hash_key_type_HASH_KEY_IS_STRING
+                    } else {
+                        HASH_KEY_IS_STRING
+                    }
+                }
+            };
+
+            const IS_LONG: u32 = {
+                cfg_if! {
+                    if #[cfg(all(phper_major_version = "8", phper_minor_version = "5"))] {
+                        zend_hash_key_type_HASH_KEY_IS_LONG
+                    } else {
+                        HASH_KEY_IS_LONG
+                    }
+                }
+            };
+
+            let iter_key = if result == IS_STRING {
                 IterKey::ZStr(ZStr::from_mut_ptr(str_index))
-            } else if result == HASH_KEY_IS_LONG {
+            } else if result == IS_LONG {
                 #[allow(clippy::unnecessary_cast)]
                 IterKey::Index(num_index as u64)
             } else {
                 self.finished = true;
                 return None;
             };
 
+            #[allow(clippy::unnecessary_mut_passed)]
             let val = zend_hash_get_current_data_ex(self.arr, &mut self.pos);
             if val.is_null() {
                 self.finished = true;

phper/src/constants.rs

@@ -75,7 +75,7 @@ impl Constant {
                         module_number,
                     )
                 }
-            }
+            };
         }
     }
 }