[TASK] Add PHP 8.5 support, drop PHP 8.1

.github/workflows/ci.yaml

@@ -32,6 +32,7 @@ jobs:
           - 8.2
           - 8.3
           - 8.4
+          - 8.5
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -112,6 +113,8 @@ jobs:
             typo3-version: '^13.4'
           - php-version: '8.4'
             typo3-version: '^13.4'
+          - php-version: '8.5'
+            typo3-version: '^13.4'
     steps:
       - uses: actions/checkout@v3
 
@@ -143,6 +146,8 @@ jobs:
             typo3-version: '^13.4'
           - php-version: '8.4'
             typo3-version: '^13.4'
+          - php-version: '8.5'
+            typo3-version: '^13.4'
     steps:
       - uses: actions/checkout@v3
 

Classes/Domain/Model/MarkerCollection.php

@@ -45,10 +45,13 @@ public function get(string $markerKey): Marker
     }
 
     /**
-     * @return mixed[]
+     * @return list<string>
      */
     public function getMarkerKeys(): array
     {
-        return array_keys($this->data);
+        return array_map(
+            static fn (Marker $marker): string => $marker->getMarkerWithBrackets(),
+            array_values($this->data),
+        );
     }
 }

Classes/EventListener/ContentProcessor.php

@@ -17,7 +17,6 @@
 
 use Sinso\Variables\Service\VariablesService;
 use TYPO3\CMS\Core\Attribute\AsEventListener;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Frontend\Event\AfterCacheableContentIsGeneratedEvent;
 
 class ContentProcessor

Classes/EventListener/ModifyCacheLifetime.php

@@ -8,10 +8,10 @@
 use TYPO3\CMS\Core\Attribute\AsEventListener;
 use TYPO3\CMS\Frontend\Event\ModifyCacheLifetimeForPageEvent;
 
