Fix test execution and phpstan errors

Author: lochmueller

Classes/Cache/RemoteFileBackend.php

@@ -10,6 +10,7 @@
 use TYPO3\CMS\Core\Cache\Backend\TaggableBackendInterface;
 use TYPO3\CMS\Core\Cache\Backend\TransientBackendInterface;
 use TYPO3\CMS\Core\Cache\Exception\InvalidDataException;
+use TYPO3\CMS\Core\Information\Typo3Version;
 use TYPO3\CMS\Core\Resource\ResourceFactory;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\PathUtility;
@@ -56,7 +57,7 @@ public function setHashLength(int $hashLength): void
      * Saves data in the cache.
      *
      * @param string $entryIdentifier An identifier for this specific cache entry
-     * @param string $data            The data to be stored
+     * @param string|mixed $data            The data to be stored
      * @param array  $tags            Tags to associate with this cache entry. If the backend does not support tags, this option can be ignored.
      * @param int    $lifetime        Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited lifetime.
      *
@@ -259,7 +260,14 @@ protected function getFileName(string $entryIdentifier): string
         }
 
         try {
-            $resourceFactory = GeneralUtility::makeInstance(ResourceFactory::class);
+            if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 14) {
+                /** @var ResourceFactory $resourceFactory */
+                $resourceFactory = GeneralUtility::makeInstance(ResourceFactory::class);
+            } else {
+                /** @var StorageRepository $resourceFactory */
+                $resourceFactory = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
+            }
+
             $storage = $resourceFactory->getDefaultStorage();
             $baseName = (string) $storage->sanitizeFileName($baseName);
         } catch (\Exception $exception) {

Classes/Cache/StaticDatabaseBackend.php

@@ -58,13 +58,13 @@ public function getTableDefinitions(): string
             ExtensionManagementUtility::extPath('staticfilecache') .
             'Resources/Private/Sql/Cache/Backend/' . $large . 'Typo3DatabaseBackendCache.sql'
         );
-        $requiredTableStructures = str_replace('###CACHE_TABLE###', $this->cacheTable, $cacheTableSql) . LF . LF;
+        $requiredTableStructures = str_replace('###CACHE_TABLE###', $this->cacheTable, $cacheTableSql) . chr(10) . chr(10);
         $tagsTableSql = file_get_contents(
             ExtensionManagementUtility::extPath('staticfilecache') .
             'Resources/Private/Sql/Cache/Backend/' . $large . 'Typo3DatabaseBackendTags.sql'
         );
 
