Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #5

Merged
merged 5 commits into from
Jun 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Changelog
## 1 7.7
* fix category model inheritance

## 1.7.6
* Account API implementation
Expand Down
47 changes: 0 additions & 47 deletions bitbucket-pipelines.yml

This file was deleted.

2 changes: 1 addition & 1 deletion project.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/modules/mo/mo_dhl/Application/Model/Category.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
/**
* @author Mediaopt GmbH
*/
class Category extends \OxidEsales\Eshop\Application\Model\Category
class Category extends Category_parent
{

/**
Expand Down
2 changes: 1 addition & 1 deletion src/modules/mo/mo_dhl/metadata.php
Original file line number Diff line number Diff line change
Expand Up @@ -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]',
Expand Down
Loading