From dc3b6016d28e074e25388e5699194ad3cba616a9 Mon Sep 17 00:00:00 2001
From: Sascha Nowak <sascha.nowak@netlogix.de>
Date: Sat, 9 Nov 2024 12:54:30 +0100
Subject: [PATCH] feat: TYPO3 13.4 compatibility

---
 .github/workflows/apply-coding-standard.yml   |   6 +-
 .github/workflows/ci.yml                      |   8 +-
 Classes/Middleware/AcceptHeaderHashBase.php   |   2 +-
 Classes/Middleware/AjaxRequestMiddleware.php  |  64 +++----
 Classes/Mvc/Controller/AjaxController.php     |   4 +-
 Classes/Mvc/View/JsonView.php                 |  43 +++--
 .../Middleware/AjaxRequestMiddlewareTest.php  |  81 ++++-----
 composer.json                                 |  10 +-
 rector.php                                    | 164 ++++--------------
 9 files changed, 122 insertions(+), 260 deletions(-)

diff --git a/.github/workflows/apply-coding-standard.yml b/.github/workflows/apply-coding-standard.yml
index fafec9a..09d9765 100644
--- a/.github/workflows/apply-coding-standard.yml
+++ b/.github/workflows/apply-coding-standard.yml
@@ -16,7 +16,7 @@ jobs:
       - name: 'Setup PHP'
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.1'
+          php-version: '8.3'
           tools: composer
 
       - name: 'Get Composer Cache Directory'
@@ -26,7 +26,7 @@ jobs:
           echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: 'Cache Composer Dependencies'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: composer
@@ -53,7 +53,7 @@ jobs:
 
       - name: 'Create pull-request'
         id: cpr
-        uses: peter-evans/create-pull-request@v5.0.2
+        uses: peter-evans/create-pull-request@v6.0.3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: "[automated] Apply Coding Standard"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f3c1118..9a4af26 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,12 +20,12 @@ permissions:
 jobs:
   test:
     runs-on: ubuntu-latest
-    name: TYPO3 v12.4 tests on PHP ${{ matrix.php }}
+    name: TYPO3 v13.4 tests on PHP ${{ matrix.php }}
 
     strategy:
       fail-fast: false
       matrix:
-        php: [ 8.1, 8.2, 8.3 ]
+        php: [ 8.3 ]
 
     steps:
       - name: 'Checkout code'
@@ -46,7 +46,7 @@ jobs:
           echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: 'Cache Composer Dependencies'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: composer-php${{ matrix.php }}
@@ -72,7 +72,7 @@ jobs:
         run: .Build/bin/phpcov merge --html .Build/artifacts/coverage/merged --clover .Build/artifacts/coverage/clover.xml .Build/artifacts/coverage/
 
       - name: 'Generate code coverage summary report'
-        uses: saschanowak/CloverCodeCoverageSummary@0.4.0
+        uses: saschanowak/CloverCodeCoverageSummary@1.0.1
         with:
           filename: .Build/artifacts/coverage/clover.xml
 
