Skip to content

Commit 21daf01

Browse files
committed
Create b-7.5.x branch
1 parent 62edcd5 commit 21daf01

7 files changed

Lines changed: 25 additions & 24 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ sonarcloud:
5050
organization: 'oxid-esales'
5151
project_name: 'oxid-esales/examples-module'
5252
project_key: 'OXID-eSales_examples-module'
53-
target_branch: 'b-7.4.x'
53+
target_branch: 'b-7.5.x'
5454
parameters: >
5555
-Dsonar.language=php
5656
-Dsonar.scm.provider=git

.github/workflows/dispatch_module.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
;;
5050
esac
5151
# shellcheck disable=SC2088
52-
TESTPLAN="~/defaults/7.4.x.yaml,${LIMIT}~/examples-module.yaml"
52+
TESTPLAN="~/defaults/7.5.x.yaml,${LIMIT}~/examples-module.yaml"
5353
echo "testplan=${TESTPLAN}" | tee -a "${GITHUB_OUTPUT}"
5454
5555
dispatch_stable:

.github/workflows/scheduled.yaml

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

99
jobs:
10-
matrix_74x_weekly:
10+
matrix_75x_weekly:
1111
uses: oxid-eSales/github-actions/.github/workflows/universal_workflow_light.yaml@v5
1212
with:
13-
testplan: '~/defaults/7.4.x.yaml,~/defaults/scheduled.yaml,~/examples-module.yaml,~/_custom.yaml'
13+
testplan: '~/defaults/7.5.x.yaml,~/defaults/scheduled.yaml,~/examples-module.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: 'Matrix-74x-Weekly-{{ .Github.EventName }}-{{ .Github.RefName }}'
19+
slack_title: 'Matrix-75x-Weekly-{{ .Github.EventName }}-{{ .Github.RefName }}'
2020
secrets:
2121
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
2222
DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}

.github/workflows/trigger.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ on:
55
pull_request: {}
66
push:
77
branches:
8-
- 'b-7.4.x**'
8+
- 'b-7.5.x**'
99

1010
jobs:
1111
php82_mysql80:
1212
uses: oxid-eSales/github-actions/.github/workflows/universal_workflow_light.yaml@v5
1313
with:
14-
testplan: '~/defaults/7.4.x.yaml,~/defaults/php8.2_mysql8.0_only.yaml,~/examples-module.yaml,~/_custom.yaml'
14+
testplan: '~/defaults/7.5.x.yaml,~/defaults/php8.2_mysql8.0_only.yaml,~/examples-module.yaml,~/_custom.yaml'
1515
runs_on: '"ubuntu-latest"'
1616
defaults: 'v5'
1717
plan_folder: '.github/oxid-esales'

README.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# OXID eShop Examples Module
22

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

@@ -28,6 +28,7 @@ This module also comes with all the quality tools OXID recommends to use.
2828

2929
## Branch compatibility
3030

31+
* b-7.5.x branch - compatible with OXID eShop compilation 7.5.x and the respective branch
3132
* b-7.4.x branch and v2.x releases - compatible with OXID eShop compilation 7.4.x and the respective branch
3233
* b-7.3.x branch and v1.x releases - compatible with OXID eShop compilation 7.3.x and the respective branch
3334

@@ -88,16 +89,16 @@ We would like to encourage following ideas and principles in module development:
8889

8990
The repository contains examples of following cases and more:
9091

