Merge pull request #106 from logeecom/4.5-4.x

PIGAM-174: Release version 3.0.22
mollie · Apr 23, 2024 · bc69a33 · bc69a33
2 parents 982f11c + 59ab8d7
commit bc69a33
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 48 deletions.
diff --git a/GXModules/Mollie/Mollie/composer.json b/GXModules/Mollie/Mollie/composer.json
@@ -1,9 +1,9 @@
 {
   "name": "mollie/gambio",
-  "version": "3.0.21",
+  "version": "3.0.22",
   "require": {
     "php": ">=5.4",
-    "mollie/integration-core": "1.3.7"
+    "mollie/integration-core": "1.3.8"
   },
   "repositories": [
     {

diff --git a/GXModules/Mollie/Mollie/composer.lock b/GXModules/Mollie/Mollie/composer.lock
diff --git a/GXModules/Mollie/Mollie/vendor/composer/installed.json b/GXModules/Mollie/Mollie/vendor/composer/installed.json
@@ -2,18 +2,12 @@
     "packages": [
         {
             "name": "mollie/integration-core",
-            "version": "1.3.7",
-            "version_normalized": "1.3.7.0",
+            "version": "1.3.8",
+            "version_normalized": "1.3.8.0",
             "source": {
                 "type": "git",
                 "url": "[email protected]:mollie/orocore.git",
-                "reference": "20a6c72f2dc4df1602dff085f66da8d93a02a597"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/mollie/orocore/zipball/20a6c72f2dc4df1602dff085f66da8d93a02a597",
-                "reference": "20a6c72f2dc4df1602dff085f66da8d93a02a597",
-                "shasum": ""
+                "reference": "25034947afe94193297e6504cbbc1edc18cd219e"
             },
             "require": {
                 "ext-json": "*",
@@ -24,7 +18,7 @@
                 "phpunit/phpunit": "^4.8.35",
                 "symfony/console": "^5.1"
             },
-            "time": "2024-02-23T16:33:33+00:00",
+            "time": "2024-04-19T07:26:56+00:00",
             "type": "library",
             "installation-source": "source",
             "autoload": {

diff --git a/GXModules/Mollie/Mollie/vendor/composer/installed.php b/GXModules/Mollie/Mollie/vendor/composer/installed.php
@@ -1,7 +1,7 @@
 <?php return array(
     'root' => array(
-        'pretty_version' => '3.0.21',
-        'version' => '3.0.21.0',
+        'pretty_version' => '3.0.22',
+        'version' => '3.0.22.0',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -11,21 +11,21 @@
     ),
     'versions' => array(
         'mollie/gambio' => array(
-            'pretty_version' => '3.0.21',
-            'version' => '3.0.21.0',
+            'pretty_version' => '3.0.22',
+            'version' => '3.0.22.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
             'reference' => NULL,
             'dev_requirement' => false,
         ),
         'mollie/integration-core' => array(
-            'pretty_version' => '1.3.7',
-            'version' => '1.3.7.0',
+            'pretty_version' => '1.3.8',
+            'version' => '1.3.8.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../mollie/integration-core',
             'aliases' => array(),
-            'reference' => '20a6c72f2dc4df1602dff085f66da8d93a02a597',
+            'reference' => '25034947afe94193297e6504cbbc1edc18cd219e',
             'dev_requirement' => false,
         ),
     ),

diff --git a/GXModules/Mollie/Mollie/vendor/mollie/integration-core/CHANGELOG.md b/GXModules/Mollie/Mollie/vendor/mollie/integration-core/CHANGELOG.md
@@ -3,7 +3,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
-## [v1.3.7](https://github.com/mollie/orocore/tree/v1.3.6) - 2024-02-23
+## [v1.3.8](https://github.com/mollie/orocore/tree/v1.3.8) - 2024-04-19
+- Add casting to array in DTO classes
+
+## [v1.3.7](https://github.com/mollie/orocore/tree/v1.3.7) - 2024-02-23
 - Do not call payments API with order token
 
 ## [v1.3.6](https://github.com/mollie/orocore/tree/v1.3.6) - 2022-09-15
@@ -88,4 +91,4 @@ WebHookTransformer.
 - Added ability for creating Mollie order/payment with multiple payment methods
 
 ## [v1.0.0](https://github.com/mollie/orocore/tree/v1.0.0) - 2020-02-18
-- First release of CORE
+- First release of CORE
diff --git a/...ules/Mollie/Mollie/vendor/mollie/integration-core/src/BusinessLogic/Http/DTO/Customer.php b/...ules/Mollie/Mollie/vendor/mollie/integration-core/src/BusinessLogic/Http/DTO/Customer.php
@@ -58,11 +58,11 @@ public static function fromArray(array $raw)
         $customer->mode = static::getValue($raw, 'mode');
         $customer->email = static::getValue($raw, 'email');
         $customer->locale = static::getValue($raw, 'locale');
-        $customer->metadata = static::getValue($raw, 'metadata', array());
+        $customer->metadata = (array)static::getValue($raw, 'metadata', array());
         $customer->createdAt = static::getValue($raw, 'createdAt');
 
-        foreach (static::getValue($raw, '_links', array()) as $linkKey => $linkData) {
-            $customer->links[$linkKey] = Link::fromArray($linkData);
+        foreach ((array)static::getValue($raw, '_links', array()) as $linkKey => $linkData) {
+            $customer->links[$linkKey] = Link::fromArray((array)$linkData);
         }
 
         return $customer;
@@ -231,4 +231,4 @@ public function toArray()
             '_links' => $links,
         );
     }
-}
+}
diff --git a/.../Mollie/Mollie/vendor/mollie/integration-core/src/BusinessLogic/Http/DTO/Orders/Order.php b/.../Mollie/Mollie/vendor/mollie/integration-core/src/BusinessLogic/Http/DTO/Orders/Order.php
@@ -162,7 +162,7 @@ public static function fromArray(array $raw)
         $order->amountRefunded = Amount::fromArray(static::getValue($raw, 'amountRefunded', array()));
         $order->status = static::getValue($raw, 'status');
         $order->isCancelable = static::getValue($raw, 'isCancelable', true);
-        $order->metadata = static::getValue($raw, 'metadata', array());
+        $order->metadata = (array)static::getValue($raw, 'metadata', array());
         $order->createdAt = \DateTime::createFromFormat(DATE_ATOM, static::getValue($raw, 'createdAt'));
         $order->expiresAt = \DateTime::createFromFormat(DATE_ATOM, static::getValue($raw, 'expiresAt'));
         $order->expiredAt = \DateTime::createFromFormat(DATE_ATOM, static::getValue($raw, 'expiredAt'));
@@ -187,8 +187,8 @@ public static function fromArray(array $raw)
             $order->embedded['refunds'] = Refund::fromArrayBatch(static::getValue($raw['_embedded'], 'refunds', array()));
         }
 
-        foreach (static::getValue($raw, '_links', array()) as $linkKey => $linkData) {
-            $order->links[$linkKey] = Link::fromArray($linkData);
+        foreach ((array)static::getValue($raw, '_links', array()) as $linkKey => $linkData) {
+            $order->links[$linkKey] = Link::fromArray((array)$linkData);
         }
 
         if (!empty($raw['payment'])) {

diff --git a/...lie/Mollie/vendor/mollie/integration-core/src/BusinessLogic/Http/DTO/Orders/OrderLine.php b/...lie/Mollie/vendor/mollie/integration-core/src/BusinessLogic/Http/DTO/Orders/OrderLine.php
@@ -142,7 +142,7 @@ public static function fromArray(array $raw)
         $orderLine->type = static::getValue($raw, 'type', null);
         $orderLine->sku = static::getValue($raw, 'sku', null);
 
-        $orderLine->metadata = static::getValue($raw, 'metadata', array());
+        $orderLine->metadata = (array)static::getValue($raw, 'metadata', array());
         $orderLine->id = static::getValue($raw, 'id');
         $orderLine->orderId = static::getValue($raw, 'orderId');
         $orderLine->isCancelable = static::getValue($raw, 'isCancelable', false);
@@ -166,8 +166,8 @@ public static function fromArray(array $raw)
 
         $orderLine->createdAt = \DateTime::createFromFormat(DATE_ATOM, static::getValue($raw, 'createdAt'));
 
-        foreach (static::getValue($raw, '_links', array()) as $linkKey => $linkData) {
-            $orderLine->links[$linkKey] = Link::fromArray($linkData);
+        foreach ((array)static::getValue($raw, '_links', array()) as $linkKey => $linkData) {
+            $orderLine->links[$linkKey] = Link::fromArray((array)$linkData);
         }
 
         return $orderLine;
@@ -645,4 +645,4 @@ public function setCreatedAt(\DateTime $createdAt)
     {
         $this->createdAt = $createdAt;
     }
-}
+}
diff --git a/...dules/Mollie/Mollie/vendor/mollie/integration-core/src/BusinessLogic/Http/DTO/Payment.php b/...dules/Mollie/Mollie/vendor/mollie/integration-core/src/BusinessLogic/Http/DTO/Payment.php
@@ -128,7 +128,7 @@ public static function fromArray(array $raw)
         $result->setLocale(static::getValue($raw, 'locale'));
         $method = static::getValue($raw, 'method', array());
         $result->methods = is_array($method) ? $method : array($method);
-        $result->metadata = static::getValue($raw, 'metadata', array());
+        $result->metadata = (array)static::getValue($raw, 'metadata', array());
 
         $result->dueDate = \DateTime::createFromFormat(Order::MOLLIE_DATE_FORMAT, static::getValue($raw, 'dueDate'));
         $result->expiresAt = \DateTime::createFromFormat(DATE_ATOM, static::getValue($raw, 'expiresAt'));
@@ -138,8 +138,8 @@ public static function fromArray(array $raw)
             $result->shippingAddress = Address::fromArray($shippingAddress);
         }
 
-        foreach (static::getValue($raw, '_links', array()) as $linkKey => $linkData) {
-            $result->links[$linkKey] = Link::fromArray($linkData);
+        foreach ((array)static::getValue($raw, '_links', array()) as $linkKey => $linkData) {
+            $result->links[$linkKey] = Link::fromArray((array)$linkData);
         }
 
         if (array_key_exists('_embedded', $raw)) {

diff --git a/...ollie/Mollie/vendor/mollie/integration-core/src/BusinessLogic/Http/DTO/Refunds/Refund.php b/...ollie/Mollie/vendor/mollie/integration-core/src/BusinessLogic/Http/DTO/Refunds/Refund.php
@@ -84,12 +84,12 @@ public static function fromArray(array $raw)
         $refund->lines = OrderLine::fromArrayBatch(static::getValue($raw, 'lines', array()));
         $refund->createdAt = \DateTime::createFromFormat(DATE_ATOM, static::getValue($raw, 'createdAt'));
         $refund->description = static::getValue($raw, 'description');
-        $refund->metadata = static::getValue($raw, 'metadata', null);
+        $refund->metadata = (array)static::getValue($raw, 'metadata', null);
         $refund->paymentId = static::getValue($raw, 'paymentId');
         $refund->orderId = static::getValue($raw, 'orderId');
 
-        foreach (static::getValue($raw, '_links', array()) as $linkKey => $linkData) {
-            $refund->links[$linkKey] = Link::fromArray($linkData);
+        foreach ((array)static::getValue($raw, '_links', array()) as $linkKey => $linkData) {
+            $refund->links[$linkKey] = Link::fromArray((array)$linkData);
         }
 
         return $refund;

diff --git a/README.md b/README.md
@@ -46,6 +46,9 @@ Read more about the integration configuration on [our Wiki](https://github.com/m
 
 # Release notes
 
+*3.0.22*
+- Add casting to array in DTO classes
+
 *3.0.21*
 - Verify if the other string constants are already defined.