Merge branch 'main' into copilot/fix-guest-checkout-email-issue

Author: sreichel

.github/copilot-instructions.md

@@ -56,6 +56,9 @@ This project aims to provide a stable and secure version of Magento 1.x, with on
 - Update comments to reflect changes in code.
 - Update tests to cover new functionality and changes in code.
 - Update copyright notices in new files.
+- Do not add return types in docblocks if type hints are used.
+- Use strict comparisons (`===` and `!==`) instead of loose comparisons (`==` and `!=`) in new code.
+- Avoid using empty() function in new code. Use explicit checks instead.
 
 ## UI guidelines
 

.github/workflows/check-files.yml

@@ -79,7 +79,7 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

.github/workflows/composer.yml

@@ -19,7 +19,7 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

.github/workflows/cypress.yml

@@ -39,7 +39,7 @@ jobs:
       - run: ddev cypress-run --config-file .cypress.config.js
 
       - name: Upload screenshots
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         if: ${{ !success() }}
         with:
           name: cypress-screenshots

.github/workflows/docs.yml

@@ -27,7 +27,7 @@ jobs:
           python-version: 3.x
       - run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v5
         with:
           key: mkdocs-material-${{ env.cache_id }}
           path: .cache

.github/workflows/php-cs-fixer.yml

@@ -24,7 +24,7 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -34,7 +34,7 @@ jobs:
         run: composer install --prefer-dist --no-progress --ignore-platform-req=ext-*
 
       - name: Restore result cache
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v5
         with:
           path: .php-cs-fixer.cache
           key: php-cs-fixer-result-cache-${{ github.run_id }}
@@ -45,7 +45,7 @@ jobs:
         run: php vendor/bin/php-cs-fixer fix --diff --dry-run
 
       - name: Save result cache
-        uses: actions/cache/save@v4
+        uses: actions/cache/save@v5
         if: always()
         with:
           path: .php-cs-fixer.cache

.github/workflows/phpcs.yml

@@ -24,7 +24,7 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -34,7 +34,7 @@ jobs:
         run: composer install --prefer-dist --no-progress --ignore-platform-req=ext-*
 
       - name: Restore result cache
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v5
         with:
           path: .phpcs.result.cache
           key: phpcs-result-cache-${{ github.run_id }}
@@ -45,7 +45,7 @@ jobs:
         run: php vendor/bin/phpcs -s -p --cache=.phpcs.result.cache --report=full --standard=.phpcs.dist.xml
 
       - name: Save result cache
-        uses: actions/cache/save@v4
+        uses: actions/cache/save@v5
         if: always()
         with:
           path: .phpcs.result.cache

.github/workflows/phpmd.yml

@@ -19,7 +19,7 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -29,7 +29,7 @@ jobs:
         run: composer install --prefer-dist --no-progress --ignore-platform-req=ext-*
 
       - name: Restore result cache
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v5
         with:
           path: .phpmd.result-cache.php
           key: phpmd-result-cache-${{ github.run_id }}
@@ -40,7 +40,7 @@ jobs:
         run: php vendor/bin/phpmd app/code/core/Mage/ github .phpmd.dist.xml --cache --baseline-file .phpmd.dist.baseline.xml
 
       - name: Save result cache
-        uses: actions/cache/save@v4
+        uses: actions/cache/save@v5
         if: always()
         with:
           path: .phpmd.result-cache.php

.github/workflows/phpstan.yml

@@ -23,7 +23,7 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -33,7 +33,7 @@ jobs:
         run: composer install --prefer-dist --no-progress --ignore-platform-req=ext-*
 
       - name: Restore result cache
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v5
         with:
           path: .phpstan.cache
           key: phpstan-result-cache-${{ github.run_id }}
@@ -44,7 +44,7 @@ jobs:
         run: XDEBUG_MODE=off php vendor/bin/phpstan.phar analyze
 
       - name: Save result cache
-        uses: actions/cache/save@v4
+        uses: actions/cache/save@v5
         if: always()
         with:
           path: .phpstan.cache

.github/workflows/phpunit.yml

@@ -53,7 +53,7 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -91,7 +91,7 @@ jobs:
           --skip_url_validation 'yes'
 
       - name: Restore result cache
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v5
         with:
           path: .phpunit.result.cache
           key: phpunit-result-cache-${{ matrix.php-versions }}-${{ matrix.mysql-version }}-${{ github.run_id }}
@@ -102,7 +102,7 @@ jobs:
         run: php vendor/bin/phpunit --configuration .phpunit.dist.xml --testsuite Base,Error,Mage,Varien
 
       - name: Save result cache
-        uses: actions/cache/save@v4
+        uses: actions/cache/save@v5
         if: always()
         with:
           path: .phpunit.result.cache
@@ -116,7 +116,7 @@ jobs:
           files: tests/logging/*.xml
 
       - name: SonarQube Scan
-        uses: SonarSource/sonarqube-scan-action@v6
+        uses: SonarSource/sonarqube-scan-action@v7
         continue-on-error: true
         if: ${{ (matrix.php-versions == '8.1') && (matrix.mysql-version == '5.7') }}
         with: