diff --git a/.ddev/config.yaml b/.ddev/config.yaml index 9f27ca7..5303086 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -1,4 +1,4 @@ -name: powermailcond +name: powermailcond-v12 type: php docroot: .Build/public php_version: "8.1" diff --git a/.ddev/typo3/config.yaml b/.ddev/typo3/config.yaml index 873a097..ca3b257 100644 --- a/.ddev/typo3/config.yaml +++ b/.ddev/typo3/config.yaml @@ -1,4 +1,4 @@ -base: 'https://powermailcond.ddev.site/' +base: 'https://powermailcond-v12.ddev.site/' errorHandling: { } languages: - diff --git a/Classes/UserFunc/GetPowermailFields.php b/Classes/UserFunc/GetPowermailFields.php index f581153..fcc7d7e 100644 --- a/Classes/UserFunc/GetPowermailFields.php +++ b/Classes/UserFunc/GetPowermailFields.php @@ -34,7 +34,7 @@ public function __construct(ConnectionPool $connectionPool) */ public function getFormFieldsForCondition(array &$params): void { - $conditionContainer = $params['row']['conditioncontainer']; + $conditionContainer = $params['row']['conditioncontainer'] ?? ''; if (!MathUtility::canBeInterpretedAsInteger($conditionContainer)) { return; } @@ -55,7 +55,7 @@ public function getFormFieldsForCondition(array &$params): void */ public function getFormFieldsForRule(array &$params): void { - $conditions = $params['row']['conditions']; + $conditions = $params['row']['conditions'] ?? ''; if (!MathUtility::canBeInterpretedAsInteger($conditions)) { return; } diff --git a/Classes/UserFunc/GetPowermailFormsWithoutConditionRelation.php b/Classes/UserFunc/GetPowermailFormsWithoutConditionRelation.php index 826a2e3..b95cc95 100644 --- a/Classes/UserFunc/GetPowermailFormsWithoutConditionRelation.php +++ b/Classes/UserFunc/GetPowermailFormsWithoutConditionRelation.php @@ -27,7 +27,10 @@ public function __construct(ConnectionPool $connectionPool) */ public function filterForms(array &$params): void { - $currentForm = (int)$params['row']['form']; + $currentForm = (int)($params['row']['form'] ?? 0); + if ($currentForm === 0) { + return; + } $formsToSkip = [0, $currentForm]; $availableForms = []; diff --git a/composer.json b/composer.json index 9090a16..8d0754d 100644 --- a/composer.json +++ b/composer.json @@ -32,18 +32,28 @@ "typo3/cms-core": "^12.4" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^3.10", - "helmich/typo3-typoscript-lint": "^3.1", - "mikey179/vfsstream": "^1.6", - "typo3/testing-framework": "dev-main", - "phpmd/phpmd": "^2.8", - "squizlabs/php_codesniffer": "^3.5", + "typo3/cms-extbase": "^12.4", "typo3/cms-extensionmanager": "^12.4", + "typo3/cms-felogin": "^12.4", + "typo3/cms-filelist": "^12.4", "typo3/cms-fluid-styled-content": "^12.4", - "typo3/cms-lowlevel": "^12.4", - "typo3/cms-tstemplate": "^12.4", + "typo3/cms-frontend": "^12.4", "typo3/cms-info": "^12.4", - "typo3/coding-standards": "^0.7" + "typo3/cms-install": "^12.4", + "typo3/cms-recordlist": "^12.4", + "typo3/cms-rte-ckeditor": "^12.4", + "typo3/cms-scheduler": "^12.4", + "typo3/cms-setup": "^12.4", + "typo3/cms-t3editor": "^12.4", + "typo3/cms-tstemplate": "^12.4", + "typo3/cms-lowlevel": "^12.4", + "helmich/typo3-typoscript-lint": "^3.1", + "mikey179/vfsstream": "^1.6", + "friendsofphp/php-cs-fixer": "^3.10", + "helhum/typo3-console": "^8.0", + "symfony/config": "^6.2", + "typo3/cms-adminpanel": "^12.4", + "typo3/cms-belog": "^12.4" }, "replace": { "typo3-ter/powermail-cond": "self.version" diff --git a/ext_emconf.php b/ext_emconf.php index 8976900..fc525a1 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -4,7 +4,7 @@ 'title' => 'Powermail Conditions', 'description' => 'Add conditions (via AJAX) to powermail forms for fields and pages', 'category' => 'plugin', - 'version' => '11.2.2', + 'version' => '11.2.3', 'state' => 'stable', 'author' => 'Alex Kellner', 'author_email' => 'alexander.kellner@in2code.de', diff --git a/readme.md b/readme.md index 4f9fa34..ea82f1e 100644 --- a/readme.md +++ b/readme.md @@ -78,6 +78,7 @@ This is the current status of the EAP features: | Version | Date | State | Description | |---------|------------|---------|------------------------------------------------------------------------------------------------------| +| 11.2.3 | 2024-09-20 | Bugfix | Some small bugfixes | | 11.2.2 | 2024-10-16 | TASK | Adjust autodeployment | | 11.2.1 | 2024-10-16 | Bugfix | Fix autodeployment | | 11.2.0 | 2024-02-15 | Feature | Move public repository, adjust deployment, fix error in multivalue checkboxes |