Merge pull request #205 from buckaroo-it/BA-628-fix/utf8-encoding-in-…

…base64data- Preserve zero fractions in JSON encoding on Hmac generator
buckaroo-it · Dec 4, 2024 · bb16315 · bb16315
2 parents 0b28723 + 50d703c
commit bb16315
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 135 deletions.
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "buckaroo/sdk",
     "description": "Buckaroo payment SDK",
     "license": "MIT",
-    "version": "1.17.0",
+    "version": "1.17.1",
     "type": "library",
     "require": {
         "php": "^8.1",

diff --git a/example/transactions/sofort.php b/example/transactions/sofort.php
diff --git a/src/Handlers/HMAC/Hmac.php b/src/Handlers/HMAC/Hmac.php
@@ -51,7 +51,7 @@ public function base64Data($data = null)
             if (is_array($data))
             {
                 $data = mb_convert_encoding(
-                    json_encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE),
+                    json_encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_PRESERVE_ZERO_FRACTION),
                     'UTF-8',
                     'auto'
                 );

diff --git a/src/PaymentMethods/PaymentMethodFactory.php b/src/PaymentMethods/PaymentMethodFactory.php
@@ -33,7 +33,6 @@
 use Buckaroo\PaymentMethods\Alipay\Alipay;
 use Buckaroo\PaymentMethods\In3Old\In3Old;
 use Buckaroo\PaymentMethods\Paypal\Paypal;
-use Buckaroo\PaymentMethods\Sofort\Sofort;
 use Buckaroo\PaymentMethods\Thunes\Thunes;
 use Buckaroo\PaymentMethods\Belfius\Belfius;
 use Buckaroo\PaymentMethods\Billink\Billink;
@@ -112,7 +111,6 @@ class PaymentMethodFactory
         EPS::class => ['eps'],
         ExternalPayment::class => ['externalpayment'],
         Emandates::class => ['emandates'],
-        Sofort::class => ['sofort', 'sofortueberweisung'],
         Marketplaces::class => ['marketplaces'],
         NoServiceSpecifiedPayment::class => ['noservice'],
         Payconiq::class => ['payconiq'],

diff --git a/src/PaymentMethods/Sofort/Sofort.php b/src/PaymentMethods/Sofort/Sofort.php
diff --git a/tests/Buckaroo/Payments/SofortTest.php b/tests/Buckaroo/Payments/SofortTest.php