From 562bd13748e2fb6c6b6a291c32d86d00e5e37cd5 Mon Sep 17 00:00:00 2001 From: Luka Simovic Date: Fri, 29 Dec 2023 15:43:59 +0100 Subject: [PATCH 1/3] Update core to working branch ISSUE: MLFL-133 --- system/classes/external/mollie/composer.json | 2 +- system/classes/external/mollie/composer.lock | 16 +- .../mollie/vendor/composer/installed.json | 12 +- .../mollie/vendor/composer/installed.php | 14 +- .../mollie/integration-core/CHANGELOG.md | 7 + .../WebHook/WebHookTransformer.php | 158 ++++++++++-------- 6 files changed, 117 insertions(+), 92 deletions(-) diff --git a/system/classes/external/mollie/composer.json b/system/classes/external/mollie/composer.json index 517c6222..852d0ebe 100644 --- a/system/classes/external/mollie/composer.json +++ b/system/classes/external/mollie/composer.json @@ -3,7 +3,7 @@ "version": "0.1.14", "require": { "php": ">=5.4", - "mollie/integration-core": "1.3.4" + "mollie/integration-core": "dev-MLFL-133" }, "repositories": [ { diff --git a/system/classes/external/mollie/composer.lock b/system/classes/external/mollie/composer.lock index 21f72d6f..998fc9e6 100644 --- a/system/classes/external/mollie/composer.lock +++ b/system/classes/external/mollie/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "9a7cfb4e08044cab5247f40e05d3a28d", + "content-hash": "c976a37c91b8463b9328d61f07620b9e", "packages": [ { "name": "mollie/integration-core", - "version": "1.3.4", + "version": "dev-MLFL-133", "source": { "type": "git", "url": "git@github.com:mollie/orocore.git", - "reference": "b1f45941eecafe15720998c23c1516c16b6cba52" + "reference": "249b6c51e36f9f6b0c5ebb791ce0444fb794e150" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mollie/orocore/zipball/b1f45941eecafe15720998c23c1516c16b6cba52", - "reference": "b1f45941eecafe15720998c23c1516c16b6cba52", + "url": "https://api.github.com/repos/mollie/orocore/zipball/249b6c51e36f9f6b0c5ebb791ce0444fb794e150", + "reference": "249b6c51e36f9f6b0c5ebb791ce0444fb794e150", "shasum": "" }, "require": { @@ -45,13 +45,15 @@ "proprietary" ], "description": "Mollie integrations core library", - "time": "2022-03-08T09:02:35+00:00" + "time": "2023-12-29T13:54:26+00:00" } ], "packages-dev": [], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": { + "mollie/integration-core": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": { diff --git a/system/classes/external/mollie/vendor/composer/installed.json b/system/classes/external/mollie/vendor/composer/installed.json index 23e96676..6cc9b716 100644 --- a/system/classes/external/mollie/vendor/composer/installed.json +++ b/system/classes/external/mollie/vendor/composer/installed.json @@ -2,17 +2,17 @@ "packages": [ { "name": "mollie/integration-core", - "version": "1.3.4", - "version_normalized": "1.3.4.0", + "version": "dev-MLFL-133", + "version_normalized": "dev-MLFL-133", "source": { "type": "git", "url": "git@github.com:mollie/orocore.git", - "reference": "b1f45941eecafe15720998c23c1516c16b6cba52" + "reference": "249b6c51e36f9f6b0c5ebb791ce0444fb794e150" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mollie/orocore/zipball/b1f45941eecafe15720998c23c1516c16b6cba52", - "reference": "b1f45941eecafe15720998c23c1516c16b6cba52", + "url": "https://api.github.com/repos/mollie/orocore/zipball/249b6c51e36f9f6b0c5ebb791ce0444fb794e150", + "reference": "249b6c51e36f9f6b0c5ebb791ce0444fb794e150", "shasum": "" }, "require": { @@ -24,7 +24,7 @@ "phpunit/phpunit": "^4.8.35", "symfony/console": "^5.1" }, - "time": "2022-03-08T09:02:35+00:00", + "time": "2023-12-29T13:54:26+00:00", "type": "library", "installation-source": "source", "autoload": { diff --git a/system/classes/external/mollie/vendor/composer/installed.php b/system/classes/external/mollie/vendor/composer/installed.php index 08012352..f1969aa7 100644 --- a/system/classes/external/mollie/vendor/composer/installed.php +++ b/system/classes/external/mollie/vendor/composer/installed.php @@ -1,7 +1,7 @@ array( - 'pretty_version' => '0.1.11', - 'version' => '0.1.11.0', + 'pretty_version' => '0.1.14', + 'version' => '0.1.14.0', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -11,8 +11,8 @@ ), 'versions' => array( 'mollie/gambio' => array( - 'pretty_version' => '0.1.11', - 'version' => '0.1.11.0', + 'pretty_version' => '0.1.14', + 'version' => '0.1.14.0', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -20,12 +20,12 @@ 'dev_requirement' => false, ), 'mollie/integration-core' => array( - 'pretty_version' => '1.3.4', - 'version' => '1.3.4.0', + 'pretty_version' => 'dev-MLFL-133', + 'version' => 'dev-MLFL-133', 'type' => 'library', 'install_path' => __DIR__ . '/../mollie/integration-core', 'aliases' => array(), - 'reference' => 'b1f45941eecafe15720998c23c1516c16b6cba52', + 'reference' => '249b6c51e36f9f6b0c5ebb791ce0444fb794e150', 'dev_requirement' => false, ), ), diff --git a/system/classes/external/mollie/vendor/mollie/integration-core/CHANGELOG.md b/system/classes/external/mollie/vendor/mollie/integration-core/CHANGELOG.md index 39a03aa3..98f3e5c3 100755 --- a/system/classes/external/mollie/vendor/mollie/integration-core/CHANGELOG.md +++ b/system/classes/external/mollie/vendor/mollie/integration-core/CHANGELOG.md @@ -3,6 +3,13 @@ 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.6](https://github.com/mollie/orocore/tree/v1.3.6) - 2022-09-15 +- Revert changes from previous release. + +## [v1.3.5](https://github.com/mollie/orocore/tree/v1.3.5) - 2022-09-13 +- Updated the access modifier of the fireChangeEvent method in +WebHookTransformer. + ## [v1.3.4](https://github.com/mollie/orocore/tree/v1.3.4) - 2022-03-08 - Added single-click payments. - Added surcharge rules. diff --git a/system/classes/external/mollie/vendor/mollie/integration-core/src/BusinessLogic/WebHook/WebHookTransformer.php b/system/classes/external/mollie/vendor/mollie/integration-core/src/BusinessLogic/WebHook/WebHookTransformer.php index 56e0f915..ca73bbc1 100644 --- a/system/classes/external/mollie/vendor/mollie/integration-core/src/BusinessLogic/WebHook/WebHookTransformer.php +++ b/system/classes/external/mollie/vendor/mollie/integration-core/src/BusinessLogic/WebHook/WebHookTransformer.php @@ -53,76 +53,6 @@ public function handle($rawRequest) WebHookContext::stop(); } - /** - * @param $rawRequest - * - * @throws HttpCommunicationException - */ - protected function doHandle($rawRequest) - { - $request = array(); - parse_str($rawRequest, $request); - - // Fire order web hook event for order payment web hooks - $payment = $this->tryGetPayment($request['id']); - if ($payment && $payment->getOrderId()) { - $request['id'] = $payment->getOrderId(); - } - - $orderReference = $this->getOrderReferenceData($request['id']); - if (!$orderReference) { - WebHookContext::stop(); - return; - } - - $changeEvent = $this->fireChangeEvent($orderReference); - if ($changeEvent) { - $this->updateOrderReference($changeEvent); - } - } - - /** - * @param string $id - * - * @return Payment|null - */ - protected function tryGetPayment($id) - { - try { - $payment = $this->getProxy()->getPayment($id); - } catch (\Exception $e) { - $payment = null; - } - - return $payment; - } - - /** - * @param string $mollieReference Payment or order id - * - * @return OrderReference|null - */ - protected function getOrderReferenceData($mollieReference) - { - /** @var OrderReferenceService $orderReferenceService */ - $orderReferenceService = ServiceRegister::getService(OrderReferenceService::CLASS_NAME); - return $orderReferenceService->getByMollieReference($mollieReference); - } - - /** - * @param OrderChangedWebHookEvent|PaymentChangedWebHookEvent $changeEvent - */ - protected function updateOrderReference($changeEvent) - { - /** @var OrderReferenceService $orderReferenceService */ - $orderReferenceService = ServiceRegister::getService(OrderReferenceService::CLASS_NAME); - $orderReferenceService->updateOrderReference( - $this->getNewOrderReferencePayload($changeEvent), - $changeEvent->getOrderReference()->getShopReference(), - $changeEvent->getOrderReference()->getApiMethod() - ); - } - /** * @param OrderReference $orderReference * @@ -194,7 +124,7 @@ protected function fireChangeEvent(OrderReference $orderReference) } catch (HttpCommunicationException $e) { Logger::logError( 'Failed to create web hook event from payload because off network connection problems.', - 'Core', + 'Core', array( 'ExceptionMessage' => $e->getMessage(), 'ExceptionTrace' => $e->getTraceAsString(), @@ -216,6 +146,92 @@ protected function fireChangeEvent(OrderReference $orderReference) return $changeEvent; } + /** + * @param $rawRequest + * + * @throws HttpCommunicationException + */ + protected function doHandle($rawRequest) + { + $request = array(); + parse_str($rawRequest, $request); + + // Fire order web hook event for order payment web hooks + $request['id'] = $this->determineRequestId($request['id']); + + $orderReference = $this->getOrderReferenceData($request['id']); + if (!$orderReference) { + WebHookContext::stop(); + return; + } + + $changeEvent = $this->fireChangeEvent($orderReference); + if ($changeEvent) { + $this->updateOrderReference($changeEvent); + } + } + + /** + * @param $id + * + * @return string + */ + protected function determineRequestId($id) + { + if (strpos($id, 'ord') === 0) { + return $id; + } + + $payment = $this->tryGetPayment($id); + if ($payment && $payment->getOrderId()) { + $id = $payment->getOrderId(); + } + + return $id; + } + + /** + * @param string $id + * + * @return Payment|null + */ + protected function tryGetPayment($id) + { + try { + $payment = $this->getProxy()->getPayment($id); + } catch (\Exception $e) { + $payment = null; + } + + return $payment; + } + + /** + * @param string $mollieReference Payment or order id + * + * @return OrderReference|null + */ + protected function getOrderReferenceData($mollieReference) + { + /** @var OrderReferenceService $orderReferenceService */ + $orderReferenceService = ServiceRegister::getService(OrderReferenceService::CLASS_NAME); + return $orderReferenceService->getByMollieReference($mollieReference); + } + + /** + * @param OrderChangedWebHookEvent|PaymentChangedWebHookEvent $changeEvent + */ + protected function updateOrderReference($changeEvent) + { + /** @var OrderReferenceService $orderReferenceService */ + $orderReferenceService = ServiceRegister::getService(OrderReferenceService::CLASS_NAME); + $orderReferenceService->updateOrderReference( + $this->getNewOrderReferencePayload($changeEvent), + $changeEvent->getOrderReference()->getShopReference(), + $changeEvent->getOrderReference()->getApiMethod() + ); + } + /** * @param OrderReference $orderReference * From 637c464600807073e98a29410fbf5476cca76035 Mon Sep 17 00:00:00 2001 From: Ivan Date: Fri, 23 Feb 2024 17:42:25 +0100 Subject: [PATCH 2/3] Update core version ISSUE: PIGAM-126 --- system/classes/external/mollie/composer.json | 2 +- system/classes/external/mollie/composer.lock | 18 ++- .../mollie/vendor/composer/ClassLoader.php | 113 ++---------------- .../vendor/composer/InstalledVersions.php | 25 +--- .../mollie/vendor/composer/installed.json | 12 +- .../mollie/vendor/composer/installed.php | 6 +- .../mollie/integration-core/CHANGELOG.md | 3 + 7 files changed, 38 insertions(+), 141 deletions(-) diff --git a/system/classes/external/mollie/composer.json b/system/classes/external/mollie/composer.json index 852d0ebe..f8f1d6ca 100644 --- a/system/classes/external/mollie/composer.json +++ b/system/classes/external/mollie/composer.json @@ -3,7 +3,7 @@ "version": "0.1.14", "require": { "php": ">=5.4", - "mollie/integration-core": "dev-MLFL-133" + "mollie/integration-core": "1.3.7" }, "repositories": [ { diff --git a/system/classes/external/mollie/composer.lock b/system/classes/external/mollie/composer.lock index 998fc9e6..b8c90483 100644 --- a/system/classes/external/mollie/composer.lock +++ b/system/classes/external/mollie/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c976a37c91b8463b9328d61f07620b9e", + "content-hash": "da3926f8a5fe19106e304ee29aa74ab8", "packages": [ { "name": "mollie/integration-core", - "version": "dev-MLFL-133", + "version": "1.3.7", "source": { "type": "git", "url": "git@github.com:mollie/orocore.git", - "reference": "249b6c51e36f9f6b0c5ebb791ce0444fb794e150" + "reference": "20a6c72f2dc4df1602dff085f66da8d93a02a597" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mollie/orocore/zipball/249b6c51e36f9f6b0c5ebb791ce0444fb794e150", - "reference": "249b6c51e36f9f6b0c5ebb791ce0444fb794e150", + "url": "https://api.github.com/repos/mollie/orocore/zipball/20a6c72f2dc4df1602dff085f66da8d93a02a597", + "reference": "20a6c72f2dc4df1602dff085f66da8d93a02a597", "shasum": "" }, "require": { @@ -45,20 +45,18 @@ "proprietary" ], "description": "Mollie integrations core library", - "time": "2023-12-29T13:54:26+00:00" + "time": "2024-02-23T16:33:33+00:00" } ], "packages-dev": [], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "mollie/integration-core": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": { "php": ">=5.4" }, "platform-dev": [], - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.1.0" } diff --git a/system/classes/external/mollie/vendor/composer/ClassLoader.php b/system/classes/external/mollie/vendor/composer/ClassLoader.php index afef3fa2..6d0c3f2d 100644 --- a/system/classes/external/mollie/vendor/composer/ClassLoader.php +++ b/system/classes/external/mollie/vendor/composer/ClassLoader.php @@ -42,75 +42,30 @@ */ class ClassLoader { - /** @var ?string */ private $vendorDir; // PSR-4 - /** - * @var array[] - * @psalm-var array> - */ private $prefixLengthsPsr4 = array(); - /** - * @var array[] - * @psalm-var array> - */ private $prefixDirsPsr4 = array(); - /** - * @var array[] - * @psalm-var array - */ private $fallbackDirsPsr4 = array(); // PSR-0 - /** - * @var array[] - * @psalm-var array> - */ private $prefixesPsr0 = array(); - /** - * @var array[] - * @psalm-var array - */ private $fallbackDirsPsr0 = array(); - /** @var bool */ private $useIncludePath = false; - - /** - * @var string[] - * @psalm-var array - */ private $classMap = array(); - - /** @var bool */ private $classMapAuthoritative = false; - - /** - * @var bool[] - * @psalm-var array - */ private $missingClasses = array(); - - /** @var ?string */ private $apcuPrefix; - /** - * @var self[] - */ private static $registeredLoaders = array(); - /** - * @param ?string $vendorDir - */ public function __construct($vendorDir = null) { $this->vendorDir = $vendorDir; } - /** - * @return string[] - */ public function getPrefixes() { if (!empty($this->prefixesPsr0)) { @@ -120,47 +75,28 @@ public function getPrefixes() return array(); } - /** - * @return array[] - * @psalm-return array> - */ public function getPrefixesPsr4() { return $this->prefixDirsPsr4; } - /** - * @return array[] - * @psalm-return array - */ public function getFallbackDirs() { return $this->fallbackDirsPsr0; } - /** - * @return array[] - * @psalm-return array - */ public function getFallbackDirsPsr4() { return $this->fallbackDirsPsr4; } - /** - * @return string[] Array of classname => path - * @psalm-return array - */ public function getClassMap() { return $this->classMap; } /** - * @param string[] $classMap Class to filename map - * @psalm-param array $classMap - * - * @return void + * @param array $classMap Class to filename map */ public function addClassMap(array $classMap) { @@ -175,11 +111,9 @@ public function addClassMap(array $classMap) * Registers a set of PSR-0 directories for a given prefix, either * appending or prepending to the ones previously set for this prefix. * - * @param string $prefix The prefix - * @param string[]|string $paths The PSR-0 root directories - * @param bool $prepend Whether to prepend the directories - * - * @return void + * @param string $prefix The prefix + * @param array|string $paths The PSR-0 root directories + * @param bool $prepend Whether to prepend the directories */ public function add($prefix, $paths, $prepend = false) { @@ -222,13 +156,11 @@ public function add($prefix, $paths, $prepend = false) * Registers a set of PSR-4 directories for a given namespace, either * appending or prepending to the ones previously set for this namespace. * - * @param string $prefix The prefix/namespace, with trailing '\\' - * @param string[]|string $paths The PSR-4 base directories - * @param bool $prepend Whether to prepend the directories + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param array|string $paths The PSR-4 base directories + * @param bool $prepend Whether to prepend the directories * * @throws \InvalidArgumentException - * - * @return void */ public function addPsr4($prefix, $paths, $prepend = false) { @@ -272,10 +204,8 @@ public function addPsr4($prefix, $paths, $prepend = false) * Registers a set of PSR-0 directories for a given prefix, * replacing any others previously set for this prefix. * - * @param string $prefix The prefix - * @param string[]|string $paths The PSR-0 base directories - * - * @return void + * @param string $prefix The prefix + * @param array|string $paths The PSR-0 base directories */ public function set($prefix, $paths) { @@ -290,12 +220,10 @@ public function set($prefix, $paths) * Registers a set of PSR-4 directories for a given namespace, * replacing any others previously set for this namespace. * - * @param string $prefix The prefix/namespace, with trailing '\\' - * @param string[]|string $paths The PSR-4 base directories + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param array|string $paths The PSR-4 base directories * * @throws \InvalidArgumentException - * - * @return void */ public function setPsr4($prefix, $paths) { @@ -315,8 +243,6 @@ public function setPsr4($prefix, $paths) * Turns on searching the include path for class files. * * @param bool $useIncludePath - * - * @return void */ public function setUseIncludePath($useIncludePath) { @@ -339,8 +265,6 @@ public function getUseIncludePath() * that have not been registered with the class map. * * @param bool $classMapAuthoritative - * - * @return void */ public function setClassMapAuthoritative($classMapAuthoritative) { @@ -361,8 +285,6 @@ public function isClassMapAuthoritative() * APCu prefix to use to cache found/not-found classes, if the extension is enabled. * * @param string|null $apcuPrefix - * - * @return void */ public function setApcuPrefix($apcuPrefix) { @@ -383,8 +305,6 @@ public function getApcuPrefix() * Registers this instance as an autoloader. * * @param bool $prepend Whether to prepend the autoloader or not - * - * @return void */ public function register($prepend = false) { @@ -404,8 +324,6 @@ public function register($prepend = false) /** * Unregisters this instance as an autoloader. - * - * @return void */ public function unregister() { @@ -485,11 +403,6 @@ public static function getRegisteredLoaders() return self::$registeredLoaders; } - /** - * @param string $class - * @param string $ext - * @return string|false - */ private function findFileWithExtension($class, $ext) { // PSR-4 lookup @@ -561,10 +474,6 @@ private function findFileWithExtension($class, $ext) * Scope isolated include. * * Prevents access to $this/self from included files. - * - * @param string $file - * @return void - * @private */ function includeFile($file) { diff --git a/system/classes/external/mollie/vendor/composer/InstalledVersions.php b/system/classes/external/mollie/vendor/composer/InstalledVersions.php index d50e0c9f..b3a4e161 100644 --- a/system/classes/external/mollie/vendor/composer/InstalledVersions.php +++ b/system/classes/external/mollie/vendor/composer/InstalledVersions.php @@ -20,25 +20,12 @@ * * See also https://getcomposer.org/doc/07-runtime.md#installed-versions * - * To require its presence, you can require `composer-runtime-api ^2.0` + * To require it's presence, you can require `composer-runtime-api ^2.0` */ class InstalledVersions { - /** - * @var mixed[]|null - * @psalm-var array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array}|array{}|null - */ private static $installed; - - /** - * @var bool|null - */ private static $canGetVendors; - - /** - * @var array[] - * @psalm-var array}> - */ private static $installedByVendor = array(); /** @@ -241,7 +228,7 @@ public static function getInstallPath($packageName) /** * @return array - * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string} + * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string} */ public static function getRootPackage() { @@ -255,7 +242,7 @@ public static function getRootPackage() * * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect. * @return array[] - * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array} + * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array} */ public static function getRawData() { @@ -278,7 +265,7 @@ public static function getRawData() * Returns the raw data of all installed.php which are currently loaded for custom implementations * * @return array[] - * @psalm-return list}> + * @psalm-return list}> */ public static function getAllRawData() { @@ -301,7 +288,7 @@ public static function getAllRawData() * @param array[] $data A vendor/composer/installed.php data set * @return void * - * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array} $data + * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array} $data */ public static function reload($data) { @@ -311,7 +298,7 @@ public static function reload($data) /** * @return array[] - * @psalm-return list}> + * @psalm-return list}> */ private static function getInstalled() { diff --git a/system/classes/external/mollie/vendor/composer/installed.json b/system/classes/external/mollie/vendor/composer/installed.json index 6cc9b716..c56060e2 100644 --- a/system/classes/external/mollie/vendor/composer/installed.json +++ b/system/classes/external/mollie/vendor/composer/installed.json @@ -2,17 +2,17 @@ "packages": [ { "name": "mollie/integration-core", - "version": "dev-MLFL-133", - "version_normalized": "dev-MLFL-133", + "version": "1.3.7", + "version_normalized": "1.3.7.0", "source": { "type": "git", "url": "git@github.com:mollie/orocore.git", - "reference": "249b6c51e36f9f6b0c5ebb791ce0444fb794e150" + "reference": "20a6c72f2dc4df1602dff085f66da8d93a02a597" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mollie/orocore/zipball/249b6c51e36f9f6b0c5ebb791ce0444fb794e150", - "reference": "249b6c51e36f9f6b0c5ebb791ce0444fb794e150", + "url": "https://api.github.com/repos/mollie/orocore/zipball/20a6c72f2dc4df1602dff085f66da8d93a02a597", + "reference": "20a6c72f2dc4df1602dff085f66da8d93a02a597", "shasum": "" }, "require": { @@ -24,7 +24,7 @@ "phpunit/phpunit": "^4.8.35", "symfony/console": "^5.1" }, - "time": "2023-12-29T13:54:26+00:00", + "time": "2024-02-23T16:33:33+00:00", "type": "library", "installation-source": "source", "autoload": { diff --git a/system/classes/external/mollie/vendor/composer/installed.php b/system/classes/external/mollie/vendor/composer/installed.php index f1969aa7..13483204 100644 --- a/system/classes/external/mollie/vendor/composer/installed.php +++ b/system/classes/external/mollie/vendor/composer/installed.php @@ -20,12 +20,12 @@ 'dev_requirement' => false, ), 'mollie/integration-core' => array( - 'pretty_version' => 'dev-MLFL-133', - 'version' => 'dev-MLFL-133', + 'pretty_version' => '1.3.7', + 'version' => '1.3.7.0', 'type' => 'library', 'install_path' => __DIR__ . '/../mollie/integration-core', 'aliases' => array(), - 'reference' => '249b6c51e36f9f6b0c5ebb791ce0444fb794e150', + 'reference' => '20a6c72f2dc4df1602dff085f66da8d93a02a597', 'dev_requirement' => false, ), ), diff --git a/system/classes/external/mollie/vendor/mollie/integration-core/CHANGELOG.md b/system/classes/external/mollie/vendor/mollie/integration-core/CHANGELOG.md index 98f3e5c3..03f758bb 100755 --- a/system/classes/external/mollie/vendor/mollie/integration-core/CHANGELOG.md +++ b/system/classes/external/mollie/vendor/mollie/integration-core/CHANGELOG.md @@ -3,6 +3,9 @@ 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 +- Do not call payments API with order token + ## [v1.3.6](https://github.com/mollie/orocore/tree/v1.3.6) - 2022-09-15 - Revert changes from previous release. From cbcec0258782e4655e8f2fd61eb831e05d44953c Mon Sep 17 00:00:00 2001 From: Ivan Date: Fri, 23 Feb 2024 17:45:52 +0100 Subject: [PATCH 3/3] Release version 0.1.15 ISSUE: PIGAM-126 --- README.md | 3 +++ system/classes/external/mollie/composer.json | 2 +- system/classes/external/mollie/composer.lock | 2 +- .../classes/external/mollie/vendor/composer/installed.php | 8 ++++---- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 6f352962..2684713a 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,9 @@ Read more about the integration configuration on [our Wiki](https://github.com/m # Release notes +*0.1.15* +- Do not call payments API with order token. + *0.1.14* - Fixed shipping costs per product. diff --git a/system/classes/external/mollie/composer.json b/system/classes/external/mollie/composer.json index f8f1d6ca..d9f383b1 100644 --- a/system/classes/external/mollie/composer.json +++ b/system/classes/external/mollie/composer.json @@ -1,6 +1,6 @@ { "name": "mollie/gambio", - "version": "0.1.14", + "version": "0.1.15", "require": { "php": ">=5.4", "mollie/integration-core": "1.3.7" diff --git a/system/classes/external/mollie/composer.lock b/system/classes/external/mollie/composer.lock index b8c90483..b4c51666 100644 --- a/system/classes/external/mollie/composer.lock +++ b/system/classes/external/mollie/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "da3926f8a5fe19106e304ee29aa74ab8", + "content-hash": "cf20fe4f9bf7aeb6f827a2bc94545b34", "packages": [ { "name": "mollie/integration-core", diff --git a/system/classes/external/mollie/vendor/composer/installed.php b/system/classes/external/mollie/vendor/composer/installed.php index 13483204..4eeaff50 100644 --- a/system/classes/external/mollie/vendor/composer/installed.php +++ b/system/classes/external/mollie/vendor/composer/installed.php @@ -1,7 +1,7 @@ array( - 'pretty_version' => '0.1.14', - 'version' => '0.1.14.0', + 'pretty_version' => '0.1.15', + 'version' => '0.1.15.0', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -11,8 +11,8 @@ ), 'versions' => array( 'mollie/gambio' => array( - 'pretty_version' => '0.1.14', - 'version' => '0.1.14.0', + 'pretty_version' => '0.1.15', + 'version' => '0.1.15.0', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(),