[TASK] Refactor SearchFormViewHelper

* Replace inheritance with `AbstractTagBasedViewHelper`
* Add missing type hints and use private method scoping
* Migrate to constructor injection for `UriBuilder`
* Adjust test cases and update fixtures accordingly

Author: sfroemkenjw

Classes/ViewHelpers/AbstractSolrFrontendTagBasedViewHelper.php

@@ -17,42 +17,33 @@
 
 namespace ApacheSolrForTypo3\Solr\ViewHelpers;
 
+use ApacheSolrForTypo3\Solr\Domain\Search\ResultSet\SearchResultSet;
+use ApacheSolrForTypo3\Solr\System\Configuration\TypoScriptConfiguration;
 use ApacheSolrForTypo3\Solr\System\Url\UrlHelper;
 use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Core\Context\Exception\AspectNotFoundException;
 use TYPO3\CMS\Core\Utility\ArrayUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Mvc\RequestInterface;
 use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
-use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
 use TYPO3Fluid\Fluid\Core\Variables\VariableProviderInterface;
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
 
-/**
- * Class SearchFormViewHelper
- *
- *
- * @property RenderingContext $renderingContext
- */
-class SearchFormViewHelper extends AbstractSolrFrontendTagBasedViewHelper
+final class SearchFormViewHelper extends AbstractTagBasedViewHelper
 {
+    protected UriBuilder $uriBuilder;
+
     protected $tagName = 'form';
 
     protected $escapeChildren = true;
 
     protected $escapeOutput = false;
 
-    /**
-     * Constructor
-     */
-    public function __construct(
-        protected readonly UriBuilder $uriBuilder,
-    ) {
-        parent::__construct();
+    public function injectUriBuilder(UriBuilder $uriBuilder): void
+    {
+        $this->uriBuilder = $uriBuilder;
     }
 
-    /**
-     * Initialize arguments.
-     */
     public function initializeArguments(): void
     {
         parent::initializeArguments();
@@ -144,7 +135,7 @@ public function render(): string
      * Get the existing search parameters in an array
      * Returns an empty array if search.keepExistingParametersForNewSearches is not set
      */
-    protected function getExistingSearchParameters(): array
+    private function getExistingSearchParameters(): array
     {
         $searchParameters = [];
         if ($this->getTypoScriptConfiguration()->getSearchKeepExistingParametersForNewSearches()) {
@@ -162,7 +153,7 @@ protected function getExistingSearchParameters(): array
     /**
      * Translate the multidimensional array of existing arguments into a flat array of name-value pairs for the input tags
      */
-    protected function translateSearchParametersToInputTagAttributes(
+    private function translateSearchParametersToInputTagAttributes(
         array $arguments,
         string $nameAttributePrefix = '',
     ): array {
@@ -181,12 +172,12 @@ protected function translateSearchParametersToInputTagAttributes(
         return $attributes;
     }
 
-    protected function getTemplateVariableContainer(): ?VariableProviderInterface
+    private function getTemplateVariableContainer(): ?VariableProviderInterface
     {
         return $this->templateVariableContainer;
     }
 
-    protected function getQueryString(): string
+    private function getQueryString(): string
     {
         $resultSet = $this->getSearchResultSet();
         if ($resultSet === null) {
@@ -195,7 +186,7 @@ protected function getQueryString(): string
         return trim($this->getSearchResultSet()->getUsedSearchRequest()->getRawUserQuery());
     }
 
-    protected function getSuggestUrl(?array $additionalFilters, int $pageUid): string
+    private function getSuggestUrl(?array $additionalFilters, int $pageUid): string
     {
         $pluginNamespace = $this->getTypoScriptConfiguration()->getSearchPluginNamespace();
         $suggestUrl = $this->uriBuilder
@@ -210,7 +201,7 @@ protected function getSuggestUrl(?array $additionalFilters, int $pageUid): strin
         return $urlService->withoutQueryParameter('cHash')->__toString();
     }
 
-    protected function buildUriFromPageUidAndArguments(int $pageUid): string
+    private function buildUriFromPageUidAndArguments(int $pageUid): string
     {
         return $this->uriBuilder
             ->reset()
@@ -224,4 +215,14 @@ protected function buildUriFromPageUidAndArguments(int $pageUid): string
             ->setSection($this->arguments['section'] ?? '')
             ->build();
     }
+
+    private function getTypoScriptConfiguration(): TypoScriptConfiguration
+    {
+        return $this->renderingContext->getVariableProvider()->get('typoScriptConfiguration');
+    }
+
+    private function getSearchResultSet(): ?SearchResultSet
+    {
+        return $this->renderingContext->getVariableProvider()->get('searchResultSet');
+    }
 }

Classes/ViewHelpers/AbstractSolrTagBasedViewHelper.php

@@ -0,0 +1,10 @@
+"pages"
+,"uid","pid","title","sorting","deleted","sys_language_uid","l10n_parent","perms_everybody","slug"
+,1,0,"Root",128,0,0,0,15,"/"
+,2,1,"Dummy 1-2",128,0,0,0,15,"/dummy-1-2"
+,3,2,"Dummy 1-2-3",128,0,0,0,15,"/dummy-1-2/dummy-1-2-3"
+,4,3,"Dummy 1-2-3-4",128,0,0,0,15,"/dummy-1-2/dummy-1-2-3/dummy-1-2-3-4"
+,5,1,"Dummy 1-5",256,0,0,15,0,"/dummy-1-5"
+,6,5,"Dummy 1-5-6",128,0,0,0,15,"/dummy-1-5/dummy-1-5-6"
+,7,0,"Root 2",128,0,0,0,15,"/"
+,8,1,"Dummy 1-2 DE",129,0,1,2,15,"/de/dummy-1-2"