Skip to content

Commit ff3cfe4

Browse files
thecaliskanthecaliskan
authored
Update Symfony package versions to include 8.0 (#185)
1 parent f00cf6c commit ff3cfe4

File tree

19 files changed

+97
-59
lines changed

19 files changed

+97
-59
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
fail-fast: false
3333
matrix:
3434
package: ${{ fromJson(needs.matrix.outputs.list) }}
35-
php: [ '8.1', '8.2', '8.3' ]
35+
php: [ '8.1', '8.2', '8.3', '8.4', '8.5' ]
3636
strategy: [ 'highest', 'lowest' ]
3737

3838
steps:

‎composer.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@
1515
"clue/arguments": "^2.1",
1616
"guzzlehttp/psr7": "^1.8 || ^2.0",
1717
"illuminate/contracts": "^8.33",
18-
"laminas/laminas-diactoros": "^2.5",
18+
"laminas/laminas-diactoros": "^2.5 || ^3.0",
1919
"laminas/laminas-httphandlerrunner": "^1.5 || ^2.9",
2020
"nyholm/psr7": "^1.3",
2121
"nyholm/psr7-server": "^1.0",
2222
"react/http": "^1.2",
2323
"spiral/roadrunner-cli": "^2.6",
2424
"spiral/roadrunner-http": "^2.0 || ^3.0",
2525
"spiral/roadrunner-worker": "^2.0 || ^3.0",
26-
"symfony/console": "^5.2 || ^6.0",
27-
"symfony/dependency-injection": "^5.2 || ^6.0",
28-
"symfony/http-foundation": "^5.3 || ^6.0",
29-
"symfony/http-kernel": "^5.4 || ^6.0 || ^7.0",
30-
"symfony/psr-http-message-bridge": "^2.1 || ^6.4 || ^7.0",
31-
"symfony/runtime": "^5.3 || ^6.0"
26+
"symfony/console": "^5.2 || ^6.0 || ^7.0 || ^8.0",
27+
"symfony/dependency-injection": "^5.2 || ^6.0 || ^7.0 || ^8.0",
28+
"symfony/http-foundation": "^5.3 || ^6.0 || ^7.0 || ^8.0",
29+
"symfony/http-kernel": "^5.4 || ^6.0 || ^7.0 || ^8.0",
30+
"symfony/psr-http-message-bridge": "^2.1 || ^6.4 || ^7.0 || ^8.0",
31+
"symfony/runtime": "^5.3 || ^6.0 || ^7.0 || ^8.0"
3232
},
3333
"require-dev": {
3434
"guzzlehttp/test-server": "^0.1",

‎src/bref/composer.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
"psr/http-server-handler": "^1.0",
1818
"riverline/multipart-parser": "^2.0.9",
1919
"runtime/bref-layer": "^1.3",
20-
"symfony/runtime": "^5.4 || ^6.0 || ^7.0"
20+
"symfony/runtime": "^5.4 || ^6.0 || ^7.0 || ^8.0"
2121
},
2222
"require-dev": {
23-
"bref/bref": "^1.3",
23+
"bref/bref": "^1.3 || 2.0",
2424
"guzzlehttp/test-server": "^0.1",
25-
"phpunit/phpunit": "^9.5",
26-
"symfony/http-foundation": "^5.4 || ^6.0 || ^7.0",
27-
"symfony/http-kernel": "^5.4 || ^6.0 || ^7.0"
25+
"phpunit/phpunit": "^10.5.58",
26+
"symfony/http-foundation": "^5.4 || ^6.0 || ^7.0 || ^8.0",
27+
"symfony/http-kernel": "^5.4 || ^6.0 || ^7.0 || ^8.0"
2828
},
2929
"minimum-stability": "dev",
3030
"prefer-stable": true,

‎src/bref/tests/Lambda/LambdaClientTest.php‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,26 @@ class LambdaClientTest extends TestCase
2222
protected function setUp(): void
2323
{
2424
ob_start();
25-
Server::start();
25+
26+
$maxRetries = 5;
27+
$attempt = 0;
28+
while ($attempt < $maxRetries) {
29+
try {
30+
Server::start();
31+
break;
32+
} catch (\RuntimeException $runtimeException) {
33+
if ('Unable to contact node.js server' !== $runtimeException->getMessage()) {
34+
throw $runtimeException;
35+
}
36+
37+
++$attempt;
38+
if ($attempt >= $maxRetries) {
39+
throw $runtimeException;
40+
}
41+
\usleep(500000);
42+
}
43+
}
44+
2645
$this->lambda = new LambdaClient('localhost:8126', 'phpunit');
2746
}
2847

