Merge pull request #150 from bestit/feature/OXAP-344-fix-include

OXAP-344 Fixed the include of the dependency autoloader to get the polyfill
bestit · Feb 9, 2021 · 1f84acb · 1f84acb
2 parents 829a8db + faa5f20
commit 1f84acb
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@ 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.8] - 2020-02-09
+### Fixed
+- Fixed an include
+
 ## [3.6.7] - 2020-02-05
 ### Fixed
 - Use random_bytes

diff --git a/application/controllers/admin/bestitamazonpay4oxid_init.php b/application/controllers/admin/bestitamazonpay4oxid_init.php
@@ -20,8 +20,11 @@
  * @version   GIT: $Id$
  * @link      http://www.bestit-online.de
  */
-require_once dirname(__FILE__).'/../../../vendor/paragonie/random_compat/lib/random.php';
+$sVendorAutoloader = realpath(dirname(__FILE__).'/../../../').'/vendor/autoload.php';
 
+if (file_exists($sVendorAutoloader) === true) {
+    include_once realpath(dirname(__FILE__).'/../../../').'/vendor/autoload.php';
+}
 /**
  * Class bestitAmazonPay4Oxid_init
  */

diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
   "type": "oxideshop-module",
   "keywords": ["oxid", "modules", "eShop"],
   "homepage": "https://www.bestit-online.de",
-  "version": "3.6.7",
+  "version": "3.6.8",
   "license": [
     "GPL-3.0-only",
     "proprietary"

diff --git a/ext/bestitamazonpay4oxid_module_config.php b/ext/bestitamazonpay4oxid_module_config.php
@@ -1,6 +1,9 @@
 <?php
-require_once dirname(__FILE__).'/../vendor/paragonie/random_compat/lib/random.php';
+$sVendorAutoloader = realpath(dirname(__FILE__).'/../').'/vendor/autoload.php';
 
+if (file_exists($sVendorAutoloader) === true) {
+    include_once realpath(dirname(__FILE__).'/../').'/vendor/autoload.php';
+}
 /**
  * Extension for OXID module_config controller
  *

diff --git a/metadata.php b/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.7',
+    'version' => '3.6.8',
     'author' => 'best it GmbH & Co. KG',
     'url' => 'http://www.bestit-online.de',
     'email' => '[email protected]',