Merge branch 'release/2.13.0'

hipay · Jul 31, 2023 · 5c1ffb8 · 5c1ffb8
2 parents 1e8529a + 47faf82
commit 5c1ffb8
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## Version 2.13.0
+
+- [fix]: Fixed `basket` element in `transaction` object
+- [add]: Add Hosted Page to demo page
+
 ## Version 2.12.4
 
 - [fix]: Fixed `reference_to_pay` field in `Transaction` class

diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
  "lint": "phpcs -p --standard=PHPCompatibility lib/ tests/"
  },
  "homepage": "https://hipay.com/product-enterprise/",
- "version": "2.12.4",
+ "version": "2.13.0",
  "license": "Apache-2.0",
  "authors": [
  {

diff --git a/lib/HiPay/Fullservice/Gateway/Client/GatewayClient.php b/lib/HiPay/Fullservice/Gateway/Client/GatewayClient.php
@@ -277,7 +277,15 @@ public function requestTransactionInformation($transactionReference)
  return null;
  }
 
- $transactionMapper = new TransactionMapper($data['transaction']);
+ $res = $data["transaction"];
+
+ if(isset($data['basket'])) {
+ $res["basket"] = $data["basket"];
+ } else {
+ $res["basket"] = null;
+ }
+
+ $transactionMapper = new TransactionMapper($res);
 
  /** @var Transaction $transaction */
  $transaction = $transactionMapper->getModelObjectMapped();

diff --git a/lib/HiPay/Fullservice/Gateway/Request/Order/HostedPaymentPageRequest.php b/lib/HiPay/Fullservice/Gateway/Request/Order/HostedPaymentPageRequest.php
@@ -83,6 +83,11 @@ class HostedPaymentPageRequest extends OrderRequest
  */
  public $multi_use;
 
+ /**
+ * @var string The theme code.
+ */
+ public $theme_code;
+
  /**
  * @return void
  */

diff --git a/tests/Unit/HiPay/Tests/Fullservice/HTTP/SimpleHTTPClientTest.php b/tests/Unit/HiPay/Tests/Fullservice/HTTP/SimpleHTTPClientTest.php
@@ -196,7 +196,7 @@ public function testRequestCanBeExecutedWithProxy(ClientProvider $client)
  $client->setConfiguration($conf);
 
  $this->expectException(CurlException::class);
- $this->expectExceptionMessage('Failed to connect to 127.0.0.1 port 25565: Connection refused');
+ $this->expectExceptionMessage('Failed to connect to 127.0.0.1 port 25565');
 
  $client->request('GET', "/");
  }