Pass the example hello tests temporarily.

Author: jmjoy

examples/hello/src/lib.rs

@@ -64,7 +64,7 @@ pub fn get_module() -> Module {
 
     // register classes
     let mut foo_class = StdClass::new();
-    foo_class.add_property("foo", 100.to_string());
+    foo_class.add_property("foo", "100".to_string());
     foo_class.add_method(
         "getFoo",
         |this: &mut Object, _: &mut [Val]| -> phper::Result<Val> {

phper-sys/php_wrapper.c

@@ -82,6 +82,14 @@ void phper_array_init(zval *arg) {
     array_init(arg);
 }
 
+void *phper_zend_hash_str_find_ptr(const HashTable *ht, const char *str, size_t len) {
+    return zend_hash_str_find_ptr(ht, str, len);
+}
+
+zval* phper_zend_hash_index_update(HashTable *ht, zend_ulong h, zval *pData) {
+    return zend_hash_index_update(ht, h, pData);
+}
+
 void phper_zend_hash_merge_with_key(HashTable *target, HashTable *source) {
     uint32_t idx;
     Bucket *p;
@@ -103,3 +111,7 @@ void phper_zend_hash_merge_with_key(HashTable *target, HashTable *source) {
         }
     }
 }
+
+void phper_zval_obj(zval *z, zend_object *o) {
+    ZVAL_OBJ(z, o);
+}

phper-sys/php_wrapper.h

@@ -35,6 +35,10 @@ void phper_zend_string_release(zend_string *s);
 void phper_zend_hash_str_update(HashTable *ht, const char *key, size_t len, zval *pData);
 
 void phper_array_init(zval *arg);
+void *phper_zend_hash_str_find_ptr(const HashTable *ht, const char *str, size_t len);
+zval* phper_zend_hash_index_update(HashTable *ht, zend_ulong h, zval *pData);
 void phper_zend_hash_merge_with_key(HashTable *target, HashTable *source);
 
+void phper_zval_obj(zval *z, zend_object *o);
+
 #endif //PHPER_PHP_WRAPPER_H

phper/src/classes.rs

@@ -1,7 +1,7 @@
 use crate::{
     functions::{Argument, Callable, FunctionEntity, FunctionEntry, Method},
     sys::*,
-    values::Val,
+    utils::ensure_end_with_zero,
 };
 use once_cell::sync::OnceCell;
 use std::{
@@ -138,12 +138,12 @@ impl ClassEntity {
     pub(crate) unsafe fn declare_properties(&mut self) {
         let properties = self.class.properties();
         for property in properties {
-            let mut val = Val::new(&*property.value);
-            zend_declare_property(
+            let value = ensure_end_with_zero(property.value.clone());
+            zend_declare_property_string(
                 self.entry.load(Ordering::SeqCst).cast(),
                 property.name.as_ptr().cast(),
                 property.name.len(),
-                val.as_mut_ptr(),
+                value.as_ptr().cast(),
                 Visibility::Public as c_int,
             );
         }
@@ -190,7 +190,7 @@ pub enum Visibility {
 pub(crate) fn get_global_class_entry_ptr(name: impl AsRef<str>) -> *mut zend_class_entry {
     let name = name.as_ref();
     unsafe {
-        zend_hash_str_find_ptr_lc(
+        phper_zend_hash_str_find_ptr(
             compiler_globals.class_table,
             name.as_ptr().cast(),
             name.len(),

phper/src/objects.rs

@@ -4,7 +4,10 @@ use crate::{
     values::{SetVal, Val},
     ClassNotFoundError,
 };
-use std::{mem::zeroed, ptr::null_mut};
+use std::{
+    mem::{forget, zeroed},
+    ptr::null_mut,
+};
 
 /// Wrapper of [crate::sys::zend_object].
 #[repr(transparent)]
@@ -19,6 +22,7 @@ impl Object {
             let class_name = class_name.as_ref();
             let ce = get_global_class_entry_ptr(class_name);
             if ce.is_null() {
+                forget(object);
                 Err(ClassNotFoundError::new(class_name.to_string()))
             } else {
                 zend_object_std_init(object.as_mut_ptr(), ce);
@@ -29,7 +33,7 @@ impl Object {
     }
 
     pub fn new_std() -> Self {
-        Self::new("stdClass").expect("stdClass not found")
+        Self::new("stdclass").expect("stdClass not found")
     }
 
     pub unsafe fn from_mut_ptr<'a>(ptr: *mut zend_object) -> &'a mut Object {
@@ -61,12 +65,13 @@ impl Object {
                     null_mut(),
                 )
             }
-
             #[cfg(phper_major_version = "7")]
             {
+                let mut zv = zeroed::<zval>();
+                phper_zval_obj(&mut zv, self.as_ptr() as *mut _);
                 zend_read_property(
                     self.inner.ce,
-                    &self.inner as *const _ as *mut _,
+                    &mut zv,
                     name.as_ptr().cast(),
                     name.len(),
                     false.into(),
@@ -82,13 +87,28 @@ impl Object {
         let name = name.as_ref();
         let mut val = Val::new(value);
         unsafe {
-            zend_update_property(
-                self.inner.ce,
-                &mut self.inner as *mut _,
-                name.as_ptr().cast(),
-                name.len(),
-                val.as_mut_ptr(),
-            )
+            #[cfg(phper_major_version = "8")]
+            {
+                zend_update_property(
+                    self.inner.ce,
+                    &mut self.inner,
+                    name.as_ptr().cast(),
+                    name.len(),
+                    val.as_mut_ptr(),
+                )
+            }
+            #[cfg(phper_major_version = "7")]
+            {
+                let mut zv = zeroed::<zval>();
+                phper_zval_obj(&mut zv, self.as_mut_ptr());
+                zend_update_property(
+                    self.inner.ce,
+                    &mut zv,
+                    name.as_ptr().cast(),
+                    name.len(),
+                    val.as_mut_ptr(),
+                )
+            }
         }
     }
 }

phper/src/values.rs

@@ -312,7 +312,7 @@ impl<T: SetVal> SetVal for Vec<T> {
         unsafe {
             phper_array_init(val.as_mut_ptr());
             for (k, v) in self.into_iter().enumerate() {
-                zend_hash_index_update(
+                phper_zend_hash_index_update(
                     (*val.as_mut_ptr()).value.arr,
                     k as u64,
                     Val::new(v).as_mut_ptr(),
@@ -347,7 +347,7 @@ where
         phper_array_init(val.as_mut_ptr());
         for (k, v) in iterator.into_iter() {
             let k = k.as_ref();
-            zend_hash_str_update(
+            phper_zend_hash_str_update(
                 (*val.as_mut_ptr()).value.arr,
                 k.as_ptr().cast(),
                 k.len(),