Update dependencies, increase TYPO3 version, increase PHP version

Author: lochmueller

.github/workflows/Release.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
 
       - name: Check tag
         run: |
@@ -42,7 +42,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.3
           extensions: intl, mbstring, json, zip, curl
           tools: composer:v2
 

.github/workflows/test.yml

@@ -6,13 +6,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ '8.1', '8.2', '8.3' ]
-        typo3: [ '12', '13' ]
-        exclude:
-          - php: '8.1'
-            typo3: '13'
+        php: [ '8.3', '8.4', '8.5' ]
+        typo3: [ '13', '14' ]
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v6
       - name: Setup PHP with PECL extension
         uses: shivammathur/setup-php@v2
         with:

Classes/Cache/Listener/CachingAllowedListener.php

@@ -5,28 +5,13 @@
 namespace SFC\Staticfilecache\Cache\Listener;
 
 use SFC\Staticfilecache\Event\CacheRuleEvent;
-use TYPO3\CMS\Core\Information\Typo3Version;
-use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
 
 class CachingAllowedListener
 {
-    public function __construct(private readonly Typo3Version $typo3Version) {}
-
     public function __invoke(CacheRuleEvent $event): void
     {
-        if ($this->typo3Version->getMajorVersion() >= 13) {
-            /* @phpstan-ignore-next-line */
-            if (!$event->getRequest()->getAttribute('frontend.cache.instruction')->isCachingAllowed()) {
-                $event->addExplanation(__CLASS__, 'No caching via frontend.cache.instruction attribute');
-            }
-            return;
-        }
-
-        // v12
-        $tsfe = $GLOBALS['TSFE'] ?? null;
-        /* @phpstan-ignore-next-line */
-        if ($tsfe instanceof TypoScriptFrontendController && $tsfe->no_cache) {
-            $event->addExplanation(__CLASS__, 'config.no_cache is true');
+        if (!$event->getRequest()->getAttribute('frontend.cache.instruction')->isCachingAllowed()) {
+            $event->addExplanation(__CLASS__, 'No caching via frontend.cache.instruction attribute');
         }
     }
 }

Classes/Cache/Listener/ForceStaticCacheListener.php

@@ -15,7 +15,7 @@
  */
 class ForceStaticCacheListener
 {
-    public function __construct(readonly protected EventDispatcherInterface $eventDispatcher) {}
+    public function __construct(protected readonly EventDispatcherInterface $eventDispatcher) {}
 
     public function __invoke(CacheRuleEvent $event): void
     {

Classes/Controller/BackendController.php

@@ -30,10 +30,10 @@ class BackendController extends ActionController implements LoggerAwareInterface
     use LoggerAwareTrait;
 
     public function __construct(
-        readonly protected QueueService          $queueService,
-        readonly protected ModuleTemplateFactory $moduleTemplateFactory,
-        readonly protected ConfigurationService  $configurationService,
-        readonly protected CacheService          $cacheService,
+        protected readonly QueueService          $queueService,
+        protected readonly ModuleTemplateFactory $moduleTemplateFactory,
+        protected readonly ConfigurationService  $configurationService,
+        protected readonly CacheService          $cacheService,
     ) {}
 
     public function listAction(string $filter = ''): ResponseInterface

Classes/Event/CacheRuleEvent.php

@@ -10,10 +10,10 @@
 final class CacheRuleEvent implements CacheRuleEventInterface
 {
     public function __construct(
-        readonly private ServerRequestInterface $request,
+        private readonly ServerRequestInterface $request,
         private array $explanation,
         private bool $skipProcessing,
-        readonly private ResponseInterface $response,
+        private readonly ResponseInterface $response,
     ) {}
 
     public function getRequest(): ServerRequestInterface

Classes/Event/CacheRuleFallbackEvent.php

@@ -9,7 +9,7 @@
 final class CacheRuleFallbackEvent implements CacheRuleEventInterface
 {
     public function __construct(
-        readonly private ServerRequestInterface $request,
+        private readonly ServerRequestInterface $request,
         private array $explanation,
         private bool $skipProcessing
     ) {}

Classes/Event/GeneratorCreate.php

@@ -9,10 +9,10 @@
 final class GeneratorCreate
 {
     public function __construct(
-        readonly protected string            $entryIdentifier,
-        readonly protected string            $fileName,
-        readonly protected ResponseInterface $response,
-        readonly protected int               $lifetime
+        protected readonly string            $entryIdentifier,
+        protected readonly string            $fileName,
+        protected readonly ResponseInterface $response,
+        protected readonly int               $lifetime
     ) {}
 
     public function getEntryIdentifier(): string

Classes/Event/GeneratorRemove.php

@@ -7,8 +7,8 @@
 final class GeneratorRemove
 {
     public function __construct(
-        readonly protected string            $entryIdentifier,
-        readonly protected string            $fileName,
+        protected readonly string            $entryIdentifier,
+        protected readonly string            $fileName,
     ) {}
 
     public function getEntryIdentifier(): string

Classes/Event/PreGenerateEvent.php

@@ -11,7 +11,7 @@ final class PreGenerateEvent
 {
     public function __construct(
         private string $uri,
-        readonly private ServerRequestInterface $request,
+        private readonly ServerRequestInterface $request,
         private ResponseInterface $response
     ) {}