Merge pull request #64 from heidelpay/MAGE2-74/bugfix/github_issue_63

MAGE2-74/bugfix/github_issue_63
heidelpay · Jun 7, 2018 · 4060484 · 4060484
2 parents bffea2d + f121a28
commit 4060484
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 13 deletions.
diff --git 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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
         );
 

diff --git a/etc/module.xml b/etc/module.xml
@@ -1,5 +1,5 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
-    <module name="Heidelpay_Gateway" schema_version="18.4.23" setup_version="18.4.23">
+    <module name="Heidelpay_Gateway" schema_version="18.6.7" setup_version="18.6.7">
         <sequence>
             <module name="Magento_Sales" />
             <module name="Magento_Payment" />