[TASK] refactor signal slot to event

Author: Starkmann

Classes/Domain/Repository/JsonSearchRepository.php

@@ -1,6 +1,8 @@
 <?php
 namespace Eike\Yacy\Domain\Repository;
 
+use Eike\Yacy\Event\BeforeReturnResultsEvent;
+use Psr\EventDispatcher\EventDispatcherInterface;
 use TYPO3\CMS\Extbase\SignalSlot\Exception\InvalidSlotException;
 use TYPO3\CMS\Extbase\SignalSlot\Exception\InvalidSlotReturnException;
 use TYPO3\CMS\Core\Log\LogManager;
@@ -40,6 +42,10 @@
  */
 class JsonSearchRepository extends AbstractSearchRepository
 {
+    public function __construct(
+        private readonly EventDispatcherInterface $eventDispatcher,
+    ) {}
+
     /**
      * @param Demand $demand
      * @param int $page
@@ -51,22 +57,20 @@ public function findDemanded(Demand $demand, $page = 1, $debug = 0)
     {
 
         try{
-            $json = json_decode(file_get_contents($demand->getRequestUrl()), true);
+            /** @var BeforeReturnResultsEvent $event */
+            $event = $this->eventDispatcher->dispatch(
+                new BeforeReturnResultsEvent(
+                    $demand,
+                    $page,
+                    json_decode(file_get_contents($demand->getRequestUrl()), true)
+                ),
+            );
+            return $event->getJson()['channels'][0];
         }catch(\Exception $exception){
             GeneralUtility::makeInstance(LogManager::class)->getLogger(__CLASS__)->log(LogLevel::INFO, $exception->getMessage(), '');
             if($debug === '1'){
                 throw $exception;
             }
         }
-
-        /*todo this needs to be refactored to events
-        * https://docs.typo3.org/c/typo3/cms-core/main/en-us/Changelog/10.4/Deprecation-90625-ExtbaseSignalSlotDispatcher.html
-        $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
-
-        $signalSlotDispatcher = $objectManager->get(Dispatcher::class);
-        $signalSlotDispatcher->dispatch(__CLASS__, 'beforeReturnResults', [$demand, $page, &$json]);
-        */
-        return $json['channels'][0];
-
     }
 }

Classes/Event/BeforeReturnResultsEvent.php

@@ -0,0 +1,42 @@
+<?php
+declare(strict_types=1);
+
+namespace Eike\Yacy\Event;
+
+use Eike\Yacy\Domain\Model\Demand;
+
+final class BeforeReturnResultsEvent
+{
+    public function __construct(
+        private Demand $demand,
+        private readonly int $page,
+        private mixed $json
+    ) {}
+
+    public function getDemand(): Demand
+    {
+        return $this->demand;
+    }
+
+    public function setDemand(Demand $demand): BeforeReturnResultsEvent
+    {
+        $this->demand = $demand;
+        return $this;
+    }
+
+    public function getJson(): mixed
+    {
+        return $this->json;
+    }
+
+    public function setJson(mixed $json): BeforeReturnResultsEvent
+    {
+        $this->json = $json;
+        return $this;
+    }
+
+    public function getPage(): int
+    {
+        return $this->page;
+    }
+}

Classes/Factory/SearchRepositoryFactory.php

@@ -28,6 +28,7 @@
 
 use Eike\Yacy\Domain\Repository\JsonSearchRepository;
 use Eike\Yacy\Domain\Repository\RssSearchRepository;
+use Psr\EventDispatcher\EventDispatcherInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Object\ObjectManager;
 
@@ -43,7 +44,8 @@ public function createSearchRepository($interfaceName)
             return GeneralUtility::makeInstance(RssSearchRepository::class);
         }
         if ($interfaceName === 'yacysearch.json') {
-            return GeneralUtility::makeInstance(JsonSearchRepository::class);
+            $eventDispatcher = GeneralUtility::makeInstance(EventDispatcherInterface::class);
+            return GeneralUtility::makeInstance(JsonSearchRepository::class,$eventDispatcher);
         }
         return null;
     }