Support für OXID 6.2.x / 6.3.x

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+- 4.0.1.0
+  - Support für OXID 6.2.x / 6.3.x
+
+---
+
 - 4.0.0.0
   - Umstellung auf OXID 6.x
   - Verwendung von Composer

composer.json

@@ -36,9 +36,8 @@
     }
   },
   "require": {
-    "php": ">=5.6",
+    "oxid-esales/oxideshop-ce": "6.3 - 6.8",
-    "oxid-esales/oxideshop-ce": "6.2 - 6.3",
+    "d3/modcfg": "^5.3.6.000 || ^6"
-    "d3/modcfg": "^5.3.1.0"
   },
   "autoload": {
     "psr-4": {

src/Setup/Events.php

@@ -41,9 +41,4 @@ class Events
     {
         d3install::checkUpdateStart();
     }
-
+}
-    public static function onDeactivate()
-    {
-    }
-}
-// @codeCoverageIgnoreEnd

src/Setup/d3geoip_update.php

@@ -31,18 +31,20 @@ class d3geoip_update extends d3install_updatebase
 {
     public $sModKey = 'd3_geoip';
     public $sModName = 'GeoIP';
-    public $sModVersion = '4.0.0.0';
+    public $sModVersion = '4.0.1.0';
-    public $sModRevision = '4000';
+    public $sModRevision = '4010';
-    public $sBaseConf = '3Ouv2==YmlyRktwdlovdEFuVDFsa2dPYmV6MGxYKzcrV3p1RVRBN1lIOUh5dnp1T2dCQmd4c0pJeVA1Z
+    public $sBaseConf = '--------------------------------------------------------------------------------
-WtrbnlIRC9Tc0Jud2N3VUFNbG1sVU15Yk9ZK2N1VVZWNHdmem9iV1AxeklXY1Bqa3k2UE5MVTN5NmVpR
+0esv2==ZmRWMjBYdm03REl5TnVxcGxsK0xYU1FzaklaSjlXZ3pHYXNUMTJ0VW96U1pJczBPaEwydHhiM
-m40TVBFQ3h2V3dsQmpXeVBXTTFQcm1VOGhiSFZxL0taUGgveWZXUlgwaVdrb2RyQ1V6Nk1wOXJsajVaM
+lRVSU1WdWhSZGFJL2s4S0ppWEdCR21TUlc1Ty9PMmc0bTF0WU9RV28xZzVCbDJ2Z0xDeEdEZUhzYXFiO
-UVoaHYwdml4N1IxVmp5QmZEUm8xS3VnQWxrTi9UeWtKRERlMjlwY29DTGd3bys3bkU1TXFOM3lXR3FOZ
+TU5M1dpZHUxalRtMVg0ZHZxOTl6c0pkaHBDZkFMNVpodFdnYU1FbXRURzc1T0RnTHkrVGUzNmMwTVRTR
-1FyMkpCaFFBTXova2VkckIvQVlvdzVOeko5YWlpWUxXbHFjWFZKT2N1b0tSN016c3J2WEhqNnNPYTdpT
+G1naVEydGU1enhOWHdicWNSd3Z4eDRFZnE1NGlMSGdaNW1uV3hMWXdodmpnRklZRVFDSG9RNEJhQksvT
-k11QjlHNmttejJjYkRxT0lNNWJ3aFRCMmY=';
+VdRVUY3NmYyemdoTWlkc0N1dGU1NnByVHBudEplNE1NVTg5cTI1NHZUUFVCVDFudzcvSi95Y0x2RzFrR
+nNaenNxYlptVURKaFFwbUZmRCszYUhXM1c=
+--------------------------------------------------------------------------------';
     public $sRequirements = '';
     public $sBaseValue = '';
 
-    public $sMinModCfgVersion = '5.3.1.0';
+    public $sMinModCfgVersion = '5.3.6.0';
     
     protected $_aUpdateMethods = array(
         array('check' => 'checkGeoIpTableExist',

src/d3metadata.php

@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * This Software is the property of Data Development and is protected
+ * by copyright law - it is NOT Freeware.
+ *
+ * Any unauthorized use of this software without a valid license
+ * is a violation of the license agreement and will be prosecuted by
+ * civil and criminal law.
+ *
+ * http://www.shopmodule.com
+ *
+ * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
+ * @author    D3 Data Development - Daniel Seifert <support@shopmodule.com>
+ * @link      http://www.oxidmodule.com
+ */
+
+use D3\GeoIp\Setup as ModuleSetup;
+
+/**
+ * Module information
+ */
+$aModule = array(
+    'd3FileRegister'    => array(
+        'd3/geoip/IntelliSenseHelper.php',
+        'd3/geoip/metadata.php',
+        'd3/geoip/d3metadata.php',
+        'd3/geoip/Application/views/admin/de/d3_geoip_lang.php',
+        'd3/geoip/Setup/Events.php',
+        'd3/geoip/Setup/d3geoip_update.php',
+    ),
+    'd3SetupClasses' => array(
+        ModuleSetup\d3geoip_update::class,
+    ),
+);

src/metadata.php

@@ -2,7 +2,7 @@
 /**
  * Metadata version
  */
-$sMetadataVersion = '2.0';
+$sMetadataVersion = '2.1';
 
 use D3\GeoIp\Application\Component\GeoIpComponent;
 use D3\GeoIp\Application\Controller\Admin\d3_cfg_geoipset;
@@ -13,33 +13,32 @@ use D3\GeoIp\Application\Controller\Admin\d3_country_geoip;
 use D3\GeoIp\Application\Model\d3geoip;
 use D3\GeoIp\Modules\Application\Component\d3_oxcmp_lang_geoip;
 use D3\GeoIp\Modules\Core\d3_oxshopcontrol_geoip;
-use D3\GeoIp\Setup as ModuleSetup;
 use D3\GeoIp\Setup\d3geoip_update;
 use OxidEsales\Eshop\Application\Component\LanguageComponent;
 use OxidEsales\Eshop\Core\ShopControl;
 
-$sD3Logo = (class_exists(d3\modcfg\Application\Model\d3utils::class) ? d3\modcfg\Application\Model\d3utils::getInstance()->getD3Logo() : 'D³');
+$sD3Logo = '<img src="https://logos.oxidmodule.com/d3logo.svg" alt="(D3)" style="height:1em;width:1em"> ';
 
 /**
  * Module information
  */
-$aModule = array(
+$aModule = [
     'id'           => 'd3geoip',
     'title'        => $sD3Logo . ' GeoIP Vorauswahl',
-    'description'  => array(
+    'description'  => [
         'de'    =>  'Begr&uuml;&szlig;en Sie Ihre Kunden in seiner Landessprache.',
         'en'    =>  '',
-    ),
+    ],
     'thumbnail'    => 'picture.png',
-    'version'      => '4.0.0.0',
+    'version'      => '4.0.1.0',
     'author'       => 'D&sup3; Data Development (Inh.: Thomas Dartsch)',
     'email'        => 'support@shopmodule.com',
     'url'          => 'http://www.oxidmodule.com/',
-    'extend'      => array(
+    'extend'      => [
         LanguageComponent::class => d3_oxcmp_lang_geoip::class,
         ShopControl::class => d3_oxshopcontrol_geoip::class
-    ),
+    ],
-    'controllers'       => array(
+    'controllers'       => [
         'GeoIpComponent'            => GeoIpComponent::class,
         'd3_cfg_geoipset'           => d3_cfg_geoipset::class,
         'd3_cfg_geoipset_list'      => d3_cfg_geoipset_list::class,
@@ -48,23 +47,12 @@ $aModule = array(
         'd3_country_geoip'          => d3_country_geoip::class,
         'd3geoip'                   => d3geoip::class,
         'd3geoip_update'            => d3geoip_update::class,
-    ),
+    ],
-    'templates'   => array(
+    'templates'   => [
         'd3_cfg_geoipset_main.tpl'  => 'd3/geoip/Application/views/admin/tpl/d3_cfg_geoipset_main.tpl',
         'd3_country_geoip.tpl'      => 'd3/geoip/Application/views/admin/tpl/d3_country_geoip.tpl',
-    ),
+    ],
-    'events'      => array(
+    'events'      => [
         'onActivate' => '\D3\GeoIp\Setup\Events::onActivate',
-    ),
+    ]
-    'blocks'      => array(
+];
-    ),
-    'd3SetupClasses' => array(
-        d3geoip_update::class,
-    ),
-    'd3FileRegister'    => array(
-        'd3/geoip/IntelliSenseHelper.php',
-        'd3/geoip/metadata.php',
-        'd3/geoip/Application/views/admin/de/d3_geoip_lang.php',
-        'd3/geoip/Setup/Events.php'
-    ),
-);