Merged in WOO-874 (pull request #93)

WOO-874 Approved-by: Thomas Tornevall Approved-by: Gert Larsson
Tornevall · Dec 21, 2022 · 7623413 · 7623413
2 parents d2e8d2f + 539db05
commit 7623413
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 21 deletions.
diff --git a/src/Modules/GetAddress/Controller/GetAddress.php b/src/Modules/GetAddress/Controller/GetAddress.php
@@ -9,18 +9,9 @@
 
 namespace Resursbank\Woocommerce\Modules\GetAddress\Controller;
 
-use JsonException;
-use ReflectionException;
 use Resursbank\Ecom\Config;
-use Resursbank\Ecom\Exception\ApiException;
-use Resursbank\Ecom\Exception\AuthException;
 use Resursbank\Ecom\Exception\ConfigException;
-use Resursbank\Ecom\Exception\CurlException;
-use Resursbank\Ecom\Exception\GetAddressException;
 use Resursbank\Ecom\Exception\HttpException;
-use Resursbank\Ecom\Exception\Validation\EmptyValueException;
-use Resursbank\Ecom\Exception\Validation\IllegalTypeException;
-use Resursbank\Ecom\Exception\ValidationException;
 use Resursbank\Ecom\Lib\Utilities\Session;
 use Resursbank\Ecom\Module\Customer\Http\GetAddressController;
 use Resursbank\Ecom\Module\Customer\Repository;
@@ -34,17 +25,8 @@
 class GetAddress
 {
     /**
-     * @throws ApiException
-     * @throws AuthException
      * @throws ConfigException
-     * @throws CurlException
-     * @throws EmptyValueException
-     * @throws GetAddressException
      * @throws HttpException
-     * @throws IllegalTypeException
-     * @throws JsonException
-     * @throws ReflectionException
-     * @throws ValidationException
      */
     public static function exec(): string
     {

diff --git a/src/Modules/GetAddress/Filter/Checkout.php b/src/Modules/GetAddress/Filter/Checkout.php
@@ -13,6 +13,7 @@
 use Resursbank\Ecom\Exception\ConfigException;
 use Resursbank\Ecom\Exception\GetAddressException;
 use Resursbank\Ecom\Module\Customer\Widget\GetAddress;
+use ResursBank\Module\Data;
 use Resursbank\Woocommerce\Util\Route;
 use Resursbank\Woocommerce\Util\Url;
 use Throwable;
@@ -81,6 +82,6 @@ public static function exec(): void
             }
         }
 
-        echo $result;
+        echo Data::getEscapedHtml($result);
     }
 }
diff --git a/src/Settings/PartPayment.php b/src/Settings/PartPayment.php
@@ -268,7 +268,7 @@ private static function getAnnuityPeriods(): array
         if (isset($annuityFactors)) {
             /** @var AnnuityInformation $annuityFactor */
             foreach ($annuityFactors->content as $annuityFactor) {
-                $return[$annuityFactor->durationInMonths] = $annuityFactor->paymentPlanName;
+                $return[$annuityFactor->durationMonths] = $annuityFactor->paymentPlanName;
             }
         }
 

diff --git a/src/Util/Url.php b/src/Util/Url.php
@@ -34,7 +34,7 @@ public static function getScriptUrl(
         // NOTE: plugin_dir_url returns everything up to the last slash.
         return plugin_dir_url(
             file: RESURSBANK_MODULE_DIR_NAME . "/src/Modules/$module/resources/js/" .
-                      str_replace(search: '/', replace: '', subject: $file)
+                  str_replace(search: '/', replace: '', subject: $file)
         ) . $file;
     }
 
@@ -52,7 +52,10 @@ public static function getEcomUrl(
     /**
      * Generate a URL for a given endpoint, with a list of arguments.
      *
+     * @param string $baseUrl
      * @param array $arguments
+     *
+     * @return string
      * @throws IllegalValueException
      */
     public static function getQueryArg(string $baseUrl, array $arguments): string