Configure shop 7.3 dependencies

Signed-off-by: Anton Fedurtsya <anton@fedurtsya.com>

Author: Sieg

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

@@ -12,9 +12,9 @@ install:
       {
           "require": {
               "oxid-esales/oxideshop-ce": "{{ .Data.global.composer.dev_ref }}",
+              "oxid-esales/twig-component": "{{ .Data.install.composer.dev_ref }}",
               "oxid-esales/twig-admin-theme": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/apex-theme": "{{ .Data.global.composer.dev_ref }}",
-              "symfony/filesystem": "v6.4.3"
+              "oxid-esales/apex-theme": "{{ .Data.global.composer.dev_ref }}"
           }
       }
   custom_script_container: |
@@ -60,4 +60,4 @@ sonarcloud:
     -Dsonar.scm.provider=git
     -Dsonar.sources=src
     -Dsonar.tests=tests
-    -Dsonar.branch.target=b-7.2.x
+    -Dsonar.branch.target=b-7.3.x

.github/workflows/dispatch_module.yaml

@@ -7,19 +7,16 @@ on:
         type: choice
         options:
           - 'no'
-          - 'PHP8.0/MySQL5.7'
-          - 'PHP8.0/MySQL8.0'
-          - 'PHP8.0/MariaDB11'
-          - 'PHP8.1/MySQL5.7'
-          - 'PHP8.1/MySQL8.0'
-          - 'PHP8.1/MariaDB11'
           - 'PHP8.2/MySQL5.7'
           - 'PHP8.2/MySQL8.0'
           - 'PHP8.2/MariaDB11'
           - 'PHP8.3/MySQL5.7'
           - 'PHP8.3/MySQL8.0'
           - 'PHP8.3/MariaDB11'
-        default: 'PHP8.1/MySQL8.0'
+          - 'PHP8.4/MySQL5.7'
+          - 'PHP8.4/MySQL8.0'
+          - 'PHP8.4/MariaDB11'
+        default: 'PHP8.3/MySQL8.0'
         description: 'Limit to one PHP/MySQL combination'
 
 jobs:
@@ -34,22 +31,19 @@ jobs:
           # shellcheck disable=SC2088
           case "${{ inputs.limit }}" in
             "no") LIMIT='';;
-            "PHP8.0/MySQL5.7") LIMIT='~/defaults/php8.0_mysql5.7_only.yaml,' ;;
-            "PHP8.0/MySQL8.0") LIMIT='~/defaults/php8.0_mysql8.0_only.yaml,' ;;
-            "PHP8.0/MariaDB11") LIMIT='~/defaults/php8.0_mariadb11_only.yaml,' ;;
-            "PHP8.1/MySQL5.7") LIMIT='~/defaults/php8.1_mysql5.7_only.yaml,' ;;
-            "PHP8.1/MySQL8.0") LIMIT='~/defaults/php8.1_mysql8.0_only.yaml,' ;;
-            "PHP8.1/MariaDB11") LIMIT='~/defaults/php8.1_mariadb11_only.yaml,' ;;
             "PHP8.2/MySQL5.7") LIMIT='~/defaults/php8.2_mysql5.7_only.yaml,' ;;
             "PHP8.2/MySQL8.0") LIMIT='~/defaults/php8.2_mysql8.0_only.yaml,' ;;
             "PHP8.2/MariaDB11") LIMIT='~/defaults/php8.2_mariadb11_only.yaml,' ;;
             "PHP8.3/MySQL5.7") LIMIT='~/defaults/php8.3_mysql5.7_only.yaml,' ;;
             "PHP8.3/MySQL8.0") LIMIT='~/defaults/php8.3_mysql8.0_only.yaml,' ;;
             "PHP8.3/MariaDB11") LIMIT='~/defaults/php8.3_mariadb11_only.yaml,' ;;
+            "PHP8.4/MySQL5.7") LIMIT='~/defaults/php8.4_mysql5.7_only.yaml,' ;;
+            "PHP8.4/MySQL8.0") LIMIT='~/defaults/php8.4_mysql8.0_only.yaml,' ;;
+            "PHP8.4/MariaDB11") LIMIT='~/defaults/php8.4_mariadb11_only.yaml,' ;;
           esac
 
           # shellcheck disable=SC2088
-          TESTPLAN="~/defaults/7.2.x.yaml,${LIMIT}~/module-invoice.yaml"
+          TESTPLAN="~/defaults/7.3.x.yaml,${LIMIT}~/module-invoice.yaml"
           echo "testplan=${TESTPLAN}" | tee -a "${GITHUB_OUTPUT}"
 
   dispatch_stable:

.github/workflows/trigger.yaml

@@ -5,13 +5,13 @@ on:
   pull_request: {}
   push:
     branches:
-      - 'b-7.2.x*'
+      - 'b-7.3.x*'
 
 jobs:
   push_trigger:
     uses: oxid-eSales/github-actions/.github/workflows/universal_workflow_light.yaml@v5
     with:
-      testplan: '~/defaults/7.2.x.yaml,~/defaults/php8.2_mysql8.0_only.yaml,~/module-invoice.yaml'
+      testplan: '~/defaults/7.3.x.yaml,~/defaults/php8.3_mysql8.0_only.yaml,~/module-invoice.yaml'
       runs_on: '"ubuntu-latest"'
       defaults: 'v5'
       plan_folder: '.github/fresh-advance'

