itk-dev · rimi-itk · Jan 25, 2022 · Jan 24, 2022 · Jan 24, 2022
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+composer.lock
+vendor
diff --git a/.php-version b/.php-version
@@ -0,0 +1 @@
+7.4
diff --git a/composer.json b/composer.json
@@ -10,6 +10,21 @@
         }
     ],
     "repositories": [
+        {
+            "//": "https://git.drupalcode.org/issue/webform_embed-3149360/-/tree/3149360-automated-drupal-9",
+            "type": "package",
+            "package": {
+                "name": "drupal/webform_embed",
+                "//": "@see https://github.com/OS2Forms/os2forms/blob/master/composer.json#L27",
+                "version": "1.x-dev",
+                "type": "drupal-module",
+                "source": {
+                    "url": "https://git.drupalcode.org/issue/webform_embed-3149360.git",
+                    "type": "git",
+                    "reference": "3149360-automated-drupal-9"
+                }
+            }
+        },
         {
             "type": "composer",
             "url": "https://packages.drupal.org/8"
@@ -49,5 +64,11 @@
         "coding-standards-apply": [
             "@coding-standards-apply/phpcs"
         ]
+    },
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "vaimo/composer-patches": true
+        }
     }
 }
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -3,7 +3,9 @@
   <description>The coding standard.</description>
 
   <file>.</file>
+  <exclude-pattern>generated-sources/</exclude-pattern>
   <exclude-pattern>vendor/</exclude-pattern>
+  <exclude-pattern>src/Client/</exclude-pattern>
 
   <!-- Show progress of the run -->
   <arg value="p"/>

