improve ClassEntry::extends

instead of accepting a fn to delay fetching ClassEntry, accept a String and look up
during init()

Author: brettmc

examples/http-client/src/errors.rs

@@ -19,7 +19,7 @@ const EXCEPTION_CLASS_NAME: &str = "HttpClient\\HttpClientException";
 pub fn make_exception_class() -> ClassEntity<()> {
     let mut class = ClassEntity::new(EXCEPTION_CLASS_NAME);
     // The `extends` is same as the PHP class `extends`.
-    class.extends(exception_class);
+    class.extends("Exception");
     class
 }
 

examples/http-server/src/errors.rs

@@ -43,6 +43,6 @@ impl From<HttpServerError> for phper::Error {
 pub fn make_exception_class() -> ClassEntity<()> {
     let mut class = ClassEntity::new(EXCEPTION_CLASS_NAME);
     // As an Exception class, inheriting from the base Exception class is important.
-    class.extends(exception_class);
+    class.extends("Exception");
     class
 }

phper-doc/doc/_02_quick_start/_02_write_a_simple_http_client/index.md

@@ -101,7 +101,7 @@ Now let's begin to finish the logic.
    pub fn make_exception_class() -> ClassEntity<()> {
        let mut class = ClassEntity::new(EXCEPTION_CLASS_NAME);
        // The `extends` is same as the PHP class `extends`.
-       class.extends(exception_class);
+       class.extends("Exception");
        class
    }
 
@@ -155,7 +155,7 @@ Now let's begin to finish the logic.
    # pub fn make_exception_class() -> ClassEntity<()> {
    #     let mut class = ClassEntity::new(EXCEPTION_CLASS_NAME);
    #     // The `extends` is same as the PHP class `extends`.
-   #     class.extends(exception_class);
+   #     class.extends("Exception");
    #     class
    # }
    #

phper-doc/doc/_06_module/_06_register_class/index.md

@@ -44,7 +44,7 @@ If you want the class `Foo` extends `Bar`, and implements interface `Stringable`
 use phper::classes::{ClassEntity, ClassEntry, Interface};
 
 let mut foo = ClassEntity::new("Foo");
-foo.extends(|| ClassEntry::from_globals("Bar").unwrap());
+foo.extends("Bar");
 foo.implements(Interface::from_name("Stringable"));
 ```
 

phper/src/classes.rs

@@ -427,7 +427,7 @@ pub struct ClassEntity<T: 'static> {
     state_constructor: Rc<StateConstructor>,
     method_entities: Vec<MethodEntity>,
     property_entities: Vec<PropertyEntity>,
-    parent: Option<Box<dyn Fn() -> &'static ClassEntry>>,
+    parent: Option<String>,
     interfaces: Vec<Interface>,
     constants: Vec<ConstantEntity>,
     bind_class: StateClass<T>,
@@ -550,7 +550,7 @@ impl<T: 'static> ClassEntity<T> {
     /// Register class to `extends` the parent class.
     ///
     /// *Because in the `MINIT` phase, the class starts to register, so the*
-    /// *closure is used to return the `ClassEntry` to delay the acquisition of*
+    /// *`ClassEntry` is looked up by name to delay the acquisition of*
     /// *the class.*
     ///
     /// # Examples
@@ -559,10 +559,10 @@ impl<T: 'static> ClassEntity<T> {
     /// use phper::classes::{ClassEntity, ClassEntry};
     ///
     /// let mut class = ClassEntity::new("MyException");
-    /// class.extends(|| ClassEntry::from_globals("Exception").unwrap());
+    /// class.extends("Exception");
     /// ```
-    pub fn extends(&mut self, parent: impl Fn() -> &'static ClassEntry + 'static) {
-        self.parent = Some(Box::new(parent));
+    pub fn extends(&mut self, parent_name: impl Into<String>) {
+        self.parent = Some(parent_name.into());
     }
 
     /// Register class to `implements` the interface, due to the class can
@@ -631,12 +631,14 @@ impl<T: 'static> ClassEntity<T> {
     #[allow(clippy::useless_conversion)]
     pub(crate) unsafe fn init(&self) -> *mut zend_class_entry {
         unsafe {
-            let parent: *mut zend_class_entry = self
-                .parent
-                .as_ref()
-                .map(|parent| parent())
-                .map(|entry| entry.as_ptr() as *mut _)
-                .unwrap_or(null_mut());
+            let parent: *mut zend_class_entry = if let Some(ref name) = self.parent {
+                let entry = ClassEntry::from_globals(name).unwrap_or_else(|err| {
+                    panic!("Unable to resolve parent class: {}: {}", name,err);
+                });
+                entry.as_ptr() as *mut _
+            } else {
+                null_mut()
+            };
 
             let class_ce = phper_init_class_entry_ex(
                 self.class_name.as_ptr().cast(),
@@ -800,7 +802,7 @@ impl InterfaceEntity {
     /// Register interface to `extends` the interfaces, due to the interface can
     /// extends multi interface, so this method can be called multi time.
     ///
-    /// *Because in the `MINIT` phase, the class starts to register, so the*
+    /// *Because in the `MINIT` phase, the class starts to register, a*
     /// *closure is used to return the `ClassEntry` to delay the acquisition of*
     /// *the class.*
     ///

tests/integration/src/classes.rs

@@ -26,6 +26,7 @@ pub fn integrate(module: &mut Module) {
     integrate_i_bar(module);
     integrate_static_props(module);
     integrate_i_constants(module);
+    integrate_bar_extends_foo(module);
     #[cfg(phper_major_version = "8")]
     integrate_stringable(module);
 }
@@ -223,6 +224,15 @@ fn integrate_static_props(module: &mut Module) {
     module.add_class(class);
 }
 
+fn integrate_bar_extends_foo(module: &mut Module) {
+    let mut cls = ClassEntity::new(r"IntegrationTest\BarExtendsFoo");
+    cls.extends(r"IntegrationTest\Foo");
+    cls.add_method("test", Visibility::Public, |_,_| {
+        phper::ok(())
+    });
+    module.add_class(cls);
+}
+
 #[cfg(phper_major_version = "8")]
 fn integrate_stringable(module: &mut Module) {
     use phper::{functions::ReturnType, types::ReturnTypeHint};

tests/integration/tests/php/classes.php

@@ -100,3 +100,8 @@ class Foo2 extends IntegrationTest\Foo {}
 assert_false(IntegrationTest\IConstants::CST_FALSE);
 assert_eq(100, IntegrationTest\IConstants::CST_INT);
 assert_eq(10.0, IntegrationTest\IConstants::CST_FLOAT);
+
+// Test module class extends module class
+$bar = new \IntegrationTest\BarExtendsFoo; //Bar should extend Foo
+$reflection = new ReflectionClass($bar);
+assert_true($reflection->isSubclassOf(IntegrationTest\Foo::class));