!!![TASK] more improvements for v5 Release

.github/workflows/ci.yml

@@ -13,14 +13,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [ '8.1', '8.2']
-        TYPO3: ['11', '12' ]
-        include:
-          - TYPO3: '13'
-            php: '8.3'
+        php: [ '8.3', '8.5']
+        TYPO3: ['13', '14' ]
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set up PHP Version
         uses: shivammathur/setup-php@v2
@@ -29,29 +26,22 @@ jobs:
           tools: composer:v2
       - name: Composer validate
         run: composer validate
-      - name: Install composer dependencies TYPO3 13
-        if: matrix.TYPO3 == '13'
+      - name: Install composer dependencies TYPO3 14
+        if: matrix.TYPO3 == '14'
         run: |
           composer install --no-progress --no-interaction
 
-      - name: Install composer dependencies TYPO3 12
-        if: matrix.TYPO3 == '12'
-        run: |
-          composer require typo3/cms-core:^12.4 --no-progress --no-interaction --dev -W
-      - name: Install composer dependencies TYPO3 11
-        if: matrix.TYPO3 == '11'
-        run: |
-          composer require typo3/cms-core:^11.5 --no-progress --no-interaction --dev -W
-      - name: Phpstan 11
-        if: matrix.TYPO3 == '11'
-        run: .Build/bin/phpstan analyze -c Build/phpstan11.neon
-      - name: Phpstan 12
-        if: matrix.TYPO3 == '12'
-        run: .Build/bin/phpstan analyze -c Build/phpstan12.neon
-      - name: Phpstan 13
+      - name: Install composer dependencies TYPO3 13
         if: matrix.TYPO3 == '13'
-        run: .Build/bin/phpstan analyze -c Build/phpstan13.neon
-      - name: Phpcsfix TYPO3 12 and 13
-        if: matrix.TYPO3 != '11'
+        run: |
+          composer require typo3/cms-core:^13.4 --no-progress --no-interaction --dev -W
+      - name: Phpstan
+        run: .Build/bin/phpstan analyze -c Build/phpstan.neon
+      - name: Phpcsfix
         run: .Build/bin/php-cs-fixer fix --config=Build/php-cs-fixer.php --dry-run --stop-on-violation --using-cache=no
-
+      - name: Archive composer.lock
+        uses: actions/upload-artifact@v6
+        if: always()
+        with:
+          name: composer.lock-${{ matrix.php }}-${{ matrix.TYPO3 }}
+          path: composer.lock

Build/php-cs-fixer.php

@@ -2,4 +2,10 @@
 
 $config = \TYPO3\CodingStandards\CsFixerConfig::create();
 $config->getFinder()->exclude(['var'])->in(__DIR__ . '/..');
+$config->addRules([
+    'nullable_type_declaration' => [
+        'syntax' => 'question_mark',
+    ],
+    'nullable_type_declaration_for_default_null_value' => true,
+]);
 return $config;

Build/phpstan12.neon → Build/phpstan.neon

@@ -1,5 +1,3 @@
-includes:
-  - phpstan-baseline-12.neon
 parameters:
   level: 5
 

Classes/Listener/ModifyClearCacheActions.php

@@ -21,6 +21,7 @@
 use B13\Proxycachemanager\ProxyConfiguration;
 use TYPO3\CMS\Backend\Backend\Event\ModifyClearCacheActionsEvent;
 use TYPO3\CMS\Backend\Routing\UriBuilder;
+use TYPO3\CMS\Core\Information\Typo3Version;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 class ModifyClearCacheActions
@@ -41,9 +42,12 @@ public function __invoke(ModifyClearCacheActionsEvent $event): void
                 'id' => 'clearProxyCache',
                 'title' => 'LLL:EXT:proxycachemanager/Resources/Private/Language/locallang.xlf:menuitem.title',
                 'description' => 'LLL:EXT:proxycachemanager/Resources/Private/Language/locallang.xlf:menuitem.description',
-                'href' => (string)$uriBuilder->buildUriFromRoute('ajax_proxy_flushcaches'),
+                'endpoint' => (string)$uriBuilder->buildUriFromRoute('ajax_proxy_flushcaches'),
                 'iconIdentifier' => 'actions-system-cache-clear-impact-medium',
             ];
+            if ((new Typo3Version())->getMajorVersion() < 14) {
+                $item['href'] = $item['endpoint'];
+            }
             $event->addCacheAction($item);
         }
     }

Classes/Provider/NullProxyProvider.php

@@ -17,7 +17,7 @@
  * The TYPO3 project - inspiring people to share!
  */
 
-use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ServerRequestInterface;
 
 class NullProxyProvider implements ProxyProviderInterface
 {
@@ -30,7 +30,7 @@ public function isActive(): bool
         return false;
     }
 
-    public function shouldRequestBeMarkedAsCached(RequestInterface $request): bool
+    public function shouldRequestBeMarkedAsCached(ServerRequestInterface $request): bool
     {
         return false;
     }

Classes/Provider/ProxyProviderInterface.php

@@ -17,7 +17,7 @@
  * The TYPO3 project - inspiring people to share!
  */
 
-use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ServerRequestInterface;
 
 /**
  * The interface to be called from the CacheBackend.
@@ -27,5 +27,5 @@ interface ProxyProviderInterface
     public function flushCacheForUrls(array $urls): void;
     public function flushAllUrls(array $urls = []): void;
     public function isActive(): bool;
-    public function shouldRequestBeMarkedAsCached(RequestInterface $request): bool;
+    public function shouldRequestBeMarkedAsCached(ServerRequestInterface $request): bool;
 }

composer.json

@@ -25,21 +25,27 @@
 		}
 	},
     "require": {
-		"php": "^8.2",
-		"typo3/cms-backend": "^13.4 || ^14.0",
-		"typo3/cms-frontend": "^13.4 || ^14.0"
+		"php": "^8.3",
+		"typo3/cms-backend": "^13.4 || ^14.3",
+		"typo3/cms-extbase": "^13.4 || ^14.3",
+		"typo3/cms-frontend": "^13.4 || ^14.3",
+		"typo3/cms-install": "^13.4 || ^14.3"
 	},
 	"require-dev": {
-		"saschaegerer/phpstan-typo3": "^1.10",
-		"typo3/coding-standards": "^0.7 || ^0.8",
+		"phpstan/phpstan": "^1.10",
+		"typo3/coding-standards": "^0.8",
 		"typo3/tailor": "^1.0"
 	},
 	"extra": {
 		"typo3/cms": {
 			"extension-key": "proxycachemanager",
 			"cms-package-dir": "{$vendor-dir}/typo3/cms",
 			"app-dir": ".Build",
-			"web-dir": ".Build/Web"
+			"web-dir": ".Build/Web",
+			"version": "4.1.2",
+			"Package": {
+				"providesPackages": {}
+			}
 		}
 	},
 	"autoload": {