Service cleanup using autowire

Author: jekuaitk

modules/os2forms_digital_post/os2forms_digital_post.services.yml

@@ -8,65 +8,35 @@ services:
     arguments: [ 'webform_submission' ]
 
   Drupal\os2forms_digital_post\Helper\Settings:
-    arguments:
-      - "@config.factory"
-      - "@key.repository"
+    autowire: true
 
   Drupal\os2forms_digital_post\Helper\CertificateLocatorHelper:
-    arguments:
-      - "@Drupal\\os2forms_digital_post\\Helper\\Settings"
-      - "@key.repository"
+    autowire: true
 
   Drupal\os2forms_digital_post\Helper\MeMoHelper:
+    autowire: true
     arguments:
-      - "@Drupal\\os2forms_digital_post\\Helper\\Settings"
-      - "@plugin.manager.element_info"
-      - "@webform.token_manager"
+      $elementInfoManager: "@plugin.manager.element_info"
+      $webformTokenManager: "@webform.token_manager"
 
   Drupal\os2forms_digital_post\Helper\ForsendelseHelper:
+    autowire: true
     arguments:
-      - "@Drupal\\os2forms_digital_post\\Helper\\Settings"
-      - "@plugin.manager.element_info"
-      - "@webform.token_manager"
+      $elementInfoManager: "@plugin.manager.element_info"
+      $webformTokenManager: "@webform.token_manager"
 
   Drupal\os2forms_digital_post\Helper\DigitalPostHelper:
-    arguments:
-      - "@Drupal\\os2forms_digital_post\\Helper\\Settings"
-      - "@Drupal\\os2web_key\\KeyHelper"
-      - "@plugin.manager.os2web_datalookup"
-      - "@Drupal\\os2forms_digital_post\\Helper\\MeMoHelper"
-      - "@Drupal\\os2forms_digital_post\\Helper\\ForsendelseHelper"
-      - "@Drupal\\os2forms_digital_post\\Helper\\BeskedfordelerHelper"
-      - "@Drupal\\os2forms_digital_post\\Helper\\CertificateLocatorHelper"
-      - "@logger.channel.os2forms_digital_post"
-      - "@logger.channel.os2forms_digital_post_submission"
-      - "@os2web_audit.logger"
+    autowire: true
 
   Drupal\os2forms_digital_post\Helper\WebformHelperSF1601:
-    arguments:
-      - "@Drupal\\os2forms_digital_post\\Helper\\Settings"
-      - "@entity_type.manager"
-      - "@plugin.manager.os2web_datalookup"
-      - "@Drupal\\os2forms_digital_post\\Helper\\MeMoHelper"
-      - "@Drupal\\os2forms_digital_post\\Helper\\ForsendelseHelper"
-      - "@Drupal\\os2forms_digital_post\\Helper\\BeskedfordelerHelper"
-      - "@logger.channel.os2forms_digital_post"
-      - "@logger.channel.os2forms_digital_post_submission"
-      - "@Drupal\\os2forms_digital_post\\Helper\\DigitalPostHelper"
+    autowire: true
 
   Drupal\os2forms_digital_post\Helper\SF1461Helper:
 
   Drupal\os2forms_digital_post\EventSubscriber\BeskedfordelerEventSubscriber:
-    arguments:
-      - '@Drupal\os2forms_digital_post\Helper\BeskedfordelerHelper'
-      - '@Drupal\beskedfordeler\Helper\MessageHelper'
-      - '@Drupal\os2forms_digital_post\Helper\WebformHelperSF1601'
-      - '@logger.channel.os2forms_digital_post'
+    autowire: true
     tags:
       - { name: 'event_subscriber' }
 
   Drupal\os2forms_digital_post\Helper\BeskedfordelerHelper:
-    arguments:
-      - '@database'
-      - '@Drupal\os2forms_digital_post\Helper\MeMoHelper'
-      - '@logger.channel.os2forms_digital_post'
+    autowire: true

