[BUGFIX] Compatibility with changes in TYPO3 11.5.35, 12.4.10, and 12…

….4.11 (#113) * [BUGFIX] Prevent incompatibility with symfony/console v7 Resolves #111 * [TASK] Add earlier symfony/console versions * [TASK] Don't require reactions for v13 * Revert "[TASK] Don't require reactions for v13" This reverts commit 85eceb2. * [TASK] Don't require reactions for v13 * [TASK] Remove unnecessary null check * [WIP] Lock Composer to 2.2.22 * Revert "[WIP] Lock Composer to 2.2.22" This reverts commit 2330fd8. * [TASK] Don't set PID for sys_file * [TASK] Raise version to 2.1.1
FriendsOfTYPO3 · Feb 26, 2024 · f082246 · f082246
1 parent c2ee393
commit f082246
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -156,27 +156,27 @@ jobs:
           - typo3-version: ^12.4
             php-version: 8.1
             composer-dependencies: highest
-            additional-requirements: "typo3/cms-reactions"
+            additional-requirements: "typo3/cms-reactions:^12.4"
           - typo3-version: ^12.4
             php-version: 8.1
             composer-dependencies: lowest
-            additional-requirements: "typo3/cms-reactions"
+            additional-requirements: "typo3/cms-reactions:^12.4"
           - typo3-version: ^12.4
             php-version: 8.2
             composer-dependencies: highest
-            additional-requirements: "typo3/cms-reactions"
+            additional-requirements: "typo3/cms-reactions:^12.4"
           - typo3-version: ^12.4
             php-version: 8.2
             composer-dependencies: lowest
-            additional-requirements: "typo3/cms-reactions"
+            additional-requirements: "typo3/cms-reactions:^12.4"
           - typo3-version: ^12.4
             php-version: 8.3
             composer-dependencies: highest
-            additional-requirements: "typo3/cms-reactions"
+            additional-requirements: "typo3/cms-reactions:^12.4"
           - typo3-version: ^12.4
             php-version: 8.3
             composer-dependencies: lowest
-            additional-requirements: "typo3/cms-reactions"
+            additional-requirements: "typo3/cms-reactions:^12.4"
   functional-tests:
     name: "Functional tests"
     runs-on: ubuntu-20.04
@@ -209,12 +209,12 @@ jobs:
       - name: "Install lowest dependencies with composer"
         if: "matrix.composer-dependencies == 'lowest'"
         run: |
-          composer update --no-ansi --no-interaction --no-progress --with-dependencies --prefer-lowest
+          composer update --no-ansi --no-interaction --no-progress --with-dependencies --prefer-lowest typo3/minimal:"$TYPO3" $ADDITIONAL_REQUIREMENTS
           composer show
       - name: "Install highest dependencies with composer"
         if: "matrix.composer-dependencies == 'highest'"
         run: |
-          composer update --no-ansi --no-interaction --no-progress --with-dependencies
+          composer update --no-ansi --no-interaction --no-progress --with-dependencies typo3/minimal:"$TYPO3" $ADDITIONAL_REQUIREMENTS
           composer show
       - name: "Start MySQL"
         run: "sudo /etc/init.d/mysql start"
@@ -262,24 +262,24 @@ jobs:
           - typo3-version: ^12.4
             php-version: 8.1
             composer-dependencies: highest
-            additional-requirements: "typo3/cms-reactions"
+            additional-requirements: "typo3/cms-reactions:^12.4"
           - typo3-version: ^12.4
             php-version: 8.1
             composer-dependencies: lowest
-            additional-requirements: "typo3/cms-reactions"
+            additional-requirements: "typo3/cms-reactions:^12.4"
           - typo3-version: ^12.4
             php-version: 8.2
             composer-dependencies: highest
-            additional-requirements: "typo3/cms-reactions"
+            additional-requirements: "typo3/cms-reactions:^12.4"
           - typo3-version: ^12.4
             php-version: 8.2
             composer-dependencies: lowest
-            additional-requirements: "typo3/cms-reactions"
+            additional-requirements: "typo3/cms-reactions:^12.4"
           - typo3-version: ^12.4
             php-version: 8.3
             composer-dependencies: highest
-            additional-requirements: "typo3/cms-reactions"
+            additional-requirements: "typo3/cms-reactions:^12.4"
           - typo3-version: ^12.4
             php-version: 8.3
             composer-dependencies: lowest
-            additional-requirements: "typo3/cms-reactions"
+            additional-requirements: "typo3/cms-reactions:^12.4"
diff --git a/Classes/DataHandling/Operation/Event/Handler/RelationSortingAsMetaData.php b/Classes/DataHandling/Operation/Event/Handler/RelationSortingAsMetaData.php
@@ -92,7 +92,7 @@ public function addSortingIntentToMetaData(array $fieldConfigurations)
         foreach ($fieldConfigurations as $fieldName => $configuration) {
             $sortingIntent = $recordOperation->getDataForDataHandler()[$fieldName] ?? [];
 
-            if (($sortingIntent ?? []) === []) {
+            if ($sortingIntent === []) {
                 continue;
             }
 

diff --git a/Classes/DataHandling/Operation/Event/Handler/SetPid.php b/Classes/DataHandling/Operation/Event/Handler/SetPid.php
@@ -21,6 +21,7 @@ public function __invoke(AbstractRecordOperationEvent $event): void
         if (
             !$event->getRecordOperation()->isDataFieldSet('pid')
             && $event->getRecordOperation() instanceof CreateRecordOperation
+            && $event->getRecordOperation()->getTable() !== 'sys_file'
         ) {
             $event->getRecordOperation()->setDataFieldForDataHandler(
                 'pid',

diff --git a/composer.json b/composer.json
@@ -19,6 +19,7 @@
 		"php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
 		"ext-json": "*",
 		"ext-pdo": "*",
+		"symfony/console": "^5.4 || ^6.0",
 		"symfony/polyfill-php81": "^1.28",
 		"typo3/cms-core": "^11.5.8 || ^12.4.6",
 		"typo3/cms-fluid": "^11.5.8 || ^12.4.6",

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -4,7 +4,7 @@
 $EM_CONF['interest'] = [
     'title' => 'Integration REST API',
     'description' => 'REST and CLI API for adding, updating, and deleting records in TYPO3. Tracks relations so records can be inserted in any order. Uses remote ID mapping so you don\'t have to keep track of what UID a record has gotten after import. Data is inserted using backend APIs as if a real human did it, so you can can inspect the record history and undo actions.',
-    'version' => '2.1.0',
+    'version' => '2.1.1',
     'state' => 'stable',
     'category' => 'plugin',
     'constraints' => [