[TASK] Fix phpstan checkFunctionArgumentTypes errors in ext:redirects

This patch fixes incompatible type usage in function arguments and is preparatory work for introducing native type hints and strict mode in all core files. Resolves: #92174 Releases: master, 10.4 Change-Id: I1a5421b844c36796dca1336c453ff0333295c320 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/65903 Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de> Reviewed-by: Oliver Bartsch <bo@cedev.de> Reviewed-by: Daniel Goerz <daniel.goerz@posteo.de> Tested-by: TYPO3com <noreply@typo3.com> Tested-by: Oliver Bartsch <bo@cedev.de> Tested-by: Daniel Goerz <daniel.goerz@posteo.de>
TYPO3 · Sep 27, 2020 · f97396c · f97396c
1 parent 882dba9
commit f97396c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/typo3/sysext/redirects/Classes/Controller/ManagementController.php b/typo3/sysext/redirects/Classes/Controller/ManagementController.php
@@ -86,7 +86,7 @@ public function handleRequest(ServerRequestInterface $request): ResponseInterfac
         $action = $request->getQueryParams()['action'] ?? $request->getParsedBody()['action'] ?? 'overview';
         $this->initializeView($action);
 
-        $result = call_user_func_array([$this, $action . 'Action'], [$request]);
+        $result = $this->{$action . 'Action'}($request);
         if ($result instanceof ResponseInterface) {
             return $result;
         }

diff --git a/typo3/sysext/redirects/Classes/Hooks/DataHandlerSlugUpdateHook.php b/typo3/sysext/redirects/Classes/Hooks/DataHandlerSlugUpdateHook.php
@@ -68,7 +68,7 @@ public function processDatamap_preProcessFieldArray(array $incomingFieldArray, s
             return;
         }
 
-        $record = BackendUtility::getRecordWSOL($table, $id, 'slug');
+        $record = BackendUtility::getRecordWSOL($table, (int)$id, 'slug');
         $this->persistedSlugValues[(int)$id] = $record['slug'];
     }
 

diff --git a/typo3/sysext/redirects/Classes/Service/RedirectService.php b/typo3/sysext/redirects/Classes/Service/RedirectService.php
@@ -118,7 +118,7 @@ public function matchRedirect(string $domain, string $path, string $query = '')
             if (!empty($allRedirects[$domainName]['regexp'])) {
                 $allRegexps = array_keys($allRedirects[$domainName]['regexp']);
                 foreach ($allRegexps as $regexp) {
-                    $matchResult = @preg_match($regexp, $path);
+                    $matchResult = @preg_match((string)$regexp, $path);
                     if ($matchResult) {
                         $possibleRedirects += $allRedirects[$domainName]['regexp'][$regexp];
                     } elseif ($matchResult === false) {

diff --git a/typo3/sysext/redirects/Classes/Service/SlugService.php b/typo3/sysext/redirects/Classes/Service/SlugService.php
@@ -118,6 +118,9 @@ public function __construct(Context $context, LanguageService $languageService,
     public function rebuildSlugsForSlugChange(int $pageId, string $currentSlug, string $newSlug, CorrelationId $correlationId): void
     {
         $currentPageRecord = BackendUtility::getRecord('pages', $pageId);
+        if ($currentPageRecord === null) {
+            return;
+        }
         $this->initializeSettings($pageId);
         if ($this->autoUpdateSlugs || $this->autoCreateRedirects) {
             $this->createCorrelationIds($pageId, $correlationId);