refactor: refactor files for v13

Author: Jaiprucl

Classes/Cache/FastlyBackend.php

@@ -10,7 +10,9 @@
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerAwareTrait;
 use TYPO3\CMS\Core\Cache\Backend\NullBackend;
+use TYPO3\CMS\Core\Cache\CacheTag;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use function array_map;
 
 class FastlyBackend extends NullBackend implements LoggerAwareInterface
 {
@@ -63,6 +65,16 @@ public function flushByTags(array $tags): void
         if ($fastlyService === null) {
             return;
         }
-        $fastlyService->purgeKeys($tags);
+
+        $tagStrings = [];
+        foreach ($tags as $tag) {
+            if ($tag instanceof CacheTag) {
+                $tagStrings[] = $tag->name;
+            } else {
+                $tagStrings[] = (string)$tag;
+            }
+        }
+
+        $fastlyService->purgeKeys($tagStrings);
     }
 }

Classes/Middleware/FastlyMiddleware.php

@@ -8,7 +8,9 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+use TYPO3\CMS\Core\Cache\CacheTag;
 use TYPO3\CMS\Core\Http\ApplicationType;
+use function array_map;
 use function array_unique;
 use function implode;
 use function is_array;
@@ -63,11 +65,22 @@ protected function isFastlyDisabledOrNotConfigured(): bool
 
     protected function appendSurrogateKeys(ResponseInterface $response): ResponseInterface
     {
-        if (is_array($GLOBALS['TYPO3_REQUEST']->getAttribute('frontend.cache.collector')->getCacheTags()) && $GLOBALS['TYPO3_REQUEST']->getAttribute('frontend.cache.collector')->getCacheTags() !== []) {
-            $cacheTags = implode(' ', array_unique($GLOBALS['TYPO3_REQUEST']->getAttribute('frontend.cache.collector')->getCacheTags()));
-            $response = $response->withHeader('Surrogate-Key', $cacheTags);
+        $cacheTagObjects = $GLOBALS['TYPO3_REQUEST']->getAttribute('frontend.cache.collector')->getCacheTags();
+        if (!is_array($cacheTagObjects) || $cacheTagObjects === []) {
+            return $response;
         }
-        return $response;
+
+        $cacheTagStrings = [];
+        foreach ($cacheTagObjects as $tag) {
+            if ($tag instanceof CacheTag) {
+                $cacheTagStrings[] = $tag->name;
+            } else {
+                $cacheTagStrings[] = (string)$tag;
+            }
+        }
+
+        $cacheTags = implode(' ', array_unique($cacheTagStrings));
+        return $response->withHeader('Surrogate-Key', $cacheTags);
     }
 
     protected function appendSurrogateControl(ResponseInterface $response): ResponseInterface