Merge pull request #127 from bestit/develop

Release 3.6.2

.travis.yml

@@ -34,12 +34,12 @@ before_deploy:
 deploy:
   - provider: script
     skip_cleanup: true
-    script: ./deploy.sh
+    script: ./scripts/deploy.sh
     on:
       branch: develop
   - provider: script
     skip_cleanup: true
-    script: ./deploy-package.sh ${GH_API_KEY} ${TRAVIS_TAG}
+    script: ./scripts/deploy-package.sh ${GH_API_KEY} ${TRAVIS_TAG}
     on:
       tags: true
 

CHANGELOG.md

@@ -4,9 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec2.0.0.html).
 
+## [3.6.2] - 2019-10-30
+### Fixed
+- Add missing parent::__construct calls [#124](https://github.com/bestit/amazon-pay-oxid/pull/124)
+- Make testFinalizeOrder more robust [#124](https://github.com/bestit/amazon-pay-oxid/pull/124)
+
 ## [3.6.1] - 2019-10-25
 ### Fixed
-- The ajax request for confirmation is now fired, if agb click is not active or checked [#115](https://github.com/bestit/amazon-pay-oxid/pull/120)
+- Fixed the missing parent call in "OxidEsales\Eshop\Core\Email" [#120](https://github.com/bestit/amazon-pay-oxid/pull/120)
 
 ## [3.6.0] - 2019-10-10
 ### Fixed

composer.json

@@ -4,7 +4,7 @@
   "type": "oxideshop-module",
   "keywords": ["oxid", "modules", "eShop"],
   "homepage": "https://www.bestit-online.de",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "license": [
     "GPL-3.0-only",
     "proprietary"

ext/bestitamazonpay4oxid_order.php

@@ -27,6 +27,7 @@ class bestitAmazonPay4Oxid_order extends bestitAmazonPay4Oxid_order_parent
      */
     public function __construct()
     {
+        parent::__construct();
         $this->_oLogger = $this->_getContainer()->getLogger();
     }
 

ext/bestitamazonpay4oxid_order_main.php

@@ -26,6 +26,7 @@ class bestitAmazonPay4Oxid_order_main extends bestitAmazonPay4Oxid_order_main_pa
      */
     public function __construct()
     {
+        parent::__construct();
         $this->_oLogger = $this->_getContainer()->getLogger();
     }
 

ext/bestitamazonpay4oxid_order_overview.php

@@ -26,6 +26,7 @@ class bestitAmazonPay4Oxid_order_overview extends bestitAmazonPay4Oxid_order_ove
      */
     public function __construct()
     {
+        parent::__construct();
         $this->_oLogger = $this->_getContainer()->getLogger();
     }
 

ext/bestitamazonpay4oxid_oxcmp_basket.php

@@ -29,6 +29,7 @@ class bestitAmazonPay4Oxid_oxcmp_basket extends bestitAmazonPay4Oxid_oxcmp_baske
      */
     public function __construct()
     {
+        parent::__construct();
         $this->_oLogger = $this->_getContainer()->getLogger();
     }
 

ext/bestitamazonpay4oxid_oxcmp_user.php

@@ -26,6 +26,7 @@ class bestitAmazonPay4Oxid_oxcmp_user extends bestitAmazonPay4Oxid_oxcmp_user_pa
      */
     public function __construct()
     {
+        parent::__construct();
         $this->_oLogger = $this->_getContainer()->getLogger();
     }
 

ext/bestitamazonpay4oxid_payment.php

@@ -26,6 +26,7 @@ class bestitAmazonPay4Oxid_payment extends bestitAmazonPay4Oxid_payment_parent
      */
     public function __construct()
     {
+        parent::__construct();
         $this->_oLogger = $this->_getContainer()->getLogger();
     }
 

metadata.php

@@ -40,7 +40,7 @@
 		<b style="color: red">Wenn Sie das Modul von einer vorhergehenden Version updaten muss das Module deaktivert und erneut aktiviert werden</b>'
     ),
     'thumbnail' => 'bestitamazonpay4oxid_logo.png',
-    'version' => '3.6.1',
+    'version' => '3.6.2',
     'author' => 'best it GmbH & Co. KG',
     'url' => 'http://www.bestit-online.de',
     'email' => '[email protected]',

scripts/deploy-package.sh

@@ -43,6 +43,12 @@ ARCHIVE_NAME="bestitamazonpay4oxid"
 MODULE_VERSION=$(cat ./metadata.php | sed -n "s/.*'version' => '\([0-9]\+\.[0-9]\+\.[0-9]\+\)',.*/\1/p")
 ARCHIVE_NAME="bestitamazonpay4oxid-oxid5-${MODULE_VERSION}"
 
+if [[ -d ${CURRENT_DIR}/vendor ]]; then
+    sudo rm -rf ${CURRENT_DIR}/vendor
+fi
+
+sudo chmod -R 777 ${CURRENT_DIR}
+
 # Install needed dependencies
 composer install --no-dev --ignore-platform-reqs
 

scripts/deploy.sh

@@ -8,7 +8,7 @@ BASE_DIR="${VENDOR_DIR}/amazonpay4oxid"
 ARCHIVE_NAME="bestitamazonpay4oxid"
 
 if [[ -d ${CURRENT_DIR}/vendor ]]; then
-    rm -rf ${CURRENT_DIR}/vendor
+    sudo rm -rf ${CURRENT_DIR}/vendor
 fi
 
 sudo chmod -R 777 ${CURRENT_DIR}

tests/unit/ext/bestitAmazonPay4OxidOxOrderTest.php

@@ -830,9 +830,8 @@ public function testFinalizeOrder()
 
 
         $oBasket = $this->_getBasketMock();
-        $oBasket->expects($this->once())
-            ->method('getContents')
-            ->will($this->returnValue(array()));
+        $oBasket->method('getContents')
+            ->willReturn(array());
 
         $oBasket->expects($this->any())
             ->method('getPaymentId')