Merge pull request #11 from 10up/fix/dont-instantiate-classes-not-extending-interface

Fix/dont instantiate classes not extending interface

Author: darylldoyle

fixtures/classes/Standalone/Standalone.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Standalone Class
+ *
+ * @package TenupFrameworkTestClasses\Standalone
+ */
+
+declare(strict_types = 1);
+
+namespace TenupFrameworkTestClasses\Standalone;
+
+/**
+ * Standalone Class
+ *
+ * @package TenupFrameworkTestClasses\Standalone
+ */
+class Standalone {
+	/**
+	 * Constructor.
+	 */
+	public function __construct() {
+		add_action( 'init', [ $this, 'init' ] );
+	}
+
+	/**
+	 * Init method.
+	 *
+	 * @return void
+	 */
+	public function init() {
+		echo 'Hello from the Standalone class!';
+	}
+}

src/ModuleInitialization.php

@@ -135,16 +135,17 @@ public function init_classes( $dir = '' ) {
 				continue;
 			}
 
+			// Check if the class implements ModuleInterface before instantiating it
+			if ( ! $reflection_class->implementsInterface( 'TenupFramework\ModuleInterface' ) ) {
+				continue;
+			}
+
 			// Initialize the class.
 			// phpcs:ignore Generic.Commenting.DocComment.MissingShort
 			/** @var ModuleInterface $instantiated_class */
 			$instantiated_class = new $class();
 
-			// Make sure the class is a subclass of Module, so we can initialize it.
-			if ( ! in_array( 'TenupFramework\Module', $this->class_uses_recursive( $instantiated_class ), true ) ) {
-				unset( $instantiated_class );
-				continue;
-			}
+			do_action( 'tenup_framework_module_init__' . $slug, $instantiated_class );
 
 			// Assign the classes into the order they should be initialized.
 			$load_class_order[ intval( $instantiated_class->load_order() ) ][] = [
@@ -173,42 +174,6 @@ public function init_classes( $dir = '' ) {
 		}
 	}
 
-	/**
-	 * Returns all traits used by a class and its traits.
-	 *
-	 * @param  object|string $class_to_search The class to check for traits.
-	 * @return array<string>
-	 */
-	protected function class_uses_recursive( $class_to_search ) {
-		if ( is_object( $class_to_search ) ) {
-			$class_to_search = get_class( $class_to_search );
-		}
-
-		$results = [];
-
-		foreach ( array_reverse( class_parents( $class_to_search ) ? class_parents( $class_to_search ) : [] ) + [ $class_to_search => $class_to_search ] as $class ) {
-			$results = array_merge( $results, $this->trait_uses_recursive( $class ) );
-		}
-
-		return array_unique( $results );
-	}
-
-	/**
-	 * Returns all traits used by a trait and its traits.
-	 *
-	 * @param  object|string $trait_to_search The trait to check for traits.
-	 * @return array<string>
-	 */
-	protected function trait_uses_recursive( $trait_to_search ) {
-		$traits_to_search = class_uses( $trait_to_search ) ? class_uses( $trait_to_search ) : [];
-
-		foreach ( $traits_to_search as $trait ) {
-			$traits_to_search = array_merge( $traits_to_search, $this->trait_uses_recursive( $trait ) );
-		}
-
-		return (array) $traits_to_search;
-	}
-
 	/**
 	 * Slugify a class name.
 	 *

tests/FrameworkTestSetup.php

@@ -20,6 +20,8 @@
 /**
  * Trait FrameworkTestSetup
  *
+ * @runTestsInSeparateProcesses
+ *
  * @package TenupFramework
  */
 trait FrameworkTestSetup {

tests/ModuleInitializationTest.php

@@ -121,4 +121,17 @@ public function test_get_module_returns_instantiated_class() {
 		$module = \TenupFramework\ModuleInitialization::get_module( 'TenupFrameworkTestClasses\DoesntExist' );
 		$this->assertFalse( $module );
 	}
+
+	/**
+	 * Test that only classes implementing ModuleInterface are initialized.
+	 *
+	 * @return void
+	 */
+	public function test_only_classes_implementing_module_interface_are_initialized() {
+		$module_init = \TenupFramework\ModuleInitialization::instance();
+		$module_init->init_classes( dirname( __DIR__, 1 ) . '/fixtures/classes' );
+
+		$this->assertTrue( did_action( 'tenup_framework_module_init__tenupframeworktestclasses-posttypes-demo' ) > 0, 'Demo was not initialized.' );
+		$this->assertFalse( did_action( 'tenup_framework_module_init__tenupframeworktestclasses-standalone-standalone' ) > 0, 'Standalone class was initialized.' );
+	}
 }