From 5385fe9866aa539aa330730cced558d979af3cfb Mon Sep 17 00:00:00 2001 From: jekuaitk Date: Wed, 19 Jul 2023 12:22:48 +0200 Subject: [PATCH 1/4] SUPPORT-1145: Added os2forms_attachment to allowed attachment elements --- src/Plugin/WebformHandler/WebformHandlerSF1601.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Plugin/WebformHandler/WebformHandlerSF1601.php b/src/Plugin/WebformHandler/WebformHandlerSF1601.php index 7a8369e..71e6e82 100644 --- a/src/Plugin/WebformHandler/WebformHandlerSF1601.php +++ b/src/Plugin/WebformHandler/WebformHandlerSF1601.php @@ -270,11 +270,15 @@ static function (array $element) use ($elementTypes) { private function getAttachmentElements(): array { $elements = $this->getWebform()->getElementsDecodedAndFlattened(); + $elementTypes = [ + 'webform_entity_print_attachment:pdf', + 'os2forms_attachment', + ]; $elements = array_filter( - $elements, - static function (array $element) { - return preg_match('/^webform_entity_print_attachment:(pdf)$/', $element['#type'] ?? NULL); - } + $elements, + static function (array $element) use ($elementTypes) { + return in_array($element['#type'], $elementTypes, TRUE); + } ); return array_map(static function (array $element) { From 3bf874e9dcbf5a922c2d74ec1a7405fac0e98e13 Mon Sep 17 00:00:00 2001 From: jekuaitk Date: Wed, 19 Jul 2023 12:23:30 +0200 Subject: [PATCH 2/4] SUPP0RT-1145: Updated CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5321f4d..136f373 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## Changed + +- Updated allowed attachment elements to contain `os2forms_attachment` + ## [2.0.0] ### Changed From 445d8a7e534adf2cd1f1d58cd33a6c6a887571c8 Mon Sep 17 00:00:00 2001 From: jekuaitk Date: Wed, 19 Jul 2023 12:26:38 +0200 Subject: [PATCH 3/4] SUPPORT-1145: Prepared release 2.0.1 --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 136f373..a3440fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [2.0.1] + ## Changed - Updated allowed attachment elements to contain `os2forms_attachment` @@ -65,7 +67,8 @@ Versioning](https://semver.org/spec/v2.0.0.html). “KombiPostAfsend”](https://digitaliseringskataloget.dk/integration/sf1601). - Added GitHub Actions for coding standards checks and code analysis. -[Unreleased]: https://github.com/itk-dev/os2forms_digital_post/compare/2.0.0...HEAD +[Unreleased]: https://github.com/itk-dev/os2forms_digital_post/compare/2.0.1...HEAD +[2.0.1]: https://github.com/itk-dev/os2forms_digital_post/compare/2.0.0...2.0.1 [2.0.0]: https://github.com/itk-dev/os2forms_digital_post/compare/1.2.3...2.0.0 [1.2.3]: https://github.com/itk-dev/os2forms_digital_post/compare/1.2.2...1.2.3 [1.2.2]: https://github.com/itk-dev/os2forms_digital_post/compare/1.2.0...1.2.2 From 48516f8d2e53334b01750837ddf7e46dbe257f28 Mon Sep 17 00:00:00 2001 From: jekuaitk Date: Wed, 19 Jul 2023 12:28:18 +0200 Subject: [PATCH 4/4] SUPP0RT-1145: Applied coding standards --- src/Plugin/WebformHandler/WebformHandlerSF1601.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Plugin/WebformHandler/WebformHandlerSF1601.php b/src/Plugin/WebformHandler/WebformHandlerSF1601.php index 71e6e82..603edbc 100644 --- a/src/Plugin/WebformHandler/WebformHandlerSF1601.php +++ b/src/Plugin/WebformHandler/WebformHandlerSF1601.php @@ -275,10 +275,10 @@ private function getAttachmentElements(): array { 'os2forms_attachment', ]; $elements = array_filter( - $elements, - static function (array $element) use ($elementTypes) { - return in_array($element['#type'], $elementTypes, TRUE); - } + $elements, + static function (array $element) use ($elementTypes) { + return in_array($element['#type'], $elementTypes, TRUE); + } ); return array_map(static function (array $element) {