Drop PHP 8.1 and add PHP 8.3 for shop versions >7.2

OXID-eSales · Aug 1, 2024 · 2ea1d4b · 2ea1d4b
2 parents 8d992c4 + fdc4c75
commit 2ea1d4b
Show file tree

Hide file tree

Showing 11 changed files with 73 additions and 68 deletions.
diff --git a/.github/oxid-esales/defaults/ee.yaml b/.github/oxid-esales/defaults/ee.yaml
@@ -30,17 +30,17 @@ install_shop_with_modules: &install
             "ddoe/*": "source"
           },
           "require": {
-              "oxid-esales/oxideshop-pe": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/oxideshop-ee": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/twig-component": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/twig-component-pe": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/twig-component-ee": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/twig-admin-theme": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/apex-theme": "{{ .Data.global.composer.dev_ref }}"
+              "oxid-esales/oxideshop-pe": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/oxideshop-ee": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/twig-component": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/twig-component-pe": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/twig-component-ee": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/twig-admin-theme": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/apex-theme": "{{ .Data.global.composer.ref_name }}"
           },
           "require-dev": {
-              "oxid-esales/codeception-modules": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/codeception-page-objects": "{{ .Data.global.composer.dev_ref }}"
+              "oxid-esales/codeception-modules": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/codeception-page-objects": "{{ .Data.global.composer.ref_name }}"
           },
           "repositories": {
               "oxid-esales/twig-component-ee": {
@@ -118,10 +118,10 @@ runtest:
     transform: |
       {
           "require-dev": {
-              "oxid-esales/testing-library": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/tests-deprecated-ce": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/tests-deprecated-pe": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/tests-deprecated-ee": "{{ .Data.global.composer.dev_ref }}",
+              "oxid-esales/testing-library": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/tests-deprecated-ce": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/tests-deprecated-pe": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/tests-deprecated-ee": "{{ .Data.global.composer.ref_name }}",
               "codeception/module-webdriver": "^3.1",
               "phpunit/phpunit": "^9.1.1"
           },

diff --git a/.github/oxid-esales/defaults/ee.yml b/.github/oxid-esales/defaults/ee.yml
@@ -30,17 +30,17 @@ install_shop_with_modules: &install
             "ddoe/*": "source"
           },
           "require": {
-              "oxid-esales/oxideshop-pe": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/oxideshop-ee": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/twig-component": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/twig-component-pe": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/twig-component-ee": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/twig-admin-theme": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/apex-theme": "{{ .Data.global.composer.dev_ref }}"
+              "oxid-esales/oxideshop-pe": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/oxideshop-ee": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/twig-component": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/twig-component-pe": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/twig-component-ee": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/twig-admin-theme": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/apex-theme": "{{ .Data.global.composer.ref_name }}"
           },
           "require-dev": {
-              "oxid-esales/codeception-modules": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/codeception-page-objects": "{{ .Data.global.composer.dev_ref }}"
+              "oxid-esales/codeception-modules": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/codeception-page-objects": "{{ .Data.global.composer.ref_name }}"
           },
           "repositories": {
               "oxid-esales/twig-component-ee": {
@@ -118,10 +118,10 @@ runtest:
     transform: |
       {
           "require-dev": {
-              "oxid-esales/testing-library": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/tests-deprecated-ce": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/tests-deprecated-pe": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/tests-deprecated-ee": "{{ .Data.global.composer.dev_ref }}",
+              "oxid-esales/testing-library": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/tests-deprecated-ce": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/tests-deprecated-pe": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/tests-deprecated-ee": "{{ .Data.global.composer.ref_name }}",
               "codeception/module-webdriver": "^3.1",
               "phpunit/phpunit": "^9.1.1"
           },

diff --git a/.github/oxid-esales/defaults/pe.yaml b/.github/oxid-esales/defaults/pe.yaml
@@ -30,15 +30,15 @@ install_shop_with_modules: &install
             "ddoe/*": "source"
           },
           "require": {
-              "oxid-esales/oxideshop-pe": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/twig-component": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/twig-component-pe": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/twig-admin-theme": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/apex-theme": "{{ .Data.global.composer.dev_ref }}"
+              "oxid-esales/oxideshop-pe": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/twig-component": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/twig-component-pe": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/twig-admin-theme": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/apex-theme": "{{ .Data.global.composer.ref_name }}"
           },
           "require-dev": {
-              "oxid-esales/codeception-modules": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/codeception-page-objects": "{{ .Data.global.composer.dev_ref }}"
+              "oxid-esales/codeception-modules": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/codeception-page-objects": "{{ .Data.global.composer.ref_name }}"
           },
           "repositories": {
               "oxid-esales/twig-component-pe": {
@@ -108,9 +108,9 @@ runtest:
     transform: |
       {
           "require-dev": {
-              "oxid-esales/testing-library": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/tests-deprecated-ce": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/tests-deprecated-pe": "{{ .Data.global.composer.dev_ref }}",
+              "oxid-esales/testing-library": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/tests-deprecated-ce": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/tests-deprecated-pe": "{{ .Data.global.composer.ref_name }}",
               "codeception/module-webdriver": "^3.1",
               "phpunit/phpunit": "^9.1.1"
           },

diff --git a/.github/oxid-esales/defaults/pe.yml b/.github/oxid-esales/defaults/pe.yml
@@ -30,15 +30,15 @@ install_shop_with_modules: &install
             "ddoe/*": "source"
           },
           "require": {
-              "oxid-esales/oxideshop-pe": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/twig-component": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/twig-component-pe": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/twig-admin-theme": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/apex-theme": "{{ .Data.global.composer.dev_ref }}"
+              "oxid-esales/oxideshop-pe": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/twig-component": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/twig-component-pe": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/twig-admin-theme": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/apex-theme": "{{ .Data.global.composer.ref_name }}"
           },
           "require-dev": {
-              "oxid-esales/codeception-modules": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/codeception-page-objects": "{{ .Data.global.composer.dev_ref }}"
+              "oxid-esales/codeception-modules": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/codeception-page-objects": "{{ .Data.global.composer.ref_name }}"
           },
           "repositories": {
               "oxid-esales/twig-component-pe": {
@@ -108,9 +108,9 @@ runtest:
     transform: |
       {
           "require-dev": {
-              "oxid-esales/testing-library": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/tests-deprecated-ce": "{{ .Data.global.composer.dev_ref }}",
-              "oxid-esales/tests-deprecated-pe": "{{ .Data.global.composer.dev_ref }}",
+              "oxid-esales/testing-library": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/tests-deprecated-ce": "{{ .Data.global.composer.ref_name }}",
+              "oxid-esales/tests-deprecated-pe": "{{ .Data.global.composer.ref_name }}",
               "codeception/module-webdriver": "^3.1",
               "phpunit/phpunit": "^9.1.1"
           },

diff --git a/.github/oxid-esales/defaults/scripts/codeception.sh b/.github/oxid-esales/defaults/scripts/codeception.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -e
+set -x
 SUITE="${1}"
 
 function init() {
@@ -44,7 +45,7 @@ function init() {
         fi
     fi
     LOG_FILE="${OUTPUT_DIR}/codeception_${SUITE}.txt"
-    PATTERN_FILE="${SCRIPT_DIR}/codeception_failure_pattern.txt"
+    PATTERN_FILE="${SCRIPT_DIR}codeception_failure_pattern.txt"
 
     CODECEPT="vendor/bin/codecept"
     if [ ! -f "${CODECEPT}" ]; then
@@ -84,7 +85,7 @@ function wait_for_selenium() {
 init
 wait_for_selenium
 
-"${CODECEPT}" build -c "${ABSOLUTE_PATH}/tests/codeception.yml"
+"${CODECEPT}" build -c "${ABSOLUTE_PATH}/${TESTDIR}/codeception.yml"
 RESULT=$?
 echo "Codecept build exited with error code ${RESULT}"
 "${CODECEPT}" run "${SUITE}" \
@@ -94,4 +95,4 @@ echo "Codecept build exited with error code ${RESULT}"
 | tee "${LOG_FILE}"
 RESULT=$?
 echo "Codecept run exited with error code ${RESULT}"
-"$SCRIPT_DIR/check_log.sh" "${LOG_FILE}" "${PATTERN_FILE}"
+"${SCRIPT_DIR}check_log.sh" "${LOG_FILE}" "${PATTERN_FILE}"
diff --git a/.github/oxid-esales/defaults/scripts/integration.sh b/.github/oxid-esales/defaults/scripts/integration.sh
@@ -32,7 +32,7 @@ function init() {
     fi
 
     LOG_FILE="${OUTPUT_DIR}/phpunit_integration.txt"
-    PATTERN_FILE="${SCRIPT_DIR}/integration_failure_pattern.txt"
+    PATTERN_FILE="${SCRIPT_DIR}integration_failure_pattern.txt"
 
     PHPUNIT="vendor/bin/phpunit"
     if [ ! -f "${PHPUNIT}" ]; then
@@ -45,15 +45,15 @@ function init() {
 
     BOOTSTRAP="/var/www/source/bootstrap.php"
     if [ ! -f "${BOOTSTRAP}" ]; then
-        BOOTSTRAP="/var/www/vendor/oxid-esales/oxideshop-ce/${TESTDIR}/bootstrap.php"
+        BOOTSTRAP="/var/www/vendor/oxid-esales/oxideshop-ce/tests/bootstrap.php"
         if [ ! -f "${BOOTSTRAP}" ]; then
             echo -e "\033[0;31mCould not find bootstrap.php in /var/www/tests or /var/www/oxid-esales/oxideshop-ce/tests\033[0m"
             find /var/www -iname "bootstrap.php"
             exit 1
         fi
     fi
 
-    XML_FILE="${ABSOLUTE_PATH}/tests/phpunit.xml"
+    XML_FILE="${ABSOLUTE_PATH}/${TESTDIR}/phpunit.xml"
     COVERAGE_FILE="${REPORT_DIR}/coverage_phpunit_integration.xml"
 
     cat <<EOF
@@ -77,4 +77,4 @@ init
 | tee "${LOG_FILE}"
 RESULT=$?
 echo "phpunit exited with error code ${RESULT}"
-"${SCRIPT_DIR}/check_log.sh" "${LOG_FILE}" "${PATTERN_FILE}"
+"${SCRIPT_DIR}check_log.sh" "${LOG_FILE}" "${PATTERN_FILE}"
diff --git a/.github/oxid-esales/defaults/scripts/unit.sh b/.github/oxid-esales/defaults/scripts/unit.sh
@@ -32,7 +32,7 @@ function init() {
     fi
 
     LOG_FILE="${OUTPUT_DIR}/phpunit_unit.txt"
-    PATTERN_FILE="${SCRIPT_DIR}/unit_failure_pattern.txt"
+    PATTERN_FILE="${SCRIPT_DIR}unit_failure_pattern.txt"
 
     PHPUNIT="vendor/bin/phpunit"
     if [ ! -f "${PHPUNIT}" ]; then
@@ -45,7 +45,7 @@ function init() {
 
     BOOTSTRAP="/var/www/source/bootstrap.php"
     if [ ! -f "${BOOTSTRAP}" ]; then
-        BOOTSTRAP="/var/www/vendor/oxid-esales/oxideshop-ce/${TESTDIR}/bootstrap.php"
+        BOOTSTRAP="/var/www/vendor/oxid-esales/oxideshop-ce/tests/bootstrap.php"
         if [ ! -f "${BOOTSTRAP}" ]; then
             echo -e "\033[0;31mCould not find bootstrap.php in /var/www/tests or /var/www/oxid-esales/oxideshop-ce/tests\033[0m"
             find /var/www -iname "bootstrap.php"
@@ -77,4 +77,4 @@ init
 | tee "${LOG_FILE}"
 RESULT=$?
 echo "phpunit exited with error code ${RESULT}"
-"${SCRIPT_DIR}/check_log.sh" "${LOG_FILE}" "${PATTERN_FILE}"
+"${SCRIPT_DIR}check_log.sh" "${LOG_FILE}" "${PATTERN_FILE}"
diff --git a/.github/workflows/call-universal_test_workflow.yaml b/.github/workflows/call-universal_test_workflow.yaml
@@ -1693,10 +1693,11 @@ jobs:
         if: ${{ inputs.runs_on != '"ubuntu-latest"'}}
         run: |
           NPM=$(type -p 'npm'||true)
-          if [ -z "${NPM}" ]; then
-            echo -e "\033[0;35m###  Installing npm ###\033[0m"
+          PIPX=$(type -p 'pipx'||true)
+          if [ -z "${NPM}" ] || [ -z "${PIPX}" ]; then
+            echo -e "\033[0;35m###  Installing npm, shellcheck, pipx ###\033[0m"
             sudo DEBIAN_FRONTEND=noninteractive apt-get -qq update
-            sudo apt-get -qq install npm
+            sudo apt-get -qq install npm shellcheck pipx python3-venv
           fi
 
       - name: Checkout

diff --git a/.github/workflows/call-universal_test_workflow.yml b/.github/workflows/call-universal_test_workflow.yml
@@ -1693,10 +1693,11 @@ jobs:
         if: ${{ inputs.runs_on != '"ubuntu-latest"'}}
         run: |
           NPM=$(type -p 'npm'||true)
-          if [ -z "${NPM}" ]; then
-            echo -e "\033[0;35m###  Installing npm ###\033[0m"
+          PIPX=$(type -p 'pipx'||true)
+          if [ -z "${NPM}" ] || [ -z "${PIPX}" ]; then
+            echo -e "\033[0;35m###  Installing npm, shellcheck, pipx ###\033[0m"
             sudo DEBIAN_FRONTEND=noninteractive apt-get -qq update
-            sudo apt-get -qq install npm
+            sudo apt-get -qq install npm shellcheck pipx python3-venv
           fi
 
       - name: Checkout

diff --git a/.github/workflows/universal_workflow_light.yaml b/.github/workflows/universal_workflow_light.yaml
@@ -1246,10 +1246,11 @@ jobs:
         if: ${{ inputs.runs_on != '"ubuntu-latest"'}}
         run: |
           NPM=$(type -p 'npm'||true)
-          if [ -z "${NPM}" ]; then
-            echo -e "\033[0;35m###  Installing npm ###\033[0m"
+          PIPX=$(type -p 'pipx'||true)
+          if [ -z "${NPM}" ] || [ -z "${PIPX}" ]; then
+            echo -e "\033[0;35m###  Installing npm, shellcheck, pipx ###\033[0m"
             sudo DEBIAN_FRONTEND=noninteractive apt-get -qq update
-            sudo apt-get -qq install npm
+            sudo apt-get -qq install npm shellcheck pipx python3-venv
           fi
 
       - name: Checkout

diff --git a/.github/workflows/universal_workflow_light.yml b/.github/workflows/universal_workflow_light.yml
@@ -1246,10 +1246,11 @@ jobs:
         if: ${{ inputs.runs_on != '"ubuntu-latest"'}}
         run: |
           NPM=$(type -p 'npm'||true)
-          if [ -z "${NPM}" ]; then
-            echo -e "\033[0;35m###  Installing npm ###\033[0m"
+          PIPX=$(type -p 'pipx'||true)
+          if [ -z "${NPM}" ] || [ -z "${PIPX}" ]; then
+            echo -e "\033[0;35m###  Installing npm, shellcheck, pipx ###\033[0m"
             sudo DEBIAN_FRONTEND=noninteractive apt-get -qq update
-            sudo apt-get -qq install npm
+            sudo apt-get -qq install npm shellcheck pipx python3-venv
           fi
 
       - name: Checkout