modules/os2forms_digital_post/src/EventSubscriber/BeskedfordelerEventSubscriber.php

@@ -8,6 +8,7 @@
 use Drupal\os2forms_digital_post\Helper\BeskedfordelerHelper;
 use Drupal\os2forms_digital_post\Helper\WebformHelperSF1601;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
 
 /**
  * Event subscriber for PostStatusBeskedModtagEvent.
@@ -23,6 +24,7 @@ public function __construct(
     private readonly BeskedfordelerHelper $beskedfordelerHelper,
     private readonly MessageHelper $messageHelper,
     private readonly WebformHelperSF1601 $webformHelper,
+    #[Autowire(service: 'logger.channel.os2forms_digital_post')]
     LoggerInterface $logger,
   ) {
     parent::__construct($logger);

modules/os2forms_digital_post/src/Form/SettingsForm.php

@@ -35,7 +35,6 @@ public function __construct(
     ConfigFactoryInterface $config_factory,
     EntityTypeManagerInterface $entityTypeManager,
     private readonly Settings $settings,
-    private readonly CertificateLocatorHelper $certificateLocatorHelper,
   ) {
     parent::__construct($config_factory);
     $this->queueStorage = $entityTypeManager->getStorage('advancedqueue_queue');
@@ -51,7 +50,6 @@ public static function create(ContainerInterface $container) {
       $container->get('config.factory'),
       $container->get('entity_type.manager'),
       $container->get(Settings::class),
-      $container->get(CertificateLocatorHelper::class),
     );
   }
 
@@ -289,15 +287,6 @@ public function buildForm(array $form, FormStateInterface $form_state): array {
       ),
     ];
 
-    $form['actions']['testCertificate'] = [
-      '#type' => 'submit',
-      '#name' => 'testCertificate',
-      '#value' => $this->t('Test certificate'),
-      '#states' => [
-        'visible' => [':input[name="certificate[certificate_provider]"]' => ['value' => Settings::PROVIDER_TYPE_FORM]],
-      ],
-    ];
-
     return $form;
   }
 
@@ -307,11 +296,6 @@ public function buildForm(array $form, FormStateInterface $form_state): array {
    * @phpstan-param array<string, mixed> $form
    */
   public function validateForm(array &$form, FormStateInterface $form_state): void {
-    $triggeringElement = $form_state->getTriggeringElement();
-    if ('testCertificate' === ($triggeringElement['#name'] ?? NULL)) {
-      return;
-    }
-
     $values = $form_state->getValues();
 
     if (Settings::PROVIDER_TYPE_FORM === $values[Settings::CERTIFICATE][Settings::CERTIFICATE_PROVIDER]) {
@@ -332,12 +316,6 @@ public function validateForm(array &$form, FormStateInterface $form_state): void
    * @phpstan-param array<string, mixed> $form
    */
   public function submitForm(array &$form, FormStateInterface $form_state): void {
-    $triggeringElement = $form_state->getTriggeringElement();
-    if ('testCertificate' === ($triggeringElement['#name'] ?? NULL)) {
-      $this->testCertificate();
-      return;
-    }
-
     $config = $this->config(Settings::CONFIG_NAME);
     foreach ([
       Settings::TEST_MODE,
@@ -376,20 +354,4 @@ private function createDescription(string|array $key, ?TranslatableMarkup $descr
     return (string) $description;
   }
 
-  /**
-   * Test certificate.
-   */
-  private function testCertificate(): void {
-    try {
-
-      $certificateLocator = $this->certificateLocatorHelper->getCertificateLocator();
-      $certificateLocator->getCertificates();
-      $this->messenger()->addStatus($this->t('Certificate succesfully tested'));
-    }
-    catch (\Throwable $throwable) {
-      $message = $this->t('Error testing certificate: %message', ['%message' => $throwable->getMessage()]);
-      $this->messenger()->addError($message);
-    }
-  }
-
 }

modules/os2forms_digital_post/src/Helper/BeskedfordelerHelper.php

@@ -9,6 +9,7 @@
 use Drupal\webform\WebformSubmissionInterface;
 use Psr\Log\LoggerAwareTrait;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
 
 /**
  * Beskedfordeler helper.
@@ -24,6 +25,7 @@ class BeskedfordelerHelper {
   public function __construct(
     private readonly Connection $database,
     private readonly MeMoHelper $meMoHelper,
+    #[Autowire(service: 'logger.channel.os2forms_digital_post')]
     LoggerInterface $logger,
   ) {
     $this->setLogger($logger);

modules/os2forms_digital_post/src/Helper/DigitalPostHelper.php

@@ -18,6 +18,7 @@
 use Oio\Fjernprint\ForsendelseI;
 use Psr\Log\LoggerInterface;
 use Psr\Log\LoggerTrait;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
 
 /**
  * Webform helper.
@@ -31,13 +32,17 @@ final class DigitalPostHelper implements LoggerInterface {
   public function __construct(
     private readonly Settings $settings,
     private readonly KeyHelper $keyHelper,
+    #[Autowire(service: 'plugin.manager.os2web_datalookup')]
     private readonly DataLookupManager $dataLookupManager,
     private readonly MeMoHelper $meMoHelper,
     private readonly ForsendelseHelper $forsendelseHelper,
     private readonly BeskedfordelerHelper $beskedfordelerHelper,
     private readonly CertificateLocatorHelper $certificateLocatorHelper,
+    #[Autowire(service: 'logger.channel.os2forms_digital_post')]
     private readonly LoggerChannelInterface $logger,
+    #[Autowire(service: 'logger.channel.os2forms_digital_post_submission')]
     private readonly LoggerChannelInterface $submissionLogger,
+    #[Autowire(service: 'os2web_audit.logger')]
     private readonly Logger $auditLogger,
   ) {
   }

modules/os2forms_digital_post/src/Helper/Settings.php

@@ -7,6 +7,7 @@
 use Drupal\Core\Config\ImmutableConfig;
 use Drupal\key\KeyInterface;
 use Drupal\key\KeyRepositoryInterface;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
 
 /**
  * General settings for os2forms_digital_post.
@@ -49,6 +50,7 @@ final class Settings {
    */
   public function __construct(
     ConfigFactoryInterface $configFactory,
+    #[Autowire(service: 'key.repository')]
     private readonly KeyRepositoryInterface $keyRepository,
   ) {
     $this->runtimeConfig = $configFactory->get(self::CONFIG_NAME);

modules/os2forms_digital_post/src/Helper/WebformHelperSF1601.php

@@ -21,6 +21,7 @@
 use ItkDev\Serviceplatformen\Service\SF1601\SF1601;
 use Psr\Log\LoggerInterface;
 use Psr\Log\LoggerTrait;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
 
 /**
  * Webform helper.
@@ -51,11 +52,14 @@ final class WebformHelperSF1601 implements LoggerInterface {
   public function __construct(
     private readonly Settings $settings,
     EntityTypeManagerInterface $entityTypeManager,
+    #[Autowire(service: 'plugin.manager.os2web_datalookup')]
     private readonly DataLookupManager $dataLookupManager,
     private readonly MeMoHelper $meMoHelper,
     private readonly ForsendelseHelper $forsendelseHelper,
     private readonly BeskedfordelerHelper $beskedfordelerHelper,
+    #[Autowire(service: 'logger.channel.os2forms_digital_post')]
     private readonly LoggerChannelInterface $logger,
+    #[Autowire(service: 'logger.channel.os2forms_digital_post_submission')]
     private readonly LoggerChannelInterface $submissionLogger,
     private readonly DigitalPostHelper $digitalPostHelper,
   ) {