Skip to content

Commit c4e15d5

Browse files
committed
OXDEV-9639 Update module-template for OXID eShop 7.5.x compatibility
- Update composer.json dependencies from dev-b-7.4.x to dev-b-7.5.x - Update conflict constraint from <7.4 to <7.5 - Update workflow triggers and testplans for 7.5.x - Add PHP 8.5 support, remove PHP 8.2 - Update README branch compatibility matrix - Update CLAUDE.md version references - Update CHANGELOG with v5.2.0 entry
1 parent df939f7 commit c4e15d5

8 files changed

Lines changed: 43 additions & 32 deletions

File tree

.github/oxid-esales/module-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ sonarcloud:
4949
organization: 'oxid-esales'
5050
project_name: 'oxid-esales/module-template'
5151
project_key: 'OXID-eSales_module-template'
52-
target_branch: 'b-7.4.x'
52+
target_branch: 'b-7.5.x'
5353
parameters: >
5454
-Dsonar.language=php
5555
-Dsonar.scm.provider=git

.github/workflows/dispatch_module.yaml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ on:
77
type: choice
88
options:
99
- 'no'
10-
- 'PHP8.2/MySQL8.0'
11-
- 'PHP8.2/MariaDB11'
1210
- 'PHP8.3/MySQL8.0'
1311
- 'PHP8.3/MySQL8.4'
1412
- 'PHP8.3/MariaDB11'
1513
- 'PHP8.4/MySQL8.0'
1614
- 'PHP8.4/MySQL8.4'
17-
- 'PHP8.4/MariaDb11'
15+
- 'PHP8.4/MariaDB11'
16+
- 'PHP8.5/MySQL8.0'
17+
- 'PHP8.5/MySQL8.4'
18+
- 'PHP8.5/MariaDB11'
1819
default: 'PHP8.3/MySQL8.0'
1920
description: 'Limit to one PHP/MySQL combination'
2021
use_dev_version:
@@ -36,20 +37,21 @@ jobs:
3637
# shellcheck disable=SC2088
3738
case "${{ inputs.limit }}" in
3839
"no") LIMIT='';;
39-
"PHP8.2/MySQL8.0") LIMIT='~/defaults/php8.2_mysql8.0_only.yaml,' ;;
40-
"PHP8.2/MariaDB11") LIMIT='~/defaults/php8.2_mariadb11_only.yaml,' ;;
4140
"PHP8.3/MySQL8.0") LIMIT='~/defaults/php8.3_mysql8.0_only.yaml,' ;;
4241
"PHP8.3/MySQL8.4") LIMIT='~/defaults/php8.3_mysql8.4_only.yaml,' ;;
4342
"PHP8.3/MariaDB11") LIMIT='~/defaults/php8.3_mariadb11_only.yaml,' ;;
4443
"PHP8.4/MySQL8.0") LIMIT='~/defaults/php8.4_mysql8.0_only.yaml,' ;;
4544
"PHP8.4/MySQL8.4") LIMIT='~/defaults/php8.4_mysql8.4_only.yaml,' ;;
46-
"PHP8.4/MariaDb11") LIMIT='~/defaults/php8.4_mariadb11_only.yaml,' ;;
45+
"PHP8.4/MariaDB11") LIMIT='~/defaults/php8.4_mariadb11_only.yaml,' ;;
46+
"PHP8.5/MySQL8.0") LIMIT='~/defaults/php8.5_mysql8.0_only.yaml,' ;;
47+
"PHP8.5/MySQL8.4") LIMIT='~/defaults/php8.5_mysql8.4_only.yaml,' ;;
48+
"PHP8.5/MariaDB11") LIMIT='~/defaults/php8.5_mariadb11_only.yaml,' ;;
4749
*) echo "Illegal choice, fix the workflow"
4850
exit 1
4951
;;
5052
esac
5153
# shellcheck disable=SC2088
52-
TESTPLAN="~/defaults/7.4.x.yaml,${LIMIT}~/module-template.yaml"
54+
TESTPLAN="~/defaults/7.5.x.yaml,${LIMIT}~/module-template.yaml"
5355
echo "testplan=${TESTPLAN}" | tee -a "${GITHUB_OUTPUT}"
5456
5557
dispatch_stable:

.github/workflows/scheduled.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ on:
66
- cron: '16 1 */7 * *'
77

88
jobs:
9-
matrix_73x_weekly:
9+
matrix_75x_weekly:
1010
uses: oxid-eSales/github-actions/.github/workflows/universal_workflow_light.yaml@v5
1111
with:
12-
testplan: '~/defaults/7.4.x.yaml,~/defaults/scheduled.yaml,~/module-template.yaml,~/_custom.yaml'
12+
testplan: '~/defaults/7.5.x.yaml,~/defaults/scheduled.yaml,~/module-template.yaml,~/_custom.yaml'
1313
runs_on: '"ubuntu-latest"'
1414
defaults: 'v5'
1515
plan_folder: '.github/oxid-esales'
1616
custom_testplan_yaml: |
1717
finish:
18-
slack_title: 'Matrix-73x-Weekly-{{ .Github.EventName }}-{{ .Github.RefName }}'
18+
slack_title: 'Matrix-75x-Weekly-{{ .Github.EventName }}-{{ .Github.RefName }}'
1919
secrets:
2020
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
2121
DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}