diff --git a/src/Commands/CreatePdf.php b/src/Commands/CreatePdf.php
@@ -16,7 +16,7 @@ class CreatePdf extends DrushCommands {
   /**
    * The os2forms_digital_post template manager.
    *
-   * @var TemplateManager
+   * @var \Drupal\os2forms_digital_post\Manager\TemplateManager
    */
   protected TemplateManager $templateManager;
 
@@ -27,6 +27,9 @@ class CreatePdf extends DrushCommands {
    */
   protected $entityTypeManager;
 
+  /**
+   * Constructor.
+   */
   public function __construct(TemplateManager $templateManager, EntityTypeManagerInterface $entity_type_manager) {
     parent::__construct();
     $this->templateManager = $templateManager;
@@ -49,7 +52,11 @@ public function __construct(TemplateManager $templateManager, EntityTypeManagerI
    * @throws \Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException
    * @throws \Drupal\Component\Plugin\Exception\PluginNotFoundException
    */
-  public function create($template, $options = ['submission_id' => 0, 'file_location' => '', 'file_name' => 'test.pdf']) {
+  public function create($template, array $options = [
+    'submission_id' => 0,
+    'file_location' => '',
+    'file_name' => 'test.pdf',
+  ]) {
     $elements[] = [];
     $webformLabel = '';
     $webform_submission = $this->entityTypeManager->getStorage('webform_submission')->load($options['submission_id']);
@@ -91,4 +98,5 @@ public function create($template, $options = ['submission_id' => 0, 'file_locati
     file_put_contents($filePath, $pdf);
     $this->output()->writeln(sprintf('Pdf written to %s', $filePath));
   }
+
 }
diff --git a/src/Consumer/PrintServiceConsumer.php b/src/Consumer/PrintServiceConsumer.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\os2forms_digital_post\Consumer;
 
+use Drupal\Core\Config\ImmutableConfig;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Lock\LockBackendInterface;
 use Drupal\Core\State\State;
@@ -17,27 +18,64 @@
 use Drupal\os2forms_digital_post\Client\StructType\KontaktOplysningType;
 use Drupal\os2forms_digital_post\Client\StructType\PrintAfsendBrevRequestType;
 use Drupal\os2forms_digital_post\Client\StructType\SlutbrugerIdentitetType;
-use Exception;
 use ItkDev\Serviceplatformen\Certificate\AzureKeyVaultCertificateLocator;
 use ItkDev\Serviceplatformen\Certificate\CertificateLocatorInterface;
-use SoapFault;
 use WsdlToPhp\PackageBase\AbstractSoapClientBase;
 use GuzzleHttp\Client;
 use Http\Factory\Guzzle\RequestFactory;
 use ItkDev\AzureKeyVault\Authorisation\VaultToken;
 use Http\Adapter\Guzzle6\Client as GuzzleAdapter;
 use ItkDev\AzureKeyVault\KeyVault\VaultSecret;
 
+/**
+ * Print service consumer.
+ */
 class PrintServiceConsumer {
-
-  private $config;
-  private $guzzleClient;
-  private $lock;
-  private $state;
+  /**
+   * The config.
+   *
+   * @var \Drupal\Core\Config\ImmutableConfig
+   */
+  private ImmutableConfig $config;
+
+  /**
+   * The client.
+   *
+   * @var \GuzzleHttp\Client
+   */
+  private Client $guzzleClient;
+
+  /**
+   * The lock.
+   *
+   * @var \Drupal\Core\Lock\LockBackendInterface
+   */
+  private LockBackendInterface $lock;
+
+  /**
+   * The state.
+   *
+   * @var \Drupal\Core\State\State
+   */
+  private State $state;
+
+  /**
+   * The UUID generator.
+   *
+   * @var UuidInterface
+   */
   private $uuid;
 
+  /**
+   * The lock name.
+   *
+   * @var string
+   */
   private $lockName = 'os2forms_digital_post_print_service';
 
+  /**
+   * Constructor.
+   */
   public function __construct(ConfigFactoryInterface $configFactory, Client $guzzleClient, LockBackendInterface $lock, State $state) {
 
     $this->config = $configFactory->get('os2forms_digital_post');
@@ -47,25 +85,28 @@ public function __construct(ConfigFactoryInterface $configFactory, Client $guzzl
     $this->uuid = \Drupal::service('uuid');
   }
 
+  /**
+   * Afsend brev person.
+   */
   public function afsendBrevPerson(
-    string $kanalValg = null,
-    string $prioritet = null,
-    string $cprNummerIdentifikator = null,
-    string $personName = null,
-    string $coNavn = null,
-    string $streetName = null,
-    string $streetBuildingIdentifier = null,
-    string $floorIdentifier = null,
-    string $suiteIdentifier = null,
-    string $mailDeliverySublocationIdentifier = null,
-    string $postCodeIdentifier = null,
-    string $districtSubdivisionIdentifier = null,
-    string $postOfficeBoxIdentifier = null,
-    string $countryIdentificationCode = null,
-    string $filFormatNavn = null,
-    string $meddelelseIndholdData = null,
-    string $titelTekst = null,
-    string $brevDato = null
+    string $kanalValg = NULL,
+    string $prioritet = NULL,
+    string $cprNummerIdentifikator = NULL,
+    string $personName = NULL,
+    string $coNavn = NULL,
+    string $streetName = NULL,
+    string $streetBuildingIdentifier = NULL,
+    string $floorIdentifier = NULL,
+    string $suiteIdentifier = NULL,
+    string $mailDeliverySublocationIdentifier = NULL,
+    string $postCodeIdentifier = NULL,
+    string $districtSubdivisionIdentifier = NULL,
+    string $postOfficeBoxIdentifier = NULL,
+    string $countryIdentificationCode = NULL,
+    string $filFormatNavn = NULL,
+    string $meddelelseIndholdData = NULL,
+    string $titelTekst = NULL,
+    string $brevDato = NULL
   ) {
 
     if (!$this->acquireLock()) {
@@ -94,12 +135,12 @@ public function afsendBrevPerson(
       $postCodeIdentifier,
       $districtSubdivisionIdentifier,
       $postOfficeBoxIdentifier,
-      null,
-      null,
-      null,
-      null,
-      null,
-      null,
+      NULL,
+      NULL,
+      NULL,
+      NULL,
+      NULL,
+      NULL,
       $countryIdentificationCodeType
     );
 
@@ -114,10 +155,10 @@ public function afsendBrevPerson(
       $forsendelsesModtager,
       $filFormatNavn,
       $meddelelseIndholdData,
-      null,
+      NULL,
       $dokumentParametre,
-      null,
-      null,
+      NULL,
+      NULL,
       $digitalPostParametre
     );
 
@@ -140,21 +181,24 @@ public function afsendBrevPerson(
       AbstractSoapClientBase::WSDL_LOCATION => $this->config->get('service_endpoint'),
     ]);
 
-
     $response = $client->afsendBrev($request);
 
     $this->releaseLock();
 
-    if (false === $response) {
+    if (FALSE === $response) {
       $lastError = $client->getLastError();
-      /* @var $soapError SoapFault */
+      /** @var SoapFault $soapError */
       $soapError = $lastError['Drupal\os2forms_digital_post\Client\ServiceType\Afsend::afsendBrev'];
-      throw new Exception($soapError->getMessage(), $soapError->getCode()); // Should maybe log this instead!
+      // Should maybe log this instead!
+      throw new \Exception($soapError->getMessage(), $soapError->getCode());
     }
 
     return $response->getResultat();
   }
 
+  /**
+   * Get absolute path to certificate.
+   */
   private function getAzureKeyVaultCertificateLocator(
     string $tenantId,
     string $applicationId,
@@ -188,13 +232,16 @@ private function getAzureKeyVaultCertificateLocator(
     );
   }
 
+  /**
+   * Afsend digital post person.
+   */
   public function afsendDigitalPostPerson(
-    string $kanalValg = null,
-    string $prioritet = null,
-    string $cprNummerIdentifikator = null,
-    string $filFormatNavn = null,
-    string $meddelelseIndholdData = null,
-    string $titelTekst = null
+    string $kanalValg = NULL,
+    string $prioritet = NULL,
+    string $cprNummerIdentifikator = NULL,
+    string $filFormatNavn = NULL,
+    string $meddelelseIndholdData = NULL,
+    string $titelTekst = NULL
   ): bool {
 
     if (!$this->acquireLock()) {
@@ -213,18 +260,18 @@ public function afsendDigitalPostPerson(
     $forsendelsesModtager = new ForsendelseModtagerType($slutBrugerIdentitetType);
 
     $dokumentParametre = new DokumentParametreType($titelTekst);
-    $digitalPostParametre = new DigitalPostParametreType(null, $this->config->get('digital_post_materiale_id'));
+    $digitalPostParametre = new DigitalPostParametreType(NULL, $this->config->get('digital_post_materiale_id'));
 
     $forsendelse = new ForsendelseIType(
       $this->generateAfsendelseIdentifikator(),
-      null,
+      NULL,
       $forsendelsesModtager,
       $filFormatNavn,
       $meddelelseIndholdData,
-      null,
+      NULL,
       $dokumentParametre,
-      null,
-      null,
+      NULL,
+      NULL,
       $digitalPostParametre
     );
 
@@ -247,21 +294,24 @@ public function afsendDigitalPostPerson(
       AbstractSoapClientBase::WSDL_LOCATION => $this->config->get('service_endpoint'),
     ]);
 
-
     $response = $client->afsendBrev($request);
 
     $this->releaseLock();
 
-    if (false === $response) {
+    if (FALSE === $response) {
       $lastError = $client->getLastError();
-      /* @var $soapError SoapFault */
+      /** @var SoapFault $soapError */
       $soapError = $lastError['Drupal\os2forms_digital_post\Client\ServiceType\Afsend::afsendBrev'];
-      throw new \Exception($soapError->getMessage(), $soapError->getCode()); // Should maybe log this instead!
+      // Should maybe log this instead!
+      throw new \Exception($soapError->getMessage(), $soapError->getCode());
     }
 
     return $response->getResultat();
   }
 
+  /**
+   * Generate afsendelse identifikator.
+   */
   protected function generateAfsendelseIdentifikator(): string {
 
     $stateKey = 'os2forms_digital_post_last_letter_counter';
@@ -276,19 +326,28 @@ protected function generateAfsendelseIdentifikator(): string {
 
     return $this->config->get('digital_post_system_id')
       . $this->config->get('digital_post_afsender_system')
-      . $nextLetterNumber
-    ;
+      . $nextLetterNumber;
   }
 
+  /**
+   * Acquire lock.
+   */
   protected function acquireLock(): bool {
     return $this->lock->acquire($this->lockName);
   }
 
+  /**
+   * Release lock.
+   */
   protected function releaseLock() {
     $this->lock->release($this->lockName);
   }
 
+  /**
+   * Wait lock.
+   */
   protected function waitLock(): bool {
     return $this->lock->wait($this->lockName);
   }
+
 }
diff --git a/src/Exception/CprElementNotFoundInSubmissionException.php b/src/Exception/CprElementNotFoundInSubmissionException.php
@@ -2,6 +2,9 @@
 
 namespace Drupal\os2forms_digital_post\Exception;
 
+/**
+ * Cpr Element Not Found In Submission Exception.
+ */
 class CprElementNotFoundInSubmissionException extends \Exception {
 
 }