diff --git a/Classes/Middleware/AcceptHeaderHashBase.php b/Classes/Middleware/AcceptHeaderHashBase.php
index 2f804eb..b6220a9 100644
--- a/Classes/Middleware/AcceptHeaderHashBase.php
+++ b/Classes/Middleware/AcceptHeaderHashBase.php
@@ -15,7 +15,7 @@ class AcceptHeaderHashBase implements MiddlewareInterface
 
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
-        $function = function (array &$params) use ($request) {
+        $function = function (array &$params) use ($request): void {
             $params['hashParameters'][self::class] = [];
             $params['hashParameters'][self::class]['REQUEST_METHOD'] = strtoupper((string) $request->getMethod());
 
diff --git a/Classes/Middleware/AjaxRequestMiddleware.php b/Classes/Middleware/AjaxRequestMiddleware.php
index 007825c..cef76cb 100644
--- a/Classes/Middleware/AjaxRequestMiddleware.php
+++ b/Classes/Middleware/AjaxRequestMiddleware.php
@@ -9,15 +9,12 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use RuntimeException;
-use TYPO3\CMS\Core\Context\Context;
+use TYPO3\CMS\Core\Cache\CacheTag;
 use TYPO3\CMS\Core\Http\Response;
 use TYPO3\CMS\Core\Http\Stream;
 use TYPO3\CMS\Core\Routing\PageArguments;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Extbase\Reflection\ObjectAccess;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
-use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
 
 class AjaxRequestMiddleware implements MiddlewareInterface
 {
@@ -28,60 +25,48 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
         $routeArguments = $routing->getRouteArguments();
 
         if (
-            str_contains((string) $request->getHeaderLine('Accept'), 'application/json')
+            str_contains($request->getHeaderLine('Accept'), 'application/json')
             && (is_countable($routeArguments) ? count($routeArguments) : 0) > 0
         ) {
-            $controller = $request->getAttribute('frontend.controller');
-            assert($controller instanceof TypoScriptFrontendController);
-
-            $controller->preparePageContentGeneration($request);
-            if (!$controller->tmpl->setup) {
-                throw new RuntimeException(
-                    'TypoScript not properly loaded, probably due to cached content.',
-                    1_593_611_242
-                );
-            }
-
             $pluginNamespace = array_key_first($routeArguments);
             [$prefix, $extensionName, $pluginName] = explode('_', (string) $pluginNamespace);
             $pluginSignature = strtolower($extensionName . '_' . $pluginName);
             $typoScriptObjectPath = 'tt_content.list.20.' . $pluginSignature;
 
-            $setup = $this->getPluginTypoScriptConfiguration($controller, $typoScriptObjectPath);
+            $setup = $this->getPluginTypoScriptConfiguration($request, $typoScriptObjectPath);
             $typoScriptObjectName = $setup[$pluginSignature];
             $typoScriptObjectConfiguration = $setup[$pluginSignature . '.'];
             $typoScriptObjectConfiguration['controller'] = $routeArguments[$pluginNamespace]['controller'] ?? '';
             $typoScriptObjectConfiguration['action'] = $routeArguments[$pluginNamespace]['action'] ?? '';
 
-            $this->addPluginFormatToRequest($request, $pluginNamespace);
+            $request = $this->addPluginFormatToRequest($request, $pluginNamespace);
 
             $contentContentObject = GeneralUtility::makeInstance(ContentObjectRenderer::class);
-            $contentContentObject->setUserObjectType(ContentObjectRenderer::OBJECTTYPE_USER);
+            $contentContentObject->setRequest($request);
             $pageContent = $contentContentObject->cObjGetSingle(
                 $typoScriptObjectName,
                 $typoScriptObjectConfiguration,
                 $typoScriptObjectPath
             );
+
+            $pageId = $request->getAttribute('frontend.page.information')->getId();
+            $pageCacheTag = new CacheTag('pageId_' . $pageId);
             if (str_starts_with((string) $pageContent, '<!--INT_SCRIPT')) {
                 $contentContentObject = GeneralUtility::makeInstance(ContentObjectRenderer::class);
+                $contentContentObject->setRequest($request);
                 $contentContentObject->setUserObjectType(ContentObjectRenderer::OBJECTTYPE_USER_INT);
                 $pageContent = $contentContentObject->cObjGetSingle(
                     $typoScriptObjectName,
                     $typoScriptObjectConfiguration,
                     $typoScriptObjectPath
                 );
-                $controller->no_cache = true;
+                $request->getAttribute('frontend.cache.instruction')
+                    ->disableCache('EXT:nxajax: Caching disabled using uncached extbase plugin.');
+                $pageCacheTag = new CacheTag('pageId_' . $pageId, 0);
             }
 
-            $controller->addCacheTags(['pageId_' . $controller->id]);
-            ObjectAccess::setProperty(
-                $controller,
-                'cacheExpires',
-                GeneralUtility::makeInstance(Context::class)->getPropertyFromAspect(
-                    'date',
-                    'timestamp'
-                ) + $controller->get_cache_timeout()
-            );
+            $request->getAttribute('frontend.cache.collector')
+                ->addCacheTags($pageCacheTag);
 
             $response = new Response();
             $body = new Stream('php://temp', 'rw');
@@ -95,23 +80,21 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
             // @codeCoverageIgnoreEnd
 
             $response = $response->withBody($body);
-            $response = $controller->applyHttpHeadersToResponse($response)
-                ->withHeader('Content-Length', (string) strlen((string) $pageContent))
-                ->withHeader('Content-Type', 'application/json;charset=utf-8');
-        } else {
-            $response = $handler->handle($request);
+            return $request->getAttribute('frontend.controller')
+                ->applyHttpHeadersToResponse($request, $response)
+                ->withHeader('Content-Length', (string) strlen((string) $pageContent));
         }
 
-        return $response;
+        return $handler->handle($request);
     }
 
     private function getPluginTypoScriptConfiguration(
-        TypoScriptFrontendController $controller,
+        ServerRequestInterface $request,
         string $typoScriptObjectPath
     ): array {
         $pathSegments = GeneralUtility::trimExplode('.', $typoScriptObjectPath);
         $lastSegment = array_pop($pathSegments);
-        $setup = $controller->tmpl->setup;
+        $setup = $request->getAttribute('frontend.typoscript')->getSetupArray();
         foreach ($pathSegments as $segment) {
             if (!array_key_exists($segment . '.', $setup)) {
                 throw new Exception(
@@ -119,8 +102,10 @@ private function getPluginTypoScriptConfiguration(
                     1_592_475_630
                 );
             }
+
             $setup = $setup[$segment . '.'];
         }
+
         if (!isset($setup[$lastSegment])) {
             throw new Exception(
                 'No Content Object definition found at TypoScript object path "' . $typoScriptObjectPath . '"',
@@ -131,13 +116,13 @@ private function getPluginTypoScriptConfiguration(
         return $setup;
     }
 
-    private function addPluginFormatToRequest(ServerRequestInterface $request, string $pluginNamespace): void
+    private function addPluginFormatToRequest(ServerRequestInterface $request, string $pluginNamespace): ServerRequestInterface
     {
         $routeArguments = $request->getAttribute('routing');
         assert($routeArguments instanceof PageArguments);
         $arguments = $routeArguments->getArguments();
         $arguments[$pluginNamespace]['format'] = 'json';
-        $request = $request->withAttribute(
+        return $request->withAttribute(
             'routing',
             new PageArguments(
                 $routeArguments->getPageId(),
@@ -147,6 +132,5 @@ private function addPluginFormatToRequest(ServerRequestInterface $request, strin
                 $routeArguments->getDynamicArguments(),
             )
         );
-        $GLOBALS['TYPO3_REQUEST'] = $request;
     }
 }
diff --git a/Classes/Mvc/Controller/AjaxController.php b/Classes/Mvc/Controller/AjaxController.php
index c173327..9bb43ce 100644
--- a/Classes/Mvc/Controller/AjaxController.php
+++ b/Classes/Mvc/Controller/AjaxController.php
@@ -12,7 +12,7 @@
 
 class AjaxController extends ExtbaseActionController
 {
-    protected $defaultViewObjectName = JsonView::class;
+    protected ?string $defaultViewObjectName = JsonView::class;
 
     public function errorAction(): ResponseInterface
     {
@@ -23,6 +23,7 @@ public function errorAction(): ResponseInterface
             if (!$validationResult->hasErrors()) {
                 continue;
             }
+
             $flattenErrors = $validationResult->getFlattenedErrors();
             foreach ($flattenErrors as $fullQualifiedPropertyPath => $errors) {
                 [$propertyName] = explode('.', (string) $fullQualifiedPropertyPath, 2);
@@ -36,6 +37,7 @@ public function errorAction(): ResponseInterface
                 }
             }
         }
+
         $this->view->assign('errors', [
             'errors' => $result,
         ]);
diff --git a/Classes/Mvc/View/JsonView.php b/Classes/Mvc/View/JsonView.php
index be2ebde..1c5ad2f 100644
--- a/Classes/Mvc/View/JsonView.php
+++ b/Classes/Mvc/View/JsonView.php
@@ -9,16 +9,32 @@
 
 class JsonView implements ViewInterface
 {
-    protected $exposeSettings = false;
+    protected bool $exposeSettings = false;
 
-    protected $variables = [];
+    protected array $variables = [];
 
-    public function setExposeSettings(bool $exposeSettings)
+    public function setExposeSettings(bool $exposeSettings): void
     {
         $this->exposeSettings = $exposeSettings;
     }
 
-    public function render()
+    public function assign($key, $value): static
+    {
+        $this->variables[$key] = $value;
+
+        return $this;
+    }
+
+    public function assignMultiple(array $values): static
+    {
+        foreach ($values as $key => $value) {
+            $this->assign($key, $value);
+        }
+
+        return $this;
+    }
+
+    public function render(): string
     {
         $variables = $this->variables;
         if (!$this->exposeSettings) {
@@ -33,25 +49,8 @@ public function render()
 
         if ((is_countable($variables) ? count($variables) : 0) === 1) {
             return json_encode(current($variables), JSON_THROW_ON_ERROR);
-        } else {
-            return json_encode($variables, JSON_THROW_ON_ERROR);
         }
-    }
-
-    public function assign($key, $value)
-    {
-        $this->variables[$key] = $value;
-
-        return $this;
-    }
-
-    public function assignMultiple(array $values)
-    {
-        foreach ($values as $key => $value) {
-            $this->assign($key, $value);
-        }
-
-        return $this;
+        return json_encode($variables, JSON_THROW_ON_ERROR);
     }
 
     public function renderSection($sectionName, array $variables = [], $ignoreUnknown = false)
diff --git a/Tests/Unit/Middleware/AjaxRequestMiddlewareTest.php b/Tests/Unit/Middleware/AjaxRequestMiddlewareTest.php
index 39d898d..6c95056 100644
--- a/Tests/Unit/Middleware/AjaxRequestMiddlewareTest.php
+++ b/Tests/Unit/Middleware/AjaxRequestMiddlewareTest.php
@@ -4,25 +4,28 @@
 
 namespace Netlogix\Nxajax\Tests\Unit\Middleware;
 
-use AssertionError;
 use Exception;
 use Netlogix\Nxajax\Middleware\AjaxRequestMiddleware;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
 use Psr\Container\ContainerInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use RuntimeException;
+use TYPO3\CMS\Core\Cache\CacheDataCollector;
 use TYPO3\CMS\Core\Http\ServerRequest;
 use TYPO3\CMS\Core\Routing\PageArguments;
-use TYPO3\CMS\Core\TypoScript\TemplateService;
+use TYPO3\CMS\Core\TypoScript\AST\Node\RootNode;
+use TYPO3\CMS\Core\TypoScript\FrontendTypoScript;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Frontend\Cache\CacheInstruction;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
 use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
+use TYPO3\CMS\Frontend\Page\PageInformation;
 use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
 class AjaxRequestMiddlewareTest extends UnitTestCase implements ContainerInterface
 {
     protected bool $resetSingletonInstances = true;
+
     private array $instances = [];
 
     public function setUp(): void
@@ -43,11 +46,13 @@ public function getContainer(): ContainerInterface
         return $this;
     }
 
+    #[\Override]
     public function get(string $id)
     {
         return $this->instances[$id];
     }
 
+    #[\Override]
     public function has(string $id): bool
     {
         return array_key_exists($id, $this->instances);
@@ -110,15 +115,24 @@ private function getServerRequest(
         int $pageId = 1,
         array $routeArguments = [],
         string $accept = 'application/json',
-        ?TypoScriptFrontendController $typoScriptFrontendController = null
+        ?TypoScriptFrontendController $typoScriptFrontendController = null,
+        array $typoScriptSetup = []
     ): ServerRequest {
         $pageArguments = new PageArguments($pageId, 'test', $routeArguments);
+        $pageInformation = new PageInformation();
+        $pageInformation->setId($pageId);
+        $frontendTypoScript = new FrontendTypoScript(new RootNode(), [], [], []);
+        $frontendTypoScript->setSetupArray($typoScriptSetup);
 
         return (new ServerRequest(uri: 'https://example.com', method: 'GET', headers: [
             'accept' => $accept,
         ]))
             ->withAttribute('routing', $pageArguments)
-            ->withAttribute('frontend.controller', $typoScriptFrontendController);
+            ->withAttribute('frontend.controller', $typoScriptFrontendController)
+            ->withAttribute('frontend.page.information', $pageInformation)
+            ->withAttribute('frontend.cache.collector', new CacheDataCollector())
+            ->withAttribute('frontend.cache.instruction', new CacheInstruction())
+            ->withAttribute('frontend.typoscript', $frontendTypoScript);
     }
 
     #[Test]
@@ -138,31 +152,10 @@ public function process_should_only_forward_request_when_route_arguments_are_emp
     }
 
     #[Test]
-    public function process_should_throw_assertion_error_when_no_typo_script_frontend_controller_given(): void
-    {
-        $request = $this->getServerRequest(routeArguments: [
-            'tx_foo_bar' => [
-                'controller' => 'Bar',
-                'action' => 'baz',
-            ],
-        ]);
-
-        $handler = $this->getMockBuilder(RequestHandlerInterface::class)
-            ->getMock();
-
-        $subject = new AjaxRequestMiddleware();
-
-        self::expectException(AssertionError::class);
-        $subject->process($request, $handler);
-    }
-
-    #[Test]
-    public function process_should_throw_runtime_exception_when_typo_script_frontend_controller_is_not_loaded_properly(
-    ): void
+    public function process_should_throw_exception_when_typo_script_frontend_controller_is_not_loaded_properly(): void
     {
         $pageId = 1;
-
-        $typoScriptFrontendController = $this->getTypoScriptFrontendController($pageId);
+        $typoScriptFrontendController = $this->getTypoScriptFrontendController();
 
         $request = $this->getServerRequest(
             pageId: $pageId,
@@ -180,27 +173,16 @@ public function process_should_throw_runtime_exception_when_typo_script_frontend
 
         $subject = new AjaxRequestMiddleware();
 
-        self::expectException(RuntimeException::class);
+        self::expectException(Exception::class);
         $subject->process($request, $handler);
     }
 
-    private function getTypoScriptFrontendController(int $pageId): TypoScriptFrontendController
+    private function getTypoScriptFrontendController(): TypoScriptFrontendController
     {
-        $typoScriptFrontendController = $this->getAccessibleMock(
+        return $this->getAccessibleMock(
             originalClassName: TypoScriptFrontendController::class,
             callOriginalConstructor: false
         );
-
-        $typoScriptFrontendController->expects(self::once())
-            ->method('preparePageContentGeneration');
-
-        $typoScriptFrontendController->id = $pageId;
-
-        $typoScriptFrontendController->tmpl = $this->getMockBuilder(TemplateService::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        return $typoScriptFrontendController;
     }
 
     #[Test]
@@ -214,27 +196,23 @@ public function process_should_return_plugin_rendering_result_or_fail_with_expec
             self::expectException($expectedException);
         }
 
-        $pageId = 1;
-
-        $typoScriptFrontendController = $this->getTypoScriptFrontendController($pageId);
-
-        $typoScriptFrontendController->tmpl->setup = $typoScriptSetup;
-
+        $typoScriptFrontendController = $this->getTypoScriptFrontendController();
         if (!$expectedException) {
             $typoScriptFrontendController->expects(self::once())
                 ->method('applyHttpHeadersToResponse')
-                ->willReturnCallback(fn ($response) => $response);
+                ->willReturnCallback(fn ($request, $response) => $response);
         }
 
         $request = $this->getServerRequest(
-            pageId: $pageId,
+            pageId: 1,
             routeArguments: [
                 'tx_foo_bar' => [
                     'controller' => 'Bar',
                     'action' => 'baz',
                 ],
             ],
-            typoScriptFrontendController: $typoScriptFrontendController
+            typoScriptFrontendController: $typoScriptFrontendController,
+            typoScriptSetup: $typoScriptSetup,
         );
 
         $handler = $this->getMockBuilder(RequestHandlerInterface::class)
@@ -258,7 +236,6 @@ public function process_should_return_plugin_rendering_result_or_fail_with_expec
         $response = $subject->process($request, $handler);
 
         $this->assertEquals('14', $response->getHeaderLine('Content-Length'));
-        $this->assertEquals('application/json;charset=utf-8', $response->getHeaderLine('Content-Type'));
         $this->assertEquals('Plugin content', $response->getBody()->__toString());
     }
 }
diff --git a/composer.json b/composer.json
index 5d4b5a2..64a037b 100644
--- a/composer.json
+++ b/composer.json
@@ -4,14 +4,14 @@
   "type": "typo3-cms-extension",
   "license": "MIT",
   "require": {
-    "php": "^8.1",
-    "typo3/cms-core": "^12.4"
+    "php": "^8.3",
+    "typo3/cms-core": "^13.4"
   },
   "require-dev": {
     "ext-sqlite3": "*",
-    "ssch/typo3-rector": "^1.5",
-    "typo3/testing-framework": "^8.0",
-    "phpunit/phpcov": "^9.0",
+    "ssch/typo3-rector": "^2.11",
+    "typo3/testing-framework": "^9.0",
+    "phpunit/phpcov": "^10.0",
     "netlogix/coding-guidelines-php": "^1.0"
   },
   "autoload": {
diff --git a/rector.php b/rector.php
index c11e814..b94111f 100644
--- a/rector.php
+++ b/rector.php
@@ -3,112 +3,46 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
-use Rector\Core\Configuration\Option;
-use Rector\Core\ValueObject\PhpVersion;
-use Rector\Php74\Rector\LNumber\AddLiteralSeparatorToNumberRector;
-use Rector\PHPUnit\Set\PHPUnitLevelSetList;
+use Rector\Php81\Rector\Array_\FirstClassCallableRector;
 use Rector\PostRector\Rector\NameImportingPostRector;
 use Rector\Set\ValueObject\LevelSetList;
 use Rector\Set\ValueObject\SetList;
-use Ssch\TYPO3Rector\Rector\General\ConvertImplicitVariablesToExplicitGlobalsRector;
-use Ssch\TYPO3Rector\Rector\General\ExtEmConfRector;
-use Ssch\TYPO3Rector\Rector\v11\v0\SubstituteConstantsModeAndRequestTypeRector;
-use Ssch\TYPO3Rector\Set\Extension\NimutTestingFrameworkSetList;
+use Rector\ValueObject\PhpVersion;
+use Ssch\TYPO3Rector\CodeQuality\General\ConvertImplicitVariablesToExplicitGlobalsRector;
+use Ssch\TYPO3Rector\Configuration\Typo3Option;
 use Ssch\TYPO3Rector\Set\Typo3LevelSetList;
-use Ssch\TYPO3Rector\Set\Typo3SetList;
-
-return static function (RectorConfig $rectorConfig): void {
-
-    // If you want to override the number of spaces for your typoscript files you can define it here, the default value is 4
-    // $parameters = $rectorConfig->parameters();
-    // $parameters->set(Typo3Option::TYPOSCRIPT_INDENT_SIZE, 2);
-
-    $rectorConfig->sets([
-        // PHP
-        LevelSetList::UP_TO_PHP_81,
 
+return RectorConfig::configure()
+    ->withPaths([
+        __DIR__ . '/Classes',
+        __DIR__ . '/Configuration',
+        __DIR__ . '/Tests',
+    ])
+    ->withPhpSets(
+        true
+    )
+    ->withSets([
+        LevelSetList::UP_TO_PHP_83,
         SetList::CODE_QUALITY,
         SetList::CODING_STYLE,
         SetList::DEAD_CODE,
         SetList::TYPE_DECLARATION,
         SetList::EARLY_RETURN,
         SetList::INSTANCEOF,
-
-        // PhpUnit
-        PHPUnitLevelSetList::UP_TO_PHPUNIT_100,
-
-        // TYPO3
-        // v7
-        Typo3SetList::TCA_76,
-
-        // v8
-        Typo3SetList::TCA_87,
-
-        // v9
-        Typo3SetList::TCA_95,
-        Typo3SetList::EXTBASE_COMMAND_CONTROLLERS_TO_SYMFONY_COMMANDS,
-
-        // v10
-        Typo3SetList::TCA_104,
-        Typo3SetList::TYPOSCRIPT_CONDITIONS_95,
-        Typo3SetList::TYPOSCRIPT_100,
-        Typo3SetList::TYPOSCRIPT_CONDITIONS_104,
-        Typo3SetList::DATABASE_TO_DBAL,
-
-        // v11
-        Typo3SetList::TCA_114,
-        Typo3SetList::REGISTER_ICONS_TO_ICON,
-
-        // v12
-        Typo3SetList::TCA_120,
-        Typo3SetList::TCA_123,
-        Typo3SetList::TYPOSCRIPT_120,
-
-        // Typo3LevelSetList::UP_TO_TYPO3_7,
-        // Typo3LevelSetList::UP_TO_TYPO3_8,
-        // Typo3LevelSetList::UP_TO_TYPO3_9,
-        // Typo3LevelSetList::UP_TO_TYPO3_10,
-        // Typo3LevelSetList::UP_TO_TYPO3_11,
-        Typo3LevelSetList::UP_TO_TYPO3_12,
-
-        NimutTestingFrameworkSetList::NIMUT_TESTING_FRAMEWORK_TO_TYPO3_TESTING_FRAMEWORK
-    ]);
-
-    $rectorConfig->rule(SubstituteConstantsModeAndRequestTypeRector::class);
-
-    // Define your target version which you want to support
-    $rectorConfig->phpVersion(PhpVersion::PHP_81);
-
-    $parameters = $rectorConfig->parameters();
-    $parameters->set(Option::IMPORT_SHORT_CLASSES, false);
-    $parameters->set(Option::AUTO_IMPORT_DOC_BLOCK_NAMES, false);
-
-    // If you only want to process one/some TYPO3 extension(s), you can specify its path(s) here.
-    // If you use the option --config change __DIR__ to getcwd()
-    $rectorConfig->paths([
-        __DIR__,
-    ]);
-
-    // When you use rector there are rules that require some more actions like creating UpgradeWizards for outdated TCA types.
-    // To fully support you we added some warnings. So watch out for them.
-
-    // If you use importNames(), you should consider excluding some TYPO3 files.
-    $rectorConfig->skip([
-        // PHP
-        AddLiteralSeparatorToNumberRector::class,
-
-        // TYPO3
+        Typo3LevelSetList::UP_TO_TYPO3_13,
+    ])
+    # To have a better analysis from PHPStan, we teach it here some more things
+    ->withPHPStanConfigs([
+        Typo3Option::PHPSTAN_FOR_RECTOR_PATH
+    ])
+    ->withPhpVersion(PhpVersion::PHP_83)
+    ->withRules([
+        ConvertImplicitVariablesToExplicitGlobalsRector::class,
+    ])
+    # If you use importNames(), you should consider excluding some TYPO3 files.
+    ->withSkip([
         // @see https://github.com/sabbelasichon/typo3-rector/issues/2536
-        __DIR__ . '/**/Configuration/ExtensionBuilder/*',
-        // We skip those directories on purpose as there might be node_modules or similar
-        // that include typescript which would result in false positive processing
-        __DIR__ . '/**/Resources/**/node_modules/*',
-        __DIR__ . '/**/Resources/**/NodeModules/*',
-        __DIR__ . '/**/Resources/**/BowerComponents/*',
-        __DIR__ . '/**/Resources/**/bower_components/*',
-        __DIR__ . '/**/Resources/**/build/*',
-        __DIR__ . '/**/Resources/**/App/*',
-        __DIR__ . '/**/Resources/Public/*',
+        __DIR__ . '/Resources/*',
         __DIR__ . '/vendor/*',
         __DIR__ . '/Build/*',
         __DIR__ . '/public/*',
@@ -118,42 +52,8 @@
             'ext_localconf.php',
             'ext_tables.php',
             'ClassAliasMap.php',
-            __DIR__ . '/**/Configuration/*.php',
-            __DIR__ . '/**/Configuration/**/*.php',
-        ]
+        ],
+        FirstClassCallableRector::class => [
+            __DIR__ . '/Configuration/Services.php',
+        ],
     ]);
-
-    // If you have trouble that rector cannot run because some TYPO3 constants are not defined add an additional constants file
-    // @see https://github.com/sabbelasichon/typo3-rector/blob/main/typo3.constants.php
-    // @see https://github.com/rectorphp/rector/blob/main/docs/static_reflection_and_autoload.md#include-files
-    // $parameters->set(Option::BOOTSTRAP_FILES, [
-    //    __DIR__ . '/typo3.constants.php'
-    // ]);
-
-    // register a single rule
-    // $rectorConfig->rule(\Ssch\TYPO3Rector\Rector\v9\v0\InjectAnnotationRector::class);
-
-    /**
-     * Useful rule from RectorPHP itself to transform i.e. GeneralUtility::makeInstance('TYPO3\CMS\Core\Log\LogManager')
-     * to GeneralUtility::makeInstance(\TYPO3\CMS\Core\Log\LogManager::class) calls.
-     * But be warned, sometimes it produces false positives (edge cases), so watch out
-     */
-    // $rectorConfig->rule(\Rector\Php55\Rector\String_\StringClassNameToClassConstantRector::class);
-
-    // Optional non-php file functionalities:
-    // @see https://github.com/sabbelasichon/typo3-rector/blob/main/docs/beyond_php_file_processors.md
-
-    // Rewrite your extbase persistence class mapping from typoscript into php according to official docs.
-    // This processor will create a summarized file with all the typoscript rewrites combined into a single file.
-    /* $rectorConfig->ruleWithConfiguration(\Ssch\TYPO3Rector\FileProcessor\TypoScript\Rector\v10\v0\ExtbasePersistenceTypoScriptRector::class, [
-        \Ssch\TYPO3Rector\FileProcessor\TypoScript\Rector\v10\v0\ExtbasePersistenceTypoScriptRector::FILENAME => __DIR__ . '/packages/acme_demo/Configuration/Extbase/Persistence/Classes.php',
-    ]); */
-    // Add some general TYPO3 rules
-    $rectorConfig->rule(ConvertImplicitVariablesToExplicitGlobalsRector::class);
-    $rectorConfig->ruleWithConfiguration(ExtEmConfRector::class, [
-        ExtEmConfRector::ADDITIONAL_VALUES_TO_BE_REMOVED => []
-    ]);
-
-    // Modernize your TypoScript include statements for files and move from <INCLUDE /> to @import use the FileIncludeToImportStatementVisitor (introduced with TYPO3 9.0)
-    // $rectorConfig->rule(\Ssch\TYPO3Rector\FileProcessor\TypoScript\Rector\v9\v0\FileIncludeToImportStatementTypoScriptRector::class);
-};