fix: refactor InspectorHints and factory for clarity

Author: Morgy93

src/Model/TemplateEngine/Decorator/InspectorHints.php

@@ -4,7 +4,6 @@
 
 namespace OpenForgeProject\MageForge\Model\TemplateEngine\Decorator;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Math\Random;
 use Magento\Framework\View\Element\AbstractBlock;
 use Magento\Framework\View\Element\BlockInterface;
@@ -21,23 +20,23 @@ class InspectorHints implements TemplateEngineInterface
 
     private bool $showBlockHints;
 
-    private ?Random $random = null;
+    private Random $random;
 
     private string $magentoRoot;
 
     /**
      * @param TemplateEngineInterface $subject
      * @param bool $showBlockHints
-     * @param Random|null $random
+     * @param Random $random
      */
     public function __construct(
         TemplateEngineInterface $subject,
         bool $showBlockHints,
-        ?Random $random = null
+        Random $random
     ) {
         $this->subject = $subject;
         $this->showBlockHints = $showBlockHints;
-        $this->random = $random ?? ObjectManager::getInstance()->get(Random::class);
+        $this->random = $random;
 
         // Get Magento root directory - try multiple strategies
         // 1. Try from BP constant (most reliable)

src/Model/TemplateEngine/Decorator/InspectorHintsFactory.php

@@ -4,7 +4,8 @@
 
 namespace OpenForgeProject\MageForge\Model\TemplateEngine\Decorator;
 
-use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Math\Random;
+use Magento\Framework\View\TemplateEngineInterface;
 use OpenForgeProject\MageForge\Model\TemplateEngine\Decorator\InspectorHints;
 
 /**
@@ -13,10 +14,10 @@
 class InspectorHintsFactory
 {
     /**
-     * @param ObjectManagerInterface $objectManager
+     * @param Random $random
      */
     public function __construct(
-        private readonly ObjectManagerInterface $objectManager
+        private readonly Random $random
     ) {
     }
 
@@ -28,8 +29,19 @@ public function __construct(
      */
     public function create(array $data = []): InspectorHints
     {
-        /** @var InspectorHints $instance */
-        $instance = $this->objectManager->create(InspectorHints::class, $data);
-        return $instance;
+        $subject = $data['subject'] ?? null;
+        $showBlockHints = $data['showBlockHints'] ?? false;
+
+        if (!$subject instanceof TemplateEngineInterface) {
+            throw new \InvalidArgumentException(
+                'Instance of "' . TemplateEngineInterface::class . '" is expected.'
+            );
+        }
+
+        return new InspectorHints(
+            $subject,
+            (bool)$showBlockHints,
+            $this->random
+        );
     }
 }