Raise to TYPO3 v13.2

DanielSiepmann · Jul 2, 2024 · d953209 · d953209
1 parent 7bd3cfa
commit d953209
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 24 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -114,10 +114,10 @@ jobs:
             typo3-version: '^12.4'
           - db-version: '8'
             php-version: '8.2'
-            typo3-version: '13.1'
+            typo3-version: '^13.2'
           - db-version: '8'
             php-version: '8.3'
-            typo3-version: '13.1'
+            typo3-version: '^13.2'
     steps:
       - uses: actions/checkout@v3
 
@@ -167,9 +167,9 @@ jobs:
           - php-version: '8.3'
             typo3-version: '^12.4'
           - php-version: '8.2'
-            typo3-version: '13.1'
+            typo3-version: '^13.2'
           - php-version: '8.3'
-            typo3-version: '13.1'
+            typo3-version: '^13.2'
     steps:
       - uses: actions/checkout@v3
 

diff --git a/Documentation/Changelog/3.0.0.rst b/Documentation/Changelog/3.0.0.rst
@@ -4,15 +4,15 @@
 Breaking
 --------
 
-* Support TYPO3 v13.1, drop v11.
+* Drop support for TYPO3 v11.
   We only support last two TYPO3 versions.
 
 * Drop `ext_emconf.php` this probably will remove support for none composer setups.
 
 Features
 --------
 
-* Add Support for TYPO3 v13.1.
+* Add Support for TYPO3 v13.
 
 Fixes
 -----

diff --git a/Documentation/Maintenance/v11.rst b/Documentation/Maintenance/v11.rst
diff --git a/Documentation/Maintenance/v12.rst b/Documentation/Maintenance/v12.rst
@@ -0,0 +1,4 @@
+V12
+===
+
+Remove `new DataHandler()` calls.
diff --git a/Tests/Functional/Typo3FeaturesTest.php b/Tests/Functional/Typo3FeaturesTest.php
@@ -56,7 +56,7 @@ protected function tearDown(): void
     #[Test]
     public function copyContainingRecords(): void
     {
-        $dataHandler = new DataHandler();
+        $dataHandler = $this->createDataHandler();
         $dataHandler->start([], [
             'pages' => [
                 1 => [
@@ -76,7 +76,7 @@ public function copyContainingRecords(): void
     #[Test]
     public function copyCustomTablesViaDataHandler(): void
     {
-        $dataHandler = new DataHandler();
+        $dataHandler = $this->createDataHandler();
         $dataHandler->copyWhichTables = 'pages,tx_tracking_pageview,tx_tracking_recordview';
         $dataHandler->start([], [
             'pages' => [
@@ -92,4 +92,14 @@ public function copyCustomTablesViaDataHandler(): void
             'EXT:tracking/Tests/Functional/ExpectedResults/Typo3FeaturesTest/CopyPasteContainingRecords.csv'
         );
     }
+
+    private function createDataHandler(): DataHandler
+    {
+        // Prior TYPO3 v13.2
+        if ($this->has(DataHandler::class) === false) {
+            return new DataHandler();
+        }
+
+        return $this->get(DataHandler::class);
+    }
 }
diff --git a/composer.json b/composer.json
@@ -28,15 +28,15 @@
     "require": {
         "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
         "ext-mbstring": "*",
-        "doctrine/dbal": "^2.12 || ^3.3 || 4.0.0-RC2",
+        "doctrine/dbal": "^2.12 || ^3.3 || ^4.0",
         "psr/http-message": "^1.0",
         "psr/http-server-handler": "^1.0",
         "psr/http-server-middleware": "^1.0",
         "symfony/console": "^5.2 || ^6.1 || ^7.0",
         "symfony/expression-language": "^5.2 || ^6.1 || ^7.0",
-        "typo3/cms-backend": "^12.4 || ^13.1",
-        "typo3/cms-core": "^12.4 || ^13.1",
-        "typo3/cms-dashboard": "^12.4 || ^13.1"
+        "typo3/cms-backend": "^12.4 || ^13.2",
+        "typo3/cms-core": "^12.4 || ^13.2",
+        "typo3/cms-dashboard": "^12.4 || ^13.2"
     },
     "require-dev": {
         "codappix/typo3-php-datasets": "^1.5",
@@ -45,8 +45,8 @@
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpstan": "^1.10",
         "phpunit/phpunit": "^10.1",
-        "saschaegerer/phpstan-typo3": "dev-add-typo3-13_1-support",
-        "typo3/testing-framework": "^8.0"
+        "saschaegerer/phpstan-typo3": "^1.10",
+        "typo3/testing-framework": "^8.0.9"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -0,0 +1,6 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Class TYPO3\\\\CMS\\\\Core\\\\DataHandling\\\\DataHandler constructor invoked with 0 parameters, 14 required\\.$#"
+			count: 1
+			path: Tests/Functional/Typo3FeaturesTest.php
diff --git a/phpstan.neon b/phpstan.neon
@@ -5,7 +5,6 @@ parameters:
     paths:
         - Classes
         - Tests
-    checkMissingIterableValueType: false
-    reportUnmatchedIgnoredErrors: true
     ignoreErrors:
+        - identifier: missingType.iterableValue
         - '#^Variable \$_EXTKEY might not be defined\.$#'