Cleanup

Author: jekuaitk

CHANGELOG.md

@@ -11,6 +11,9 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 
 ## [Unreleased]
 
+- Updated `os2web/os2web_audit` version
+- Updated `os2web/os2web_datalookup` version
+
 ## [3.16.2] 2024-10-31
 
 - Applied coding standards

modules/os2forms_digital_post/src/Helper/DigitalPostHelper.php

@@ -8,8 +8,8 @@
 use Drupal\os2web_datalookup\LookupResult\CompanyLookupResult;
 use Drupal\os2web_datalookup\LookupResult\CprLookupResult;
 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_datalookup\Plugin\os2web\DataLookup\DataLookupCompanyInterface;
+use Drupal\os2web_datalookup\Plugin\os2web\DataLookup\DataLookupCprInterface;
 use Drupal\webform\WebformSubmissionInterface;
 use ItkDev\Serviceplatformen\Service\SF1601\SF1601;
 use ItkDev\Serviceplatformen\Service\SF1601\Serializer;
@@ -99,7 +99,7 @@ public function log($level, $message, array $context = []): void {
    */
   public function lookupCpr(string $cpr): CprLookupResult {
     $instance = $this->dataLookupManager->createDefaultInstanceByGroup('cpr_lookup');
-    if (!($instance instanceof DataLookupInterfaceCpr)) {
+    if (!($instance instanceof DataLookupCprInterface)) {
       throw new RuntimeException('Cannot get CPR data lookup instance');
     }
     $lookupResult = $instance->lookup($cpr);
@@ -115,7 +115,7 @@ public function lookupCpr(string $cpr): CprLookupResult {
    */
   public function lookupCvr(string $cvr): CompanyLookupResult {
     $instance = $this->dataLookupManager->createDefaultInstanceByGroup('cvr_lookup');
-    if (!($instance instanceof DataLookupInterfaceCompany)) {
+    if (!($instance instanceof DataLookupCompanyInterface)) {
       throw new RuntimeException('Cannot get CVR data lookup instance');
     }
     $lookupResult = $instance->lookup($cvr);

modules/os2forms_digital_post/src/Helper/WebformHelperSF1601.php

@@ -14,8 +14,8 @@
 use Drupal\os2forms_digital_post\Plugin\AdvancedQueue\JobType\SendDigitalPostSF1601;
 use Drupal\os2forms_digital_post\Plugin\WebformHandler\WebformHandlerSF1601;
 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_datalookup\Plugin\os2web\DataLookup\DataLookupCompanyInterface;
+use Drupal\os2web_datalookup\Plugin\os2web\DataLookup\DataLookupCprInterface;
 use Drupal\webform\WebformSubmissionInterface;
 use Drupal\webform\WebformSubmissionStorageInterface;
 use ItkDev\Serviceplatformen\Service\SF1601\SF1601;
@@ -127,7 +127,7 @@ public function sendDigitalPost(WebformSubmissionInterface $submission, array $h
 
     if (preg_match('/^\d{8}$/', $recipientIdentifier)) {
       $instance = $this->dataLookupManager->createDefaultInstanceByGroup('cvr_lookup');
-      if (!($instance instanceof DataLookupInterfaceCompany)) {
+      if (!($instance instanceof DataLookupCompanyInterface)) {
         throw new RuntimeException('Cannot get CVR data lookup instance');
       }
       $lookupResult = $instance->lookup($recipientIdentifier);
@@ -138,7 +138,7 @@ public function sendDigitalPost(WebformSubmissionInterface $submission, array $h
     }
     else {
       $instance = $this->dataLookupManager->createDefaultInstanceByGroup('cpr_lookup');
-      if (!($instance instanceof DataLookupInterfaceCpr)) {
+      if (!($instance instanceof DataLookupCprInterface)) {
         throw new RuntimeException('Cannot get CPR data lookup instance');
       }
       $lookupResult = $instance->lookup($recipientIdentifier);