From 20fb1b16bd95b1e478c95de966687a29d050da03 Mon Sep 17 00:00:00 2001 From: Simon Gabriel Date: Thu, 7 Jun 2018 10:56:45 +0200 Subject: [PATCH 1/2] [bugfix] (MAGE2-74) Allow the base payment config to be null and add default value (null). Signed-off-by: Simon Gabriel --- PaymentMethods/HeidelpayAbstractPaymentMethod.php | 4 ++-- PaymentMethods/HeidelpayCreditCardPaymentMethod.php | 2 +- PaymentMethods/HeidelpayDebitCardPaymentMethod.php | 2 +- PaymentMethods/HeidelpayDirectDebitPaymentMethod.php | 2 +- PaymentMethods/HeidelpayDirectDebitSecuredPaymentMethod.php | 2 +- PaymentMethods/HeidelpayGiropayPaymentMethod.php | 2 +- PaymentMethods/HeidelpayInvoicePaymentMethod.php | 2 +- PaymentMethods/HeidelpayInvoiceSecuredPaymentMethod.php | 2 +- PaymentMethods/HeidelpayPayPalPaymentMethod.php | 2 +- PaymentMethods/HeidelpayPrepaymentPaymentMethod.php | 2 +- PaymentMethods/HeidelpaySofortPaymentMethod.php | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/PaymentMethods/HeidelpayAbstractPaymentMethod.php b/PaymentMethods/HeidelpayAbstractPaymentMethod.php index 039e0f704e9..32fbcbd47ad 100755 --- a/PaymentMethods/HeidelpayAbstractPaymentMethod.php +++ b/PaymentMethods/HeidelpayAbstractPaymentMethod.php @@ -190,7 +190,6 @@ class HeidelpayAbstractPaymentMethod extends \Magento\Payment\Model\Method\Abstr * @param \Magento\Framework\Locale\ResolverInterface $localeResolver * @param \Magento\Framework\App\ProductMetadataInterface $productMetadata * @param \Magento\Framework\Module\ResourceInterface $moduleResource - * @param HgwBasePaymentConfigInterface $paymentConfig * @param \Heidelpay\Gateway\Helper\Payment $paymentHelper * @param \Heidelpay\Gateway\Helper\BasketHelper $basketHelper * @param \Magento\Sales\Helper\Data $salesHelper @@ -199,6 +198,7 @@ class HeidelpayAbstractPaymentMethod extends \Magento\Payment\Model\Method\Abstr * @param HeidelpayTransactionCollectionFactory $transactionCollectionFactory * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection + * @param HgwBasePaymentConfigInterface $paymentConfig * @param array $data */ public function __construct( @@ -215,7 +215,6 @@ public function __construct( \Magento\Framework\Locale\ResolverInterface $localeResolver, \Magento\Framework\App\ProductMetadataInterface $productMetadata, \Magento\Framework\Module\ResourceInterface $moduleResource, - $paymentConfig /* do not add Type or this wont work */, \Heidelpay\Gateway\Helper\Payment $paymentHelper, \Heidelpay\Gateway\Helper\BasketHelper $basketHelper, \Magento\Sales\Helper\Data $salesHelper, @@ -224,6 +223,7 @@ public function __construct( HeidelpayTransactionCollectionFactory $transactionCollectionFactory, \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null, \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null, + $paymentConfig = null /* do not add Type or this wont work */, array $data = [] ) { parent::__construct( diff --git a/PaymentMethods/HeidelpayCreditCardPaymentMethod.php b/PaymentMethods/HeidelpayCreditCardPaymentMethod.php index 36a974a07cd..46d3953654c 100755 --- a/PaymentMethods/HeidelpayCreditCardPaymentMethod.php +++ b/PaymentMethods/HeidelpayCreditCardPaymentMethod.php @@ -136,7 +136,6 @@ public function __construct( $localeResolver, $productMetadata, $moduleResource, - $paymentConfig, $paymentHelper, $basketHelper, $salesHelper, @@ -145,6 +144,7 @@ public function __construct( $transactionCollectionFactory, $resource, $resourceCollection, + $paymentConfig, $data ); diff --git a/PaymentMethods/HeidelpayDebitCardPaymentMethod.php b/PaymentMethods/HeidelpayDebitCardPaymentMethod.php index e940d2beeff..b16db95bc90 100755 --- a/PaymentMethods/HeidelpayDebitCardPaymentMethod.php +++ b/PaymentMethods/HeidelpayDebitCardPaymentMethod.php @@ -136,7 +136,6 @@ public function __construct( $localeResolver, $productMetadata, $moduleResource, - $paymentConfig, $paymentHelper, $basketHelper, $salesHelper, @@ -145,6 +144,7 @@ public function __construct( $transactionCollectionFactory, $resource, $resourceCollection, + $paymentConfig, $data ); diff --git a/PaymentMethods/HeidelpayDirectDebitPaymentMethod.php b/PaymentMethods/HeidelpayDirectDebitPaymentMethod.php index 2477cbd70ee..de87986b280 100755 --- a/PaymentMethods/HeidelpayDirectDebitPaymentMethod.php +++ b/PaymentMethods/HeidelpayDirectDebitPaymentMethod.php @@ -118,7 +118,6 @@ public function __construct( $localeResolver, $productMetadata, $moduleResource, - $paymentConfig, $paymentHelper, $basketHelper, $salesHelper, @@ -127,6 +126,7 @@ public function __construct( $transactionCollectionFactory, $resource, $resourceCollection, + $paymentConfig, $data ); diff --git a/PaymentMethods/HeidelpayDirectDebitSecuredPaymentMethod.php b/PaymentMethods/HeidelpayDirectDebitSecuredPaymentMethod.php index 6d263f3e904..24e445ce97e 100755 --- a/PaymentMethods/HeidelpayDirectDebitSecuredPaymentMethod.php +++ b/PaymentMethods/HeidelpayDirectDebitSecuredPaymentMethod.php @@ -118,7 +118,6 @@ public function __construct( $localeResolver, $productMetadata, $moduleResource, - $paymentConfig, $paymentHelper, $basketHelper, $salesHelper, @@ -127,6 +126,7 @@ public function __construct( $transactionCollectionFactory, $resource, $resourceCollection, + $paymentConfig, $data ); diff --git a/PaymentMethods/HeidelpayGiropayPaymentMethod.php b/PaymentMethods/HeidelpayGiropayPaymentMethod.php index 01ad109cf72..49a90563494 100755 --- a/PaymentMethods/HeidelpayGiropayPaymentMethod.php +++ b/PaymentMethods/HeidelpayGiropayPaymentMethod.php @@ -115,7 +115,6 @@ public function __construct( $localeResolver, $productMetadata, $moduleResource, - $paymentConfig, $paymentHelper, $basketHelper, $salesHelper, @@ -124,6 +123,7 @@ public function __construct( $transactionCollectionFactory, $resource, $resourceCollection, + $paymentConfig, $data ); diff --git a/PaymentMethods/HeidelpayInvoicePaymentMethod.php b/PaymentMethods/HeidelpayInvoicePaymentMethod.php index 1de75f65bb1..3e21821633c 100755 --- a/PaymentMethods/HeidelpayInvoicePaymentMethod.php +++ b/PaymentMethods/HeidelpayInvoicePaymentMethod.php @@ -131,7 +131,6 @@ public function __construct( $localeResolver, $productMetadata, $moduleResource, - $paymentConfig, $paymentHelper, $basketHelper, $salesHelper, @@ -140,6 +139,7 @@ public function __construct( $transactionCollectionFactory, $resource, $resourceCollection, + $paymentConfig, $data ); diff --git a/PaymentMethods/HeidelpayInvoiceSecuredPaymentMethod.php b/PaymentMethods/HeidelpayInvoiceSecuredPaymentMethod.php index b3449e7028d..939e6d5d598 100755 --- a/PaymentMethods/HeidelpayInvoiceSecuredPaymentMethod.php +++ b/PaymentMethods/HeidelpayInvoiceSecuredPaymentMethod.php @@ -131,7 +131,6 @@ public function __construct( $localeResolver, $productMetadata, $moduleResource, - $paymentConfig, $paymentHelper, $basketHelper, $salesHelper, @@ -140,6 +139,7 @@ public function __construct( $transactionCollectionFactory, $resource, $resourceCollection, + $paymentConfig, $data ); diff --git a/PaymentMethods/HeidelpayPayPalPaymentMethod.php b/PaymentMethods/HeidelpayPayPalPaymentMethod.php index c70994e2ece..27cc91b16f3 100755 --- a/PaymentMethods/HeidelpayPayPalPaymentMethod.php +++ b/PaymentMethods/HeidelpayPayPalPaymentMethod.php @@ -136,7 +136,6 @@ public function __construct( $localeResolver, $productMetadata, $moduleResource, - $paymentConfig, $paymentHelper, $basketHelper, $salesHelper, @@ -145,6 +144,7 @@ public function __construct( $transactionCollectionFactory, $resource, $resourceCollection, + $paymentConfig, $data ); diff --git a/PaymentMethods/HeidelpayPrepaymentPaymentMethod.php b/PaymentMethods/HeidelpayPrepaymentPaymentMethod.php index 4e2a83d48f9..8b16d4860d1 100755 --- a/PaymentMethods/HeidelpayPrepaymentPaymentMethod.php +++ b/PaymentMethods/HeidelpayPrepaymentPaymentMethod.php @@ -131,7 +131,6 @@ public function __construct( $localeResolver, $productMetadata, $moduleResource, - $paymentConfig, $paymentHelper, $basketHelper, $salesHelper, @@ -140,6 +139,7 @@ public function __construct( $transactionCollectionFactory, $resource, $resourceCollection, + $paymentConfig, $data ); diff --git a/PaymentMethods/HeidelpaySofortPaymentMethod.php b/PaymentMethods/HeidelpaySofortPaymentMethod.php index a3c62f86347..891211b3f4d 100755 --- a/PaymentMethods/HeidelpaySofortPaymentMethod.php +++ b/PaymentMethods/HeidelpaySofortPaymentMethod.php @@ -125,7 +125,6 @@ public function __construct( $localeResolver, $productMetadata, $moduleResource, - $paymentConfig, $paymentHelper, $basketHelper, $salesHelper, @@ -134,6 +133,7 @@ public function __construct( $transactionCollectionFactory, $resource, $resourceCollection, + $paymentConfig, $data ); From f121a286259f8eb4cfe6ab85cd8eb341d8692eee Mon Sep 17 00:00:00 2001 From: Simon Gabriel Date: Thu, 7 Jun 2018 11:02:24 +0200 Subject: [PATCH 2/2] [bugfix] (MAGE2-74) Update version and changelog. Signed-off-by: Simon Gabriel --- CHANGELOG.md | 5 +++++ etc/module.xml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5cf06a1db24..438d2984aba 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ This project does not follow a versioning standard. Versions are crafted after the dates; for example, the version 17.7.25 was released on July, 25th in 2017 +## 18.6.7 + +### Fixed +- A bug which resulted in a problem in developer mode forcing the shop-owner to perform di:compile on install. + ## 18.4.23 ### Fixed diff --git a/etc/module.xml b/etc/module.xml index 6cabfc457b1..17d2c5f8059 100755 --- a/etc/module.xml +++ b/etc/module.xml @@ -1,5 +1,5 @@ - +