From 88f98f2a468c78fc6066f5196c03d08c9e49366f Mon Sep 17 00:00:00 2001 From: sixer1182 Date: Thu, 18 Feb 2021 08:50:17 +0100 Subject: [PATCH 1/3] [bugfix] Remove incompatibility issue. --- Block/System/Config/WebhooksButtons.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Block/System/Config/WebhooksButtons.php b/Block/System/Config/WebhooksButtons.php index f5456a2..713bdb4 100644 --- a/Block/System/Config/WebhooksButtons.php +++ b/Block/System/Config/WebhooksButtons.php @@ -9,7 +9,6 @@ use Magento\Framework\Data\Form\Element\AbstractElement; use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Exception\NoSuchEntityException; -use Magento\Framework\View\Helper\SecureHtmlRenderer; use Magento\Store\Model\StoreManagerInterface; use Zend_Json; @@ -56,17 +55,15 @@ class WebhooksButtons extends Field * @param RequestInterface $request * @param StoreManagerInterface $storeManager * @param array $data - * @param SecureHtmlRenderer|null $secureRenderer */ public function __construct( Context $context, RequestInterface $request, StoreManagerInterface $storeManager, - array $data = [], - ?SecureHtmlRenderer $secureRenderer = null + array $data = [] ) { - parent::__construct($context, $data, $secureRenderer); + parent::__construct($context, $data); $this->_request = $request; $this->_storeManager = $storeManager; From e9890f09eec0360287a96f78d7d9f5b8c9afdb5f Mon Sep 17 00:00:00 2001 From: "David.Owusu" Date: Thu, 18 Feb 2021 09:00:33 +0100 Subject: [PATCH 2/3] update version: 1.1.1 --- CHANGELOG.md | 4 ++++ etc/module.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90f0d01..7533094 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,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/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [1.1.1][1.1.1] +### Fix +* Incompatibility with magento 2.3.x causing DI compilation to fail. ## [1.1.0][1.1.0] ### Added @@ -27,3 +30,4 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a [1.0.1]: https://github.com/heidelpay/magento2-merchant-gateway/compare/1.0.0..1.0.1 [1.0.2]: https://github.com/heidelpay/magento2-merchant-gateway/compare/1.0.1..1.0.2 [1.1.0]: https://github.com/heidelpay/magento2-merchant-gateway/compare/1.0.2..1.1.0 +[1.1.0]: https://github.com/heidelpay/magento2-merchant-gateway/compare/1.1.0..1.1.1 diff --git a/etc/module.xml b/etc/module.xml index 722cec2..abe0c28 100644 --- a/etc/module.xml +++ b/etc/module.xml @@ -1,7 +1,7 @@ - + From 4e6a32f8843f6142cd3b700a8b1ea0ba67cd1c23 Mon Sep 17 00:00:00 2001 From: "David.Owusu" Date: Thu, 18 Feb 2021 09:23:21 +0100 Subject: [PATCH 3/3] fix link in changelog. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7533094..d7fe30d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,4 +30,4 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a [1.0.1]: https://github.com/heidelpay/magento2-merchant-gateway/compare/1.0.0..1.0.1 [1.0.2]: https://github.com/heidelpay/magento2-merchant-gateway/compare/1.0.1..1.0.2 [1.1.0]: https://github.com/heidelpay/magento2-merchant-gateway/compare/1.0.2..1.1.0 -[1.1.0]: https://github.com/heidelpay/magento2-merchant-gateway/compare/1.1.0..1.1.1 +[1.1.1]: https://github.com/heidelpay/magento2-merchant-gateway/compare/1.1.0..1.1.1