Skip to content

Commit

Permalink
ci: Add PHP 8.4 (#297)
Browse files Browse the repository at this point in the history
  • Loading branch information
theofidry authored Dec 6, 2024
1 parent c701016 commit af1058b
Show file tree
Hide file tree
Showing 7 changed files with 916 additions and 187 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/auto-review.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: AutoReview

env:
PHP_CS_FIXER_IGNORE_ENV: 1

on:
push:
branches: [ "main" ]
Expand All @@ -15,7 +18,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php: [ "8.3" ]
php: [ "8.4" ]
check:
- name: "PHPStan"
command: "make phpstan"
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ jobs:
- "8.1"
- "8.2"
- "8.3"
- "8.4"
symfony:
- version_name: "6.4"
conflict: "<6.4 || >=7.0"
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
"fidry/cpu-core-counter": "^0.5.0 || ^1.0",
"nikic/iter": "^2.2",
"psr/log": "^1.1 || ^2.0 || ^3.0",
"symfony/console": "^6.4",
"symfony/dependency-injection": "^6.4",
"symfony/console": "^6.4.15",
"symfony/dependency-injection": "^6.4.15",
"symfony/deprecation-contracts": "^2.5 || ^3.1",
"symfony/process": "^6.4",
"symfony/process": "^6.4.15",
"symfony/service-contracts": "^3.3",
"thecodingmachine/safe": "^1.3.3 || ^2.4",
"webmozart/assert": "^1.5"
Expand All @@ -40,8 +40,8 @@
"phpstan/phpstan-phpunit": "^1.1",
"phpstan/phpstan-symfony": "^1.2",
"phpstan/phpstan-webmozart-assert": "^1.2",
"phpunit/phpunit": "^10.0",
"symfony/framework-bundle": "^6.4",
"phpunit/phpunit": "^10.5.38",
"symfony/framework-bundle": "^6.4.10",
"webmozarts/strict-phpunit": "^7.3"
},
"autoload": {
Expand Down
6 changes: 3 additions & 3 deletions tests/Integration/OutputNormalizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public static function removeTrailingSpaces(string $output): string
public static function removeIntermediateFixedProgressBars(string $output): string
{
$output = preg_replace(
'# \d+\/\d+ \[=[=>-]+\-] .+?MiB\\n#',
'# \d+\/\d+ \[=[=>-]+\-] .+?MiB\n#',
'',
$output,
);
Expand All @@ -148,7 +148,7 @@ public static function removeIntermediateNonFixedProgressBars(

// Remove intermediate lines
$output = preg_replace(
'#\s+\d+ \[[->]+?\] .+?MiB\\n#',
'#\s+\d+ \[[->]+?\] .+?MiB\n#',
'',
$output,
);
Expand Down Expand Up @@ -176,7 +176,7 @@ private static function excludeNonFixedSizedProgressBarLine(
int $itemNumber
): callable {
$lineFound = 1 === preg_match(
'#(?<line> '.$itemNumber.' \[[->]+] .+?MiB.*?\\n?)#',
'#(?<line> '.$itemNumber.' \[[->]+] .+?MiB.*?\n?)#',
$output,
$matches,
);
Expand Down
2 changes: 1 addition & 1 deletion tests/Integration/services.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

$services
->load(
'Webmozarts\\Console\\Parallelization\\Fixtures\\Command\\',
'Webmozarts\Console\Parallelization\Fixtures\Command\\',
__DIR__.'/../Fixtures/Command',
)
->set(Counter::class);
Expand Down
Loading

0 comments on commit af1058b

Please sign in to comment.