Merge pull request #1199 from PHPCSStandards/feature/ghactions-revert-workaround

Revert "GH Actions: apply work-around for testing against PHP 8.5"

Author: jrfnl

.github/workflows/test.yml

@@ -199,7 +199,7 @@ jobs:
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ matrix.php == '8.5' && '8.4' || matrix.php }}
+          php-version: ${{ matrix.php }}
           ini-values: ${{ steps.set_ini.outputs.PHP_INI }}
           coverage: none
 
@@ -229,14 +229,6 @@ jobs:
           composer-options: ${{ matrix.php == '8.5' && '--ignore-platform-req=php+' || '' }}
           custom-cache-suffix: $(date -u "+%Y-%m")
 
-      - name: "Install PHP again (PHP 8.5)"
-        if: ${{ matrix.php == '8.5' }}
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          ini-values: ${{ steps.set_ini.outputs.PHP_INI }}
-          coverage: none
-
       - name: 'PHPCS: set the path to PHP'
         run: php "bin/phpcs" --config-set php_path php