From d4c56b664bdeb0f1050d485fc0b4727575cfab82 Mon Sep 17 00:00:00 2001
From: Tatyana Koleva <tatjana.koleva@dnhsoft.com>
Date: Fri, 11 Oct 2024 17:49:04 +0300
Subject: [PATCH] OXDEV-8306 Update composer and workflow files for 7.2.x

---
 .github/workflows/dispatch_module.yaml | 12 ++++++++----
 composer.json                          | 10 +++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/dispatch_module.yaml b/.github/workflows/dispatch_module.yaml
index 41d0f1d..3e9bf62 100644
--- a/.github/workflows/dispatch_module.yaml
+++ b/.github/workflows/dispatch_module.yaml
@@ -8,10 +8,12 @@ on:
         type: choice
         options:
           - 'no'
-          - 'PHP8.1/MySQL5.7'
-          - 'PHP8.1/MySQL8.0'
           - 'PHP8.2/MySQL5.7'
           - 'PHP8.2/MySQL8.0'
+          - 'PHP8.2/MariaDb11'
+          - 'PHP8.3/MySQL5.7'
+          - 'PHP8.3/MySQL8.0'
+          - 'PHP8.3/MariaDb11'
         default: 'PHP8.2/MySQL8.0'
         description: 'Limit to one PHP/MySQL combination'
 
@@ -28,10 +30,12 @@ jobs:
           # shellcheck disable=SC2088
           case "${{ inputs.limit }}" in
             "no") LIMIT='';;
-            "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.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,' ;;
             *) echo "Illegal choice, fix the workflow"
               exit 1
               ;;
diff --git a/composer.json b/composer.json
index 3a4a4c0..d3774af 100644
--- a/composer.json
+++ b/composer.json
@@ -11,25 +11,25 @@
   "prefer-stable": true,
   "prefer-dist": true,
   "conflict": {
-    "oxid-esales/oxideshop-ce": "<7.1"
+    "oxid-esales/oxideshop-ce": "<7.2"
   },
   "require": {
-    "php": "^8.1"
+    "php": "^8.2"
   },
   "require-dev": {
     "phpstan/phpstan": "^1.9.14",
     "squizlabs/php_codesniffer": "3.*",
     "phpmd/phpmd": "^2.11",
     "phpunit/phpunit": "^10.4",
-    "oxid-esales/oxideshop-ce": "dev-b-7.1.x",
+    "oxid-esales/oxideshop-ce": "dev-b-7.2.x",
     "mikey179/vfsstream": "~1.6.8",
     "codeception/codeception": "^5.0",
     "codeception/module-asserts": "*",
     "codeception/module-db": "*",
     "codeception/module-filesystem": "*",
     "codeception/module-webdriver": "*",
-    "oxid-esales/codeception-modules": "dev-b-7.1.x",
-    "oxid-esales/codeception-page-objects": "dev-b-7.1.x"
+    "oxid-esales/codeception-modules": "dev-b-7.2.x",
+    "oxid-esales/codeception-page-objects": "dev-b-7.2.x"
   },
   "autoload": {
     "psr-4": {