Merge remote-tracking branch 'origin/b-7.0.x' into b-7.0.x

OXID-eSales · Apr 4, 2024 · 1e9bf08 · 1e9bf08
2 parents 0f4609b + 449e487
commit 1e9bf08
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 24 deletions.
diff --git a/.github/workflows/dispatch_module.yml b/.github/workflows/dispatch_module.yml
@@ -8,23 +8,17 @@ on:
         type: choice
         options:
           - 7.0.x
-          - 7.1.x
-          - 8.0.x
           - use custom testplan
         default: '7.0.x'
         description: 'Choose test scenario'
       limit:
         type: choice
-        options: 
+        options:
           - 'no'
           - 'PHP8.0/MySQL5.7'
           - 'PHP8.0/MySQL8.0'
           - 'PHP8.1/MySQL5.7'
           - 'PHP8.1/MySQL8.0'
-          - 'PHP8.2/MySQL5.7'
-          - 'PHP8.2/MySQL8.0'
-          - 'PHP8.3/MySQL5.7'
-          - 'PHP8.3/MySQL8.0'
         default: 'PHP8.1/MySQL5.7'
         description: 'Limit to one PHP/MySQL combination'
       custom_testplan:
@@ -64,10 +58,6 @@ jobs:
             "PHP8.0/MySQL8.0") LIMIT='~/defaults/php8.0_mysql8.0_only.yml,' ;;
             "PHP8.1/MySQL5.7") LIMIT='~/defaults/php8.1_mysql5.7_only.yml,' ;;
             "PHP8.1/MySQL8.0") LIMIT='~/defaults/php8.1_mysql8.0_only.yml,' ;;
-            "PHP8.2/MySQL5.7") LIMIT='~/defaults/php8.2_mysql5.7_only.yml,' ;;
-            "PHP8.2/MySQL8.0") LIMIT='~/defaults/php8.2_mysql8.0_only.yml,' ;;
-            "PHP8.3/MySQL5.7") LIMIT='~/defaults/php8.3_mysql5.7_only.yml,' ;;
-            "PHP8.3/MySQL8.0") LIMIT='~/defaults/php8.3_mysql8.0_only.yml,' ;;
             *) echo "Illegal choice, fix the workflow"
                exit 1
                ;;
@@ -77,14 +67,6 @@ jobs:
               # shellcheck disable=SC2088 # Tilde expansion happens in the workflow and not by bash
               TESTPLAN="~/defaults/7.0.x.yml,${LIMIT}~/module-template.yml"
               ;;
-            "7.1.x")
-              # shellcheck disable=SC2088 # Tilde expansion happens in the workflow and not by bash
-              TESTPLAN="~/defaults/7.1.x.yml,${LIMIT}~/module-template.yml"
-              ;;
-            "8.0.x")
-              # shellcheck disable=SC2088 # Tilde expansion happens in the workflow and not by bash
-              TESTPLAN="${LIMIT}~/module-template.yml"
-              ;;
             "use custom testplan")
               # shellcheck disable=SC2088 # Tilde expansion happens in the workflow and not by bash
               TESTPLAN="${{ inputs.custom_testplan }}"

diff --git a/composer.json b/composer.json
@@ -53,7 +53,7 @@
 
         "tests-unit": "XDEBUG_MODE=coverage vendor/bin/phpunit --config=tests/ --testsuite=Unit",
         "tests-integration": "XDEBUG_MODE=coverage vendor/bin/phpunit --bootstrap=/var/www/source/bootstrap.php --config=tests/ --testsuite=Integration",
-        "tests-coverage": "XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-text --bootstrap=/var/www/source/bootstrap.php --config=tests/ --coverage-html=tests/result/coverage",
+        "tests-coverage": "XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-text --bootstrap=/var/www/source/bootstrap.php --config=tests/ --coverage-html=tests/reports/coverage",
 
         "tests-codeception": "(cd /var/www/ && THEME_ID=apex MODULE_IDS=oe_moduletemplate /var/www/vendor/bin/codecept run acceptance -c /var/www/vendor/oxid-esales/module-template/tests/codeception.yml -g oe_moduletemplate)",
 
@@ -64,9 +64,6 @@
         ]
     },
     "config": {
-        "allow-plugins": {
-            "oxid-esales/oxideshop-composer-plugin": true,
-            "oxid-esales/oxideshop-unified-namespace-generator": true
-        }
+        "allow-plugins": false
     }
 }