Revert "simplify with macro"

This reverts commit 7f4d4c4.

Author: brettmc

phper/src/macros.rs

@@ -109,15 +109,3 @@ macro_rules! sg {
         $crate::sys::sapi_globals.$x
     };
 }
-
-/// Define a class stub
-#[macro_export]
-macro_rules! define_class_stub {
-    ($name:expr, $cls_var:ident) => {{
-        use std::{cell::RefCell, rc::Rc};
-
-        let $cls_var: Rc<RefCell<Option<_>>> = Rc::new(RefCell::new(None));
-        let entity = ::phper::classes::ClassEntity::new($name);
-        (entity, $cls_var)
-    }};
-}

tests/integration/src/classes.rs

@@ -16,7 +16,8 @@ use phper::{
     types::{ArgumentTypeHint, ReturnTypeHint},
     values::ZVal,
 };
-use std::{collections::HashMap, convert::Infallible, rc::Rc};
+use std::{collections::HashMap, convert::Infallible};
+use std::rc::Rc;
 
 pub fn integrate(module: &mut Module) {
     integrate_a(module);
@@ -234,39 +235,50 @@ fn integrate_bar_extends_foo(module: &mut Module, foo_class: StateClass<Foo>) {
 fn integrate_dependent_classes(module: &mut Module) {
     const A_CLS: &str = r"IntegrationTest\Dependency\A";
     const B_CLS: &str = r"IntegrationTest\Dependency\B";
+    // Build both class entities
+    let mut a_cls = ClassEntity::new(A_CLS);
+    let mut b_cls = ClassEntity::new(B_CLS);
 
-    let (mut a_cls, a_ref) = define_class_stub!(A_CLS, a_ref);
-    let (mut b_cls, b_ref) = define_class_stub!(B_CLS, b_ref);
+    // Placeholder, will clone StateClass into closures after registration
+    let a_cls_ref = std::rc::Rc::new(std::cell::RefCell::new(None));
+    let b_cls_ref = std::rc::Rc::new(std::cell::RefCell::new(None));
 
     {
-        let b_ref = Rc::clone(&b_ref);
-        a_cls
-            .add_static_method("createB", Visibility::Public, move |_| {
-                let borrow = b_ref.borrow();
-                let b_state: &StateClass<()> = borrow.as_ref().unwrap();
-                Ok::<_, phper::Error>(b_state.init_object()?)
-            })
-            .return_type(ReturnType::new(ReturnTypeHint::ClassEntry(B_CLS.into())));
+        let b_cls_ref = Rc::clone(&b_cls_ref);
+        a_cls.add_static_method("createB", Visibility::Public, move |_| {
+            let borrow = b_cls_ref.borrow();
+            let b_state: &StateClass<()> = borrow
+                .as_ref()
+                .expect("B class not registered");
+            let obj = b_state.init_object()?;
+            Ok::<_, phper::Error>(obj)
+        })
+        .return_type(ReturnType::new(ReturnTypeHint::ClassEntry(String::from(B_CLS))));
     }
 
     {
-        let a_ref = Rc::clone(&a_ref);
-        b_cls
-            .add_static_method("createA", Visibility::Public, move |_| {
-                let borrow = a_ref.borrow();
-                let a_state: &StateClass<()> = borrow.as_ref().unwrap();
-                Ok::<_, phper::Error>(a_state.init_object()?)
-            })
-            .return_type(ReturnType::new(ReturnTypeHint::ClassEntry(A_CLS.into())));
+        let a_cls_ref = Rc::clone(&a_cls_ref);
+        b_cls.add_static_method("createA", Visibility::Public, move |_| {
+            let borrow = a_cls_ref.borrow();
+            let a_state: &StateClass<()> = borrow
+                .as_ref()
+                .expect("A class not registered");
+            let obj = a_state.init_object()?;
+            Ok::<_, phper::Error>(obj)
+        })
+        .return_type(ReturnType::new(ReturnTypeHint::ClassEntry(String::from(A_CLS))));
     }
 
-    // Register both classes
+
+    // Register both classes and save the StateClass into shared RefCells
     let a_state = module.add_class(a_cls);
     let b_state = module.add_class(b_cls);
-    *a_ref.borrow_mut() = Some(a_state.clone());
-    *b_ref.borrow_mut() = Some(b_state.clone());
+
+    *a_cls_ref.borrow_mut() = Some(a_state);
+    *b_cls_ref.borrow_mut() = Some(b_state);
 }
 
+
 #[cfg(phper_major_version = "8")]
 fn integrate_stringable(module: &mut Module) {
     use phper::{functions::ReturnType, types::ReturnTypeHint};

tests/integration/src/lib.rs

@@ -9,8 +9,6 @@
 // See the Mulan PSL v2 for more details.
 
 #![warn(rust_2018_idioms, clippy::dbg_macro, clippy::print_stdout)]
-#[macro_use]
-extern crate phper;
 
 mod arguments;
 mod arrays;