Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhancement: Add support for PHP 8.4 #906

Merged
merged 1 commit into from
Nov 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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