Skip to content

Commit d7f0cf0

Browse files
committed
OXDEV-9641 Update module for OXID eShop 7.5.x compatibility
1 parent d956d22 commit d7f0cf0

6 files changed

Lines changed: 24 additions & 15 deletions

File tree

.github/workflows/dispatch_module.yaml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,15 @@ on:
77
type: choice
88
options:
99
- 'no'
10-
- 'PHP8.2/MySQL5.7'
11-
- 'PHP8.2/MySQL8.0'
12-
- 'PHP8.2/MariaDb11'
13-
- 'PHP8.3/MySQL5.7'
1410
- 'PHP8.3/MySQL8.0'
1511
- 'PHP8.3/MySQL8.4'
1612
- 'PHP8.3/MariaDb11'
1713
- 'PHP8.4/MySQL8.0'
1814
- 'PHP8.4/MySQL8.4'
1915
- 'PHP8.4/MariaDb11'
16+
- 'PHP8.5/MySQL8.0'
17+
- 'PHP8.5/MySQL8.4'
18+
- 'PHP8.5/MariaDb11'
2019
default: 'PHP8.3/MySQL8.0'
2120
description: 'Limit to one PHP/MySQL combination'
2221

@@ -33,16 +32,15 @@ jobs:
3332
# shellcheck disable=SC2088 # Tilde expansion happens in the workflow and not by bash
3433
case '${{inputs.limit}}' in
3534
"no") LIMIT='';;
36-
"PHP8.2/MySQL5.7") LIMIT='~/defaults/php8.2_mysql5.7_only.yaml,' ;;
37-
"PHP8.2/MySQL8.0") LIMIT='~/defaults/php8.2_mysql8.0_only.yaml,' ;;
38-
"PHP8.2/MariaDb11") LIMIT='~/defaults/php8.2_mariadb11_only.yaml,' ;;
39-
"PHP8.3/MySQL5.7") LIMIT='~/defaults/php8.3_mysql5.7_only.yaml,' ;;
4035
"PHP8.3/MySQL8.0") LIMIT='~/defaults/php8.3_mysql8.0_only.yaml,' ;;
4136
"PHP8.3/MySQL8.4") LIMIT='~/defaults/php8.3_mysql8.4_only.yaml,' ;;
4237
"PHP8.3/MariaDb11") LIMIT='~/defaults/php8.3_mariadb11_only.yaml,' ;;
4338
"PHP8.4/MySQL8.0") LIMIT='~/defaults/php8.4_mysql8.0_only.yaml,' ;;
4439
"PHP8.4/MySQL8.4") LIMIT='~/defaults/php8.4_mysql8.4_only.yaml,' ;;
4540
"PHP8.4/MariaDb11") LIMIT='~/defaults/php8.4_mariadb11_only.yaml,' ;;
41+
"PHP8.5/MySQL8.0") LIMIT='~/defaults/php8.5_mysql8.0_only.yaml,' ;;
42+
"PHP8.5/MySQL8.4") LIMIT='~/defaults/php8.5_mysql8.4_only.yaml,' ;;
43+
"PHP8.5/MariaDb11") LIMIT='~/defaults/php8.5_mariadb11_only.yaml,' ;;
4644
*) echo "Illegal choice, fix the workflow"
4745
exit 1
4846
;;

.github/workflows/schema_trigger.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Trigger schema workflow
22

33
on:
44
push:
5-
tags: [v12.*]
5+
tags: [v13.*]
66

77
jobs:
88
documentation_schema:
@@ -16,4 +16,4 @@ jobs:
1616
github_user: ${{ secrets.CI_USER }}
1717
github_token: ${{ secrets.GH_CI_JENKINS_TOKEN }}
1818
workflow_file_name: schema.yaml
19-
ref: "12.0-en"
19+
ref: "13.0-en"

CHANGELOG-v13.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Changelog
2+
All notable changes to this project will be documented in this file.
3+
4+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
5+
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
6+
7+
## [Unreleased]
8+
9+
### Changed
10+
- Update module to work with OXID eShop 7.5
11+
- Minimum PHP version is now 8.3, tested up to PHP 8.5

README.md

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

2121
## Usage
2222

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.
23+
This assumes you have OXID eShop (at least `OXID-eSales/oxideshop_ce: v7.5.0` component, which is part of the `7.5.0` compilation) up and running.
2424

2525
## Branch Compatibility
2626

27-
* b-7.5.x branch is compatible with latest shop compilation 7.5.x resp. b-7.5.x shop compilation branches
27+
* 13.0.x versions (or b-7.5.x branch) are compatible with latest shop compilation 7.5.x resp. b-7.5.x shop compilation branches
2828
* 12.0.x versions (or b-7.4.x branch) are compatible with latest shop compilation 7.4.x resp. b-7.4.x shop compilation branches
2929
* 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
3030
* 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

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"homepage": "https://www.oxid-esales.com",
77
"license": ["proprietary"],
88
"require": {
9-
"php": "^8.2",
9+
"php": "^8.3",
1010
"ext-json": "*",
1111
"thecodingmachine/graphqlite": "^7.0",
1212
"lcobucci/jwt": "^4.1",

recipes/setup-development.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ perl -pi\
3030
containers/httpd/project.conf
3131

3232
perl -pi\
33-
-e 's#PHP_VERSION=.*#PHP_VERSION=8.2#g;'\
33+
-e 's#PHP_VERSION=.*#PHP_VERSION=8.3#g;'\
3434
.env
3535

3636
docker compose up --build -d php
@@ -43,7 +43,7 @@ $SCRIPT_PATH/parts/shared/require.sh -n"oxid-esales/developer-tools" -v"dev-b-7.
4343
$SCRIPT_PATH/parts/shared/require.sh -n"oxid-esales/oxideshop-doctrine-migration-wrapper" -v"dev-b-7.5.x"
4444
$SCRIPT_PATH/parts/shared/require_theme.sh -t"apex" -b"b-7.5.x"
4545

46-
git clone -b 12.0-en https://github.com/OXID-eSales/oxapi-documentation source/documentation/oxapi-documentation
46+
git clone -b 13.0-en https://github.com/OXID-eSales/oxapi-documentation source/documentation/oxapi-documentation
4747
make docpath=./source/documentation/oxapi-documentation addsphinxservice
4848

4949
make up

0 commit comments

Comments
 (0)