Moved autowire to abstract class

Author: jekuaitk

modules/os2forms_digital_post/src/Helper/AbstractMessageHelper.php

@@ -12,6 +12,7 @@
 use Drupal\webform_attachment\Element\WebformAttachmentBase;
 use ItkDev\Serviceplatformen\Service\SF1601\Serializer;
 use Oio\Fjernprint\ForsendelseI;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
 
 /**
  * Abstract message helper.
@@ -23,6 +24,7 @@ abstract class AbstractMessageHelper {
    */
   public function __construct(
     readonly protected Settings $settings,
+    #[Autowire(service: 'plugin.manager.element_info')]
     readonly protected ElementInfoManager $elementInfoManager,
     readonly protected WebformTokenManagerInterface $webformTokenManager,
   ) {

modules/os2forms_digital_post/src/Helper/ForsendelseHelper.php

@@ -2,14 +2,12 @@
 
 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;
@@ -18,7 +16,6 @@
 use Oio\Fjernprint\ForsendelseModtager;
 use Oio\Fjernprint\ModtagerAdresse;
 use Oio\Fjernprint\PostParametre;
-use Symfony\Component\DependencyInjection\Attribute\Autowire;
 
 /**
  * Forsendelse helper.
@@ -27,22 +24,6 @@ class ForsendelseHelper extends AbstractMessageHelper {
   // PostKategoriKode.
   public const POST_KATEGORI_KODE_PRIORITAIRE = 'Prioritaire';
 
-  /**
-   * {@inheritDoc}
-   */
-  // phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod
-  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);
-  }
-
-  // phpcs:enable
-
   /**
    * Build forsendelse.
    */

modules/os2forms_digital_post/src/Helper/MeMoHelper.php

@@ -14,38 +14,19 @@
 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}
-   */
-  // phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod
-  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);
-  }
-
-  // phpcs:enable
-
   /**
    * Build message.
    *