Fix Dependency Injection

Author: ipf

Classes/Controller/SearchController.php

@@ -40,14 +40,13 @@
 use TYPO3\CMS\Extbase\Http\ForwardResponse;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 use TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException;
+use TYPO3\CMS\Extbase\Utility\DebuggerUtility;
 
 class SearchController extends ActionController
 {
     protected array $requestArguments = [];
 
-    protected ?ServiceProviderInterface $searchProvider = null;
-
-    public function __construct(private readonly AssetCollector $assetCollector, private readonly LoggerInterface $logger, private readonly PageTitleProviderInterface $pageTitleProvider) {}
+    public function __construct(private readonly AssetCollector $assetCollector, private readonly ServiceProviderInterface $searchProvider, private readonly PageTitleProviderInterface $pageTitleProvider) {}
 
     /**
      * @throws NoSuchArgumentException|\JsonException
@@ -155,14 +154,11 @@ protected function addStandardAssignments(): void
     protected function initializeConnection(string $activeConnection): void
     {
         $connectionConfiguration = $this->settings['connections'][$activeConnection];
-
+        $this->searchProvider->setConnectionName($activeConnection);
+        $this->searchProvider->setSettings($this->settings);
+        $this->searchProvider->setConnectionSettings($connectionConfiguration['provider']);
         /* @var ServiceProviderInterface $searchProvider */
-        $this->searchProvider = GeneralUtility::makeInstance(
-            $connectionConfiguration['provider'],
-            $activeConnection,
-            $this->settings,
-            $this->logger,
-        );
+
         $this->searchProvider->connect();
     }
 }

Classes/Service/ServiceProviderInterface.php

@@ -34,6 +34,10 @@ interface ServiceProviderInterface
 {
     public function connect();
 
+    public function setConnectionName(string $name): void;
+    public function setSettings(array $settings): void;
+    public function setConnectionSettings(string $settings): void;
+
     public function getConfiguration();
 
     public function getDefaultQuery();

Classes/Service/SolrServiceProvider.php

@@ -39,6 +39,7 @@
 use Subugoe\Find\Utility\SettingsUtility;
 use Subugoe\Find\Utility\UpgradeUtility;
 use Symfony\Component\EventDispatcher\EventDispatcher;
+use TYPO3\CMS\Extbase\Utility\DebuggerUtility;
 use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
 
 /**
@@ -58,7 +59,26 @@ class SolrServiceProvider implements ServiceProviderInterface
 
     protected array $requestArguments = [];
 
-    public function __construct(protected string $connectionName, protected array $settings, protected LoggerInterface $logger) {}
+    protected string $connectionName;
+
+    private array $settings;
+
+    private string $connectionSettings;
+
+    public function setConnectionName(string $name): void
+    {
+        $this->connectionName = $name;
+    }
+
+    public function setSettings(array $settings): void
+    {
+        $this->settings = $settings;
+    }
+
+    public function setConnectionSettings(string $settings): void
+    {
+        $this->connectionSettings = $settings;
+    }
 
     public function getRequestArguments(): array
     {

Classes/ViewHelpers/Data/NewArrayViewHelper.php

@@ -57,7 +57,7 @@ public function initializeArguments(): void
         $this->registerArgument('omitEmptyFields', 'boolean', 'omits empty fields', false, false);
     }
 
-    public function render(): array
+    public function render()
     {
         $result = $this->arguments['array'] ?? [];
 
@@ -69,11 +69,6 @@ public function render(): array
                         $result[$key] = $value;
                     }
                 }
-            } else {
-                $result = 'newArray View Helper: Number of keys and values must be the same.' . PHP_EOL . print_r(
-                    $this->arguments,
-                    true
-                );
             }
         } else {
             foreach ($this->arguments['values'] as $value) {

Configuration/Services.yaml

@@ -6,3 +6,6 @@ services:
 
   Subugoe\Find\:
     resource: '../Classes/*'
+
+  Subugoe\Find\Service\ServiceProviderInterface:
+    class: Subugoe\Find\Service\SolrServiceProvider