-final class ModifyCacheLifetime
+final readonly class ModifyCacheLifetime
 {
     public function __construct(
-        private readonly VariablesService $variablesService,
+        private VariablesService $variablesService,
     ) {
     }
 

Classes/Service/VariablesService.php

@@ -87,7 +87,7 @@ private function replaceMarkersInText(
         MarkerCollection $markerCollection,
         string &$text
     ): void {
-        $markerRegexp = '/(' . implode('|', array_map('preg_quote', $markerCollection->getMarkerKeys())) . ')/';
+        $markerRegexp = '/(' . implode('|', array_map(preg_quote(...), $markerCollection->getMarkerKeys())) . ')/';
 
         $loops = 0;
 
@@ -128,9 +128,7 @@ private function replaceMarkersInText(
     private function getMarkers(
         ServerRequestInterface $request,
     ): MarkerCollection {
-        $pids = array_map(static function ($page) {
-            return $page['uid'];
-        }, $request->getAttribute('frontend.page.information')?->getRootLine() ?? []);
+        $pids = array_map(static fn ($page) => $page['uid'], $request->getAttribute('frontend.page.information')?->getRootLine() ?? []);
 
         $storagePid = $this->getStoragePidFromTypoScript($request);
         if (is_int($storagePid)) {
@@ -183,10 +181,7 @@ private function setCacheTags(
             return;
         }
 
-        $cacheTags = array_map(function (string $tag): CacheTag {
-            return new CacheTag($tag);
-        }, $this->cacheTags->toArray());
-
+        $cacheTags = array_map(fn (string $tag): CacheTag => new CacheTag($tag), $this->cacheTags->toArray());
         $cacheCollector->addCacheTags(...$cacheTags);
     }
 

Configuration/TCA/tx_variables_marker.php

@@ -24,7 +24,6 @@
             'starttime' => 'starttime',
             'endtime' => 'endtime',
         ],
-        'searchFields' => 'marker,replacement',
         'iconfile' => 'EXT:variables/Resources/Public/Icons/tx_variables_marker.png'
     ],
     'types' => [

Tests/Functional/Caching/AdjustsPageCacheLifetimeTest.php

@@ -27,19 +27,9 @@
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
-use Prophecy\Argument;
-use Prophecy\PhpUnit\ProphecyTrait;
 use Sinso\Variables\EventListener\ModifyCacheLifetime;
-use Sinso\Variables\Hooks\DataHandler;
 use Sinso\Variables\Service\VariablesService;
 use Sinso\Variables\Tests\Functional\Frontend\AbstractProcessesMarkersTestCase;
-use TYPO3\CMS\Core\Cache\CacheManager;
-use TYPO3\CMS\Core\Context\Context;
-use TYPO3\CMS\Core\Database\ConnectionPool;
-use TYPO3\CMS\Core\DataHandling\DataHandler as Typo3DataHandler;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Frontend\Cache\CacheLifetimeCalculator;
-use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
 #[CoversClass(ModifyCacheLifetime::class)]
 #[CoversClass(VariablesService::class)]

Tests/Functional/Caching/FlushViaDataHandlerChangesTest.php

@@ -26,13 +26,10 @@
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
-use Prophecy\Argument;
-use Prophecy\PhpUnit\ProphecyTrait;
 use Sinso\Variables\Hooks\DataHandler;
 use TYPO3\CMS\Core\Cache\CacheManager;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\DataHandling\DataHandler as Typo3DataHandler;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
 #[CoversClass(DataHandler::class)]

Tests/Unit/Domain/Model/MarkerCollectionTest.php

@@ -38,7 +38,7 @@ public function returnsType(): void
     {
         $subject = new MarkerCollection();
 
-        self::assertSame('Sinso\Variables\Domain\Model\Marker', $subject->getType());
+        self::assertSame(\Sinso\Variables\Domain\Model\Marker::class, $subject->getType());
     }
 
     #[Test]

composer.json

@@ -14,16 +14,17 @@
     }
   },
   "require": {
-    "php": ">= 8.1 < 8.5",
+    "php": ">= 8.2 < 8.6",
     "ramsey/collection": "^2.0",
     "typo3/cms-core": "^13.4"
   },
   "require-dev": {
-    "rector/rector": "^0.12.23",
+    "rector/rector": "^2.6",
     "typo3/testing-framework": "^8.0",
     "symplify/easy-coding-standard": "^12.3",
     "phpstan/extension-installer": "^1.4",
-    "saschaegerer/phpstan-typo3": "^1.10"
+    "saschaegerer/phpstan-typo3": "^2.1",
+    "ssch/typo3-rector": "^3.16"
   },
   "extra": {
     "typo3/cms": {

ext_localconf.php

@@ -1,6 +1,5 @@
 <?php
 
-use Sinso\Variables\Hooks\ContentProcessor;
 use Sinso\Variables\Hooks\DataHandler;
 
 defined('TYPO3') || die();

phpstan-baseline.neon

@@ -1,16 +1,169 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Cannot cast mixed to int\\.$#"
+			message: '#^Property TYPO3\\CMS\\Frontend\\Controller\\TypoScriptFrontendController\:\:\$content \(string\) does not accept mixed\.$#'
+			identifier: assign.propertyType
+			count: 1
+			path: Classes/EventListener/ContentProcessor.php
+
+		-
+			message: '#^Parameter \$key of class Sinso\\Variables\\Domain\\Model\\Marker constructor expects string, mixed given\.$#'
+			identifier: argument.type
+			count: 1
+			path: Classes/Hooks/DataHandler.php
+
+		-
+			message: '#^Possibly invalid array key type float\|int\|string\.$#'
+			identifier: offsetAccess.invalidOffset
+			count: 1
+			path: Classes/Hooks/DataHandler.php
+
+		-
+			message: '#^Binary operation "\-" between int and mixed results in an error\.$#'
+			identifier: binaryOp.invalid
+			count: 1
+			path: Classes/Service/VariablesService.php
+
+		-
+			message: '#^Binary operation "\." between mixed and '' does not implement '' results in an error\.$#'
+			identifier: binaryOp.invalid
+			count: 1
+			path: Classes/Service/VariablesService.php
+
+		-
+			message: '#^Cannot access offset ''EXTCONF'' on mixed\.$#'
+			identifier: offsetAccess.nonOffsetAccessible
+			count: 2
+			path: Classes/Service/VariablesService.php
+
+		-
+			message: '#^Cannot access offset ''ctrl'' on mixed\.$#'
+			identifier: offsetAccess.nonOffsetAccessible
+			count: 1
+			path: Classes/Service/VariablesService.php
+
+		-
+			message: '#^Cannot access offset ''enablecolumns'' on mixed\.$#'
+			identifier: offsetAccess.nonOffsetAccessible
+			count: 1
+			path: Classes/Service/VariablesService.php
+
+		-
+			message: '#^Cannot access offset ''endtime''\|''starttime'' on mixed\.$#'
+			identifier: offsetAccess.nonOffsetAccessible
+			count: 1
+			path: Classes/Service/VariablesService.php
+
+		-
+			message: '#^Cannot access offset ''marker'' on mixed\.$#'
+			identifier: offsetAccess.nonOffsetAccessible
+			count: 1
+			path: Classes/Service/VariablesService.php
+
+		-
+			message: '#^Cannot access offset ''postProcessMarkers'' on mixed\.$#'
+			identifier: offsetAccess.nonOffsetAccessible
+			count: 1
+			path: Classes/Service/VariablesService.php
+
+		-
+			message: '#^Cannot access offset ''replacement'' on mixed\.$#'
+			identifier: offsetAccess.nonOffsetAccessible
+			count: 1
+			path: Classes/Service/VariablesService.php
+
+		-
+			message: '#^Cannot access offset ''tx_variables_marker'' on mixed\.$#'
+			identifier: offsetAccess.nonOffsetAccessible
+			count: 1
+			path: Classes/Service/VariablesService.php
+
+		-
+			message: '#^Cannot access offset ''uid'' on mixed\.$#'
+			identifier: offsetAccess.nonOffsetAccessible
+			count: 2
+			path: Classes/Service/VariablesService.php
+
+		-
+			message: '#^Cannot access offset ''variables'' on mixed\.$#'
+			identifier: offsetAccess.nonOffsetAccessible
+			count: 2
+			path: Classes/Service/VariablesService.php
+
+		-
+			message: '#^Cannot cast mixed to int\.$#'
+			identifier: cast.int
 			count: 3
 			path: Classes/Service/VariablesService.php
 
 		-
-			message: "#^Parameter \\#1 \\$callback of function array_map expects \\(callable\\(mixed\\)\\: mixed\\)\\|null, 'preg_quote' given\\.$#"
+			message: '#^Parameter \#1 \$className of static method TYPO3\\CMS\\Core\\Utility\\GeneralUtility\:\:makeInstance\(\) expects class\-string\<object\>, mixed given\.$#'
+			identifier: argument.type
+			count: 1
+			path: Classes/Service/VariablesService.php
+
+		-
+			message: '#^Parameter \#1 \$fieldName of method TYPO3\\CMS\\Core\\Database\\Query\\Expression\\ExpressionBuilder\:\:gt\(\) expects string, mixed given\.$#'
+			identifier: argument.type
+			count: 1
+			path: Classes/Service/VariablesService.php
+
+		-
+			message: '#^Parameter \#1 \$fieldName of method TYPO3\\CMS\\Core\\Database\\Query\\Expression\\ExpressionBuilder\:\:lte\(\) expects string, mixed given\.$#'
+			identifier: argument.type
+			count: 1
+			path: Classes/Service/VariablesService.php
+
+		-
+			message: '#^Parameter \#1 \$identifier of method TYPO3\\CMS\\Core\\Database\\Query\\QueryBuilder\:\:quoteIdentifier\(\) expects string, mixed given\.$#'
+			identifier: argument.type
+			count: 2
+			path: Classes/Service/VariablesService.php
+
+		-
+			message: '#^Parameter \#2 \$array of function implode expects array\<string\>, array given\.$#'
+			identifier: argument.type
 			count: 1
 			path: Classes/Service/VariablesService.php
 
 		-
-			message: "#^Unable to resolve the template type T in call to method static method TYPO3\\\\CMS\\\\Core\\\\Utility\\\\GeneralUtility\\:\\:makeInstance\\(\\)$#"
+			message: '#^Parameter \$key of class Sinso\\Variables\\Domain\\Model\\Marker constructor expects string, mixed given\.$#'
+			identifier: argument.type
 			count: 1
 			path: Classes/Service/VariablesService.php
+
+		-
+			message: '#^Parameter \$replacement of class Sinso\\Variables\\Domain\\Model\\Marker constructor expects string, mixed given\.$#'
+			identifier: argument.type
+			count: 1
+			path: Classes/Service/VariablesService.php
+
+		-
+			message: '#^Parameter \$uid of class Sinso\\Variables\\Domain\\Model\\Marker constructor expects int, mixed given\.$#'
+			identifier: argument.type
+			count: 1
+			path: Classes/Service/VariablesService.php
+
+		-
+			message: '#^Parameter &\$text by\-ref type of method Sinso\\Variables\\Service\\VariablesService\:\:replaceMarkersInText\(\) expects string, string\|null given\.$#'
+			identifier: parameterByRef.type
+			count: 1
+			path: Classes/Service/VariablesService.php
+
+		-
+			message: '#^Unable to resolve the template type T in call to static method TYPO3\\CMS\\Core\\Utility\\GeneralUtility\:\:makeInstance\(\)$#'
+			identifier: argument.templateType
+			count: 1
+			path: Classes/Service/VariablesService.php
+
+		-
+			message: '#^Parameter \#1 \$params of method Sinso\\Variables\\Hooks\\DataHandler\:\:clearCachePostProc\(\) expects array\<string, mixed\>, array\<mixed\> given\.$#'
+			identifier: argument.type
+			count: 1
+			path: Tests/Functional/Caching/FlushViaDataHandlerChangesTest.php
+
+		-
+			message: '#^Property TYPO3\\TestingFramework\\Core\\Functional\\FunctionalTestCase\:\:\$configurationToUseInTestInstance \(array\<string, mixed\>\) does not accept array\.$#'
+			identifier: assign.propertyType
+			count: 1
+			path: Tests/Functional/Frontend/AbstractProcessesMarkersTestCase.php