diff --git a/.github/workflows/dispatch_module.yaml b/.github/workflows/dispatch_module.yaml index 3e9bf62..25dee3b 100644 --- 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 index dc99bbe..2e17917 100644 --- 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 index 672827a..6816f82 100644 --- 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 index 4320103..d98f746 100644 --- 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() {