From 59534d0d93e3e02b9931112e18f2b39ef0a5b68c Mon Sep 17 00:00:00 2001 From: Marcus Schwemer Date: Fri, 20 Sep 2024 14:32:30 +0200 Subject: [PATCH 1/6] [TASK] Update composer.json to refelct public, stable versions --- composer.json | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 8f0e10b..8811ae6 100644 --- a/composer.json +++ b/composer.json @@ -23,13 +23,7 @@ "role": "Developer" } ], - "homepage": "https://github.com/einpraegsam/powermail_cond", - "repositories": [ - { - "type": "vcs", - "url": "git@github.com:in2code-pro/powermail.git" - } - ], + "homepage": "https://github.com/in2code-de/powermail_cond", "require": { "php": "^8.1", "ext-json": "*", @@ -41,7 +35,7 @@ "friendsofphp/php-cs-fixer": "^3.10", "helmich/typo3-typoscript-lint": "^3.1", "mikey179/vfsstream": "^1.6", - "typo3/testing-framework": "dev-main", + "typo3/testing-framework": "^8.0", "phpmd/phpmd": "^2.8", "squizlabs/php_codesniffer": "^3.5", "typo3/cms-extensionmanager": "^12.4", From 0985122e66708c5fb1b3c6de7bee156d6148652c Mon Sep 17 00:00:00 2001 From: Marcus Schwemer Date: Fri, 20 Sep 2024 15:00:40 +0200 Subject: [PATCH 2/6] [TASK] Use TYPO3 version specific hostname for dev environment --- .ddev/config.yaml | 2 +- .ddev/typo3/config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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: - From aafaf9d81b1507ac2e879e8b5765fad98f7fdbf9 Mon Sep 17 00:00:00 2001 From: Marcus Schwemer Date: Fri, 20 Sep 2024 15:01:27 +0200 Subject: [PATCH 3/6] [TASK] Add neccessary composer packages for dev environment --- composer.json | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 8811ae6..baf14d4 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": "^8.0", - "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" From 78064ea56b6b62978b2a26bfd1a4fd1775381470 Mon Sep 17 00:00:00 2001 From: Marcus Schwemer Date: Fri, 20 Sep 2024 15:12:04 +0200 Subject: [PATCH 4/6] [BUGFIX] Prevent possible undefined array key warning in userfunc --- Classes/UserFunc/GetPowermailFields.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; } From f35232494224cd927f1ed5fdf90ad47d830ac64a Mon Sep 17 00:00:00 2001 From: Marcus Schwemer Date: Fri, 20 Sep 2024 15:36:11 +0200 Subject: [PATCH 5/6] [BUGFIX] Prevent possible undefined array key warning for filterForms --- .../UserFunc/GetPowermailFormsWithoutConditionRelation.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 = []; From 430e93fb3d22048015a3bdecd71664ad43a622da Mon Sep 17 00:00:00 2001 From: Marcus Schwemer Date: Fri, 20 Sep 2024 15:49:30 +0200 Subject: [PATCH 6/6] [RELEASE] Version 11.2.3 Some small bugfixes. See commit history for details --- ext_emconf.php | 2 +- readme.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ext_emconf.php b/ext_emconf.php index 59b0a52..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.1.0', + 'version' => '11.2.3', 'state' => 'stable', 'author' => 'Alex Kellner', 'author_email' => 'alexander.kellner@in2code.de', diff --git a/readme.md b/readme.md index a5e9b0f..f7cafbf 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.1.0 | 2023-10-16 | Feature | Support Powermail 11 & 12 | | 11.0.0 | 2023-07-05 | Feature | Support Powermail 11 | | 10.1.1 | 2023-03-23 | Bugfix | Fix possible undefined array key error |