OXDEV-8306 Change testplans to use b-7.2.x

OXID-eSales · Oct 14, 2024 · 1a3b75a · 1a3b75a
1 parent d4c56b6
commit 1a3b75a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/dispatch_module.yaml b/.github/workflows/dispatch_module.yaml
@@ -41,7 +41,7 @@ jobs:
               ;;
           esac
           # shellcheck disable=SC2088
-          TESTPLAN="~/defaults/7.1.x.yaml,${LIMIT}~/geo-blocking.yaml"
+          TESTPLAN="~/defaults/7.2.x.yaml,${LIMIT}~/geo-blocking.yaml"
           echo "testplan=${TESTPLAN}" | tee -a "${GITHUB_OUTPUT}"
 
   dispatch_stable:

diff --git a/.github/workflows/schedule.yaml b/.github/workflows/schedule.yaml
@@ -10,7 +10,7 @@ jobs:
     if: always()
     uses: oxid-eSales/github-actions/.github/workflows/universal_workflow_light.yaml@v4
     with:
-      testplan: '~/defaults/7.1.x.yaml,~/defaults/scheduled.yaml,~/geo-blocking.yaml'
+      testplan: '~/defaults/7.2.x.yaml,~/defaults/scheduled.yaml,~/geo-blocking.yaml'
       runs_on: '"ubuntu-latest"'
       defaults: 'v4'
       plan_folder: '.github/oxid-esales'

diff --git a/.github/workflows/trigger.yaml b/.github/workflows/trigger.yaml
@@ -5,13 +5,13 @@ on:
   pull_request: {}
   push:
     branches:
-      - 'b-7.1.x*'
+      - 'b-7.2.x*'
 
 jobs:
   geo_blocking_php82_mysql80:
     uses: oxid-eSales/github-actions/.github/workflows/universal_workflow_light.yaml@v4
     with:
-      testplan: '~/defaults/7.1.x.yaml,~/defaults/php8.2_mysql8.0_only.yaml,~/geo-blocking.yaml'
+      testplan: '~/defaults/7.2.x.yaml,~/defaults/php8.2_mysql8.0_only.yaml,~/geo-blocking.yaml'
       runs_on: '"ubuntu-latest"'
       defaults: 'v4'
       plan_folder: '.github/oxid-esales'

diff --git a/src/Component/UserComponent.php b/src/Component/UserComponent.php
@@ -21,7 +21,7 @@ class UserComponent extends UserComponent_parent
      *
      * @see \OxidEsales\Eshop\Application\Component\UserComponent::changeUserWithoutRedirect()
      *
-     * @return bool
+     * @return bool|null
      */
     public function changeUserWithoutRedirect()
     {