README.md

@@ -1,6 +1,6 @@
 # PDF Invoice module for OXID eShop
 
-[![Development](https://github.com/Fresh-Advance/Invoice/actions/workflows/trigger.yaml/badge.svg?branch=b-7.2.x)](https://github.com/Fresh-Advance/Invoice/actions/workflows/trigger.yaml)
+[![Development](https://github.com/Fresh-Advance/Invoice/actions/workflows/trigger.yaml/badge.svg?branch=b-7.3.x)](https://github.com/Fresh-Advance/Invoice/actions/workflows/trigger.yaml)
 [![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)
 [![PHP Version](https://img.shields.io/packagist/php-v/Fresh-Advance/Invoice)](https://github.com/Fresh-Advance/Invoice)
 
@@ -31,12 +31,10 @@
 ## Limitations
 
 * Only Twig shop installations supported
-* Tested with:
-  * Shop 7.1 - PHP 8.1, 8.2, MySQL 5.7 and 8.0
-  * Shop 7.2 - PHP 8.2, 8.3, MySQL 5.7 and 8.0
 
 ## Branch compatibility
 
+* Branch **b-7.3.x** is compatible with OXID Shop compilation **7.3.0 and up**
 * Branch **b-7.2.x** is compatible with OXID Shop compilation **7.2.0 and up**
 * Branch **b-7.1.x** is compatible with OXID Shop compilation **7.1.0 and up**
 * Branch **b-7.0.x** is compatible with OXID Shop compilation **7.0.0-rc.2 and up**
@@ -77,7 +75,7 @@ In case of different environment usage, please adjust by your own needs.
 # Development installation on Fresh Advance Development Base
 
 The installation instructions below are shown for the current [Fresh Advance Development Base](https://github.com/Fresh-Advance/development)
-for shop 7.2. Make sure your system meets the requirements of the Development Base.
+for shop 7.3. Make sure your system meets the requirements of the Development Base.
 
 0. Ensure all docker containers are down to avoid port conflicts
 
@@ -88,7 +86,7 @@ echo MyProject && git clone https://github.com/Fresh-Advance/development.git $_
 
 2. Clone the repository to the source directory
 ```shell
-git clone --recurse-submodules https://github.com/Fresh-Advance/Invoice.git --branch=b-7.2.x ./source
+git clone --recurse-submodules https://github.com/Fresh-Advance/Invoice.git --branch=b-7.3.x ./source
 ```
 
 3. Run the recipe to setup the development environment

composer.json

@@ -19,10 +19,10 @@
     "kwn/number-to-words": "^2.7"
   },
   "conflict": {
-    "oxid-esales/oxideshop-ce": "<7.2.0"
+    "oxid-esales/oxideshop-ce": "<7.3.0"
   },
   "require-dev": {
-    "oxid-esales/oxideshop-ce": "dev-b-7.2.x",
+    "oxid-esales/oxideshop-ce": "dev-b-7.3.x",
     "phpunit/phpunit": "^11",
     "phpstan/phpstan": "^2.1",
     "squizlabs/php_codesniffer": "4.*",
@@ -33,9 +33,9 @@
     "codeception/module-db": "^3.0",
     "codeception/module-filesystem": "^3.0",
     "codeception/module-webdriver": "^4.0",
-    "oxid-esales/codeception-modules": "dev-b-7.2.x",
-    "oxid-esales/codeception-page-objects": "dev-b-7.2.x",
-    "oxid-esales/developer-tools": "dev-b-7.2.x"
+    "oxid-esales/codeception-modules": "dev-b-7.3.x",
+    "oxid-esales/codeception-page-objects": "dev-b-7.3.x",
+    "oxid-esales/developer-tools": "dev-b-7.3.x"
   },
   "autoload": {
     "psr-4": {

recipes/setup-development.sh

@@ -35,10 +35,10 @@ perl -pi\
 mkdir source
 docker compose up --build -d php
 
-$SCRIPT_PATH/parts/shared/require_shop_edition_packages.sh -e"${edition}" -v"dev-b-7.2.x"
-$SCRIPT_PATH/parts/shared/require_twig_components.sh -e"${edition}" -b"b-7.2.x"
-$SCRIPT_PATH/parts/shared/require.sh -n"oxid-esales/apex-theme" -v"dev-b-7.2.x"
-$SCRIPT_PATH/parts/shared/require_demodata_package.sh -e"${edition}" -b"b-7.2.x"
+$SCRIPT_PATH/parts/shared/require_shop_edition_packages.sh -e"${edition}" -v"dev-b-7.3.x"
+$SCRIPT_PATH/parts/shared/require_twig_components.sh -e"${edition}" -b"b-7.3.x"
+$SCRIPT_PATH/parts/shared/require.sh -n"oxid-esales/apex-theme" -v"dev-b-7.3.x"
+$SCRIPT_PATH/parts/shared/require_demodata_package.sh -e"${edition}" -b"b-7.3.x"
 
 docker compose exec php composer update --no-interaction