Skip to content

Commit 04f07a8

Browse files
committed
OXDEV-8811 Compatibility with shop 7.4
1 parent 2f65aa5 commit 04f07a8

7 files changed

Lines changed: 23 additions & 17 deletions

File tree

.github/workflows/dispatch_module.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
;;
4545
esac
4646
# shellcheck disable=SC2088
47-
TESTPLAN="~/defaults/7.3.x.yaml,${LIMIT}~/graphql-base.yaml"
47+
TESTPLAN="~/defaults/7.4.x.yaml,${LIMIT}~/graphql-base.yaml"
4848
echo "testplan=${TESTPLAN}" | tee -a "${GITHUB_OUTPUT}"
4949
5050
dispatch_stable:

.github/workflows/schedule_module.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
call_matrix:
99
uses: OXID-eSales/github-actions/.github/workflows/universal_workflow_light.yaml@v4
1010
with:
11-
testplan: '~/defaults/7.3.x.yaml,~/graphql-base.yaml'
11+
testplan: '~/defaults/7.4.x.yaml,~/graphql-base.yaml'
1212
runs_on: '"ubuntu-latest"'
1313
defaults: 'v4'
1414
plan_folder: '.github/oxid-esales'

.github/workflows/trigger.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
call_matrix:
99
uses: OXID-eSales/github-actions/.github/workflows/universal_workflow_light.yaml@v4
1010
with:
11-
testplan: '~/defaults/7.3.x.yaml,~/defaults/php8.2_mysql8.0_only.yaml,~/graphql-base.yaml'
11+
testplan: '~/defaults/7.4.x.yaml,~/defaults/php8.3_mysql8.0_only.yaml,~/graphql-base.yaml'
1212
runs_on: '"ubuntu-latest"'
1313
defaults: 'v4'
1414
plan_folder: '.github/oxid-esales'

CHANGELOG-v11.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [Undecided] - unreleased
8+
9+
### Changed
10+
- Update module to work with OXID eShop 7.4
11+
712
## [11.0.0] - 2025-06-11
813
This is stable release for v11.0.0. No changes have been made since v11.0.0-rc.1.
914

README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ This module provides:
2020

2121
## Usage
2222

23-
This assumes you have OXID eShop (at least `OXID-eSales/oxideshop_ce: v7.3.0` component, which is part of the `7.3.0` compilation) up and running.
23+
This assumes you have OXID eShop (at least `OXID-eSales/oxideshop_ce: v7.4.0` component, which is part of the `7.4.0` compilation) up and running.
2424

2525
## Branch Compatibility
2626

