From 6219e4ed4cf640ce6e45bb87c2262b19bed14d0a Mon Sep 17 00:00:00 2001 From: mabolek Date: Wed, 14 Feb 2024 18:23:10 +0100 Subject: [PATCH 01/10] [BUGFIX] Prevent incompatibility with symfony/console v7 Resolves #111 --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 02796e1..c32348a 100644 --- 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": "^6.4", "symfony/polyfill-php81": "^1.28", "typo3/cms-core": "^11.5.8 || ^12.4.6", "typo3/cms-fluid": "^11.5.8 || ^12.4.6", From 161f20fa2610ae1417541494185da6b1c1f8f848 Mon Sep 17 00:00:00 2001 From: mabolek Date: Wed, 14 Feb 2024 18:32:57 +0100 Subject: [PATCH 02/10] [TASK] Add earlier symfony/console versions --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c32348a..dc29fad 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", "ext-json": "*", "ext-pdo": "*", - "symfony/console": "^6.4", + "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", From 85eceb2b88c80cdefebfa41807800d032a4e08b5 Mon Sep 17 00:00:00 2001 From: mabolek Date: Wed, 14 Feb 2024 18:39:29 +0100 Subject: [PATCH 03/10] [TASK] Don't require reactions for v13 --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d376fe6..1772b73 100644 --- 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 From 1ecec044de6c907a17083be1c4a560d6b6f44a94 Mon Sep 17 00:00:00 2001 From: mabolek Date: Wed, 14 Feb 2024 18:41:26 +0100 Subject: [PATCH 04/10] Revert "[TASK] Don't require reactions for v13" This reverts commit 85eceb2b88c80cdefebfa41807800d032a4e08b5. --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1772b73..d376fe6 100644 --- 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:\"^12.4\"" + additional-requirements: "typo3/cms-reactions" - typo3-version: ^12.4 php-version: 8.1 composer-dependencies: lowest - additional-requirements: "typo3/cms-reactions:\"^12.4\"" + additional-requirements: "typo3/cms-reactions" - typo3-version: ^12.4 php-version: 8.2 composer-dependencies: highest - additional-requirements: "typo3/cms-reactions:\"^12.4\"" + additional-requirements: "typo3/cms-reactions" - typo3-version: ^12.4 php-version: 8.2 composer-dependencies: lowest - additional-requirements: "typo3/cms-reactions:\"^12.4\"" + additional-requirements: "typo3/cms-reactions" - typo3-version: ^12.4 php-version: 8.3 composer-dependencies: highest - additional-requirements: "typo3/cms-reactions:\"^12.4\"" + additional-requirements: "typo3/cms-reactions" - typo3-version: ^12.4 php-version: 8.3 composer-dependencies: lowest - additional-requirements: "typo3/cms-reactions:\"^12.4\"" + additional-requirements: "typo3/cms-reactions" functional-tests: name: "Functional tests" runs-on: ubuntu-20.04 From 15c0f556f737de388af73ea9e3b8a0521fd6f290 Mon Sep 17 00:00:00 2001 From: mabolek Date: Wed, 14 Feb 2024 18:45:44 +0100 Subject: [PATCH 05/10] [TASK] Don't require reactions for v13 --- .github/workflows/ci.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d376fe6..f00d57d 100644 --- 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" From 807eee9c6a26b56b327ced85bc5f4bbb1ef4ccbb Mon Sep 17 00:00:00 2001 From: mabolek Date: Wed, 14 Feb 2024 18:50:34 +0100 Subject: [PATCH 06/10] [TASK] Remove unnecessary null check --- .../Operation/Event/Handler/RelationSortingAsMetaData.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classes/DataHandling/Operation/Event/Handler/RelationSortingAsMetaData.php b/Classes/DataHandling/Operation/Event/Handler/RelationSortingAsMetaData.php index acb2f88..6518cec 100644 --- 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; } From 2330fd8e1026714f697ce61b9dfa6b324265842a Mon Sep 17 00:00:00 2001 From: mabolek Date: Wed, 14 Feb 2024 19:01:47 +0100 Subject: [PATCH 07/10] [WIP] Lock Composer to 2.2.22 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f00d57d..1cc0adb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -91,7 +91,7 @@ jobs: with: php-version: "${{ matrix.php-version }}" coverage: none - tools: composer:v2.2 + tools: composer:v2.2.22 - name: "Show Composer version" run: composer --version - name: "Cache dependencies installed with composer" @@ -188,7 +188,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: "${{ matrix.php-version }}" - tools: composer:v2.2 + tools: composer:v2.2.22 extensions: mysqli coverage: none - name: "Show Composer version" From aaf4e0ba16778e770b9829f862f70aedff616622 Mon Sep 17 00:00:00 2001 From: mabolek Date: Wed, 14 Feb 2024 19:03:32 +0100 Subject: [PATCH 08/10] Revert "[WIP] Lock Composer to 2.2.22" This reverts commit 2330fd8e1026714f697ce61b9dfa6b324265842a. --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1cc0adb..f00d57d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -91,7 +91,7 @@ jobs: with: php-version: "${{ matrix.php-version }}" coverage: none - tools: composer:v2.2.22 + tools: composer:v2.2 - name: "Show Composer version" run: composer --version - name: "Cache dependencies installed with composer" @@ -188,7 +188,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: "${{ matrix.php-version }}" - tools: composer:v2.2.22 + tools: composer:v2.2 extensions: mysqli coverage: none - name: "Show Composer version" From 610b364e5742172b438a8271b3b4c2e759ff1293 Mon Sep 17 00:00:00 2001 From: mabolek Date: Thu, 15 Feb 2024 16:44:52 +0100 Subject: [PATCH 09/10] [TASK] Don't set PID for sys_file --- Classes/DataHandling/Operation/Event/Handler/SetPid.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Classes/DataHandling/Operation/Event/Handler/SetPid.php b/Classes/DataHandling/Operation/Event/Handler/SetPid.php index 8c25a0e..60e95e1 100644 --- 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', From b4cddf3715b471f69690731ba2ca0220e338a845 Mon Sep 17 00:00:00 2001 From: mabolek Date: Sat, 24 Feb 2024 15:06:09 +0100 Subject: [PATCH 10/10] [TASK] Raise version to 2.1.1 --- ext_emconf.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext_emconf.php b/ext_emconf.php index bb24c3d..c623bc7 100644 --- 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' => [