-        return $requiredTableStructures . str_replace('###TAGS_TABLE###', $this->tagsTable, $tagsTableSql) . LF;
+        return $requiredTableStructures . str_replace('###TAGS_TABLE###', $this->tagsTable, $tagsTableSql) . chr(10);
     }
 
     /**

Tests/Unit/Cache/Listener/AbstractListenerTest.php

@@ -4,18 +4,21 @@
 
 namespace SFC\Staticfilecache\Tests\Unit\Cache\Listener;
 
+use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use SFC\Staticfilecache\Event\CacheRuleEvent;
 use SFC\Staticfilecache\Tests\Unit\AbstractTest;
+use TYPO3\CMS\Core\Http\ServerRequest;
 
 abstract class AbstractListenerTest extends AbstractTest
 {
     protected function emptyCacheRuleEvent(): CacheRuleEvent
     {
         return new CacheRuleEvent(
-            $this->getMockBuilder(ServerRequestInterface::class)->getMock(),
+            new ServerRequest(),
             [],
-            false
+            false,
+            $this->getMockBuilder(ResponseInterface::class)->getMock(),
         );
     }
 

Tests/Unit/Cache/Listener/CachingAllowedListenerTest.php

@@ -4,33 +4,34 @@
 
 namespace SFC\Staticfilecache\Tests\Unit\Cache\Listener;
 
+use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use SFC\Staticfilecache\Cache\Listener\CachingAllowedListener;
 use SFC\Staticfilecache\Event\CacheRuleEvent;
+use TYPO3\CMS\Core\Http\ServerRequest;
 use TYPO3\CMS\Core\Information\Typo3Version;
+use TYPO3\CMS\Extbase\Mvc\Request;
 
 class CachingAllowedListenerTest extends AbstractListenerTest
 {
     public function testNoExplanation(): void
     {
-        $version = $this->getMockBuilder(Typo3Version::class)->disableOriginalConstructor()->getMock();
-        $version->method('getMajorVersion')->willReturn(12);
-
-        $listener = new CachingAllowedListener($version);
+        $listener = new CachingAllowedListener();
 
         $event = $this->emptyCacheRuleEvent();
         $listener($event);
 
-        self::assertEquals([], $event->getExplanation());
+        self::assertEmpty($event->getExplanation());
         self::assertEquals(false, $event->isSkipProcessing());
 
     }
     protected function emptyCacheRuleEvent(): CacheRuleEvent
     {
         return new CacheRuleEvent(
-            $this->getMockBuilder(ServerRequestInterface::class)->getMock(),
+            new ServerRequest(),
             [],
-            false
+            false,
+            $this->getMockBuilder(ResponseInterface::class)->getMock(),
         );
     }
 }

Tests/Unit/Cache/Listener/ForceStaticCacheListenerTest.php

@@ -4,10 +4,12 @@
 
 namespace SFC\Staticfilecache\Tests\Unit\Cache\Listener;
 
+use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use SFC\Staticfilecache\Cache\Listener\ForceStaticCacheListener;
 use SFC\Staticfilecache\Event\CacheRuleEvent;
 use TYPO3\CMS\Core\EventDispatcher\NoopEventDispatcher;
+use TYPO3\CMS\Core\Http\ServerRequest;
 
 class ForceStaticCacheListenerTest extends AbstractListenerTest
 {
@@ -16,9 +18,10 @@ public function testNoExplanation(): void
         $listener = new ForceStaticCacheListener(new NoopEventDispatcher());
 
         $cacheRuleEvent = new CacheRuleEvent(
-            $this->getMockBuilder(ServerRequestInterface::class)->getMock(),
+            new ServerRequest(),
             ['dummy'],
-            false
+            false,
+            $this->getMockBuilder(ResponseInterface::class)->getMock()
         );
 
         $listener($cacheRuleEvent);

Tests/Unit/Cache/Listener/NoAuthorizationListenerTest.php

@@ -4,6 +4,7 @@
 
 namespace SFC\Staticfilecache\Tests\Unit\Cache\Listener;
 
+use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use SFC\Staticfilecache\Cache\Listener\NoAuthorizationListener;
 use SFC\Staticfilecache\Event\CacheRuleEvent;
@@ -32,7 +33,8 @@ public function testAddExplanation(): void
         $event = new CacheRuleEvent(
             $request,
             [],
-            false
+            false,
+            $this->getMockBuilder(ResponseInterface::class)->getMock(),
         );
         $listener($event);
 

Tests/Unit/Cache/Listener/ValidRequestMethodListenerTest.php

@@ -4,6 +4,7 @@
 
 namespace SFC\Staticfilecache\Tests\Unit\Cache\Listener;
 
+use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use SFC\Staticfilecache\Cache\Listener\NoBackendUserListener;
 use SFC\Staticfilecache\Cache\Listener\ValidRequestMethodListener;
@@ -26,7 +27,8 @@ public function testNoExplanation(): void
         $event = new CacheRuleEvent(
             $request,
             [],
-            false
+            false,
+            $this->getMockBuilder(ResponseInterface::class)->getMock(),
         );
         $listener($event);
 
@@ -44,7 +46,8 @@ public function testExplanationAndSkip(): void
         $event = new CacheRuleEvent(
             $request,
             [],
-            false
+            false,
+            $this->getMockBuilder(ResponseInterface::class)->getMock()
         );
         $listener($event);
 

phpstan.neon

@@ -2,7 +2,7 @@ includes:
 	- phpstan-baseline.neon
 
 parameters:
-	level: 5
+	level: 4
 	reportUnmatchedIgnoredErrors: false
 	paths:
 		- Classes