[MAINTENANCE] Filter array for empty search parameters (#1411)

Co-authored-by: Sebastian Meyer <[email protected]>
kitodo · Feb 1, 2025 · d4590f3 · d4590f3
1 parent 70567e6
commit d4590f3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/.github/phpstan.neon b/.github/phpstan.neon
@@ -23,6 +23,7 @@ parameters:
     - '#Constant LOG_SEVERITY_ERROR not found\.#'
     - '#Constant LOG_SEVERITY_NOTICE not found\.#'
     - '#Constant LOG_SEVERITY_WARNING not found\.#'
+    - '#^Parameter \#2 \$callback of function array_filter expects \(callable\(mixed\)\: bool\)\|null, ''strlen'' given\.$#'
   level: 5
   paths:
     - ../Classes/

diff --git a/Classes/Controller/ListViewController.php b/Classes/Controller/ListViewController.php
@@ -79,14 +79,13 @@ public function injectMetadataRepository(MetadataRepository $metadataRepository)
     public function mainAction(): ResponseInterface
     {
         $this->searchParams = $this->getParametersSafely('searchParameter');
+        $this->searchParams = is_array($this->searchParams) ? array_filter($this->searchParams, 'strlen') : [];
 
         // extract collection(s) from collection parameter
         $collections = [];
-        if (is_array($this->searchParams) && array_key_exists('collection', $this->searchParams)) {
+        if (array_key_exists('collection', $this->searchParams)) {
             foreach(explode(',', $this->searchParams['collection']) as $collectionEntry) {
-                if (!empty($collectionEntry)) {
-                    $collections[] = $this->collectionRepository->findByUid((int) $collectionEntry);
-                }
+                $collections[] = $this->collectionRepository->findByUid((int) $collectionEntry);
             }
         }
 
@@ -104,7 +103,7 @@ public function mainAction(): ResponseInterface
 
         $solrResults = null;
         $numResults = 0;
-        if (is_array($this->searchParams) && !empty($this->searchParams)) {
+        if (!empty($this->searchParams)) {
             $solrResults = $this->documentRepository->findSolrByCollections($collections, $this->settings, $this->searchParams, $listedMetadata, $indexedMetadata);
             $numResults = $solrResults->getNumFound();
 

diff --git a/Classes/Controller/SearchController.php b/Classes/Controller/SearchController.php
@@ -115,6 +115,7 @@ public function mainAction(): ResponseInterface
 
         // if search was triggered, get search parameters from POST variables
         $this->searchParams = $this->getParametersSafely('searchParameter');
+
         // if search was triggered by the ListView plugin, get the parameters from GET variables
         // replace with $this->request->getQueryParams() when dropping support for Typo3 v11, see Deprecation-100596
         $listRequestData = GeneralUtility::_GPmerged('tx_dlf_listview');
@@ -130,13 +131,15 @@ public function mainAction(): ResponseInterface
             $GLOBALS['TSFE']->fe_user->setKey('ses', 'search', $this->searchParams);
         }
 
+        $this->searchParams = is_array($this->searchParams) ? array_filter($this->searchParams, 'strlen') : [];
+
         // sanitize date search input
-        if (!empty($this->searchParams['dateFrom']) || !empty($this->searchParams['dateTo'])) {
-            if (empty($this->searchParams['dateFrom']) && !empty($this->searchParams['dateTo'])) {
+        if (array_key_exists('dateFrom', $this->searchParams) || array_key_exists('dateTo', $this->searchParams)) {
+            if (!array_key_exists('dateFrom', $this->searchParams) && array_key_exists('dateTo', $this->searchParams)) {
                 $this->searchParams['dateFrom'] = '*';
             }
 
-            if (empty($this->searchParams['dateTo']) && !empty($this->searchParams['dateFrom'])) {
+            if (!array_key_exists('dateTo', $this->searchParams) && array_key_exists('dateFrom', $this->searchParams)) {
                 $this->searchParams['dateTo'] = 'NOW';
             }
 
@@ -168,7 +171,7 @@ public function mainAction(): ResponseInterface
 
         // If no search has been executed, no variables have to be prepared.
         // An empty form will be shown.
-        if (is_array($this->searchParams) && !empty($this->searchParams)) {
+        if (!empty($this->searchParams)) {
             // get all sortable metadata records
             $sortableMetadata = $this->metadataRepository->findByIsSortable(true);
 
@@ -276,7 +279,7 @@ public function makeFacetsMenuArray(array $facets): array
         // Set search query.
         $searchParams = $this->searchParams;
         if (
-            (!empty($searchParams['fulltext']))
+            (array_key_exists('fulltext', $searchParams))
             || preg_match('/' . $fields['fulltext'] . ':\((.*)\)/', trim($searchParams['query']), $matches)
         ) {
             // If the query already is a fulltext query e.g using the facets
@@ -298,7 +301,7 @@ public function makeFacetsMenuArray(array $facets): array
         }
 
         // add filter query for date search
-        if (!empty($this->searchParams['dateFrom']) && !empty($this->searchParams['dateTo'])) {
+        if (array_key_exists('dateFrom', $this->searchParams) && array_key_exists('dateTo', $this->searchParams)) {
             // combine dateFrom and dateTo into filterquery as range search
             $search['params']['filterquery'][]['query'] = '{!join from=' . $fields['uid'] . ' to=' . $fields['uid'] . '}' . $fields['date'] . ':[' . $this->searchParams['dateFrom'] . ' TO ' . $this->searchParams['dateTo'] . ']';
         }
@@ -326,7 +329,7 @@ public function makeFacetsMenuArray(array $facets): array
             }
         }
 
-        if (isset($this->searchParams['fq']) && is_array($this->searchParams['fq'])) {
+        if (array_key_exists('fq', $this->searchParams) && is_array($this->searchParams['fq'])) {
             foreach ($this->searchParams['fq'] as $fq) {
                 $search['params']['filterquery'][]['query'] = $fq;
             }