From 0bc9c2d2d05b2784bc65f4ca34ef4bbe0a0e03fd Mon Sep 17 00:00:00 2001 From: Georg Ringer Date: Thu, 8 Jan 2026 12:49:15 +0100 Subject: [PATCH 1/4] [TASK] Allow TYPO3 14 --- .github/workflows/compute.yml | 9 +++++++++ composer.json | 12 ++++++------ ext_emconf.php | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.github/workflows/compute.yml b/.github/workflows/compute.yml index 194f6c2..bd617ac 100644 --- a/.github/workflows/compute.yml +++ b/.github/workflows/compute.yml @@ -12,6 +12,7 @@ env: "^11.5" "^12.4" "^13.4" + "^14" TYPO3_DEV: | "11.5.x-dev" "12.4.x-dev" @@ -34,6 +35,14 @@ env: "typo3": "13.4.x-dev", "php": "8.1", }, + "14.0-8.1": { + "typo3": "^14", + "php": "8.1", + }, + "14.0-8.2": { + "typo3": "^14", + "php": "8.2", + }, } on: diff --git a/composer.json b/composer.json index f65a78f..fe4487f 100644 --- a/composer.json +++ b/composer.json @@ -21,18 +21,18 @@ ], "require": { "php": "^8.1", - "typo3/cms-backend": "^11.5 || ^12.4 || ^13.4", - "typo3/cms-core": "^11.5 || ^12.4 || ^13.4" + "typo3/cms-backend": "^11.5 || ^12.4 || ^13.4 || ^14", + "typo3/cms-core": "^11.5 || ^12.4 || ^13.4 || ^14" }, "require-dev": { "php-parallel-lint/php-parallel-lint": "^1.4", "phpspec/prophecy": "^1.12.1", "phpspec/prophecy-phpunit": "^2.0", "phpunit/phpunit": "^10.5", - "typo3/cms-fluid-styled-content": "^11.5 || ^12.4 || ^13.4", - "typo3/cms-indexed-search": "^11.5 || ^12.4 || ^13.4", - "typo3/cms-workspaces": "^11.5 || ^12.4 || ^13.4", - "typo3/minimal": "^11.5 || ^12.0 || ^13.0", + "typo3/cms-fluid-styled-content": "^11.5 || ^12.4 || ^13.4 || ^14", + "typo3/cms-indexed-search": "^11.5 || ^12.4 || ^13.4 || ^14", + "typo3/cms-workspaces": "^11.5 || ^12.4 || ^13.4 || ^14", + "typo3/minimal": "^11.5 || ^12.0 || ^13.0 || ^14", "typo3/testing-framework": "^7.0.4 || ^8.2.3" }, "autoload": { diff --git a/ext_emconf.php b/ext_emconf.php index ff52065..4108750 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -26,7 +26,7 @@ array ( 'depends' => array ( - 'typo3' => '11.5.0-13.4.99', + 'typo3' => '11.5.0-14.4.99', ), 'conflicts' => array ( From 6ca05ca06d4374a77ae7add2394b9a0acb4d5a37 Mon Sep 17 00:00:00 2001 From: Georg Ringer Date: Thu, 8 Jan 2026 12:55:26 +0100 Subject: [PATCH 2/4] [TASK] Cleamup ext_emconf --- ext_emconf.php | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/ext_emconf.php b/ext_emconf.php index 4108750..ad521f6 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -1,15 +1,5 @@ 'Content Defender', 'description' => 'Define allowed or denied content element types in your backend layouts', @@ -19,7 +9,6 @@ 'author_company' => 'biz-design', 'state' => 'stable', 'uploadfolder' => 0, - 'createDirs' => '', 'clearCacheOnLoad' => 0, 'version' => '3.5.3', 'constraints' => @@ -28,12 +17,6 @@ array ( 'typo3' => '11.5.0-14.4.99', ), - 'conflicts' => - array ( - ), - 'suggests' => - array ( - ), ), ); From 55a1836a19c8d3e811cfbdf3c2da5d587b56f928 Mon Sep 17 00:00:00 2001 From: Nicole Hummel Date: Thu, 8 Jan 2026 13:19:56 +0100 Subject: [PATCH 3/4] [TASK] Adjust composer configuration --- composer.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index fe4487f..806f003 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ "typo3/cms-indexed-search": "^11.5 || ^12.4 || ^13.4 || ^14", "typo3/cms-workspaces": "^11.5 || ^12.4 || ^13.4 || ^14", "typo3/minimal": "^11.5 || ^12.0 || ^13.0 || ^14", - "typo3/testing-framework": "^7.0.4 || ^8.2.3" + "typo3/testing-framework": "^7.0.4 || ^8.2.3 || ^9.1.2" }, "autoload": { "psr-4": { @@ -53,6 +53,9 @@ "typo3/class-alias-loader": true, "typo3/cms-composer-installers": true }, + "audit": { + "block-insecure": false + }, "bin-dir": ".Build/bin", "vendor-dir": ".Build/vendor", "sort-packages": true From dbdd68a6a465eeb5d6430e02b5d83bd80b45f96b Mon Sep 17 00:00:00 2001 From: Georg Ringer Date: Thu, 8 Jan 2026 13:28:56 +0100 Subject: [PATCH 4/4] [TASK] Migrate VersionState::cast --- Classes/Repository/ContentRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classes/Repository/ContentRepository.php b/Classes/Repository/ContentRepository.php index 63f91be..08b92dc 100644 --- a/Classes/Repository/ContentRepository.php +++ b/Classes/Repository/ContentRepository.php @@ -149,7 +149,7 @@ protected function fetchRecordsForColPos(array $record): array while ($row = $statement->fetchAssociative()) { BackendUtility::workspaceOL('tt_content', $row, -99, true); - if (is_array($row) && !VersionState::cast($row['t3ver_state'])->equals(VersionState::DELETE_PLACEHOLDER)) { + if (is_array($row) && ! VersionState::tryFrom($row['t3ver_state']) === VersionState::DELETE_PLACEHOLDER) { $uid = ($row['_ORIG_uid'] ?? 0) ?: $row['uid']; $rows[$uid] = $uid; }