27+
* b-7.4.x branch is compatible with b-7.4.x shop compilation branches
2728
* 11.0.x versions (or b-7.3.x branch) are compatible with latest shop compilation 7.3.x resp. b-7.3.x shop compilation branches
2829
* 10.0.x versions (or b-7.2.x branch) are compatible with latest shop compilation 7.2.x resp. b-7.2.x shop compilation branches
2930
* 9.x versions (or b-7.1.x branch) are compatible with latest shop compilation 7.1.x resp. b-7.1.x shop compilation branches
@@ -35,8 +36,8 @@ This assumes you have OXID eShop (at least `OXID-eSales/oxideshop_ce: v7.3.0` co
3536
### Install
3637

3738
```bash
38-
# Install desired version of oxid-esales/graphql-base module, in this case - latest released 9.x version, While updating the version you should add additional flag --with-all-dependencies with below command.
39-
$ composer require oxid-esales/graphql-base ^9.0.0 --with-all-dependencies
39+
# Install desired version of oxid-esales/graphql-base module, in this case - latest released 11.x version, While updating the version you should add additional flag --with-all-dependencies with below command.
40+
$ composer require oxid-esales/graphql-base ^11.0.0 --with-all-dependencies
4041
```
4142

4243
You should run migrations both after installing the module and after each module update:
@@ -199,7 +200,7 @@ In case of different environment usage, please adjust by your own needs.
199200
# Development installation on OXID eShop SDK
200201

201202
The installation instructions below are shown for the current [SDK](https://github.com/OXID-eSales/docker-eshop-sdk)
202-
for shop 7.3. Make sure your system meets the requirements of the SDK.
203+
for shop 7.4. Make sure your system meets the requirements of the SDK.
203204

204205
0. Ensure all docker containers are down to avoid port conflicts
205206

@@ -210,7 +211,7 @@ echo MyProject && git clone https://github.com/OXID-eSales/docker-eshop-sdk.git
210211

211212
2. Clone the repository to the source directory
212213
```shell
213-
git clone --recurse-submodules https://github.com/OXID-eSales/graphql-base-module.git --branch=b-7.3.x ./source
214+
git clone --recurse-submodules https://github.com/OXID-eSales/graphql-base-module.git --branch=b-7.4.x ./source
214215
```
215216

216217
3. Run the recipe to setup the development environment, you can decide which shop edition to install. Omitting the flag installs EE.

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
"myclabs/php-enum": "^1.8"
1717
},
1818
"require-dev": {
19-
"phpunit/phpunit": "^10.4",
19+
"phpunit/phpunit": "^11.4",
2020
"ext-xdebug": "*",
21-
"oxid-esales/oxideshop-ce": "dev-b-7.3.x",
21+
"oxid-esales/oxideshop-ce": "dev-b-7.4.x",
2222
"phpstan/phpstan": "^1.10",
2323
"squizlabs/php_codesniffer": "3.*",
2424
"phpmd/phpmd": "^2.11",
@@ -27,11 +27,11 @@
2727
"codeception/module-phpbrowser": "*",
2828
"codeception/module-db": "*",
2929
"codeception/codeception": "^5.0",
30-
"oxid-esales/codeception-modules": "dev-b-7.3.x",
30+
"oxid-esales/codeception-modules": "dev-b-7.4.x",
3131
"codeception/module-asserts": "^3.0"
3232
},
3333
"conflict": {
34-
"oxid-esales/oxideshop-ce": "<7.3"
34+
"oxid-esales/oxideshop-ce": "<7.4"
3535
},
3636
"autoload": {
3737
"psr-4": {

recipes/setup-development.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ docker compose up --build -d php
3737

3838
docker compose exec -T php git config --global --add safe.directory /var/www
3939

40-
$SCRIPT_PATH/parts/shared/require_shop_edition_packages.sh -e"${edition}" -v"dev-b-7.3.x"
41-
$SCRIPT_PATH/parts/shared/require_twig_components.sh -e"${edition}" -b"b-7.3.x"
42-
$SCRIPT_PATH/parts/shared/require.sh -n"oxid-esales/developer-tools" -v"dev-b-7.3.x"
43-
$SCRIPT_PATH/parts/shared/require.sh -n"oxid-esales/oxideshop-doctrine-migration-wrapper" -v"dev-b-7.3.x"
44-
$SCRIPT_PATH/parts/shared/require_theme_dev.sh -t"apex" -b"b-7.3.x"
40+
$SCRIPT_PATH/parts/shared/require_shop_edition_packages.sh -e"${edition}" -v"dev-b-7.4.x"
41+
$SCRIPT_PATH/parts/shared/require_twig_components.sh -e"${edition}" -b"b-7.4.x"
42+
$SCRIPT_PATH/parts/shared/require.sh -n"oxid-esales/developer-tools" -v"dev-b-7.4.x"
43+
$SCRIPT_PATH/parts/shared/require.sh -n"oxid-esales/oxideshop-doctrine-migration-wrapper" -v"dev-b-7.4.x"
44+
$SCRIPT_PATH/parts/shared/require_theme.sh -t"apex" -b"b-7.4.x"
4545

4646
git clone -b 11.0-en https://github.com/OXID-eSales/oxapi-documentation source/documentation/oxapi-documentation
4747
make docpath=./source/documentation/oxapi-documentation addsphinxservice

0 commit comments

Comments
 (0)