.github/workflows/trigger.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ on:
44
pull_request: {}
55
push:
66
branches:
7-
- 'b-7.4.x**'
7+
- 'b-7.5.x**'
88

99
jobs:
10-
php82_mysql80:
10+
php83_mysql80:
1111
uses: oxid-eSales/github-actions/.github/workflows/universal_workflow_light.yaml@v5
1212
with:
13-
testplan: '~/defaults/7.4.x.yaml,~/defaults/php8.2_mysql8.0_only.yaml,~/module-template.yaml,~/_custom.yaml'
13+
testplan: '~/defaults/7.5.x.yaml,~/defaults/php8.3_mysql8.0_only.yaml,~/module-template.yaml,~/_custom.yaml'
1414
runs_on: '"ubuntu-latest"'
1515
defaults: 'v5'
1616
plan_folder: '.github/oxid-esales'
1717
custom_testplan_yaml: |
1818
finish:
19-
slack_title: 'PHP82-MySQL80-{{ .Github.EventName }}-{{ .Github.RefName }}'
19+
slack_title: 'PHP83-MySQL80-{{ .Github.EventName }}-{{ .Github.RefName }}'
2020
secrets:
2121
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
2222
DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}

CHANGELOG.md

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

7+
## [v5.2.0] - Unreleased
8+
9+
### Changed
10+
- Updated for OXID eShop 7.5.x compatibility
11+
- PHP 8.3-8.5 support (removed PHP 8.2)
12+
- Updated all OXID dependencies to dev-b-7.5.x
13+
714
## [v5.1.0] - 2025-11-27
815

916
### Added
@@ -148,6 +155,7 @@ This is the stable release for v3.0.0. No changes have been made since v3.0.0-rc
148155
### Added
149156
- First version of our reusable examples
150157

158+
[v5.2.0]: https://github.com/OXID-eSales/module-template/compare/v5.1.0...v5.2.0
151159
[v5.1.0]: https://github.com/OXID-eSales/module-template/compare/v5.0.0...v5.1.0
152160
[v5.0.0]: https://github.com/OXID-eSales/module-template/compare/v5.0.0-rc.1...v5.0.0
153161
[v5.0.0-rc.1]: https://github.com/OXID-eSales/module-template/compare/v4.0.0...v5.0.0-rc.1

CLAUDE.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Files typically containing TODOs after personalization:
115115
**Location**: Run from `source/` directory
116116

117117
**Before running**: Review and adjust `recipes/setup-development.sh` for:
118-
- **Shop branch version** (currently set to b-7.4.x) - verify this matches your target OXID version
118+
- **Shop branch version** (currently set to b-7.5.x) - verify this matches your target OXID version
119119
- **PHP version** (currently set to 8.2) - confirm compatibility with your OXID version
120120
- **MySQL version** (check if matches your requirements) - may need adjustment
121121

@@ -141,7 +141,7 @@ Files typically containing TODOs after personalization:
141141
2. Adds services: adminer, selenium-chrome, node
142142
3. Configures PHP and MySQL versions, Apache (source/source/ path)
143143
4. Builds and starts containers
144-
5. Installs OXID eShop CE/EE (dev-b-7.4.x by default)
144+
5. Installs OXID eShop CE/EE (dev-b-7.5.x by default)
145145
6. Installs Twig components and apex theme
146146
7. Sets up database (no demodata)
147147
8. Installs and activates the module
@@ -442,8 +442,8 @@ docker compose exec -T php composer clear-cache
442442
- Commit hooks installed automatically (`.github/commit-hooks`)
443443
- Pre-commit runs quality tools
444444
- Branch naming pattern: `{base-branch}-{description}-{task-number}`
445-
- Example: `b-7.4.x-add-user-preferences-OXDEV-123`
446-
- Base branch is typically the current main branch (e.g., b-7.4.x)
445+
- Example: `b-7.5.x-add-user-preferences-OXDEV-123`
446+
- Base branch is typically the current main branch (e.g., b-7.5.x)
447447
- **IMPORTANT**: Do not mention "Claude" or "Claude Code" in commit messages
448448
- Commit messages should be tool-agnostic and professional
449449
- Focus on what was changed and why, not which tool was used
@@ -514,7 +514,7 @@ docker compose exec -T php vendor/bin/oe-eshop-doctrine_migration migrations:gen
514514
## Environment Variables
515515

