Merge branch 'utf8decodefix' of github.com:jamieburchell/omnipay-sagepay into jamieburchell-opayo-urls

judgej · judgej · commit 6d2c45ea3784 · 2023-11-04T11:55:52.000Z
diff --git a/src/Message/Form/AuthorizeRequest.php b/src/Message/Form/AuthorizeRequest.php
@@ -201,7 +201,7 @@ public function generateCrypt(array $data)
 
         $query = [];
         foreach ($data as $name => $value) {
-            $query[] = $name . '=' . ($disableUtf8Decode ? $value : utf8_decode($value));
+            $query[] = $name . '=' . ($disableUtf8Decode ? $value : mb_convert_encoding($value, 'ISO-8859-1', 'UTF-8'));
         }
         $query = implode('&', $query);
 

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ public function generateCrypt(array $data)`
`201`	`201`
`202`	`202`	`$query = [];`
`203`	`203`	`foreach ($data as $name => $value) {`
`204`		`- $query[] = $name . '=' . ($disableUtf8Decode ? $value : utf8_decode($value));`
	`204`	`+ $query[] = $name . '=' . ($disableUtf8Decode ? $value : mb_convert_encoding($value, 'ISO-8859-1', 'UTF-8'));`
`205`	`205`	`}`
`206`	`206`	`$query = implode('&', $query);`
`207`	`207`