Skip to content

Commit

Permalink
Enhancement: Add support for PHP 8.4
Browse files Browse the repository at this point in the history
  • Loading branch information
localheinz committed Nov 24, 2024
1 parent b70232c commit 77ea645
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 6 deletions.
3 changes: 3 additions & 0 deletions .github/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,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:

Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,7 @@ jobs:
- "8.1"
- "8.2"
- "8.3"
- "8.4"

dependencies:
- "lowest"
Expand Down Expand Up @@ -456,6 +457,10 @@ jobs:
key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}"
restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"

- name: "Remove incompatible dependencies with composer"
if: "matrix.dependencies != 'locked'"
run: "composer remove roave/backward-compatibility-check --ansi --dev --no-interaction --no-progress"

- name: "Remove platform configuration with composer"
if: "matrix.dependencies != 'locked'"
run: "composer config platform.php --ansi --unset"
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"security": "https://github.com/ergebnis/php-cs-fixer-config-template/blob/main/.github/SECURITY.md"
},
"require": {
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
"friendsofphp/php-cs-fixer": "~3.64.0"
},
"require-dev": {
Expand Down
8 changes: 4 additions & 4 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 13 additions & 1 deletion test/EndToEnd/RuleSet/AbstractRuleSetTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -49,7 +60,8 @@ final public function testConfigurationIsConsideredValid(): void
'--dry-run',
self::configPath(),
],
null
null,
$env,
);

$process->run();
Expand Down

0 comments on commit 77ea645

Please sign in to comment.