Fix base type getter.

Author: jmjoy

phper-alloc/src/lib.rs

@@ -27,7 +27,7 @@ pub trait EAllocatable {
 
 /// The Box which use php `emalloc` and `efree` to manage memory.
 ///
-/// TODO now feature `allocator_api` is still unstable, implement myself.
+/// TODO now feature `allocator_api` is still unstable, implement myself, use Box<T, Alloc> later.
 pub struct EBox<T: EAllocatable> {
     ptr: *mut T,
 }

phper/src/arrays.rs

@@ -130,6 +130,8 @@ impl EAllocatable for Array {
             if (*ptr).inner.gc.refcount == 0 {
                 zend_hash_destroy(ptr.cast());
                 _efree(ptr.cast());
+            } else {
+                (*ptr).inner.gc.refcount -= 1;
             }
         }
     }

phper/src/classes.rs

@@ -171,6 +171,14 @@ impl<T: Send> Classifiable for DynamicClass<T> {
 pub type StatelessClassEntry = ClassEntry<()>;
 
 /// Wrapper of [crate::sys::zend_class_entry].
+///
+/// # Generic
+///
+/// 1. Any `zend_class_entry` can be make into `ClassEntry<()>`, alias as [StatelessClassEntry].
+///
+/// 2. Only the `zend_class_entry` created by [crate::modules::Module::add_class] can be make into
+/// `ClassEntry<T>`, where `T` is the type defined by [Classifiable::state_type_id], as the inner
+/// state of `ClassEntry<T>` and `Object<T>`.
 #[repr(transparent)]
 pub struct ClassEntry<T: 'static> {
     inner: zend_class_entry,

phper/src/errors.rs

@@ -9,8 +9,6 @@ use anyhow::anyhow;
 use std::{convert::Infallible, error, ffi::FromBytesWithNulError, io, str::Utf8Error};
 
 /// PHP Throwable, can cause throwing an exception when setting to [crate::values::Val].
-///
-/// TODO Write a derive macro for auto extends the item implements for enum.
 pub trait Throwable: error::Error {
     fn class_entry(&self) -> &StatelessClassEntry;
 

phper/src/modules.rs

@@ -150,6 +150,8 @@ impl Module {
         self.class_entities.push(unsafe { ClassEntity::new(class) });
     }
 
+    /// Leak memory to generate `zend_module_entry` pointer.
+    #[doc(hidden)]
     pub unsafe fn module_entry(self) -> *const zend_module_entry {
         assert!(!self.name.is_empty(), "module name must be set");
         assert!(!self.version.is_empty(), "module version must be set");

phper/src/objects.rs

@@ -158,6 +158,8 @@ impl<T> EAllocatable for Object<T> {
 
                 // zend_objects_store_call_destructors(ptr.cast());
                 // zend_objects_store_free_object_storage(ptr.cast(), true.into());
+            } else {
+                (*ptr).inner.gc.refcount -= 1;
             }
         }
     }

phper/src/strings.rs

@@ -54,7 +54,11 @@ impl ZendString {
 impl EAllocatable for ZendString {
     fn free(ptr: *mut Self) {
         unsafe {
-            phper_zend_string_release(ptr.cast());
+            if (*ptr).inner.gc.refcount == 0 {
+                phper_zend_string_release(ptr.cast());
+            } else {
+                (*ptr).inner.gc.refcount -= 1;
+            }
         }
     }
 }

phper/src/types.rs

@@ -129,7 +129,7 @@ impl From<u32> for Type {
     }
 }
 
-pub(crate) fn get_type_by_const(mut t: u32) -> crate::Result<String> {
+fn get_type_by_const(mut t: u32) -> crate::Result<String> {
     unsafe {
         t = get_base_type_by_raw(t);
         let s = zend_get_type_by_const(t as c_int);
@@ -147,18 +147,8 @@ pub(crate) fn get_type_by_const(mut t: u32) -> crate::Result<String> {
 }
 
 #[inline]
-pub fn get_base_type_by_raw(mut t: u32) -> u32 {
-    t &= !(IS_TYPE_REFCOUNTED << Z_TYPE_FLAGS_SHIFT);
-
-    #[cfg(any(
-        phper_major_version = "8",
-        all(phper_major_version = "7", phper_minor_version = "4")
-    ))]
-    {
-        t &= !(IS_TYPE_COLLECTABLE << Z_TYPE_FLAGS_SHIFT);
-    }
-
-    t
+fn get_base_type_by_raw(t: u32) -> u32 {
+    t & !(!0 << Z_TYPE_FLAGS_SHIFT)
 }
 
 #[derive(From)]

phper/src/values.rs

@@ -391,8 +391,7 @@ impl SetVal for EBox<Array> {
     }
 }
 
-// TODO Because the type of method argument `this` is mut ref, can't become a return value,
-// TODO Support chain call for PHP object later.
+// TODO Support chain call for PHP object later, now only support return owned object.
 impl<T> SetVal for EBox<Object<T>> {
     unsafe fn set_val(self, val: &mut Val) {
         let object = EBox::into_raw(self);

tests/integration/tests/php/arrays.php

@@ -4,4 +4,4 @@
 
 assert_eq(integrate_arrays_new_drop(), "FOO BAR");
 integrate_arrays_types();
-integrate_arrays_iter();
+integrate_arrays_iter();