[TASK] Prevent type errors

Prevent type errors by ensuring the right types is used.
TYPO3-Solr · Apr 21, 2022 · 061ef24 · 061ef24
1 parent ec66f49
commit 061ef24
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/Classes/FrontendEnvironment/TypoScript.php b/Classes/FrontendEnvironment/TypoScript.php
@@ -123,8 +123,8 @@ public function ext_getSetup(array $theSetup, string $theKey): array
     {
         $parts = explode('.', $theKey, 2);
         if ((string)$parts[0] !== '' && is_array($theSetup[$parts[0] . '.'])) {
-            if (trim($parts[1]) !== '') {
-                return $this->ext_getSetup($theSetup[$parts[0] . '.'], trim($parts[1]));
+            if (trim($parts[1] ?? '') !== '') {
+                return $this->ext_getSetup($theSetup[$parts[0] . '.'], trim($parts[1] ?? ''));
             }
             return [$theSetup[$parts[0] . '.'], $theSetup[$parts[0]]];
         }

diff --git a/Classes/ViewHelpers/SearchFormViewHelper.php b/Classes/ViewHelpers/SearchFormViewHelper.php
@@ -104,6 +104,7 @@ public function render()
         if ($pageUid === null && !empty($this->getTypoScriptConfiguration()->getSearchTargetPage())) {
             $pageUid = $this->getTypoScriptConfiguration()->getSearchTargetPage();
         }
+        $pageUid = (int)$pageUid;
 
         $uri = $this->buildUriFromPageUidAndArguments($pageUid);
 
@@ -190,10 +191,10 @@ protected function translateSearchParametersToInputTagAttributes(
      * When no speaking urls are active (e.g. with TYPO3 8 and no realurl) this information is passed as query parameter
      * and would get lost when it is only part of the query arguments in the action parameter of the form.
      *
-     * @param $pageId
+     * @param int $pageId
      * @return bool
      */
-    protected function getIsSiteManagedSite($pageId): bool
+    protected function getIsSiteManagedSite(int $pageId): bool
     {
         return SiteUtility::getIsSiteManagedSite($pageId);
     }
@@ -248,7 +249,7 @@ protected function buildUriFromPageUidAndArguments($pageUid): string
         $uriBuilder = $this->getControllerContext()->getUriBuilder();
         return $uriBuilder
             ->reset()
-            ->setTargetPageUid($pageUid)
+            ->setTargetPageUid((int)$pageUid)
             ->setTargetPageType($this->arguments['pageType'] ?? 0)
             ->setNoCache($this->arguments['noCache'] ?? false)
             ->setArguments($this->arguments['additionalParams'] ?? [])

diff --git a/Classes/ViewHelpers/Uri/Result/AddSearchWordListViewHelper.php b/Classes/ViewHelpers/Uri/Result/AddSearchWordListViewHelper.php
@@ -41,7 +41,7 @@ public function initializeArguments()
     {
         parent::initializeArguments();
         $this->registerArgument('url', 'string', 'The context searchResultSet', true);
-        $this->registerArgument('searchWords', 'string', 'The document to highlight', true);
+        $this->registerArgument('searchWords', 'string', 'The document to highlight', true, '');
         $this->registerArgument('addNoCache', 'boolean', 'Should no_cache=1 be added or not', false, true);
         $this->registerArgument('keepCHash', 'boolean', 'Should cHash be kept or not', false, false);
     }
@@ -67,7 +67,7 @@ public static function renderStatic(
             return $url;
         }
 
-        $searchWords = $arguments['searchWords'];
+        $searchWords = $arguments['searchWords'] ?? '';
         $addNoCache = $arguments['addNoCache'];
         $keepCHash = $arguments['keepCHash'];