[BUGFIX] Let RedirectCacheService not rely on having redirects cached

RedirectCacheService::getRedirects() relies on having the redirects cached. This assumption may lead to issues (e.g. in case a Redis server fails), causing TypeErrors. The code is changed to return the composed array in case the initial cache request misses. Resolves: #84070 Releases: master Change-Id: I148db9ccbf28a2f93761fbf4b2cb632e27787b2d Reviewed-on: https://review.typo3.org/56050 Tested-by: TYPO3com <no-reply@typo3.com> Reviewed-by: Benjamin Franzke <bfr@qbus.de> Tested-by: Benjamin Franzke <bfr@qbus.de> Reviewed-by: Mathias Schreiber <mathias.schreiber@typo3.com> Tested-by: Mathias Schreiber <mathias.schreiber@typo3.com> Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch> Tested-by: Christian Kuhn <lolli@schwarzbu.ch>

[BUGFIX] Let RedirectCacheService not rely on having redirects cached
RedirectCacheService::getRedirects() relies on having the redirects cached. This assumption may lead to issues (e.g. in case a Redis server fails), causing TypeErrors. The code is changed to return the composed array in case the initial cache request misses. Resolves: #84070 Releases: master Change-Id: I148db9ccbf28a2f93761fbf4b2cb632e27787b2d Reviewed-on: https://review.typo3.org/56050 Tested-by: TYPO3com <no-reply@typo3.com> Reviewed-by: Benjamin Franzke <bfr@qbus.de> Tested-by: Benjamin Franzke <bfr@qbus.de> Reviewed-by: Mathias Schreiber <mathias.schreiber@typo3.com> Tested-by: Mathias Schreiber <mathias.schreiber@typo3.com> Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch> Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
43cda8c4 · Andreas Kienast · Christian Kuhn · 7fb4977b · 43cda8c4
Commit 43cda8c4 authored 7 years ago by Andreas Kienast Committed by Christian Kuhn 7 years ago
--- a/typo3/sysext/redirects/Classes/Service/RedirectCacheService.php
+++ b/typo3/sysext/redirects/Classes/Service/RedirectCacheService.php
@@ -54,8 +54,7 @@ class RedirectCacheService
    {
        $redirects = $this->cache->get('redirects');
        if (!is_array($redirects)) {
-            $this->rebuild();
-            $redirects = $this->cache->get('redirects');
+            $redirects = $this->rebuild();
        }
        return $redirects;
    }
@@ -64,7 +63,7 @@ class RedirectCacheService
     * Rebuilds the cache for all redirects, grouped by host and by regular expressions.
     * Does not include deleted redirects, but includes the ones with dynamic starttime/endtime.
     */
-    public function rebuild()
+    public function rebuild(): array
    {
        $redirects = [];
        $this->flush();
@@ -85,6 +84,7 @@ class RedirectCacheService
            }
        }
        $this->cache->set('redirects', $redirects, ['redirects']);
+        return $redirects;
    }

    /**