fix: Tweaks and bugfixes

Author: seebeen

composer.lock

@@ -59,9 +59,9 @@ class Handler extends Hook implements Can_Handle {
     /**
      * Container ID.
      *
-     * @var string
+     * @var ?string
      */
-    protected string $container_id;
+    protected ?string $container_id;
 
     /**
      * Is the handler hookable.

src/Decorators/Handler.php

@@ -8,6 +8,7 @@
 
 namespace XWP\DI;
 
+use ReflectionClass;
 use XWP\DI\Decorators\Handler;
 use XWP\DI\Interfaces\Can_Handle;
 use XWP\DI\Utils\Reflection;
@@ -18,6 +19,24 @@
  * @since 1.0.0
  */
 class Handler_Factory {
+    /**
+     * Get a handler target classname from an instance.
+     *
+     * @param  object $instance The handler instance.
+     * @return string
+     */
+    public static function get_target( object $instance ): string {
+        if ( $instance instanceof Can_Handle ) {
+            return $instance->classname;
+        }
+
+        if ( $instance instanceof ReflectionClass ) {
+            return $instance->getName();
+        }
+
+        return $instance::class;
+    }
+
     /**
      * Create a handler from a classname.
      *
@@ -43,8 +62,8 @@ public static function from_classname( string $classname ): Can_Handle {
      */
     public static function from_instance( object $instance, ?string $container = null ): Can_Handle {
         if ( Reflection::class_implements( $instance, Can_Handle::class ) ) {
-			return $instance;
-		}
+            return $instance;
+        }
 
         $refl    = Reflection::get_reflector( $instance );
         $handler = Reflection::get_decorator( $refl, Can_Handle::class )

src/Handler_Factory.php

@@ -23,6 +23,13 @@
 class Invoker {
     use Singleton_Ex;
 
+    /**
+     * Is WP in debug mode.
+     *
+     * @var bool
+     */
+    protected bool $debug = false;
+
     /**
      * Handlers.
      *
@@ -31,6 +38,13 @@ class Invoker {
      */
     protected array $handlers = array();
 
+    /**
+     * Registered hooks.
+     *
+     * @var array<class-string,string>
+     */
+    protected array $reg_hooks = array();
+
     /**
      * Hooks.
      *
@@ -39,6 +53,22 @@ class Invoker {
      */
     protected array $hooks = array();
 
+    /**
+     * Constructor.
+     */
+    protected function __construct() {
+        $this->debug = \defined( 'WP_DEBUG' ) && WP_DEBUG;
+    }
+
+    /**
+     * Get debug info.
+     *
+     * @return array<class-string,string>
+     */
+    public function debug_info(): array {
+        return $this->reg_hooks;
+    }
+
     /**
      * Check if a handler is registered.
      *
@@ -61,6 +91,15 @@ public function get_handler( string $classname ): ?Can_Handle {
         return $this->has_handler( $classname ) ? $this->handlers[ $classname ] : null;
     }
 
+    /**
+     * Get all handlers.
+     *
+     * @return array<class-string,Can_Handle<object>>
+     */
+    public function all_handlers(): array {
+        return $this->handlers;
+    }
+
     /**
      * Add a handler.
      *
@@ -70,10 +109,12 @@ public function get_handler( string $classname ): ?Can_Handle {
      * @return static
      */
     public function add_handler( Can_Handle $handler, bool $clear = true ): static {
-        $this->handlers[ $handler->classname ] = $handler;
+        $cname = $handler->classname;
+
+        $this->handlers[ $cname ] = $handler;
 
         if ( $clear ) {
-            $this->hooks[ $handler->classname ] = array();
+            $this->hooks[ $cname ] = array();
         }
 
         return $this;
@@ -101,6 +142,15 @@ public function get_hooks( string $classname ): array {
         return $this->has_hooks( $classname ) ? $this->hooks[ $classname ] : array();
     }
 
+    /**
+     * Get all hooks.
+     *
+     * @return array<class-string,array<string,array<int,Can_Invoke<object,Can_Handle<object>>>>>
+     */
+    public function all_hooks(): array {
+        return $this->hooks;
+    }
+
     /**
      * Register a module.
      *
@@ -170,12 +220,12 @@ public function register_handler( string $classname ): static {
      * @return static
      */
     public function load_handler( object $instance, ?string $container = null ): static {
-        $handler = Handler_Factory::from_instance( $instance, $container );
-
-        if ( $this->has_handler( $handler->classname ) ) {
+        if ( $this->has_handler( Handler_Factory::get_target( $instance ) ) ) {
             return $this;
         }
 
+        $handler = Handler_Factory::from_instance( $instance, $container );
+
         return $this
             ->add_handler( $handler )
             ->register_methods( $handler )
@@ -215,6 +265,10 @@ function () use ( $handler ) {
     protected function init_handler( Can_Handle $handler ): static {
         $handler->load();
 
+        if ( $this->debug ) {
+            $this->reg_hooks[ $handler->classname ] ??= \current_action();
+        }
+
         return $this;
     }
 
@@ -271,7 +325,14 @@ private function register_method( Can_Handle $handler, \ReflectionMethod $method
      */
     protected function queue_methods( Can_Handle $handler ): static {
         if ( $handler->is_lazy() ) {
-            \add_action( $handler->lazy_hook, array( $handler, 'lazy_load' ), -1, 0 );
+            \add_action(
+                $handler->lazy_hook,
+                function () use ( $handler ) {
+                    $this->init_handler( $handler );
+                },
+                -1,
+                0,
+            );
         }
 
         \add_action(