Autowired services

Author: jekuaitk

modules/os2forms_digital_post/os2forms_digital_post.services.yml

@@ -15,15 +15,9 @@ services:
 
   Drupal\os2forms_digital_post\Helper\MeMoHelper:
     autowire: true
-    arguments:
-      $elementInfoManager: "@plugin.manager.element_info"
-      $webformTokenManager: "@webform.token_manager"
 
   Drupal\os2forms_digital_post\Helper\ForsendelseHelper:
     autowire: true
-    arguments:
-      $elementInfoManager: "@plugin.manager.element_info"
-      $webformTokenManager: "@webform.token_manager"
 
   Drupal\os2forms_digital_post\Helper\DigitalPostHelper:
     autowire: true

modules/os2forms_digital_post/src/Helper/ForsendelseHelper.php

@@ -2,12 +2,14 @@
 
 namespace Drupal\os2forms_digital_post\Helper;
 
+use Drupal\Core\Render\ElementInfoManager;
 use Drupal\os2forms_digital_post\Exception\InvalidForsendelseException;
 use Drupal\os2forms_digital_post\Model\Document;
 use Drupal\os2forms_digital_post\Plugin\WebformHandler\WebformHandlerSF1601;
 use Drupal\os2web_datalookup\LookupResult\CompanyLookupResult;
 use Drupal\os2web_datalookup\LookupResult\CprLookupResult;
 use Drupal\webform\WebformSubmissionInterface;
+use Drupal\webform\WebformTokenManagerInterface;
 use ItkDev\Serviceplatformen\Service\SF1601\Serializer;
 use Oio\Dkal\AfsendelseModtager;
 use Oio\Ebxml\CountryIdentificationCode;
@@ -16,6 +18,7 @@
 use Oio\Fjernprint\ForsendelseModtager;
 use Oio\Fjernprint\ModtagerAdresse;
 use Oio\Fjernprint\PostParametre;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
 
 /**
  * Forsendelse helper.
@@ -24,6 +27,19 @@ class ForsendelseHelper extends AbstractMessageHelper {
   // PostKategoriKode.
   public const POST_KATEGORI_KODE_PRIORITAIRE = 'Prioritaire';
 
+  /**
+   * {@inheritDoc}
+   */
+  public function __construct(
+    Settings $settings,
+    #[Autowire(service: 'plugin.manager.element_info')]
+    ElementInfoManager $elementInfoManager,
+    #[Autowire(service: 'webform.token_manager')]
+    WebformTokenManagerInterface $webformTokenManager,
+  ) {
+    parent::__construct($settings, $elementInfoManager, $webformTokenManager);
+  }
+
   /**
    * Build forsendelse.
    */

modules/os2forms_digital_post/src/Helper/MeMoHelper.php

@@ -14,19 +14,35 @@
 use DigitalPost\MeMo\MessageHeader;
 use DigitalPost\MeMo\Recipient;
 use DigitalPost\MeMo\Sender;
+use Drupal\Core\Render\ElementInfoManager;
 use Drupal\os2forms_digital_post\Model\Document;
 use Drupal\os2forms_digital_post\Plugin\WebformHandler\WebformHandlerSF1601;
 use Drupal\os2web_datalookup\LookupResult\CompanyLookupResult;
 use Drupal\os2web_datalookup\LookupResult\CprLookupResult;
 use Drupal\webform\WebformSubmissionInterface;
+use Drupal\webform\WebformTokenManagerInterface;
 use ItkDev\Serviceplatformen\Service\SF1601\SF1601;
 use ItkDev\Serviceplatformen\Service\SF1601\Serializer;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
 
 /**
  * MeMo helper.
  */
 class MeMoHelper extends AbstractMessageHelper {
 
+  /**
+   * {@inheritDoc}
+   */
+  public function __construct(
+    Settings $settings,
+    #[Autowire(service: 'plugin.manager.element_info')]
+    ElementInfoManager $elementInfoManager,
+    #[Autowire(service: 'webform.token_manager')]
+    WebformTokenManagerInterface $webformTokenManager,
+  ) {
+    parent::__construct($settings, $elementInfoManager, $webformTokenManager);
+  }
+
   /**
    * Build message.
    *