Undo removal of M2.4.5 workarounds, use patch instead

Author: jissereitsma

Controller/Adminhtml/Index/Html.php

@@ -49,7 +49,7 @@ public function __construct(
         parent::__construct($context);
     }
 
-    public function execute(): ResultInterface
+    public function execute(): ResultInterface|ResponseInterface
     {
         $data = $this->requestDataLoader->load();
         $this->requestDataLoader->mergeRequestParams();

Controller/Index/Html.php

@@ -45,7 +45,7 @@ public function __construct(
     ) {
     }
 
-    public function execute(): ResultInterface
+    public function execute(): ResultInterface|ResponseInterface
     {
         $data = $this->requestDataLoader->load();
         $this->requestDataLoader->mergeRequestParams();

Util/Controller/RepositoryDispatcher.php

@@ -17,7 +17,7 @@ public function __construct(
     ) {
     }
 
-    public function dispatch(ComponentInterface $component, $componentData): void
+    public function dispatch(ComponentInterface $component, mixed $componentData): void
     {
         $this->eventManager->dispatch('loki_components_repository_dispatch', ['component' => $component]);