5189: Cleaned up

Author: rimi-itk

CHANGELOG.md

@@ -11,6 +11,9 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 
 ## [Unreleased]
 
+- [PR-189](https://github.com/OS2Forms/os2forms/pull/189)
+  - Added support for MeMo 1.2 and added additional validation of MeMo actions.
+
 ## [4.1.0] 2025-06-03
 
 - [PR-176](https://github.com/OS2Forms/os2forms/pull/176)

modules/os2forms_digital_post/src/Helper/MeMoHelper.php

@@ -199,6 +199,8 @@ private function buildAction(array $options, WebformSubmissionInterface $submiss
    *
    * @return \Drupal\Core\StringTranslation\TranslatableMarkup|null
    *   A message if the URL is not valid for an action.
+   *
+   * @phpstan-param array<string, mixed> $options
    */
   public static function validateActionUrl(string $url, array $options): ?TranslatableMarkup {
     // URL must be absolute and use https (cf. https://digitaliser.dk/digital-post/nyhedsarkiv/2024/nov/oeget-validering-i-digital-post)
@@ -214,6 +216,8 @@ public static function validateActionUrl(string $url, array $options): ?Translat
         '%action' => self::getTranslatedActionName($options['action']),
       ]);
     }
+
+    return NULL;
   }
 
   /**
@@ -227,6 +231,9 @@ public static function validateActionUrl(string $url, array $options): ?Translat
 
   /**
    * Get translated action names.
+   *
+   * @return array<string, string>
+   *   The translated action names.
    */
   public static function getTranslatedActionNames(): array {
     if (NULL === self::$translatedActionNames) {

modules/os2forms_digital_post/src/Plugin/WebformHandler/WebformHandlerSF1601.php

@@ -265,7 +265,7 @@ public function validateConfigurationForm(array &$form, FormStateInterface $form
           $formState->setErrorByName(
             self::MEMO_ACTIONS . '][actions][' . $index . '][url',
             $this->t('Url for action %action is required.', [
-              '%action' => $this->getTranslatedActionName($action['action']),
+              '%action' => MeMoHelper::getTranslatedActionName($action['action']),
             ])
           );
         }