91-
* [Extending of shop controllers and models](https://github.com/OXID-eSales/examples-module/blob/b-7.4.x/metadata.php#L25)
92+
* [Extending of shop controllers and models](https://github.com/OXID-eSales/examples-module/blob/b-7.5.x/metadata.php#L25)
9293
* extending a shop model (`OxidEsales\ExamplesModule\Extension\Model\User`) / (`OxidEsales\ExamplesModule\Extension\Model\Basket`)
9394
* extending a shop controller (`OxidEsales\ExamplesModule\Extension\Controller\StartController`)
9495

95-
* [Controllers as service](https://github.com/OXID-eSales/examples-module/blob/b-7.4.x/src/Greeting/services.yaml#L29)
96+
* [Controllers as service](https://github.com/OXID-eSales/examples-module/blob/b-7.5.x/src/Greeting/services.yaml#L34)
9697
* own module controller (`oeem_greeting` with own template and own translations)
9798
* own module admin controller (`oeem_admin_greeting` with own template and own translations)
9899

99100
* [Using Symfony DI](services.yaml)
100-
* [Injection of Registry classes with bind](https://github.com/OXID-eSales/examples-module/blob/b-7.4.x/services.yaml#L16)
101+
* [Injection of Registry classes with bind](https://github.com/OXID-eSales/examples-module/blob/b-7.5.x/services.yaml#L16)
101102
* [Service decoration](src/Greeting/Service/Decorator/GreetingValidationDecorator.php) - shows how to decorate services
102103
* Note: While the example uses validation/truncation for simplicity, better use cases include logging, caching, performance monitoring, or audit trails
103104
* [Decorator registration](src/Greeting/services.yaml) - using `decorates:` in DI configuration
@@ -114,7 +115,7 @@ The repository contains examples of following cases and more:
114115
* [UserRepository](src/Greeting/Infrastructure/Repository/UserRepository.php) - loading shop user with model example
115116
* [TrackerRepository](src/Tracker/Infrastructure/Repository/TrackerRepository.php) - more comprehensive example showing dependencies and DTO usage
116117

117-
* [Various types of module settings](https://github.com/OXID-eSales/examples-module/blob/b-7.4.x/metadata.php#L38)
118+
* [Various types of module settings](https://github.com/OXID-eSales/examples-module/blob/b-7.5.x/metadata.php#L38)
118119

119120
* Templates
120121
* [creating templates for your module](views/twig/templates/greetingtemplate.html.twig)
@@ -132,7 +133,7 @@ The repository contains examples of following cases and more:
132133
* [Dispatching the event](src/ProductVote/Service/VoteService.php) - triggering events from services
133134

134135
* Testing your module backend and frontend part
135-
* [Composer aliases for easy running of tests and quality tools](https://github.com/OXID-eSales/examples-module/blob/b-7.4.x/composer.json#L48)
136+
* [Composer aliases for easy running of tests and quality tools](https://github.com/OXID-eSales/examples-module/blob/b-7.5.x/composer.json#L49)
136137
* [Using the github actions as CI tool with all recommended tools preconfigured for you.](.github)
137138

138139
* [Using variables from .env file](.env)
@@ -198,7 +199,7 @@ In case of different environment usage, please adjust by your own needs.
198199
## Development installation on OXID eShop SDK
199200
200201
The installation instructions below are shown for the current [SDK](https://github.com/OXID-eSales/docker-eshop-sdk)
201-
for shop 7.4. Make sure your system meets the requirements of the SDK.
202+
for shop 7.5. Make sure your system meets the requirements of the SDK.
202203
203204
0. Ensure all docker containers are down to avoid port conflicts
204205
@@ -209,7 +210,7 @@ echo MyProject && git clone https://github.com/OXID-eSales/docker-eshop-sdk.git
209210

210211
2. Clone the repository to the source directory
211212
```shell
212-
git clone --recurse-submodules https://github.com/OXID-eSales/examples-module.git --branch=b-7.4.x ./source
213+
git clone --recurse-submodules https://github.com/OXID-eSales/examples-module.git --branch=b-7.5.x ./source
213214
```
214215

215216
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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,20 @@
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"
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"
3434
},
3535
"conflict": {
36-
"oxid-esales/oxideshop-ce": "<7.4"
36+
"oxid-esales/oxideshop-ce": "<7.5"
3737
},
3838
"autoload": {
3939
"psr-4": {

recipes/setup-development.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ 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.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/oxideshop-doctrine-migration-wrapper" -v"dev-b-7.4.x"
43-
$SCRIPT_PATH/parts/shared/require_theme_dev.sh -t"apex" -b"b-7.4.x"
40+
$SCRIPT_PATH/parts/shared/require_shop_edition_packages.sh -e"${edition}" -v"dev-b-7.5.x"
41+
$SCRIPT_PATH/parts/shared/require_twig_components.sh -e"${edition}" -b"b-7.5.x"
42+
$SCRIPT_PATH/parts/shared/require.sh -n"oxid-esales/oxideshop-doctrine-migration-wrapper" -v"dev-b-7.5.x"
43+
$SCRIPT_PATH/parts/shared/require_theme_dev.sh -t"apex" -b"b-7.5.x"
4444

4545
make up
4646

0 commit comments

Comments
 (0)