Cleaned up

Author: rimi-itk

modules/os2forms_digital_post/os2forms_digital_post.install

@@ -21,7 +21,7 @@ function os2forms_digital_post_schema() {
 /**
  * Implements hook_update_N().
  */
-function os2forms_digital_post_update_9001() {
+function os2forms_digital_post_update_9001(): void {
   \Drupal::service('module_installer')->install([
     'os2web_key',
   ], TRUE);

modules/os2forms_digital_post/os2forms_digital_post.services.yml

@@ -32,7 +32,7 @@ services:
   Drupal\os2forms_digital_post\Helper\DigitalPostHelper:
     arguments:
       - "@Drupal\\os2forms_digital_post\\Helper\\Settings"
-      - "@Drupal\\os2web_key\\CertificateHelper"
+      - "@Drupal\\os2web_key\\KeyHelper"
       - "@plugin.manager.os2web_datalookup"
       - "@Drupal\\os2forms_digital_post\\Helper\\MeMoHelper"
       - "@Drupal\\os2forms_digital_post\\Helper\\ForsendelseHelper"

modules/os2forms_digital_post/src/Drush/Commands/DigitalPostTestCommands.php

@@ -145,7 +145,9 @@ private function dumpDigitalPostSettings(SymfonyStyle $io): void {
       Yaml::encode([
         'testMode' => $this->digitalPostSettings->getTestMode(),
         'sender' => $this->digitalPostSettings->getSender(),
-        'certificate' => $this->digitalPostSettings->getCertificate(),
+        'certificate' => [
+          'key' => $this->digitalPostSettings->getKey(),
+        ],
         'processing' => $this->digitalPostSettings->getProcessing(),
       ]),
       '',

modules/os2forms_digital_post/src/Form/SettingsForm.php

@@ -55,7 +55,7 @@ public static function create(ContainerInterface $container) {
   /**
    * {@inheritdoc}
    *
-   * @phpstan-return array<string>
+   * @phpstan-return string[]
    */
   protected function getEditableConfigNames() {
     return [
@@ -202,13 +202,15 @@ public function submitForm(array &$form, FormStateInterface $form_state): void {
   /**
    * Create form field description with information on any runtime override.
    *
-   * @param string|array<string> $key
+   * @param string|array $key
    *   The key.
    * @param \Drupal\Core\StringTranslation\TranslatableMarkup|null $description
    *   The actual field description.
    *
    * @return string
    *   The full description.
+   *
+   * @phpstan-param string|string[] $key
    */
   private function createDescription(string|array $key, ?TranslatableMarkup $description = NULL): string {
     if ($value = $this->settings->getOverride($key)) {

modules/os2forms_digital_post/src/Helper/DigitalPostHelper.php

@@ -10,7 +10,7 @@
 use Drupal\os2web_datalookup\Plugin\DataLookupManager;
 use Drupal\os2web_datalookup\Plugin\os2web\DataLookup\DataLookupInterfaceCompany;
 use Drupal\os2web_datalookup\Plugin\os2web\DataLookup\DataLookupInterfaceCpr;
-use Drupal\os2web_key\CertificateHelper;
+use Drupal\os2web_key\KeyHelper;
 use Drupal\webform\WebformSubmissionInterface;
 use ItkDev\Serviceplatformen\Service\SF1601\Serializer;
 use ItkDev\Serviceplatformen\Service\SF1601\SF1601;
@@ -29,7 +29,7 @@ final class DigitalPostHelper implements LoggerInterface {
    */
   public function __construct(
     private readonly Settings $settings,
-    private readonly CertificateHelper $certificateHelper,
+    private readonly KeyHelper $keyHelper,
     private readonly DataLookupManager $dataLookupManager,
     private readonly MeMoHelper $meMoHelper,
     private readonly ForsendelseHelper $forsendelseHelper,
@@ -63,7 +63,7 @@ public function sendDigitalPost(string $type, Message $message, ?ForsendelseI $f
       'authority_cvr' => $senderSettings[Settings::SENDER_IDENTIFIER],
       'certificate_locator' => new KeyCertificateLocator(
         $this->settings->getCertificateKey(),
-        $this->certificateHelper
+        $this->keyHelper
       ),
     ];
     $service = new SF1601($options);

modules/os2forms_digital_post/src/Helper/KeyCertificateLocator.php

@@ -3,7 +3,7 @@
 namespace Drupal\os2forms_digital_post\Helper;
 
 use Drupal\key\KeyInterface;
-use Drupal\os2web_key\CertificateHelper;
+use Drupal\os2web_key\KeyHelper;
 use ItkDev\Serviceplatformen\Certificate\AbstractCertificateLocator;
 use ItkDev\Serviceplatformen\Certificate\Exception\CertificateLocatorException;
 
@@ -15,16 +15,16 @@ class KeyCertificateLocator extends AbstractCertificateLocator {
   /**
    * The parsed certificates.
    *
-   * @var array
+   * @var array<string, string>
    */
-  private readonly array $certificates;
+  private array $certificates;
 
   /**
    * Constructor.
    */
   public function __construct(
     private readonly KeyInterface $key,
-    private readonly CertificateHelper $certificateHelper,
+    private readonly KeyHelper $keyHelper,
   ) {
     parent::__construct();
   }
@@ -36,7 +36,7 @@ public function __construct(
    */
   public function getCertificates(): array {
     if (!isset($this->certificates)) {
-      $this->certificates = $this->certificateHelper->getCertificates($this->key);
+      $this->certificates = $this->keyHelper->getCertificates($this->key);
     }
 
     return $this->certificates;