From b9e0a91cf4b64e7ba0be5e05185b65a46a051c9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=B6ller?= <am@localheinz.com>
Date: Sun, 24 Nov 2024 11:37:52 +0100
Subject: [PATCH] Enhancement: Add support for PHP 8.4

---
 .github/settings.yml                              |  3 +++
 .github/workflows/integrate.yaml                  |  1 +
 CHANGELOG.md                                      |  5 +++++
 test/EndToEnd/RuleSet/AbstractRuleSetTestCase.php | 12 ++++++++++++
 4 files changed, 21 insertions(+)

diff --git a/.github/settings.yml b/.github/settings.yml
index 37f890ac..8ea2ae73 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -35,6 +35,9 @@ branches:
           - context: "Tests (8.3, highest)"
           - context: "Tests (8.3, locked)"
           - context: "Tests (8.3, lowest)"
+          - context: "Tests (8.4, highest)"
+          - context: "Tests (8.4, locked)"
+          - context: "Tests (8.4, lowest)"
         strict: false
       restrictions:
 
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
index d5ffc77e..bc3780d3 100644
--- a/.github/workflows/integrate.yaml
+++ b/.github/workflows/integrate.yaml
@@ -370,6 +370,7 @@ jobs:
           - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
 
         dependencies:
           - "lowest"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4693d3b..ca1087bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 For a full diff see [`6.37.0...main`][6.37.0...main].
 
+### Changed
+
+- Added support for PHP 8.4 ([#1138]), by [@localheinz]
+
 ## [`6.37.0`][6.37.0]
 
 For a full diff see [`6.36.0...6.37.0`][6.36.0...6.37.0].
@@ -1761,6 +1765,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
 [#1102]: https://github.com/ergebnis/php-cs-fixer-config/pull/1102
 [#1103]: https://github.com/ergebnis/php-cs-fixer-config/pull/1103
 [#1109]: https://github.com/ergebnis/php-cs-fixer-config/pull/1109
+[#1138]: https://github.com/ergebnis/php-cs-fixer-config/pull/1138
 
 [@dependabot]: https://github.com/apps/dependabot
 [@linuxjuggler]: https://github.com/linuxjuggler
diff --git a/test/EndToEnd/RuleSet/AbstractRuleSetTestCase.php b/test/EndToEnd/RuleSet/AbstractRuleSetTestCase.php
index 015f27f8..27dbbf6b 100644
--- a/test/EndToEnd/RuleSet/AbstractRuleSetTestCase.php
+++ b/test/EndToEnd/RuleSet/AbstractRuleSetTestCase.php
@@ -38,6 +38,17 @@ final protected function tearDown(): void
 
     final public function testConfigurationIsConsideredValid(): void
     {
+        $env = [];
+
+        if (\PHP_VERSION_ID >= 80400) {
+            $env = [
+                /**
+                 * @see https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/v3.64.0/README.md#supported-php-versions
+                 */
+                'PHP_CS_FIXER_IGNORE_ENV' => true,
+            ];
+        }
+
         $process = new Process\Process(
             [
                 'vendor/bin/php-cs-fixer',
@@ -50,6 +61,7 @@ final public function testConfigurationIsConsideredValid(): void
                 self::configPath(),
             ],
             null,
+            $env,
         );
 
         $process->run();