Cleanup add support for PHP 8.4

Author: hannesbochmann

.github/workflows/php.yml

@@ -25,6 +25,7 @@ jobs:
                     - "8.1"
                     - "8.2"
                     - "8.3"
+                    - "8.4"
 
         steps:
             -
@@ -41,21 +42,22 @@ jobs:
                 run: "composer validate --strict"
             -
                 name: "Determine composer cache directory"
-                id: "determine-composer-cache-directory"
-                run: "echo \"::set-output name=directory::$(composer config cache-dir)\""
+                id: composer-cache
+                run: |
+                    echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
             -
                 name: "Cache dependencies installed with composer"
                 uses: "actions/cache@v4"
                 with:
-                    path: "${{ steps.determine-composer-cache-directory.outputs.directory }}"
+                    path: ${{ steps.composer-cache.outputs.dir }}
                     key: "php-${{ matrix.php-version }}-composer-${{ hashFiles('composer.lock') }}"
                     restore-keys: "php-${{ matrix.php-version }}-composer-"
             -
                 name: "Install composer dependencies"
                 run: "composer install --no-interaction --no-progress --no-suggest"
             -
                 name: "Run Linter"
-                run: "composer lint:php"
+                run: "composer lint"
 
     php-qs:
         name: "PHP QS"
@@ -78,7 +80,11 @@ jobs:
                     - "8.1"
                     - "8.2"
                     - "8.3"
-
+                    - "8.4"
+                ### Exclude PHP 8.4 for php-c-fixers as there is currently no support
+                exclude:
+                    - command: "test:phpcs"
+                      php-version: "8.4"
         steps:
             -
                 name: "Checkout"
@@ -94,13 +100,14 @@ jobs:
                 run: "composer validate --strict"
             -
                 name: "Determine composer cache directory"
-                id: "determine-composer-cache-directory"
-                run: "echo \"::set-output name=directory::$(composer config cache-dir)\""
+                id: composer-cache
+                run: |
+                    echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
             -
                 name: "Cache dependencies installed with composer"
                 uses: "actions/cache@v4"
                 with:
-                    path: "${{ steps.determine-composer-cache-directory.outputs.directory }}"
+                    path: ${{ steps.composer-cache.outputs.dir }}
                     key: "php-${{ matrix.php-version }}-composer-${{ hashFiles('composer.lock') }}"
                     restore-keys: "php-${{ matrix.php-version }}-composer-"
             -
@@ -146,6 +153,9 @@ jobs:
                     -
                         typo3-version: "^12.4"
                         php-version: "8.3"
+                    -
+                        typo3-version: "^12.4"
+                        php-version: "8.4"
 
         steps:
             -
@@ -162,13 +172,14 @@ jobs:
                 run: "composer validate --strict"
             -
                 name: "Determine composer cache directory"
-                id: "determine-composer-cache-directory"
-                run: "echo \"::set-output name=directory::$(composer config cache-dir)\""
+                id: composer-cache
+                run: |
+                    echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
             -
                 name: "Cache dependencies installed with composer"
                 uses: "actions/cache@v4"
                 with:
-                    path: "${{ steps.determine-composer-cache-directory.outputs.directory }}"
+                    path: ${{ steps.composer-cache.outputs.dir }}
                     key: "php-${{ matrix.php-version }}-composer-${{ hashFiles('composer.lock') }}"
                     restore-keys: "php-${{ matrix.php-version }}-composer-"
             -

composer.json

@@ -21,7 +21,6 @@
         "issues": "https://github.com/DMKEBUSINESSGMBH/typo3-mkcache_queue"
     },
     "require" : {
-        "php": "^7.4 || ^8.0 || ^8.1 || ^8.2 || ^8.3",
         "typo3/cms-core" : "^11.5.7 || ^12.4"
     },
     "require-dev": {
@@ -90,14 +89,15 @@
             "@lint:php"
         ],
         "test:phpcs": [
-            ".Build/bin/php-cs-fixer fix -v --dry-run --diff"
+            "PHP_CS_FIXER_IGNORE_ENV=1 .Build/bin/php-cs-fixer fix -v --dry-run --diff"
         ],
         "test:phpcompatibility": [
             "@test:phpcompatibility:7.4",
             "@test:phpcompatibility:8.0",
             "@test:phpcompatibility:8.1",
             "@test:phpcompatibility:8.2",
-            "@test:phpcompatibility:8.3"
+            "@test:phpcompatibility:8.3",
+            "@test:phpcompatibility:8.4"
         ],
         "test:phpcompatibility:7.4": [
             ".Build/bin/phpcs --ignore=.Build/*,Resources/Public/* -p . --standard=.Build/vendor/phpcompatibility/php-compatibility/PHPCompatibility --runtime-set testVersion 7.4"
@@ -114,6 +114,9 @@
         "test:phpcompatibility:8.3": [
             ".Build/bin/phpcs --ignore=.Build/*,Resources/Public/* -p . --standard=.Build/vendor/phpcompatibility/php-compatibility/PHPCompatibility --runtime-set testVersion 8.3"
         ],
+        "test:phpcompatibility:8.4": [
+            ".Build/bin/phpcs --ignore=.Build/*,Resources/Public/* -p . --standard=.Build/vendor/phpcompatibility/php-compatibility/PHPCompatibility --runtime-set testVersion 8.4"
+        ],
         "test:phpmd": [
             ".Build/bin/phpmd ./Classes text phpmd.xml"
         ],
@@ -139,7 +142,7 @@
             "@test:phpunit"
         ],
         "fix:phpcs": [
-            ".Build/bin/php-cs-fixer fix -v"
+            "PHP_CS_FIXER_IGNORE_ENV=1 .Build/bin/php-cs-fixer fix -v"
         ],
         "fix": [
             "@pre-qs",