Skip to content

Commit af1058b

Browse files
authored
ci: Add PHP 8.4 (#297)
1 parent c701016 commit af1058b

7 files changed

Lines changed: 916 additions & 187 deletions

File tree

.github/workflows/auto-review.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: AutoReview
22

3+
env:
4+
PHP_CS_FIXER_IGNORE_ENV: 1
5+
36
on:
47
push:
58
branches: [ "main" ]
@@ -15,7 +18,7 @@ jobs:
1518
strategy:
1619
fail-fast: false
1720
matrix:
18-
php: [ "8.3" ]
21+
php: [ "8.4" ]
1922
check:
2023
- name: "PHPStan"
2124
command: "make phpstan"

.github/workflows/tests.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ jobs:
4949
- "8.1"
5050
- "8.2"
5151
- "8.3"
52+
- "8.4"
5253
symfony:
5354
- version_name: "6.4"
5455
conflict: "<6.4 || >=7.0"

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
"fidry/cpu-core-counter": "^0.5.0 || ^1.0",
1919
"nikic/iter": "^2.2",
2020
"psr/log": "^1.1 || ^2.0 || ^3.0",
21-
"symfony/console": "^6.4",
22-
"symfony/dependency-injection": "^6.4",
21+
"symfony/console": "^6.4.15",
22+
"symfony/dependency-injection": "^6.4.15",
2323
"symfony/deprecation-contracts": "^2.5 || ^3.1",
24-
"symfony/process": "^6.4",
24+
"symfony/process": "^6.4.15",
2525
"symfony/service-contracts": "^3.3",
2626
"thecodingmachine/safe": "^1.3.3 || ^2.4",
2727
"webmozart/assert": "^1.5"
@@ -40,8 +40,8 @@
4040
"phpstan/phpstan-phpunit": "^1.1",
4141
"phpstan/phpstan-symfony": "^1.2",
4242
"phpstan/phpstan-webmozart-assert": "^1.2",
43-
"phpunit/phpunit": "^10.0",
44-
"symfony/framework-bundle": "^6.4",
43+
"phpunit/phpunit": "^10.5.38",
44+
"symfony/framework-bundle": "^6.4.10",
4545
"webmozarts/strict-phpunit": "^7.3"
4646
},
4747
"autoload": {

tests/Integration/OutputNormalizer.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public static function removeTrailingSpaces(string $output): string
121121
public static function removeIntermediateFixedProgressBars(string $output): string
122122
{
123123
$output = preg_replace(
124-
'# \d+\/\d+ \[=[=>-]+\-] .+?MiB\\n#',
124+
'# \d+\/\d+ \[=[=>-]+\-] .+?MiB\n#',
125125
'',
126126
$output,
127127
);
@@ -148,7 +148,7 @@ public static function removeIntermediateNonFixedProgressBars(
148148

149149
// Remove intermediate lines
150150
$output = preg_replace(
151-
'#\s+\d+ \[[->]+?\] .+?MiB\\n#',
151+
'#\s+\d+ \[[->]+?\] .+?MiB\n#',
152152
'',
153153
$output,
154154
);
@@ -176,7 +176,7 @@ private static function excludeNonFixedSizedProgressBarLine(
176176
int $itemNumber
177177
): callable {
178178
$lineFound = 1 === preg_match(
179-
'#(?<line> '.$itemNumber.' \[[->]+] .+?MiB.*?\\n?)#',
179+
'#(?<line> '.$itemNumber.' \[[->]+] .+?MiB.*?\n?)#',
180180
$output,
181181
$matches,
182182
);

tests/Integration/services.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
$services
2525
->load(
26-
'Webmozarts\\Console\\Parallelization\\Fixtures\\Command\\',
26+
'Webmozarts\Console\Parallelization\Fixtures\Command\\',
2727
__DIR__.'/../Fixtures/Command',
2828
)
2929
->set(Counter::class);

0 commit comments

Comments
 (0)