From bdf87c1cc6248a680a2cd3f51f4d0eacdc90b76d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 May 2021 10:15:39 +0200 Subject: [PATCH 1/6] Bump symfony/security-core from 4.4.22 to 4.4.23 (#172) Bumps [symfony/security-core](https://github.com/symfony/security-core) from 4.4.22 to 4.4.23. - [Release notes](https://github.com/symfony/security-core/releases) - [Changelog](https://github.com/symfony/security-core/blob/5.x/CHANGELOG.md) - [Commits](https://github.com/symfony/security-core/compare/v4.4.22...v4.4.23) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 89 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 82 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index edbb5fa1..595d680d 100644 --- a/composer.lock +++ b/composer.lock @@ -1,7 +1,7 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], "content-hash": "6ae2fe27d6fe32fe07830aebf214c258", @@ -3215,6 +3215,9 @@ "psr", "psr-6" ], + "support": { + "source": "https://github.com/php-fig/cache/tree/master" + }, "time": "2016-08-06T20:24:11+00:00" }, { @@ -3259,6 +3262,10 @@ "container-interop", "psr" ], + "support": { + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/1.1.1" + }, "time": "2021-03-05T17:36:06+00:00" }, { @@ -3305,6 +3312,10 @@ "psr", "psr-14" ], + "support": { + "issues": "https://github.com/php-fig/event-dispatcher/issues", + "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" + }, "time": "2019-01-08T18:20:26+00:00" }, { @@ -4566,6 +4577,9 @@ "interoperability", "standards" ], + "support": { + "source": "https://github.com/symfony/cache-contracts/tree/master" + }, "time": "2019-10-04T21:43:27+00:00" }, { @@ -5106,6 +5120,9 @@ "interoperability", "standards" ], + "support": { + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/master" + }, "time": "2019-09-17T09:54:03+00:00" }, { @@ -5384,6 +5401,23 @@ "interoperability", "standards" ], + "support": { + "source": "https://github.com/symfony/http-client-contracts/tree/v2.4.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2021-04-11T23:07:08+00:00" }, { @@ -6590,6 +6624,23 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.1" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2021-01-07T16:49:33+00:00" }, { @@ -6956,16 +7007,16 @@ }, { "name": "symfony/security-core", - "version": "v4.4.22", + "version": "v4.4.23", "source": { "type": "git", "url": "https://github.com/symfony/security-core.git", - "reference": "e06e67aa97b7bba1d381e3fda1ca7706fef86bff" + "reference": "8188709909f1e980bd5d791aa9d85156204526e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-core/zipball/e06e67aa97b7bba1d381e3fda1ca7706fef86bff", - "reference": "e06e67aa97b7bba1d381e3fda1ca7706fef86bff", + "url": "https://api.github.com/repos/symfony/security-core/zipball/8188709909f1e980bd5d791aa9d85156204526e9", + "reference": "8188709909f1e980bd5d791aa9d85156204526e9", "shasum": "" }, "require": { @@ -7021,7 +7072,24 @@ ], "description": "Symfony Security Component - Core Library", "homepage": "https://symfony.com", - "time": "2021-04-30T14:11:22+00:00" + "support": { + "source": "https://github.com/symfony/security-core/tree/v4.4.23" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-05-12T12:42:28+00:00" }, { "name": "symfony/security-csrf", @@ -7211,6 +7279,9 @@ "interoperability", "standards" ], + "support": { + "source": "https://github.com/symfony/service-contracts/tree/v1.1.8" + }, "time": "2019-10-14T12:27:06+00:00" }, { @@ -7470,6 +7541,9 @@ "interoperability", "standards" ], + "support": { + "source": "https://github.com/symfony/translation-contracts/tree/v1.1.7" + }, "time": "2019-09-17T11:12:18+00:00" }, { @@ -8252,5 +8326,6 @@ "platform": { "ext-json": "*" }, - "platform-dev": [] + "platform-dev": [], + "plugin-api-version": "2.0.0" } From c96bfa4bdca85ad62ff305e98163e2f3bba19971 Mon Sep 17 00:00:00 2001 From: Marcos Garcia Date: Tue, 25 May 2021 09:38:30 +0200 Subject: [PATCH 2/6] It's not you, it's me. (#174) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 💔 --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 819b49d3..049c3642 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @cyattilakiss @acampos1916 @msilvagarcia @rikterbeek @peterojo @morerice +* @cyattilakiss @acampos1916 @rikterbeek @peterojo @morerice From 8c8823bc8d0791f90dbc62b75bbd08819896bbf7 Mon Sep 17 00:00:00 2001 From: Peter Ojo Date: Wed, 26 May 2021 15:21:53 +0200 Subject: [PATCH 3/6] Return only payment method config for each PM extension (#175) * Return only payment method config for each PM extension * optimize filter for PM --- src/Struct/AdyenPaymentMethodDataStruct.php | 10 +++++----- .../PaymentMethodRouteResponseSubscriber.php | 18 ++++++++---------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/Struct/AdyenPaymentMethodDataStruct.php b/src/Struct/AdyenPaymentMethodDataStruct.php index d3ac9dbd..4dad326a 100644 --- a/src/Struct/AdyenPaymentMethodDataStruct.php +++ b/src/Struct/AdyenPaymentMethodDataStruct.php @@ -36,7 +36,7 @@ class AdyenPaymentMethodDataStruct extends Struct /** * @var array|null */ - protected $paymentMethodsResponse = null; + protected $paymentMethodConfig = null; public function getType(): ?string { @@ -48,13 +48,13 @@ public function setType(?string $type): void $this->type = $type; } - public function getPaymentMethodsResponse(): ?array + public function getPaymentMethodConfig(): ?array { - return $this->paymentMethodsResponse; + return $this->paymentMethodConfig; } - public function setPaymentMethodsResponse(?array $paymentMethodsResponse): void + public function setPaymentMethodConfig(?array $paymentMethodConfig): void { - $this->paymentMethodsResponse = $paymentMethodsResponse; + $this->paymentMethodConfig = $paymentMethodConfig; } } diff --git a/src/Subscriber/Response/PaymentMethodRouteResponseSubscriber.php b/src/Subscriber/Response/PaymentMethodRouteResponseSubscriber.php index 160b7a5a..f0c8d80b 100644 --- a/src/Subscriber/Response/PaymentMethodRouteResponseSubscriber.php +++ b/src/Subscriber/Response/PaymentMethodRouteResponseSubscriber.php @@ -130,28 +130,26 @@ private function extendPaymentMethodsData(SalesChannelContext $context, PaymentM $extension->setType($type); if (!empty($type)) { - $extension->setPaymentMethodsResponse($this->getPaymentMethodsResponseForType($context, $type)); + $extension->setPaymentMethodConfig($this->getPaymentMethodConfigByType($context, $type)); } $method->addExtension('adyenData', $extension); } } - private function getPaymentMethodsResponseForType(SalesChannelContext $context, string $type) + private function getPaymentMethodConfigByType(SalesChannelContext $context, string $type) { $paymentMethodsResponse = $this->getPaymentMethodsResponse($context); if (empty($paymentMethodsResponse['paymentMethods'])) { - return $paymentMethodsResponse; + return null; } - - $paymentMethodsResponse['paymentMethods'] = array_filter( - $paymentMethodsResponse['paymentMethods'], - function ($value) use ($type) { - return ($value['type'] ?? null) == $type; + foreach ($paymentMethodsResponse['paymentMethods'] as $paymentMethodConfig) { + if (($paymentMethodConfig['type'] ?? null) == $type) { + return $paymentMethodConfig; } - ); + } - return $paymentMethodsResponse; + return null; } private function getPaymentMethodType(PaymentMethodEntity $method): ?string From 0d97d7dc927cd897eb9346f1ad27f1da47e3debe Mon Sep 17 00:00:00 2001 From: Peter Ojo Date: Wed, 26 May 2021 15:22:11 +0200 Subject: [PATCH 4/6] [PW-4562] add help text to configuration (#173) * [PW-4562] add help text to configuration * [PW-4562] update wording --- .../storefront/js/adyen-payment-shopware6.js | 2 +- src/Resources/config/config.xml | 57 ++++++++++++++++++- .../js/adyen-payment-shopware6.js | 2 +- 3 files changed, 56 insertions(+), 5 deletions(-) diff --git a/src/Resources/app/storefront/dist/storefront/js/adyen-payment-shopware6.js b/src/Resources/app/storefront/dist/storefront/js/adyen-payment-shopware6.js index 3d131671..44aed12b 100644 --- a/src/Resources/app/storefront/dist/storefront/js/adyen-payment-shopware6.js +++ b/src/Resources/app/storefront/dist/storefront/js/adyen-payment-shopware6.js @@ -1 +1 @@ -(window.webpackJsonp=window.webpackJsonp||[]).push([["adyen-payment-shopware6"],{"/rG8":function(e,t,n){"use strict";(function(e){t.a=function(){return e("[name=paymentMethodId]:checked").val()}}).call(this,n("UoTJ"))},AAiy:function(e,t,n){"use strict";function a(e,t){for(var n=0;n1&&void 0!==arguments[1]?arguments[1]:{},n=adyenCheckoutOptions.orderId,a=null,o=null;n?(e.set("orderId",n),a=adyenCheckoutOptions.updatePaymentUrl,o=this.afterSetPayment.bind(this,t)):(a=adyenCheckoutOptions.checkoutOrderUrl,o=this.afterCreateOrder.bind(this,t)),this._client.post(a,e,o)}},{key:"afterCreateOrder",value:function(){var e,t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=arguments.length>1?arguments[1]:void 0;try{e=JSON.parse(n)}catch(e){return d.a.remove(document.body),void console.log("Error: invalid response from Shopware API",n)}this.orderId=e.id,this.finishUrl=new URL(location.origin+adyenCheckoutOptions.paymentFinishUrl),this.finishUrl.searchParams.set("orderId",e.id),this.errorUrl=new URL(location.origin+adyenCheckoutOptions.paymentErrorUrl),this.errorUrl.searchParams.set("orderId",e.id);var a={orderId:this.orderId,finishUrl:this.finishUrl.toString(),errorUrl:this.errorUrl.toString()};for(var o in t)a[o]=t[o];this._client.post(adyenCheckoutOptions.paymentHandleUrl,JSON.stringify(a),this.afterPayOrder.bind(this,this.orderId))}},{key:"afterSetPayment",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=arguments.length>1?arguments[1]:void 0;try{var n=JSON.parse(t);n.success&&this.afterCreateOrder(e,JSON.stringify({id:adyenCheckoutOptions.orderId}))}catch(e){return d.a.remove(document.body),void console.log("Error: invalid response from Shopware API",t)}}},{key:"afterPayOrder",value:function(e,t){try{t=JSON.parse(t),this.returnUrl=t.redirectUrl}catch(e){return d.a.remove(document.body),void console.log("Error: invalid response from Shopware API",t)}this.returnUrl===this.errorUrl.toString()&&(location.href=this.returnUrl);try{this._client.post("".concat(adyenCheckoutOptions.paymentStatusUrl),JSON.stringify({orderId:e}),this.responseHandler.bind(this))}catch(e){console.log(e)}}},{key:"handlePaymentAction",value:function(t){try{var n=JSON.parse(t);n.isFinal&&(location.href=this.returnUrl),n.action&&(this.adyenCheckout.createFromAction(n.action).mount("[data-adyen-payment-action-container]"),"threeDS2"===n.action.type&&e("[data-adyen-payment-action-modal]").modal({show:!0}))}catch(e){console.log(e)}}},{key:"initializeCustomPayButton",value:function(){var e=this,t=this.getSelectedPaymentMethodKey();if(t in c.a.componentsWithPayButton){var n=c.a.componentsWithPayButton[t];this.completePendingPayment(t,n);var a=this.adyenCheckout.paymentMethodsResponse.paymentMethods.filter((function(e){return e.type===t}));if(!(a.length<1)){var o=a[0];if(adyenCheckoutOptions.amount)if(n.prePayRedirect)this.renderPrePaymentButton(n,o);else{var r=y(n.extra,o,{amount:{value:adyenCheckoutOptions.amount,currency:adyenCheckoutOptions.currency},onClick:function(t,a){if(!n.onClick(t,a,e))return!1;d.a.create(document.body)},onSubmit:function(e,t){if(e.isValid){var a={stateData:JSON.stringify(e.data)},o=i.a.serialize(this.confirmOrderForm);"responseHandler"in n&&(this.responseHandler=n.responseHandler.bind(t,this)),this.confirmOrder(o,a)}else t.showValidation(),console.log("Payment failed: ",e)}.bind(this),onCancel:function(t,a){d.a.remove(document.body),n.onCancel(t,a,e)},onError:function(t,a){d.a.remove(document.body),n.onError(t,a,e),console.log(t)}}),s=this.adyenCheckout.create(o.type,r);try{"isAvailable"in s?s.isAvailable().then(function(){this.mountPaymentButton(s)}.bind(this)).catch((function(e){console.log(o.type+" is not available",e)})):this.mountPaymentButton(s)}catch(e){console.log(e)}}else console.error("Failed to fetch Cart/Order total amount.")}}}},{key:"renderPrePaymentButton",value:function(e,t){var n=this,a=y(e.extra,t,{configuration:t.configuration,amount:{value:adyenCheckoutOptions.amount,currency:adyenCheckoutOptions.currency},onClick:function(t,a){if(!e.onClick(t,a,n))return!1;d.a.create(document.body)},onError:function(t,a){d.a.remove(document.body),e.onError(t,a,n),console.log(t)}}),o=this.adyenCheckout.create(t.type,a);this.mountPaymentButton(o)}},{key:"completePendingPayment",value:function(e,t){var n=new URL(location.href);if(n.searchParams.has(t.sessionKey)){var a;d.a.create(document.body);var o=this.adyenCheckout.create(e,(l(a={},t.sessionKey,n.searchParams.get(t.sessionKey)),l(a,"showOrderButton",!1),l(a,"onSubmit",function(e,t){if(e.isValid){var n={stateData:JSON.stringify(e.data)},a=i.a.serialize(this.confirmOrderForm);this.confirmOrder(a,n)}}.bind(this)),a));this.mountPaymentButton(o),o.submit()}}},{key:"getSelectedPaymentMethodKey",value:function(){return Object.keys(c.a.paymentMethodTypeHandlers).find((function(e){return c.a.paymentMethodTypeHandlers[e]===adyenCheckoutOptions.selectedPaymentMethodHandler}))}},{key:"mountPaymentButton",value:function(t){var n=e('
');e("#confirmOrderForm").append(n),t.mount(n.get(0)),e("#confirmOrderForm button[type=submit]").remove()}}])&&h(a.prototype,s),f&&h(a,f),n}(a.a)}).call(this,n("UoTJ"))},vM5V:function(e,t,n){"use strict";n.r(t);var a=n("WjMb"),o=n("aCEd"),r=window.PluginManager;r.register("CheckoutPlugin",a.a,"[data-adyen-payment]"),r.register("ConfirmOrderPlugin",o.a,"[data-adyen-payment]")}},[["vM5V","runtime","vendor-node","vendor-shared"]]]); \ No newline at end of file +(window.webpackJsonp=window.webpackJsonp||[]).push([["adyen-payment-shopware6"],{"6rcx":function(e,t,n){"use strict";(function(e){n.d(t,"a",(function(){return f}));var a=n("FGIj"),o=n("gHbT"),r=n("p4AR"),i=n("2Y4b"),d=n("u0Tz"),c=n("CPJe");function s(e){return(s="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function l(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function y(){return(y=Object.assign||function(e){for(var t=1;t1&&void 0!==arguments[1]?arguments[1]:{},n=adyenCheckoutOptions.orderId,a=null,o=null;n?(e.set("orderId",n),a=adyenCheckoutOptions.updatePaymentUrl,o=this.afterSetPayment.bind(this,t)):(a=adyenCheckoutOptions.checkoutOrderUrl,o=this.afterCreateOrder.bind(this,t)),this._client.post(a,e,o)}},{key:"afterCreateOrder",value:function(){var e,t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=arguments.length>1?arguments[1]:void 0;try{e=JSON.parse(n)}catch(e){return d.a.remove(document.body),void console.log("Error: invalid response from Shopware API",n)}this.orderId=e.id,this.finishUrl=new URL(location.origin+adyenCheckoutOptions.paymentFinishUrl),this.finishUrl.searchParams.set("orderId",e.id),this.errorUrl=new URL(location.origin+adyenCheckoutOptions.paymentErrorUrl),this.errorUrl.searchParams.set("orderId",e.id);var a={orderId:this.orderId,finishUrl:this.finishUrl.toString(),errorUrl:this.errorUrl.toString()};for(var o in t)a[o]=t[o];this._client.post(adyenCheckoutOptions.paymentHandleUrl,JSON.stringify(a),this.afterPayOrder.bind(this,this.orderId))}},{key:"afterSetPayment",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=arguments.length>1?arguments[1]:void 0;try{var n=JSON.parse(t);n.success&&this.afterCreateOrder(e,JSON.stringify({id:adyenCheckoutOptions.orderId}))}catch(e){return d.a.remove(document.body),void console.log("Error: invalid response from Shopware API",t)}}},{key:"afterPayOrder",value:function(e,t){try{t=JSON.parse(t),this.returnUrl=t.redirectUrl}catch(e){return d.a.remove(document.body),void console.log("Error: invalid response from Shopware API",t)}this.returnUrl===this.errorUrl.toString()&&(location.href=this.returnUrl);try{this._client.post("".concat(adyenCheckoutOptions.paymentStatusUrl),JSON.stringify({orderId:e}),this.responseHandler.bind(this))}catch(e){console.log(e)}}},{key:"handlePaymentAction",value:function(t){try{var n=JSON.parse(t);n.isFinal&&(location.href=this.returnUrl),n.action&&(this.adyenCheckout.createFromAction(n.action).mount("[data-adyen-payment-action-container]"),"threeDS2"===n.action.type&&e("[data-adyen-payment-action-modal]").modal({show:!0}))}catch(e){console.log(e)}}},{key:"initializeCustomPayButton",value:function(){var e=this,t=this.getSelectedPaymentMethodKey();if(t in c.a.componentsWithPayButton){var n=c.a.componentsWithPayButton[t];this.completePendingPayment(t,n);var a=this.adyenCheckout.paymentMethodsResponse.paymentMethods.filter((function(e){return e.type===t}));if(!(a.length<1)){var o=a[0];if(adyenCheckoutOptions.amount)if(n.prePayRedirect)this.renderPrePaymentButton(n,o);else{var r=y(n.extra,o,{amount:{value:adyenCheckoutOptions.amount,currency:adyenCheckoutOptions.currency},onClick:function(t,a){if(!n.onClick(t,a,e))return!1;d.a.create(document.body)},onSubmit:function(e,t){if(e.isValid){var a={stateData:JSON.stringify(e.data)},o=i.a.serialize(this.confirmOrderForm);"responseHandler"in n&&(this.responseHandler=n.responseHandler.bind(t,this)),this.confirmOrder(o,a)}else t.showValidation(),console.log("Payment failed: ",e)}.bind(this),onCancel:function(t,a){d.a.remove(document.body),n.onCancel(t,a,e)},onError:function(t,a){d.a.remove(document.body),n.onError(t,a,e),console.log(t)}}),s=this.adyenCheckout.create(o.type,r);try{"isAvailable"in s?s.isAvailable().then(function(){this.mountPaymentButton(s)}.bind(this)).catch((function(e){console.log(o.type+" is not available",e)})):this.mountPaymentButton(s)}catch(e){console.log(e)}}else console.error("Failed to fetch Cart/Order total amount.")}}}},{key:"renderPrePaymentButton",value:function(e,t){var n=this,a=y(e.extra,t,{configuration:t.configuration,amount:{value:adyenCheckoutOptions.amount,currency:adyenCheckoutOptions.currency},onClick:function(t,a){if(!e.onClick(t,a,n))return!1;d.a.create(document.body)},onError:function(t,a){d.a.remove(document.body),e.onError(t,a,n),console.log(t)}}),o=this.adyenCheckout.create(t.type,a);this.mountPaymentButton(o)}},{key:"completePendingPayment",value:function(e,t){var n=new URL(location.href);if(n.searchParams.has(t.sessionKey)){var a;d.a.create(document.body);var o=this.adyenCheckout.create(e,(l(a={},t.sessionKey,n.searchParams.get(t.sessionKey)),l(a,"showOrderButton",!1),l(a,"onSubmit",function(e,t){if(e.isValid){var n={stateData:JSON.stringify(e.data)},a=i.a.serialize(this.confirmOrderForm);this.confirmOrder(a,n)}}.bind(this)),a));this.mountPaymentButton(o),o.submit()}}},{key:"getSelectedPaymentMethodKey",value:function(){return Object.keys(c.a.paymentMethodTypeHandlers).find((function(e){return c.a.paymentMethodTypeHandlers[e]===adyenCheckoutOptions.selectedPaymentMethodHandler}))}},{key:"mountPaymentButton",value:function(t){var n=e('
');e("#confirmOrderForm").append(n),t.mount(n.get(0)),e("#confirmOrderForm button[type=submit]").remove()}}])&&h(a.prototype,s),f&&h(a,f),n}(a.a)}).call(this,n("UoTJ"))},CPJe:function(e,t,n){"use strict";t.a={updatablePaymentMethods:["scheme","ideal","sepadirectdebit","oneclick","dotpay","bcmc","blik"],componentsWithPayButton:{applepay:{extra:{},onClick:function(e,t,n){return n.confirmOrderForm.checkValidity()?(e(),!0):(t(),!1)}},paywithgoogle:{extra:{buttonSizeMode:"fill"},onClick:function(e,t,n){return n.confirmOrderForm.checkValidity()?(e(),!0):(t(),!1)},onError:function(e,t,n){"CANCELED"!==e.statusCode&&("statusMessage"in e?console.log(e.statusMessage):console.log(e.statusCode))}},paypal:{extra:{},onClick:function(e,t,n){return n.confirmOrderForm.checkValidity()},onError:function(e,t,n){t.setStatus("ready"),window.location.href=n.errorUrl.toString()},onCancel:function(e,t,n){t.setStatus("ready"),window.location.href=n.errorUrl.toString()},responseHandler:function(e,t){try{(t=JSON.parse(t)).isFinal&&(location.href=e.returnUrl),this.handleAction(t.action)}catch(e){console.error(e)}}},amazonpay:{extra:{productType:"PayOnly",checkoutMode:"ProcessOrder",returnUrl:location.href},prePayRedirect:!0,sessionKey:"amazonCheckoutSessionId",onClick:function(e,t,n){return n.confirmOrderForm.checkValidity()?(e(),!0):(t(),!1)},onError:function(e,t){console.log(e),t.setStatus("ready")}}},paymentMethodTypeHandlers:{scheme:"handler_adyen_cardspaymentmethodhandler",ideal:"handler_adyen_idealpaymentmethodhandler",klarna:"handler_adyen_klarnapaylaterpaymentmethodhandler",klarna_account:"handler_adyen_klarnaaccountpaymentmethodhandler",klarna_paynow:"handler_adyen_klarnapaynowpaymentmethodhandler",sepadirectdebit:"handler_adyen_sepapaymentmethodhandler",sofort:"handler_adyen_sofortpaymentmethodhandler",paypal:"handler_adyen_paypalpaymentmethodhandler",oneclick:"handler_adyen_oneclickpaymentmethodhandler",giropay:"handler_adyen_giropaypaymentmethodhandler",applepay:"handler_adyen_applepaypaymentmethodhandler",paywithgoogle:"handler_adyen_googlepaypaymentmethodhandler",dotpay:"handler_adyen_dotpaypaymentmethodhandler",bcmc:"handler_adyen_bancontactcardpaymentmethodhandler",amazonpay:"handler_adyen_amazonpaypaymentmethodhandler",blik:"handler_adyen_blikpaymentmethodhandler"}}},ILio:function(e,t,n){"use strict";(function(e){t.a=function(){return e("[name=paymentMethodId]:checked").val()}}).call(this,n("UoTJ"))},M5kZ:function(e,t,n){"use strict";(function(e){n.d(t,"a",(function(){return p}));var a=n("gHbT"),o=n("FGIj"),r=n("p4AR"),i=n("ILio"),d=n("wjXm"),c=n("CPJe");function s(e){return(s="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function l(){return(l=Object.assign||function(e){for(var t=1;t merchantAccount + + Enter your merchant account identifier. + This can be found in your Adyen Customer Area, at the top of the screen you will see [YourCompanyAccount] > [YourMerchantAccount]. + Please note that the merchant account is different from the company account; a company account can have one or more merchant accounts. + See https://docs.adyen.com/plugins/shopware-6#set-up-shopware + apiKeyTest + + Enter your test API Key. This can be found in your test Customer Area > Account > API Credentials. + See https://docs.adyen.com/plugins/shopware-6#set-up-api-key + For a live environment, this field can be empty. + apiKeyLive + + Enter your live API Key. This can be found in your live Customer Area > Account > API Credentials. + See https://docs.adyen.com/plugins/shopware-6#set-up-api-key. + For a test environment, this field can be empty. + clientKeyTest We use your client key to authenticate requests from your payment environment. + This can be found in your test Customer Area > Account > API Credentials. See https://docs.adyen.com/plugins/shopware-6#generate-a-client-key for more information. + For a live environment, this field can be empty. @@ -29,7 +47,9 @@ We use your client key to authenticate requests from your payment environment. + This can be found in your live Customer Area > Account > API Credentials. See https://docs.adyen.com/plugins/shopware-6#generate-a-client-key for more information. + For a test environment, this field can be empty. @@ -39,25 +59,56 @@ liveEndpointUrlPrefix + + The URL prefix [random]-[company name] from your Adyen live Customer Area > Account > API URLs. + For a test environment, this field can be empty. + + + configTest + + + + Notification Credentials notificationUsername + + This is the username for basic authentication of your live endpoints. + Fill in from your live Adyen Customer Area > Account > Webhooks > Edit or Add. + See https://docs.adyen.com/plugins/shopware-6#set-up-notifications. + For testing the plugin without notifications, this field can be empty. + notificationPassword + + This is the password for basic authentication of your live endpoints. + Fill in from your live Adyen Customer Area > Account > Webhooks > Edit or Add. + See https://docs.adyen.com/plugins/shopware-6#set-up-notifications. + For testing the plugin without notifications, this field can be empty. + hmacTest + + This is used to authenticate your endpoints. + If you want to test the webhook notifications then get your test HMAC Key from your test Adyen Customer Area > Account > Webhooks > Edit or Add. + See https://docs.adyen.com/plugins/shopware-6#set-up-notifications. + For testing the plugin without notifications, this field can be empty. + hmacLive + + This is used to authenticate your endpoints. + Fill in your live HMAC Key from your live Adyen Customer Area > Account > Webhooks > Edit or Add. + See https://docs.adyen.com/plugins/shopware-6#set-up-notifications. + For testing the plugin without notifications, this field can be empty. + - - configTest - diff --git a/src/Resources/public/administration/js/adyen-payment-shopware6.js b/src/Resources/public/administration/js/adyen-payment-shopware6.js index 111231d6..9cd4ffb5 100644 --- a/src/Resources/public/administration/js/adyen-payment-shopware6.js +++ b/src/Resources/public/administration/js/adyen-payment-shopware6.js @@ -1 +1 @@ -(this.webpackJsonp=this.webpackJsonp||[]).push([["adyen-payment-shopware6"],{H3KO:function(e,s){const t=Shopware.Classes.ApiService,{Application:i}=Shopware;class n extends t{constructor(e,s,t="adyen"){super(e,s,t)}check(e){const s=this.getBasicHeaders({});return this.httpClient.post(`_action/${this.getApiBasePath()}/verify`,e,{headers:s}).then(e=>t.handleResponse(e))}}i.addServiceProvider("adyenConfigCheck",e=>{const s=i.getContainer("init");return new n(s.httpClient,e.loginService)})},KAat:function(e,s,t){"use strict";t.r(s);t("H3KO");var i=t("L/yV"),n=t.n(i);const{Component:a,Mixin:c}=Shopware;a.register("adyen-config-check-button",{template:n.a,inject:["adyenConfigCheck"],mixins:[c.getByName("notification")],data:()=>({isLoading:!1,isSaveSuccessful:!1}),computed:{pluginConfig(){let e=this.$parent;for(;!e.hasOwnProperty("actualConfigData");)e=e.$parent;let s=e.currentSalesChannelId,t=e.actualConfigData;return Object.assign({},t.null,t[s])}},methods:{saveFinish(){this.isSaveSuccessful=!1},check(){this.isLoading=!0,this.adyenConfigCheck.check(this.pluginConfig).then(e=>{e.success?(this.isSaveSuccessful=!0,this.createNotificationSuccess({title:this.$tc("adyen.configTestTitle"),message:this.$tc("adyen.configTestSuccess")})):this.createNotificationError({title:this.$tc("adyen.configTestTitle"),message:this.$tc(e.message?e.message:"adyen.configTestFail")}),this.isLoading=!1})}}});var o=t("ca/c");Shopware.Locale.extend("en-GB",o)},"L/yV":function(e,s){e.exports='\n'},"ca/c":function(e){e.exports=JSON.parse('{"adyen":{"configTestTitle":"Configuration test","configTestSuccess":"Configuration is successfully tested","configTestFail":"There\'s an issue in your configuration"}}')}},[["KAat","runtime"]]]); \ No newline at end of file +(this.webpackJsonp=this.webpackJsonp||[]).push([["adyen-payment-shopware6"],{"EEQ/":function(e){e.exports=JSON.parse('{"adyen":{"configTestTitle":"Configuration test","configTestSuccess":"Configuration is successfully tested","configTestFail":"There\'s an issue in your configuration"}}')},FRES:function(e,s){e.exports='\n'},LoYZ:function(e,s,t){"use strict";t.r(s);t("OEky");var i=t("FRES"),n=t.n(i);const{Component:a,Mixin:c}=Shopware;a.register("adyen-config-check-button",{template:n.a,inject:["adyenConfigCheck"],mixins:[c.getByName("notification")],data:()=>({isLoading:!1,isSaveSuccessful:!1}),computed:{pluginConfig(){let e=this.$parent;for(;!e.hasOwnProperty("actualConfigData");)e=e.$parent;let s=e.currentSalesChannelId,t=e.actualConfigData;return Object.assign({},t.null,t[s])}},methods:{saveFinish(){this.isSaveSuccessful=!1},check(){this.isLoading=!0,this.adyenConfigCheck.check(this.pluginConfig).then(e=>{e.success?(this.isSaveSuccessful=!0,this.createNotificationSuccess({title:this.$tc("adyen.configTestTitle"),message:this.$tc("adyen.configTestSuccess")})):this.createNotificationError({title:this.$tc("adyen.configTestTitle"),message:this.$tc(e.message?e.message:"adyen.configTestFail")}),this.isLoading=!1})}}});var o=t("EEQ/");Shopware.Locale.extend("en-GB",o)},OEky:function(e,s){const t=Shopware.Classes.ApiService,{Application:i}=Shopware;class n extends t{constructor(e,s,t="adyen"){super(e,s,t)}check(e){const s=this.getBasicHeaders({});return this.httpClient.post(`_action/${this.getApiBasePath()}/verify`,e,{headers:s}).then(e=>t.handleResponse(e))}}i.addServiceProvider("adyenConfigCheck",e=>{const s=i.getContainer("init");return new n(s.httpClient,e.loginService)})}},[["LoYZ","runtime"]]]); \ No newline at end of file From df4cfc2d446402f597566ccb6a88501858ce9ab4 Mon Sep 17 00:00:00 2001 From: peterojo Date: Thu, 27 May 2021 11:29:25 +0200 Subject: [PATCH 5/6] Version bump 2.1.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 804b4520..25bdfb47 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ } ], "description": "Official Shopware 6 Plugin to connect to Payment Service Provider Adyen", - "version": "2.0.0", + "version": "2.1.0", "type": "shopware-platform-plugin", "license": "MIT", "require": { From 916d4873f72570f58abd3fdd3e6a29f009976f62 Mon Sep 17 00:00:00 2001 From: peterojo Date: Thu, 27 May 2021 11:48:15 +0200 Subject: [PATCH 6/6] Version bump 2.1.0 --- composer.lock | 332 +++++++++++++++++++++----------------------------- 1 file changed, 142 insertions(+), 190 deletions(-) diff --git a/composer.lock b/composer.lock index 595d680d..c57c8475 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "6ae2fe27d6fe32fe07830aebf214c258", + "content-hash": "745252de9e192edc9d09df14f87e893a", "packages": [ { "name": "adyen/php-api-library", @@ -346,16 +346,16 @@ }, { "name": "composer/package-versions-deprecated", - "version": "1.11.99.1", + "version": "1.11.99.2", "source": { "type": "git", "url": "https://github.com/composer/package-versions-deprecated.git", - "reference": "7413f0b55a051e89485c5cb9f765fe24bb02a7b6" + "reference": "c6522afe5540d5fc46675043d3ed5a45a740b27c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/7413f0b55a051e89485c5cb9f765fe24bb02a7b6", - "reference": "7413f0b55a051e89485c5cb9f765fe24bb02a7b6", + "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/c6522afe5540d5fc46675043d3ed5a45a740b27c", + "reference": "c6522afe5540d5fc46675043d3ed5a45a740b27c", "shasum": "" }, "require": { @@ -397,7 +397,7 @@ } ], "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", - "time": "2020-11-11T10:22:58+00:00" + "time": "2021-05-24T07:46:03+00:00" }, { "name": "composer/semver", @@ -697,16 +697,16 @@ }, { "name": "doctrine/cache", - "version": "1.11.0", + "version": "1.11.3", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "a9c1b59eba5a08ca2770a76eddb88922f504e8e0" + "reference": "3bb5588cec00a0268829cc4a518490df6741af9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/a9c1b59eba5a08ca2770a76eddb88922f504e8e0", - "reference": "a9c1b59eba5a08ca2770a76eddb88922f504e8e0", + "url": "https://api.github.com/repos/doctrine/cache/zipball/3bb5588cec00a0268829cc4a518490df6741af9d", + "reference": "3bb5588cec00a0268829cc4a518490df6741af9d", "shasum": "" }, "require": { @@ -774,7 +774,7 @@ "redis", "xcache" ], - "time": "2021-04-13T14:46:17+00:00" + "time": "2021-05-25T09:01:55+00:00" }, { "name": "doctrine/dbal", @@ -1667,22 +1667,22 @@ }, { "name": "friendsofphp/proxy-manager-lts", - "version": "v1.0.3", + "version": "v1.0.5", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/proxy-manager-lts.git", - "reference": "121af47c9aee9c03031bdeca3fac0540f59aa5c3" + "reference": "006aa5d32f887a4db4353b13b5b5095613e0611f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/proxy-manager-lts/zipball/121af47c9aee9c03031bdeca3fac0540f59aa5c3", - "reference": "121af47c9aee9c03031bdeca3fac0540f59aa5c3", + "url": "https://api.github.com/repos/FriendsOfPHP/proxy-manager-lts/zipball/006aa5d32f887a4db4353b13b5b5095613e0611f", + "reference": "006aa5d32f887a4db4353b13b5b5095613e0611f", "shasum": "" }, "require": { "laminas/laminas-code": "~3.4.1|^4.0", "php": ">=7.1", - "symfony/filesystem": "^4.4.17|^5.0" + "symfony/filesystem": "^4.4.17|^5.0|^6.0" }, "conflict": { "laminas/laminas-stdlib": "<3.2.1", @@ -1693,7 +1693,7 @@ }, "require-dev": { "ext-phar": "*", - "symfony/phpunit-bridge": "^5.2" + "symfony/phpunit-bridge": "^5.2|^6.0" }, "type": "library", "extra": { @@ -1731,7 +1731,7 @@ "proxy pattern", "service proxies" ], - "time": "2021-01-14T21:52:44+00:00" + "time": "2021-05-22T16:11:15+00:00" }, { "name": "google/auth", @@ -1787,20 +1787,20 @@ }, { "name": "google/cloud-core", - "version": "v1.41.1", + "version": "v1.42.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-cloud-php-core.git", - "reference": "6c39dfc66eb9e542fcc5d793a1c128d3d006a6b8" + "reference": "0e311771797adb1b8674fce77e5dbaf727cea3eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/6c39dfc66eb9e542fcc5d793a1c128d3d006a6b8", - "reference": "6c39dfc66eb9e542fcc5d793a1c128d3d006a6b8", + "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/0e311771797adb1b8674fce77e5dbaf727cea3eb", + "reference": "0e311771797adb1b8674fce77e5dbaf727cea3eb", "shasum": "" }, "require": { - "google/auth": "^1.6", + "google/auth": "^1.12", "guzzlehttp/guzzle": "^5.3|^6.0|^7.0", "guzzlehttp/promises": "^1.3", "guzzlehttp/psr7": "^1.2", @@ -1844,7 +1844,7 @@ "Apache-2.0" ], "description": "Google Cloud PHP shared dependency, providing functionality useful to all components.", - "time": "2021-03-18T20:36:57+00:00" + "time": "2021-05-07T17:20:51+00:00" }, { "name": "google/cloud-storage", @@ -2246,16 +2246,16 @@ }, { "name": "laminas/laminas-code", - "version": "4.2.1", + "version": "4.3.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-code.git", - "reference": "a1e7f8b6467ac7f277b8e027e8537fa13664a8d8" + "reference": "1beb4447f9efd26041eba7eff50614e798c353fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-code/zipball/a1e7f8b6467ac7f277b8e027e8537fa13664a8d8", - "reference": "a1e7f8b6467ac7f277b8e027e8537fa13664a8d8", + "url": "https://api.github.com/repos/laminas/laminas-code/zipball/1beb4447f9efd26041eba7eff50614e798c353fd", + "reference": "1beb4447f9efd26041eba7eff50614e798c353fd", "shasum": "" }, "require": { @@ -2299,7 +2299,7 @@ "laminas", "laminasframework" ], - "time": "2021-04-23T11:54:51+00:00" + "time": "2021-05-12T12:41:03+00:00" }, { "name": "laminas/laminas-eventmanager", @@ -4447,16 +4447,16 @@ }, { "name": "symfony/cache", - "version": "v4.4.22", + "version": "v4.4.24", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "0da1df9b1a31f328f1711b5cd922c38a15c5fc74" + "reference": "9084b7312c3de1e6d621d60e00c5d42a4b77cfee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/0da1df9b1a31f328f1711b5cd922c38a15c5fc74", - "reference": "0da1df9b1a31f328f1711b5cd922c38a15c5fc74", + "url": "https://api.github.com/repos/symfony/cache/zipball/9084b7312c3de1e6d621d60e00c5d42a4b77cfee", + "reference": "9084b7312c3de1e6d621d60e00c5d42a4b77cfee", "shasum": "" }, "require": { @@ -4480,7 +4480,7 @@ }, "require-dev": { "cache/integration-tests": "dev-master", - "doctrine/cache": "^1.6", + "doctrine/cache": "^1.6|^2.0", "doctrine/dbal": "^2.6|^3.0", "predis/predis": "^1.1", "psr/simple-cache": "^1.0", @@ -4519,7 +4519,7 @@ "caching", "psr6" ], - "time": "2021-04-23T07:09:57+00:00" + "time": "2021-05-16T21:41:25+00:00" }, { "name": "symfony/cache-contracts", @@ -4584,16 +4584,16 @@ }, { "name": "symfony/config", - "version": "v4.4.22", + "version": "v4.4.23", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "f6d8318c14e4be81525ae47b30e618f0bed4c7b3" + "reference": "be9e601f17fc684ddfd6c675fdfcd04bb51fa928" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/f6d8318c14e4be81525ae47b30e618f0bed4c7b3", - "reference": "f6d8318c14e4be81525ae47b30e618f0bed4c7b3", + "url": "https://api.github.com/repos/symfony/config/zipball/be9e601f17fc684ddfd6c675fdfcd04bb51fa928", + "reference": "be9e601f17fc684ddfd6c675fdfcd04bb51fa928", "shasum": "" }, "require": { @@ -4639,20 +4639,20 @@ ], "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", - "time": "2021-04-07T15:47:03+00:00" + "time": "2021-05-07T13:37:51+00:00" }, { "name": "symfony/console", - "version": "v4.4.22", + "version": "v4.4.24", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "36bbd079b69b94bcc9c9c9e1e37ca3b1e7971625" + "reference": "1b15ca1b1bedda86f98064da9ff5d800560d4c6d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/36bbd079b69b94bcc9c9c9e1e37ca3b1e7971625", - "reference": "36bbd079b69b94bcc9c9c9e1e37ca3b1e7971625", + "url": "https://api.github.com/repos/symfony/console/zipball/1b15ca1b1bedda86f98064da9ff5d800560d4c6d", + "reference": "1b15ca1b1bedda86f98064da9ff5d800560d4c6d", "shasum": "" }, "require": { @@ -4711,7 +4711,7 @@ ], "description": "Eases the creation of beautiful and testable command line interfaces", "homepage": "https://symfony.com", - "time": "2021-04-16T17:32:19+00:00" + "time": "2021-05-13T06:28:07+00:00" }, { "name": "symfony/debug", @@ -4828,16 +4828,16 @@ }, { "name": "symfony/dependency-injection", - "version": "v4.4.22", + "version": "v4.4.24", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "778b140b3e8f6890f43dc2c978e58e69f188909a" + "reference": "8422396fb0b477ecbbe130907f90a0809b49c835" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/778b140b3e8f6890f43dc2c978e58e69f188909a", - "reference": "778b140b3e8f6890f43dc2c978e58e69f188909a", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/8422396fb0b477ecbbe130907f90a0809b49c835", + "reference": "8422396fb0b477ecbbe130907f90a0809b49c835", "shasum": "" }, "require": { @@ -4858,7 +4858,7 @@ "require-dev": { "symfony/config": "^4.3", "symfony/expression-language": "^3.4|^4.0|^5.0", - "symfony/yaml": "^3.4|^4.0|^5.0" + "symfony/yaml": "^4.4|^5.0" }, "suggest": { "symfony/config": "", @@ -4892,7 +4892,7 @@ ], "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", - "time": "2021-04-07T15:47:03+00:00" + "time": "2021-05-16T09:52:47+00:00" }, { "name": "symfony/dotenv", @@ -4948,16 +4948,16 @@ }, { "name": "symfony/error-handler", - "version": "v4.4.22", + "version": "v4.4.23", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "76603a8df8e001436df80758eb03a8baa5324175" + "reference": "21d75bfbdfdd3581a7f97080deb98926987f14a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/76603a8df8e001436df80758eb03a8baa5324175", - "reference": "76603a8df8e001436df80758eb03a8baa5324175", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/21d75bfbdfdd3581a7f97080deb98926987f14a7", + "reference": "21d75bfbdfdd3581a7f97080deb98926987f14a7", "shasum": "" }, "require": { @@ -4996,7 +4996,7 @@ ], "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", - "time": "2021-04-02T07:50:12+00:00" + "time": "2021-05-02T20:47:26+00:00" }, { "name": "symfony/event-dispatcher", @@ -5172,16 +5172,16 @@ }, { "name": "symfony/finder", - "version": "v4.4.20", + "version": "v4.4.24", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "2543795ab1570df588b9bbd31e1a2bd7037b94f6" + "reference": "a96bc19ed87c88eec78e1a4c803bdc1446952983" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/2543795ab1570df588b9bbd31e1a2bd7037b94f6", - "reference": "2543795ab1570df588b9bbd31e1a2bd7037b94f6", + "url": "https://api.github.com/repos/symfony/finder/zipball/a96bc19ed87c88eec78e1a4c803bdc1446952983", + "reference": "a96bc19ed87c88eec78e1a4c803bdc1446952983", "shasum": "" }, "require": { @@ -5212,27 +5212,27 @@ ], "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", - "time": "2021-02-12T10:48:09+00:00" + "time": "2021-05-16T12:27:45+00:00" }, { "name": "symfony/framework-bundle", - "version": "v4.4.22", + "version": "v4.4.24", "source": { "type": "git", "url": "https://github.com/symfony/framework-bundle.git", - "reference": "98e855fd35dd2c4614f61d349b1fd7dd3622b9b9" + "reference": "0e9b5cec25fb3de04fb51d8ec05eb35df1385096" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/98e855fd35dd2c4614f61d349b1fd7dd3622b9b9", - "reference": "98e855fd35dd2c4614f61d349b1fd7dd3622b9b9", + "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/0e9b5cec25fb3de04fb51d8ec05eb35df1385096", + "reference": "0e9b5cec25fb3de04fb51d8ec05eb35df1385096", "shasum": "" }, "require": { "ext-xml": "*", "php": ">=7.1.3", "symfony/cache": "^4.4|^5.0", - "symfony/config": "^4.3.4|^5.0", + "symfony/config": "^4.4.11|~5.0.11|^5.1.3", "symfony/dependency-injection": "^4.4.1|^5.0.1", "symfony/error-handler": "^4.4.1|^5.0.1", "symfony/filesystem": "^3.4|^4.0|^5.0", @@ -5271,7 +5271,7 @@ }, "require-dev": { "doctrine/annotations": "^1.10.4", - "doctrine/cache": "~1.0", + "doctrine/cache": "^1.0|^2.0", "doctrine/persistence": "^1.3|^2.0", "paragonie/sodium_compat": "^1.8", "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", @@ -5340,7 +5340,7 @@ ], "description": "Provides a tight integration between Symfony components and the Symfony full-stack framework", "homepage": "https://symfony.com", - "time": "2021-04-14T13:03:08+00:00" + "time": "2021-05-16T21:41:25+00:00" }, { "name": "symfony/http-client-contracts", @@ -5404,34 +5404,20 @@ "support": { "source": "https://github.com/symfony/http-client-contracts/tree/v2.4.0" }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2021-04-11T23:07:08+00:00" }, { "name": "symfony/http-foundation", - "version": "v4.4.22", + "version": "v4.4.23", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "1a6f87ef99d05b1bf5c865b4ef7992263e1cb081" + "reference": "2ffb43bd6c589a274ee1e93a5fd6b7ef1577b9c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/1a6f87ef99d05b1bf5c865b4ef7992263e1cb081", - "reference": "1a6f87ef99d05b1bf5c865b4ef7992263e1cb081", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/2ffb43bd6c589a274ee1e93a5fd6b7ef1577b9c5", + "reference": "2ffb43bd6c589a274ee1e93a5fd6b7ef1577b9c5", "shasum": "" }, "require": { @@ -5469,7 +5455,7 @@ ], "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", - "time": "2021-04-30T12:05:50+00:00" + "time": "2021-05-05T07:40:41+00:00" }, { "name": "symfony/http-kernel", @@ -5560,16 +5546,16 @@ }, { "name": "symfony/inflector", - "version": "v4.4.21", + "version": "v4.4.23", "source": { "type": "git", "url": "https://github.com/symfony/inflector.git", - "reference": "9455097d23776a4a10c817d903271bc1ce7596ff" + "reference": "89dc6b7d1143c114e7e251ab965f4a751bfe7ad5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/inflector/zipball/9455097d23776a4a10c817d903271bc1ce7596ff", - "reference": "9455097d23776a4a10c817d903271bc1ce7596ff", + "url": "https://api.github.com/repos/symfony/inflector/zipball/89dc6b7d1143c114e7e251ab965f4a751bfe7ad5", + "reference": "89dc6b7d1143c114e7e251ab965f4a751bfe7ad5", "shasum": "" }, "require": { @@ -5609,7 +5595,7 @@ "symfony", "words" ], - "time": "2021-03-17T16:19:54+00:00" + "time": "2021-05-10T14:36:02+00:00" }, { "name": "symfony/intl", @@ -5754,16 +5740,16 @@ }, { "name": "symfony/mime", - "version": "v4.4.22", + "version": "v4.4.24", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "36f2e59c90762bb09170553130a4dc1934cada58" + "reference": "7e8e9192500d0bae9f6aff60c842befc7d887b68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/36f2e59c90762bb09170553130a4dc1934cada58", - "reference": "36f2e59c90762bb09170553130a4dc1934cada58", + "url": "https://api.github.com/repos/symfony/mime/zipball/7e8e9192500d0bae9f6aff60c842befc7d887b68", + "reference": "7e8e9192500d0bae9f6aff60c842befc7d887b68", "shasum": "" }, "require": { @@ -5808,7 +5794,7 @@ "mime", "mime-type" ], - "time": "2021-04-27T14:58:50+00:00" + "time": "2021-05-16T09:52:47+00:00" }, { "name": "symfony/monolog-bridge", @@ -6627,20 +6613,6 @@ "support": { "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.1" }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2021-01-07T16:49:33+00:00" }, { @@ -6751,16 +6723,16 @@ }, { "name": "symfony/property-info", - "version": "v4.4.22", + "version": "v4.4.23", "source": { "type": "git", "url": "https://github.com/symfony/property-info.git", - "reference": "a910e1a728b90797d9e549737c8fc640b99a2873" + "reference": "3b6d316b1e007dc637962573e2599eb0b82176f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-info/zipball/a910e1a728b90797d9e549737c8fc640b99a2873", - "reference": "a910e1a728b90797d9e549737c8fc640b99a2873", + "url": "https://api.github.com/repos/symfony/property-info/zipball/3b6d316b1e007dc637962573e2599eb0b82176f6", + "reference": "3b6d316b1e007dc637962573e2599eb0b82176f6", "shasum": "" }, "require": { @@ -6818,20 +6790,20 @@ "type", "validator" ], - "time": "2021-04-13T22:23:01+00:00" + "time": "2021-05-07T13:22:49+00:00" }, { "name": "symfony/proxy-manager-bridge", - "version": "v4.4.20", + "version": "v4.4.24", "source": { "type": "git", "url": "https://github.com/symfony/proxy-manager-bridge.git", - "reference": "811a39770b21f05bea9a737568074be4f02e7733" + "reference": "4f1a76bca5c9a0159f7cee17d25c77917b0580b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/proxy-manager-bridge/zipball/811a39770b21f05bea9a737568074be4f02e7733", - "reference": "811a39770b21f05bea9a737568074be4f02e7733", + "url": "https://api.github.com/repos/symfony/proxy-manager-bridge/zipball/4f1a76bca5c9a0159f7cee17d25c77917b0580b1", + "reference": "4f1a76bca5c9a0159f7cee17d25c77917b0580b1", "shasum": "" }, "require": { @@ -6868,7 +6840,7 @@ ], "description": "Provides integration for ProxyManager with various Symfony components", "homepage": "https://symfony.com", - "time": "2021-01-27T09:09:26+00:00" + "time": "2021-05-14T23:35:14+00:00" }, { "name": "symfony/psr-http-message-bridge", @@ -6936,16 +6908,16 @@ }, { "name": "symfony/routing", - "version": "v4.4.22", + "version": "v4.4.24", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "049e7c5c41f98511959668791b4adc0898a821b3" + "reference": "b42c3631fd9e3511610afb2ba081ea7e38d9fa38" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/049e7c5c41f98511959668791b4adc0898a821b3", - "reference": "049e7c5c41f98511959668791b4adc0898a821b3", + "url": "https://api.github.com/repos/symfony/routing/zipball/b42c3631fd9e3511610afb2ba081ea7e38d9fa38", + "reference": "b42c3631fd9e3511610afb2ba081ea7e38d9fa38", "shasum": "" }, "require": { @@ -7003,20 +6975,20 @@ "uri", "url" ], - "time": "2021-04-11T12:59:39+00:00" + "time": "2021-05-16T09:52:47+00:00" }, { "name": "symfony/security-core", - "version": "v4.4.23", + "version": "v4.4.24", "source": { "type": "git", "url": "https://github.com/symfony/security-core.git", - "reference": "8188709909f1e980bd5d791aa9d85156204526e9" + "reference": "c8b37f1583138cc53edbefe81f0fa274f548129c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-core/zipball/8188709909f1e980bd5d791aa9d85156204526e9", - "reference": "8188709909f1e980bd5d791aa9d85156204526e9", + "url": "https://api.github.com/repos/symfony/security-core/zipball/c8b37f1583138cc53edbefe81f0fa274f548129c", + "reference": "c8b37f1583138cc53edbefe81f0fa274f548129c", "shasum": "" }, "require": { @@ -7072,24 +7044,7 @@ ], "description": "Symfony Security Component - Core Library", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/security-core/tree/v4.4.23" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2021-05-12T12:42:28+00:00" + "time": "2021-05-19T12:06:31+00:00" }, { "name": "symfony/security-csrf", @@ -7147,16 +7102,16 @@ }, { "name": "symfony/serializer", - "version": "v4.4.22", + "version": "v4.4.24", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "9db284ce4b1194797ad2ac6ad5406c5b416a9bb4" + "reference": "c9c90ead6a87d5bc76a8c8dc49e6aeceea414707" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/9db284ce4b1194797ad2ac6ad5406c5b416a9bb4", - "reference": "9db284ce4b1194797ad2ac6ad5406c5b416a9bb4", + "url": "https://api.github.com/repos/symfony/serializer/zipball/c9c90ead6a87d5bc76a8c8dc49e6aeceea414707", + "reference": "c9c90ead6a87d5bc76a8c8dc49e6aeceea414707", "shasum": "" }, "require": { @@ -7173,7 +7128,6 @@ }, "require-dev": { "doctrine/annotations": "^1.10.4", - "doctrine/cache": "~1.0", "phpdocumentor/reflection-docblock": "^3.2|^4.0|^5.0", "symfony/cache": "^3.4|^4.0|^5.0", "symfony/config": "^3.4|^4.0|^5.0", @@ -7187,8 +7141,7 @@ "symfony/yaml": "^3.4|^4.0|^5.0" }, "suggest": { - "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.", - "doctrine/cache": "For using the default cached annotation reader and metadata cache.", + "doctrine/annotations": "For using the annotation mapping.", "psr/cache-implementation": "For using the metadata cache.", "symfony/config": "For using the XML mapping loader.", "symfony/http-foundation": "For using a MIME type guesser within the DataUriNormalizer.", @@ -7221,7 +7174,7 @@ ], "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.", "homepage": "https://symfony.com", - "time": "2021-04-13T06:32:41+00:00" + "time": "2021-05-16T21:41:25+00:00" }, { "name": "symfony/service-contracts", @@ -7286,16 +7239,16 @@ }, { "name": "symfony/string", - "version": "v5.2.6", + "version": "v5.2.8", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "ad0bd91bce2054103f5eaa18ebeba8d3bc2a0572" + "reference": "01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/ad0bd91bce2054103f5eaa18ebeba8d3bc2a0572", - "reference": "ad0bd91bce2054103f5eaa18ebeba8d3bc2a0572", + "url": "https://api.github.com/repos/symfony/string/zipball/01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db", + "reference": "01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db", "shasum": "" }, "require": { @@ -7348,7 +7301,7 @@ "utf-8", "utf8" ], - "time": "2021-03-17T17:12:15+00:00" + "time": "2021-05-10T14:56:10+00:00" }, { "name": "symfony/swiftmailer-bundle", @@ -7417,16 +7370,16 @@ }, { "name": "symfony/translation", - "version": "v4.4.21", + "version": "v4.4.24", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "eb8f5428cc3b40d6dffe303b195b084f1c5fbd14" + "reference": "424d29dfcc15575af05196de0100d7b52f650602" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/eb8f5428cc3b40d6dffe303b195b084f1c5fbd14", - "reference": "eb8f5428cc3b40d6dffe303b195b084f1c5fbd14", + "url": "https://api.github.com/repos/symfony/translation/zipball/424d29dfcc15575af05196de0100d7b52f650602", + "reference": "424d29dfcc15575af05196de0100d7b52f650602", "shasum": "" }, "require": { @@ -7484,7 +7437,7 @@ ], "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", - "time": "2021-03-23T16:25:01+00:00" + "time": "2021-05-16T09:52:47+00:00" }, { "name": "symfony/translation-contracts", @@ -7716,16 +7669,16 @@ }, { "name": "symfony/validator", - "version": "v4.4.22", + "version": "v4.4.24", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "65525b93ebc48c2992271f435e1391bbb049367a" + "reference": "0a947c69d66d5560f244a754524445b9002b1e4b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/65525b93ebc48c2992271f435e1391bbb049367a", - "reference": "65525b93ebc48c2992271f435e1391bbb049367a", + "url": "https://api.github.com/repos/symfony/validator/zipball/0a947c69d66d5560f244a754524445b9002b1e4b", + "reference": "0a947c69d66d5560f244a754524445b9002b1e4b", "shasum": "" }, "require": { @@ -7745,7 +7698,7 @@ }, "require-dev": { "doctrine/annotations": "^1.10.4", - "doctrine/cache": "~1.0", + "doctrine/cache": "^1.0|^2.0", "egulias/email-validator": "^2.1.10|^3", "symfony/cache": "^3.4|^4.0|^5.0", "symfony/config": "^3.4|^4.0|^5.0", @@ -7800,20 +7753,20 @@ ], "description": "Provides tools to validate values", "homepage": "https://symfony.com", - "time": "2021-04-14T09:41:13+00:00" + "time": "2021-05-16T21:41:25+00:00" }, { "name": "symfony/var-dumper", - "version": "v5.2.7", + "version": "v5.2.8", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "27cb9f7cfa3853c736425c7233a8f68814b19636" + "reference": "d693200a73fae179d27f8f1b16b4faf3e8569eba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/27cb9f7cfa3853c736425c7233a8f68814b19636", - "reference": "27cb9f7cfa3853c736425c7233a8f68814b19636", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/d693200a73fae179d27f8f1b16b4faf3e8569eba", + "reference": "d693200a73fae179d27f8f1b16b4faf3e8569eba", "shasum": "" }, "require": { @@ -7871,20 +7824,20 @@ "debug", "dump" ], - "time": "2021-04-19T14:07:32+00:00" + "time": "2021-05-07T13:42:21+00:00" }, { "name": "symfony/var-exporter", - "version": "v4.4.22", + "version": "v4.4.23", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "ef3054c7e878fe0837ef9ac2c5ecfddfd27dd9e9" + "reference": "11439b8e3264502293bd5e5ecd6957f70319f526" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/ef3054c7e878fe0837ef9ac2c5ecfddfd27dd9e9", - "reference": "ef3054c7e878fe0837ef9ac2c5ecfddfd27dd9e9", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/11439b8e3264502293bd5e5ecd6957f70319f526", + "reference": "11439b8e3264502293bd5e5ecd6957f70319f526", "shasum": "" }, "require": { @@ -7926,20 +7879,20 @@ "instantiate", "serialize" ], - "time": "2021-04-01T10:24:12+00:00" + "time": "2021-05-06T19:16:33+00:00" }, { "name": "symfony/yaml", - "version": "v4.4.22", + "version": "v4.4.24", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "1c2fd24147961525eaefb65b11987cab75adab59" + "reference": "8b6d1b97521e2f125039b3fcb4747584c6dfa0ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/1c2fd24147961525eaefb65b11987cab75adab59", - "reference": "1c2fd24147961525eaefb65b11987cab75adab59", + "url": "https://api.github.com/repos/symfony/yaml/zipball/8b6d1b97521e2f125039b3fcb4747584c6dfa0ef", + "reference": "8b6d1b97521e2f125039b3fcb4747584c6dfa0ef", "shasum": "" }, "require": { @@ -7980,7 +7933,7 @@ ], "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", - "time": "2021-04-23T12:09:37+00:00" + "time": "2021-05-16T09:52:47+00:00" }, { "name": "true/punycode", @@ -8326,6 +8279,5 @@ "platform": { "ext-json": "*" }, - "platform-dev": [], - "plugin-api-version": "2.0.0" + "platform-dev": [] }