Skip to content

Commit 64efb9a

Browse files
committed
Configure shop 7.5 dependencies
Signed-off-by: Anton Fedurtsya <anton@fedurtsya.com>
1 parent e14ae8f commit 64efb9a

6 files changed

Lines changed: 19 additions & 19 deletions

File tree

.github/fresh-advance/module-invoice.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ install:
1414
"oxid-esales/oxideshop-ce": "{{ .Data.global.composer.dev_ref }}",
1515
"oxid-esales/twig-component": "{{ .Data.install.composer.dev_ref }}",
1616
"oxid-esales/twig-admin-theme": "{{ .Data.global.composer.dev_ref }}",
17-
"oxid-esales/apex-theme": "{{ .Data.global.composer.dev_ref }}",
18-
"symfony/filesystem": "v6.4.24"
17+
"oxid-esales/apex-theme": "{{ .Data.global.composer.dev_ref }}"
1918
}
2019
}
2120
custom_script_container: |
@@ -61,4 +60,4 @@ sonarcloud:
6160
-Dsonar.scm.provider=git
6261
-Dsonar.sources=src
6362
-Dsonar.tests=tests
64-
-Dsonar.branch.target=b-7.4.x
63+
-Dsonar.branch.target=b-7.5.x

.github/workflows/dispatch_module.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
esac
4444
4545
# shellcheck disable=SC2088
46-
TESTPLAN="~/defaults/7.4.x.yaml,${LIMIT}~/module-invoice.yaml"
46+
TESTPLAN="~/defaults/7.5.x.yaml,${LIMIT}~/module-invoice.yaml"
4747
echo "testplan=${TESTPLAN}" | tee -a "${GITHUB_OUTPUT}"
4848
4949
dispatch_stable:

.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
push_trigger:
1212
uses: oxid-eSales/github-actions/.github/workflows/universal_workflow_light.yaml@v5
1313
with:
14-
testplan: '~/defaults/7.4.x.yaml,~/defaults/php8.3_mysql8.0_only.yaml,~/module-invoice.yaml'
14+
testplan: '~/defaults/7.5.x.yaml,~/defaults/php8.4_mysql8.0_only.yaml,~/module-invoice.yaml'
1515
runs_on: '"ubuntu-latest"'
1616
defaults: 'v5'
1717
plan_folder: '.github/fresh-advance'

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# PDF Invoice module for OXID eShop
22

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

@@ -34,6 +34,7 @@
3434

3535
## Branch compatibility
3636

37+
* Branch **b-7.5.x** is compatible with OXID Shop compilation **7.5.0 and up**
3738
* Branch **b-7.4.x** is compatible with OXID Shop compilation **7.4.0 and up**
3839
* Branch **b-7.3.x** is compatible with OXID Shop compilation **7.3.0 and up**
3940
* Branch **b-7.2.x** is compatible with OXID Shop compilation **7.2.0 and up**
@@ -44,7 +45,7 @@ Note: Not all latest features are available in the older branches.
4445

4546
## Version compatibility
4647

47-
* v5.x is compatible with OXID Shop compilation 7.1.x-7.4.x [Additional Migration to v5.0 Notes](./migration/docs/4.x-to-5.x.md)
48+
* v5.x is compatible with OXID Shop compilation 7.1.x-7.5.x [Additional Migration to v5.0 Notes](./migration/docs/4.x-to-5.x.md)
4849
* v3.x is compatible with OXID Shop compilation 7.0.x-7.4.x
4950

5051
Note: Not all latest features and fixes are available in older than the last versions - always prefer the latest possible release.
@@ -76,7 +77,7 @@ In case of different environment usage, please adjust by your own needs.
7677
# Development installation on Fresh Advance Development Base
7778

7879
The installation instructions below are shown for the current [Fresh Advance Development Base](https://github.com/Fresh-Advance/development)
79-
for shop 7.4. Make sure your system meets the requirements of the Development Base.
80+
for shop 7.5. Make sure your system meets the requirements of the Development Base.
8081

8182
0. Ensure all docker containers are down to avoid port conflicts
8283

@@ -87,7 +88,7 @@ echo MyProject && git clone https://github.com/Fresh-Advance/development.git $_
8788

8889
2. Clone the repository to the source directory
8990
```shell
90-
git clone --recurse-submodules https://github.com/Fresh-Advance/Invoice.git --branch=b-7.4.x ./source
91+
git clone --recurse-submodules https://github.com/Fresh-Advance/Invoice.git --branch=b-7.5.x ./source
9192
```
9293

9394
3. Run the recipe to setup the development environment

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
"kwn/number-to-words": "^2.7"
2020
},
2121
"conflict": {
22-
"oxid-esales/oxideshop-ce": "<7.4.0"
22+
"oxid-esales/oxideshop-ce": "<7.5.0"
2323
},
2424
"require-dev": {
25-
"oxid-esales/oxideshop-ce": "dev-b-7.4.x",
25+
"oxid-esales/oxideshop-ce": "dev-b-7.5.x",
2626
"phpunit/phpunit": "^11",
2727
"phpstan/phpstan": "^2.1",
2828
"squizlabs/php_codesniffer": "4.*",
@@ -33,9 +33,9 @@
3333
"codeception/module-db": "^3.0",
3434
"codeception/module-filesystem": "^3.0",
3535
"codeception/module-webdriver": "^4.0",
36-
"oxid-esales/codeception-modules": "dev-b-7.4.x",
37-
"oxid-esales/codeception-page-objects": "dev-b-7.4.x",
38-
"oxid-esales/developer-tools": "dev-b-7.4.x"
36+
"oxid-esales/codeception-modules": "dev-b-7.5.x",
37+
"oxid-esales/codeception-page-objects": "dev-b-7.5.x",
38+
"oxid-esales/developer-tools": "dev-b-7.5.x"
3939
},
4040
"autoload": {
4141
"psr-4": {

recipes/setup-development.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ perl -pi\
3535
mkdir source
3636
docker compose up --build -d php
3737

38-
$SCRIPT_PATH/parts/shared/require_shop_edition_packages.sh -e"${edition}" -v"dev-b-7.4.x"
39-
$SCRIPT_PATH/parts/shared/require_twig_components.sh -e"${edition}" -b"b-7.4.x"
40-
$SCRIPT_PATH/parts/shared/require.sh -n"oxid-esales/apex-theme" -v"dev-b-7.4.x"
41-
$SCRIPT_PATH/parts/shared/require_demodata_package.sh -e"${edition}" -b"b-7.4.x"
38+
$SCRIPT_PATH/parts/shared/require_shop_edition_packages.sh -e"${edition}" -v"dev-b-7.5.x"
39+
$SCRIPT_PATH/parts/shared/require_twig_components.sh -e"${edition}" -b"b-7.5.x"
40+
$SCRIPT_PATH/parts/shared/require.sh -n"oxid-esales/apex-theme" -v"dev-b-7.5.x"
41+
$SCRIPT_PATH/parts/shared/require_demodata_package.sh -e"${edition}" -b"b-7.5.x"
4242

4343
docker compose exec php composer update --no-interaction
4444

0 commit comments

Comments
 (0)