Merge pull request #5 from mediaopt/develop

Develop

.github/workflows/phpunit.yml

@@ -0,0 +1,36 @@
+name: PHP CI
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+  pull_request:
+    branches:
+      - '**'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '7.4'
+          extensions: calendar, soap
+          tools: composer
+
+      - name: Install dependencies
+        run: |
+          apt-get update && apt-get install -y unzip libxml2-dev
+          composer install
+        env:
+          COMPOSER_CACHE_DIR: ${{ github.workspace }}/.composer/cache
+
+      - name: Run tests
+        run: |
+          src/modules/mo/mo_dhl/vendor/bin/phpunit -c tests/phpunit.xml tests

Changelog.md

@@ -1,4 +1,6 @@
 # Changelog
+## 1 7.7
+* fix category model inheritance
 
 ## 1.7.6
 * Account API implementation

project.json

@@ -4,7 +4,7 @@
     "pathToModule": "copy_this/modules/mo/mo_dhl",
     "prefix": "mo_",
     "suffix": "",
-    "version": "1.7.6",
+    "version": "1.7.7",
     "compatibility": {
         "minimumVersion": "6.0",
         "maximumVersion": null,

src/modules/mo/mo_dhl/Application/Model/Category.php

@@ -13,7 +13,7 @@
 /**
  * @author Mediaopt GmbH
  */
-class Category extends \OxidEsales\Eshop\Application\Model\Category
+class Category extends Category_parent
 {
 
     /**

src/modules/mo/mo_dhl/metadata.php

@@ -17,7 +17,7 @@
         'en' => '<p>Enable features providing Post & Paket Delivery to your OXID shop.</p>' . '<p><a href="https://projects.mediaopt.de/projects/mopt-postp-ua/wiki" target="_blank">Handbook</a></p>',
     ],
     'thumbnail'   => 'logo.png',
-    'version'     => '1.7.6',
+    'version'     => '1.7.7',
     'author'      => '<a href="http://www.mediaopt.de" target="_blank">mediaopt.</a>',
     'url'         => 'http://www.mediaopt.de',
     'email'       => '[email protected]',