Fix php classes extends from phper classes. (#151)

jmjoy · web-flow · commit 7548f5c13f48 · 2024-02-27T16:13:19.000+08:00
diff --git a/examples/http-server/src/server.rs b/examples/http-server/src/server.rs
@@ -91,7 +91,7 @@ pub fn make_server_class() -> ClassEntity<()> {
             let app = Router::new().route(
                 "/",
                 any(move |req: Request<Body>| async move {
-                    match (async move {
+                    let fut = async move {
                         let (parts, body) = req.into_parts();
 
                         // Read all request body content.
@@ -132,9 +132,8 @@ pub fn make_server_class() -> ClassEntity<()> {
 
                             Ok::<Response<Body>, phper::Error>(response)
                         })
-                    })
-                    .await
-                    {
+                    };
+                    match fut.await {
                         Ok(response) => response,
                         Err(e) => {
                             // If failed, simply return 500 as http status code, and the error
diff --git a/phper-alloc/src/lib.rs b/phper-alloc/src/lib.rs
@@ -18,7 +18,6 @@ mod macros;
 use phper_sys::*;
 use std::{
     borrow::Borrow,
-    convert::TryInto,
     mem::{size_of, ManuallyDrop},
     ops::{Deref, DerefMut},
 };
diff --git a/phper-sys/php_wrapper.c b/phper-sys/php_wrapper.c
@@ -375,6 +375,10 @@ bool phper_instanceof_function(const zend_class_entry *instance_ce,
     return instanceof_function(instance_ce, ce) != 0;
 }
 
+zend_class_entry *phper_get_parent_class(zend_class_entry *ce) {
+    return ce->parent;
+}
+
 // ==================================================
 // function apis:
 // ==================================================
diff --git a/phper/src/arrays.rs b/phper/src/arrays.rs
@@ -14,7 +14,6 @@ use crate::{alloc::ToRefOwned, strings::ZStr, sys::*, values::ZVal};
 use derive_more::From;
 use std::{
     borrow::Borrow,
-    convert::TryInto,
     fmt::{self, Debug},
     marker::PhantomData,
     mem::ManuallyDrop,
diff --git a/phper/src/classes.rs b/phper/src/classes.rs
@@ -14,6 +14,7 @@ use crate::{
     arrays::ZArr,
     errors::{ClassNotFoundError, InitializeObjectError, Throwable},
     functions::{Function, FunctionEntry, Method, MethodEntity},
+    modules::global_module,
     objects::{StateObj, StateObject, ZObject},
     strings::ZStr,
     sys::*,
@@ -23,8 +24,6 @@ use crate::{
 };
 use std::{
     any::Any,
-    borrow::ToOwned,
-    convert::TryInto,
     ffi::{c_void, CString},
     fmt::Debug,
     marker::PhantomData,
@@ -849,12 +848,15 @@ pub(crate) type RawVisibility = u32;
 
 #[allow(clippy::useless_conversion)]
 unsafe extern "C" fn create_object(ce: *mut zend_class_entry) -> *mut zend_object {
+    // Get real ce which hold state_constructor.
+    let real_ce = find_real_ce(ce).unwrap();
+
     // Alloc more memory size to store state data.
     let state_object = phper_zend_object_alloc(size_of::<StateObj<()>>().try_into().unwrap(), ce);
     let state_object = StateObj::<()>::from_mut_ptr(state_object);
 
     // Find the hack elements hidden behind null builtin_function.
-    let mut func_ptr = (*ce).info.internal.builtin_functions;
+    let mut func_ptr = (*real_ce).info.internal.builtin_functions;
     while !(*func_ptr).fname.is_null() {
         func_ptr = func_ptr.offset(1);
     }
@@ -904,14 +906,15 @@ unsafe extern "C" fn clone_object(object: *mut zval) -> *mut zend_object {
 #[allow(clippy::useless_conversion)]
 unsafe fn clone_object_common(object: *mut zend_object) -> *mut zend_object {
     let ce = (*object).ce;
+    let real_ce = find_real_ce(ce).unwrap();
 
     // Alloc more memory size to store state data.
     let new_state_object =
         phper_zend_object_alloc(size_of::<StateObj<()>>().try_into().unwrap(), ce);
     let new_state_object = StateObj::<()>::from_mut_ptr(new_state_object);
 
     // Find the hack elements hidden behind null builtin_function.
-    let mut func_ptr = (*(*object).ce).info.internal.builtin_functions;
+    let mut func_ptr = (*real_ce).info.internal.builtin_functions;
     while !(*func_ptr).fname.is_null() {
         func_ptr = func_ptr.offset(1);
     }
@@ -947,3 +950,19 @@ unsafe extern "C" fn free_object(object: *mut zend_object) {
     // Original destroy call.
     zend_object_std_dtor(object);
 }
+
+/// Find the class that registered by phper.
+unsafe fn find_real_ce(mut ce: *mut zend_class_entry) -> Option<*mut zend_class_entry> {
+    let class_entities = global_module().class_entities();
+
+    while !ce.is_null() {
+        for entity in class_entities {
+            if ClassEntry::from_ptr(ce).get_name().to_c_str() == Ok(&entity.class_name) {
+                return Some(ce);
+            }
+        }
+        ce = phper_get_parent_class(ce);
+    }
+
+    None
+}
diff --git a/phper/src/functions.rs b/phper/src/functions.rs
@@ -13,7 +13,6 @@
 //! TODO Add lambda.
 
 use crate::{
-    cg,
     classes::{ClassEntry, RawVisibility, Visibility},
     errors::{throw, ArgumentCountError, ExceptionGuard, ThrowObject, Throwable},
     objects::{StateObj, ZObj, ZObject},
diff --git a/phper/src/modules.rs b/phper/src/modules.rs
@@ -37,6 +37,11 @@ static mut GLOBAL_MODULE: *mut Module = null_mut();
 
 static mut GLOBAL_MODULE_ENTRY: *mut zend_module_entry = null_mut();
 
+#[inline]
+pub(crate) unsafe fn global_module<'a>() -> &'a Module {
+    GLOBAL_MODULE.as_ref().unwrap()
+}
+
 unsafe extern "C" fn module_startup(_type: c_int, module_number: c_int) -> c_int {
     let module = GLOBAL_MODULE.as_mut().unwrap();
 
@@ -285,4 +290,9 @@ impl Module {
 
         Box::into_raw(entries.into_boxed_slice()).cast()
     }
+
+    #[inline]
+    pub(crate) fn class_entities(&self) -> &[ClassEntity<()>] {
+        &self.class_entities
+    }
 }
diff --git a/phper/src/objects.rs b/phper/src/objects.rs
@@ -20,7 +20,6 @@ use phper_alloc::{RefClone, ToRefOwned};
 use std::{
     any::Any,
     borrow::Borrow,
-    convert::TryInto,
     ffi::c_void,
     fmt::{self, Debug},
     marker::PhantomData,
diff --git a/phper/src/strings.rs b/phper/src/strings.rs
@@ -14,7 +14,6 @@ use crate::sys::*;
 use phper_alloc::ToRefOwned;
 use std::{
     borrow::Borrow,
-    convert::TryInto,
     ffi::{CStr, FromBytesWithNulError},
     fmt::{self, Debug},
     marker::PhantomData,
diff --git a/phper/src/values.rs b/phper/src/values.rs
@@ -24,7 +24,6 @@ use crate::{
 };
 use phper_alloc::RefClone;
 use std::{
-    convert::TryInto,
     ffi::CStr,
     fmt,
     fmt::Debug,
diff --git a/tests/integration/tests/php/classes.php b/tests/integration/tests/php/classes.php
@@ -68,3 +68,8 @@
 $pre_foo1 = IntegrationTest\PropsHolder::setFoo1("baz");
 assert_eq($pre_foo1, 12345);
 assert_eq(IntegrationTest\PropsHolder::getFoo1(), "baz");
+
+// Test php class extends from phper registered class.
+class Foo2 extends IntegrationTest\Foo {}
+$foo2 = new Foo2();
+assert_eq($foo2->current(), 'Current: 0');
diff --git a/tests/integration/tests/php/objects.php b/tests/integration/tests/php/objects.php
@@ -29,3 +29,8 @@
 $b2->incr();
 assert_eq($b->get(), 123456);
 assert_eq($b2->get(), 123457);
+
+class B2 extends IntegrationTest\Objects\B {}
+$b2 = new B2();
+$b22 = clone $b2;
+assert_eq($b22->get(), 123456);