@@ -284,7 +303,7 @@ private function assertInvocationErrorResult(string $errorClass, string $errorMe
284303
private function assertErrorInLogs(string $errorClass, string $errorMessage): void
285304
{
286305
// Decode the logs from stdout
287-
$stdout = $this->getActualOutput();
306+
$stdout = $this->getActualOutputForAssertion();
288307

289308
[$requestId, $message, $json] = explode("\t", $stdout);
290309

@@ -308,7 +327,7 @@ private function assertErrorInLogs(string $errorClass, string $errorMessage): vo
308327
private function assertPreviousErrorsInLogs(array $previousErrors)
309328
{
310329
// Decode the logs from stdout
311-
$stdout = $this->getActualOutput();
330+
$stdout = $this->getActualOutputForAssertion();
312331

313332
[, , $json] = explode("\t", $stdout);
314333

‎src/bref/tests/SymfonyRequestBridgeTest.php‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@ public function testRawContent()
6161
rfc
6262
------------------------------83ff53821b7c--
6363
64-
HTTP
65-
,
64+
HTTP,
6665
]), $this->getContext());
6766
$this->assertSame('', $request->getContent());
6867
}
@@ -90,8 +89,7 @@ public function testUploadedFile()
9089
bar
9190
------------------------------83ff53821b7c--
9291
93-
HTTP
94-
,
92+
HTTP,
9593
]), $this->getContext());
9694
$files = $request->files->all();
9795
$this->assertArrayHasKey('img', $files['form']);
@@ -124,8 +122,7 @@ public function testEmptyUploadedFile()
124122
bar
125123
------------------------------83ff53821b7c--
126124
127-
HTTP
128-
,
125+
HTTP,
129126
]), $this->getContext());
130127
$files = $request->files->all();
131128
$this->assertArrayHasKey('img', $files['form']);

‎src/frankenphp-symfony/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"symfony/runtime": "^5.4 || ^6.0 || ^7.0"
1717
},
1818
"require-dev": {
19-
"phpunit/phpunit": "^9.5"
19+
"phpunit/phpunit": "^10.5.58"
2020
},
2121
"minimum-stability": "dev",
2222
"prefer-stable": true,

‎src/google-cloud/composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
"require": {
1313
"php": ">=8.0.5",
1414
"ext-json": "*",
15-
"symfony/runtime": "^5.4 || ^6.0 || ^7.0"
15+
"symfony/runtime": "^5.4 || ^6.0 || ^7.0 || ^8.0"
1616
},
1717
"require-dev": {
18-
"phpunit/phpunit": "^9.5"
18+
"phpunit/phpunit": "^10.5.58"
1919
},
2020
"minimum-stability": "dev",
2121
"prefer-stable": true,

‎src/laravel/composer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
"require": {
1313
"php": ">=8.0.5",
1414
"illuminate/contracts": "^8.33",
15-
"symfony/runtime": "^5.4 || ^6.0 || ^7.0"
15+
"symfony/runtime": "^5.4 || ^6.0 || ^7.0 || ^8.0"
1616
},
1717
"require-dev": {
1818
"illuminate/http": "^8.33",
19-
"phpunit/phpunit": "^9.5",
20-
"symfony/console": "^5.4 || ^6.0 || ^7.0"
19+
"phpunit/phpunit": "^10.5.58",
20+
"symfony/console": "^5.4 || ^6.0 || ^7.0 || ^8.0"
2121
},
2222
"minimum-stability": "dev",
2323
"prefer-stable": true,

‎src/psr-17/composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
"nyholm/psr7-server": "^1.0",
1515
"psr/http-factory-implementation": "^1.0",
1616
"psr/http-server-handler": "^1.0",
17-
"symfony/runtime": "^5.4 || ^6.0 || ^7.0"
17+
"symfony/runtime": "^5.4.46 || ^6.0 || ^7.0 || ^8.0"
1818
},
1919
"require-dev": {
2020
"nyholm/psr7": "^1.4",
21-
"phpunit/phpunit": "^9.5"
21+
"phpunit/phpunit": "^10.5.58"
2222
},
2323
"minimum-stability": "dev",
2424
"prefer-stable": true,

‎src/psr-guzzle/composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
"php": ">=8.0.5",
1414
"guzzlehttp/psr7": "^1.8 || ^2.0",
1515
"psr/http-server-handler": "^1.0",
16-
"symfony/runtime": "^5.4 || ^6.0 || ^7.0"
16+
"symfony/runtime": "^5.4.46 || ^6.0 || ^7.0 || ^8.0"
1717
},
1818
"require-dev": {
19-
"phpunit/phpunit": "^9.5"
19+
"phpunit/phpunit": "^10.5.58"
2020
},
2121
"minimum-stability": "dev",
2222
"prefer-stable": true,

0 commit comments

Comments
 (0)