Merge pull request #204 from buckaroo-it/develop

vildanbina · web-flow · commit 0cebe5bb7703 · 2024-11-21T15:03:26.000+01:00
Release v1.17.0
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "buckaroo/sdk",
     "description": "Buckaroo payment SDK",
     "license": "MIT",
-    "version": "1.16.0",
+    "version": "1.17.0",
     "type": "library",
     "require": {
         "php": "^8.1",
diff --git a/src/Handlers/HMAC/Hmac.php b/src/Handlers/HMAC/Hmac.php
@@ -50,7 +50,11 @@ public function base64Data($data = null)
         {
             if (is_array($data))
             {
-                $data = json_encode($data, JSON_UNESCAPED_UNICODE | JSON_PRESERVE_ZERO_FRACTION);
+                $data = mb_convert_encoding(
+                    json_encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE),
+                    'UTF-8',
+                    'auto'
+                );
             }
 
             $md5 = md5($data, true);
diff --git a/src/Models/Company.php b/src/Models/Company.php
@@ -25,5 +25,5 @@ class Company extends Person
     protected string $companyName;
     protected bool $vatApplicable;
     protected string $vatNumber;
-    protected string $chamberOfCommerce;
+    protected ?string $chamberOfCommerce;
 }

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,11 @@ public function base64Data($data = null)`
`50`	`50`	`{`
`51`	`51`	`if (is_array($data))`
`52`	`52`	`{`
`53`		`- $data = json_encode($data, JSON_UNESCAPED_UNICODE \| JSON_PRESERVE_ZERO_FRACTION);`
	`53`	`+ $data = mb_convert_encoding(`
	`54`	`+ json_encode($data, JSON_UNESCAPED_SLASHES \| JSON_UNESCAPED_UNICODE),`
	`55`	`+ 'UTF-8',`
	`56`	`+ 'auto'`
	`57`	`+ );`
`54`	`58`	`}`
`55`	`59`
`56`	`60`	`$md5 = md5($data, true);`
Original file line number	Diff line number	Diff line change
`@@ -25,5 +25,5 @@ class Company extends Person`
`25`	`25`	`protected string $companyName;`
`26`	`26`	`protected bool $vatApplicable;`
`27`	`27`	`protected string $vatNumber;`
`28`		`- protected string $chamberOfCommerce;`
	`28`	`+ protected ?string $chamberOfCommerce;`
`29`	`29`	`}`