Applied coding standards

Author: jekuaitk

modules/os2forms_fasit/src/Form/SettingsForm.php

@@ -141,7 +141,6 @@ public function buildForm(array $form, FormStateInterface $form_state): array {
       '#states' => [
         'visible' => [
           ':input[name="certificate[certificate_provider]"]' => ['value' => self::PROVIDER_TYPE_FORM],
-          'and',
           ':input[name="certificate[locator_type]"]' => ['value' => CertificateLocatorHelper::LOCATOR_TYPE_AZURE_KEY_VAULT],
         ],
       ],
@@ -164,7 +163,6 @@ public function buildForm(array $form, FormStateInterface $form_state): array {
         '#states' => [
           'required' => [
             ':input[name="certificate[certificate_provider]"]' => ['value' => self::PROVIDER_TYPE_FORM],
-            'and',
             ':input[name="certificate[locator_type]"]' => ['value' => CertificateLocatorHelper::LOCATOR_TYPE_AZURE_KEY_VAULT],
           ],
         ],
@@ -177,7 +175,6 @@ public function buildForm(array $form, FormStateInterface $form_state): array {
       '#states' => [
         'visible' => [
           ':input[name="certificate[certificate_provider]"]' => ['value' => self::PROVIDER_TYPE_FORM],
-          'and',
           ':input[name="certificate[locator_type]"]' => ['value' => CertificateLocatorHelper::LOCATOR_TYPE_FILE_SYSTEM],
         ],
       ],
@@ -189,8 +186,7 @@ public function buildForm(array $form, FormStateInterface $form_state): array {
         '#states' => [
           'required' => [
             ':input[name="certificate[certificate_provider]"]' => ['value' => self::PROVIDER_TYPE_FORM],
-            'and',
-            ':input[name="certificate[locator_type]"]' => ['value' => CertificateLocatorHelper::LOCATOR_TYPE_FILE_SYSTEM]
+            ':input[name="certificate[locator_type]"]' => ['value' => CertificateLocatorHelper::LOCATOR_TYPE_FILE_SYSTEM],
           ],
         ],
       ],

modules/os2forms_fasit/src/Helper/FasitHelper.php

@@ -221,8 +221,6 @@ private function uploadDocument(array $uploads, string $submissionId, array $han
         'Content-Type' => 'application/xml',
       ],
       'body' => $body,
-      // 'cert' => $this->settings->getKeyValue(),
-//      'cert' => $this->getCertificate(),
     ];
 
     // Attempt upload.
@@ -553,25 +551,6 @@ public function pingApi(): void {
     }
   }
 
-  /**
-   * Get certificate.
-   *
-   * @throws InvalidSettingException
-   */
-  private function getCertificate(): mixed {
-    $config = $this->settings->getFasitCertificateConfig();
-    $provider = $config['certificate_provider'];
-    if (SettingsForm::PROVIDER_TYPE_KEY === $provider) {
-      return $this->settings->getKeyValue();
-    }
-    elseif (SettingsForm::PROVIDER_TYPE_FORM === $provider) {
-      [$certificateOptions, $tempCertFilename] = $this->getCertificateOptionsAndTempCertFilename();
-      return $certificateOptions;
-    }
-
-    throw new InvalidSettingException('Invalid certificate configuration');
-  }
-
   /**
    * Gets certificate options and temp certificate filename.
    *

modules/os2forms_fasit/src/Helper/Settings.php

@@ -50,7 +50,7 @@ public function getFasitApiVersion(): ?string {
   }
 
   /**
-   * Get Fasit configuration selector
+   * Get Fasit configuration selector.
    */
   public function getFasitCertificateConfig(): ?array {
     return $this->get(SettingsForm::CERTIFICATE);