516516
**SDK (.env in SDK root)**:
517-
- `PHP_VERSION` - PHP version (8.2 recommended for OXID 7.3.x/7.4.x)
517+
- `PHP_VERSION` - PHP version (8.3 recommended for OXID 7.5.x)
518518
- `MYSQL_VERSION` - MySQL version (5.7 or 8.0)
519519
- `MYSQL_ROOT_PASSWORD` - root password (default: root)
520520
- `MYSQL_DATABASE` - database name (default: example)
@@ -538,9 +538,9 @@ docker compose exec -T php vendor/bin/oe-eshop-doctrine_migration migrations:gen
538538

539539
## Branch Compatibility
540540

541-
Current branch (b-7.4.x) is compatible with:
542-
- **OXID eShop**: 7.4.x
543-
- **PHP**: 8.2
541+
Current branch (b-7.5.x) is compatible with:
542+
- **OXID eShop**: 7.5.x
543+
- **PHP**: 8.3
544544
- **MySQL**: 8.0
545545

546546
Check metadata.php and composer.json for exact version constraints.

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# OXID eShop Module Template
22

3-
[![Development](https://github.com/OXID-eSales/module-template/actions/workflows/trigger.yaml/badge.svg?branch=b-7.4.x)](https://github.com/OXID-eSales/module-template/actions/workflows/trigger.yaml)
3+
[![Development](https://github.com/OXID-eSales/module-template/actions/workflows/trigger.yaml/badge.svg?branch=b-7.5.x)](https://github.com/OXID-eSales/module-template/actions/workflows/trigger.yaml)
44
[![Latest Version](https://img.shields.io/packagist/v/OXID-eSales/module-template?logo=composer&label=latest&include_prereleases&color=orange)](https://packagist.org/packages/oxid-esales/module-template)
55
[![PHP Version](https://img.shields.io/packagist/php-v/oxid-esales/module-template)](https://github.com/oxid-esales/module-template)
66

@@ -28,6 +28,7 @@ If you are looking for a module with code examples, please check out the [exampl
2828

2929
## Branch compatibility
3030

31+
* b-7.5.x branch / v5.2.x version - compatible with OXID eShop compilation 7.5.x and the respective branch
3132
* b-7.4.x branch / v5.1.x version - compatible with OXID eShop compilation 7.4.x and the respective branch
3233
* b-7.3.x branch / v5.0.x version - compatible with OXID eShop compilation 7.3.x and the respective branch
3334
* b-7.2.x branch / v4.x version - compatible with OXID eShop compilation 7.2.x and the respective branch
@@ -69,7 +70,7 @@ In case you'd like to use this module as a template for your own module, this se
6970

7071
The following procedure describes how to create a base for your further module, and shows the basic installation for the development process.
7172

72-
**Important** Instructions here are for the case you intend to develop a module for OXID eShop 7.4.x. For other
73+
**Important** Instructions here are for the case you intend to develop a module for OXID eShop 7.5.x. For other
7374
versions, refer to the version specific branch.
7475

7576
**Please note there are different approaches presented, so before the start, please, read the whole section once, decide
@@ -122,7 +123,7 @@ be installed as a [root package](https://getcomposer.org/doc/04-schema.md#root-p
122123
Clone the repository which you just created with using the template button to the SDK source directory.
123124
**Please make sure you replace the github repository url to your own in the command!**
124125

125-
git clone --recurse-submodules https://github.com/OXID-eSales/module-template.git --branch=b-7.4.x ./source
126+
git clone --recurse-submodules https://github.com/OXID-eSales/module-template.git --branch=b-7.5.x ./source
126127

127128
#### 3a. Personalize the module
128129

composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,21 @@
2020
"phpstan/phpstan": "^2.0.2",
2121
"squizlabs/php_codesniffer": "^4.0",
2222
"phpmd/phpmd": "^2.15",
23-
"oxid-esales/oxideshop-ce": "dev-b-7.4.x",
23+
"oxid-esales/oxideshop-ce": "dev-b-7.5.x",
2424
"phpunit/phpunit": "~10.5.17",
2525
"mikey179/vfsstream": "~1.6.8",
2626
"codeception/codeception": "^5.1",
2727
"codeception/module-asserts": "^3.0",
2828
"codeception/module-db": "^3.1",
2929
"codeception/module-filesystem": "^3.0",
3030
"codeception/module-webdriver": "^4.0",
31-
"oxid-esales/codeception-modules": "dev-b-7.4.x",
32-
"oxid-esales/codeception-page-objects": "dev-b-7.4.x",
33-
"oxid-esales/developer-tools": "dev-b-7.4.x",
34-
"oxid-esales/examples-module": "dev-b-7.4.x"
31+
"oxid-esales/codeception-modules": "dev-b-7.5.x",
32+
"oxid-esales/codeception-page-objects": "dev-b-7.5.x",
33+
"oxid-esales/developer-tools": "dev-b-7.5.x",
34+
"oxid-esales/examples-module": "dev-b-7.5.x"
3535
},
3636
"conflict": {
37-
"oxid-esales/oxideshop-ce": "<7.4"
37+
"oxid-esales/oxideshop-ce": "<7.5"
3838
},
3939
"autoload": {
4040
"psr-4": {

0 commit comments

Comments
 (0)