Skip to content

Commit 450168f

Browse files
WyriHaximusWyriHaximus
committed
[3.x] PHP8.5
1 parent 11b03a2 commit 450168f

File tree

7 files changed

+124
-41
lines changed

7 files changed

+124
-41
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ jobs:
1111
strategy:
1212
matrix:
1313
php:
14+
- 8.5
1415
- 8.4
1516
- 8.3
1617
- 8.2

‎tests/BrowserTest.php‎

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ public function setUpBrowser()
2525
$this->browser = new Browser(null, $this->loop);
2626

2727
$ref = new \ReflectionProperty($this->browser, 'transaction');
28-
$ref->setAccessible(true);
28+
if (PHP_VERSION_ID < 80100) {
29+
$ref->setAccessible(true);
30+
}
2931
$ref->setValue($this->browser, $this->sender);
3032
}
3133

@@ -34,11 +36,15 @@ public function testConstructWithoutLoopAssignsLoopAutomatically()
3436
$browser = new Browser();
3537

3638
$ref = new \ReflectionProperty($browser, 'transaction');
37-
$ref->setAccessible(true);
39+
if (PHP_VERSION_ID < 80100) {
40+
$ref->setAccessible(true);
41+
}
3842
$transaction = $ref->getValue($browser);
3943

4044
$ref = new \ReflectionProperty($transaction, 'loop');
41-
$ref->setAccessible(true);
45+
if (PHP_VERSION_ID < 80100) {
46+
$ref->setAccessible(true);
47+
}
4248
$loop = $ref->getValue($transaction);
4349

4450
$this->assertInstanceOf(LoopInterface::class, $loop);
@@ -51,23 +57,33 @@ public function testConstructWithConnectorAssignsGivenConnector()
5157
$browser = new Browser($connector);
5258

5359
$ref = new \ReflectionProperty($browser, 'transaction');
54-
$ref->setAccessible(true);
60+
if (PHP_VERSION_ID < 80100) {
61+
$ref->setAccessible(true);
62+
}
5563
$transaction = $ref->getValue($browser);
5664

5765
$ref = new \ReflectionProperty($transaction, 'sender');
58-
$ref->setAccessible(true);
66+
if (PHP_VERSION_ID < 80100) {
67+
$ref->setAccessible(true);
68+
}
5969
$sender = $ref->getValue($transaction);
6070

6171
$ref = new \ReflectionProperty($sender, 'http');
62-
$ref->setAccessible(true);
72+
if (PHP_VERSION_ID < 80100) {
73+
$ref->setAccessible(true);
74+
}
6375
$client = $ref->getValue($sender);
6476

6577
$ref = new \ReflectionProperty($client, 'connectionManager');
66-
$ref->setAccessible(true);
78+
if (PHP_VERSION_ID < 80100) {
79+
$ref->setAccessible(true);
80+
}
6781
$connectionManager = $ref->getValue($client);
6882

6983
$ref = new \ReflectionProperty($connectionManager, 'connector');
70-
$ref->setAccessible(true);
84+
if (PHP_VERSION_ID < 80100) {
85+
$ref->setAccessible(true);
86+
}
7187
$ret = $ref->getValue($connectionManager);
7288

7389
$this->assertSame($connector, $ret);
@@ -78,11 +94,15 @@ public function testConstructWithLoopAssignsGivenLoop()
7894
$browser = new Browser(null, $this->loop);
7995

8096
$ref = new \ReflectionProperty($browser, 'transaction');
81-
$ref->setAccessible(true);
97+
if (PHP_VERSION_ID < 80100) {
98+
$ref->setAccessible(true);
99+
}
82100
$transaction = $ref->getValue($browser);
83101

84102
$ref = new \ReflectionProperty($transaction, 'loop');
85-
$ref->setAccessible(true);
103+
if (PHP_VERSION_ID < 80100) {
104+
$ref->setAccessible(true);
105+
}
86106
$loop = $ref->getValue($transaction);
87107

88108
$this->assertSame($this->loop, $loop);

‎tests/HttpServerTest.php‎

Lines changed: 48 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,21 @@ public function testConstructWithoutLoopAssignsLoopAutomatically()
5858
$http = new HttpServer(function () { });
5959

6060
$ref = new \ReflectionProperty($http, 'streamingServer');
61-
$ref->setAccessible(true);
61+
if (PHP_VERSION_ID < 80100) {
62+
$ref->setAccessible(true);
63+
}
6264
$streamingServer = $ref->getValue($http);
6365

6466
$ref = new \ReflectionProperty($streamingServer, 'clock');
65-
$ref->setAccessible(true);
67+
if (PHP_VERSION_ID < 80100) {
68+
$ref->setAccessible(true);
69+
}
6670
$clock = $ref->getValue($streamingServer);
6771

6872
$ref = new \ReflectionProperty($clock, 'loop');
69-
$ref->setAccessible(true);
73+
if (PHP_VERSION_ID < 80100) {
74+
$ref->setAccessible(true);
75+
}
7076
$loop = $ref->getValue($clock);
7177

7278
$this->assertInstanceOf(LoopInterface::class, $loop);
@@ -331,7 +337,9 @@ public function testServerConcurrency($memory_limit, $post_max_size, $expectedCo
331337
$http = new HttpServer(function () { });
332338

333339
$ref = new \ReflectionMethod($http, 'getConcurrentRequestsLimit');
334-
$ref->setAccessible(true);
340+
if (PHP_VERSION_ID < 80100) {
341+
$ref->setAccessible(true);
342+
}
335343

336344
$value = $ref->invoke($http, $memory_limit, $post_max_size);
337345

@@ -343,7 +351,9 @@ public function testServerGetPostMaxSizeReturnsSizeFromGivenIniSetting()
343351
$http = new HttpServer(function () { });
344352

345353
$ref = new \ReflectionMethod($http, 'getMaxRequestSize');
346-
$ref->setAccessible(true);
354+
if (PHP_VERSION_ID < 80100) {
355+
$ref->setAccessible(true);
356+
}
347357

348358
$value = $ref->invoke($http, '1k');
349359

@@ -355,7 +365,9 @@ public function testServerGetPostMaxSizeReturnsSizeCappedFromGivenIniSetting()
355365
$http = new HttpServer(function () { });
356366

357367
$ref = new \ReflectionMethod($http, 'getMaxRequestSize');
358-
$ref->setAccessible(true);
368+
if (PHP_VERSION_ID < 80100) {
369+
$ref->setAccessible(true);
370+
}
359371

360372
$value = $ref->invoke($http, '1M');
361373

@@ -371,7 +383,9 @@ public function testServerGetPostMaxSizeFromIniIsCapped()
371383
$http = new HttpServer(function () { });
372384

373385
$ref = new \ReflectionMethod($http, 'getMaxRequestSize');
374-
$ref->setAccessible(true);
386+
if (PHP_VERSION_ID < 80100) {
387+
$ref->setAccessible(true);
388+
}
375389

376390
$value = $ref->invoke($http);
377391

@@ -388,17 +402,23 @@ public function testConstructServerWithUnlimitedMemoryLimitDoesNotLimitConcurren
388402
ini_set('memory_limit', $old);
389403

390404
$ref = new \ReflectionProperty($http, 'streamingServer');
391-
$ref->setAccessible(true);
405+
if (PHP_VERSION_ID < 80100) {
406+
$ref->setAccessible(true);
407+
}
392408

393409
$streamingServer = $ref->getValue($http);
394410

395411
$ref = new \ReflectionProperty($streamingServer, 'callback');
396-
$ref->setAccessible(true);
412+
if (PHP_VERSION_ID < 80100) {
413+
$ref->setAccessible(true);
414+
}
397415

398416
$middlewareRunner = $ref->getValue($streamingServer);
399417

400418
$ref = new \ReflectionProperty($middlewareRunner, 'middleware');
401-
$ref->setAccessible(true);
419+
if (PHP_VERSION_ID < 80100) {
420+
$ref->setAccessible(true);
421+
}
402422

403423
$middleware = $ref->getValue($middlewareRunner);
404424

@@ -418,17 +438,23 @@ public function testConstructServerWithMemoryLimitDoesLimitConcurrency()
418438
ini_set('memory_limit', $old);
419439

420440
$ref = new \ReflectionProperty($http, 'streamingServer');
421-
$ref->setAccessible(true);
441+
if (PHP_VERSION_ID < 80100) {
442+
$ref->setAccessible(true);
443+
}
422444

423445
$streamingServer = $ref->getValue($http);
424446

425447
$ref = new \ReflectionProperty($streamingServer, 'callback');
426-
$ref->setAccessible(true);
448+
if (PHP_VERSION_ID < 80100) {
449+
$ref->setAccessible(true);
450+
}
427451

428452
$middlewareRunner = $ref->getValue($streamingServer);
429453

430454
$ref = new \ReflectionProperty($middlewareRunner, 'middleware');
431-
$ref->setAccessible(true);
455+
if (PHP_VERSION_ID < 80100) {
456+
$ref->setAccessible(true);
457+
}
432458

433459
$middleware = $ref->getValue($middlewareRunner);
434460

@@ -441,17 +467,23 @@ public function testConstructFiltersOutConfigurationMiddlewareBefore()
441467
$http = new HttpServer(new StreamingRequestMiddleware(), function () { });
442468

443469
$ref = new \ReflectionProperty($http, 'streamingServer');
444-
$ref->setAccessible(true);
470+
if (PHP_VERSION_ID < 80100) {
471+
$ref->setAccessible(true);
472+
}
445473

446474
$streamingServer = $ref->getValue($http);
447475

448476
$ref = new \ReflectionProperty($streamingServer, 'callback');
449-
$ref->setAccessible(true);
477+
if (PHP_VERSION_ID < 80100) {
478+
$ref->setAccessible(true);
479+
}
450480

451481
$middlewareRunner = $ref->getValue($streamingServer);
452482

453483
$ref = new \ReflectionProperty($middlewareRunner, 'middleware');
454-
$ref->setAccessible(true);
484+
if (PHP_VERSION_ID < 80100) {
485+
$ref->setAccessible(true);
486+
}
455487

456488
$middleware = $ref->getValue($middlewareRunner);
457489

‎tests/Io/ClockTest.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ public function testNowResetsMemoizedTimestampOnFutureTick()
3333
$now = $clock->now();
3434

3535
$ref = new \ReflectionProperty($clock, 'now');
36-
$ref->setAccessible(true);
36+
if (PHP_VERSION_ID < 80100) {
37+
$ref->setAccessible(true);
38+
}
3739
$this->assertEquals($now, $ref->getValue($clock));
3840

3941
$this->assertNotNull($tick);

‎tests/Io/RequestHeaderParserTest.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -851,7 +851,9 @@ public function testServerParamsWillBeRememberedUntilConnectionIsClosed()
851851
$connection->emit('data', ["GET /foo HTTP/1.0\r\nHost: example.com\r\n\r\n"]);
852852

853853
$ref = new \ReflectionProperty($parser, 'connectionParams');
854-
$ref->setAccessible(true);
854+
if (PHP_VERSION_ID < 80100) {
855+
$ref->setAccessible(true);
856+
}
855857

856858
$this->assertCount(1, $ref->getValue($parser));
857859

‎tests/Io/StreamingServerTest.php‎

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2251,11 +2251,15 @@ public function testResponseWithoutExplicitDateHeaderWillAddCurrentDateFromClock
22512251
});
22522252

22532253
$ref = new \ReflectionProperty($server, 'clock');
2254-
$ref->setAccessible(true);
2254+
if (PHP_VERSION_ID < 80100) {
2255+
$ref->setAccessible(true);
2256+
}
22552257
$clock = $ref->getValue($server);
22562258

22572259
$ref = new \ReflectionProperty($clock, 'now');
2258-
$ref->setAccessible(true);
2260+
if (PHP_VERSION_ID < 80100) {
2261+
$ref->setAccessible(true);
2262+
}
22592263
$ref->setValue($clock, 1652972091.3958);
22602264

22612265
$buffer = '';
@@ -3052,7 +3056,9 @@ public function testNewConnectionWillInvokeParserOnce()
30523056
$parser->expects($this->once())->method('handle');
30533057

30543058
$ref = new \ReflectionProperty($server, 'parser');
3055-
$ref->setAccessible(true);
3059+
if (PHP_VERSION_ID < 80100) {
3060+
$ref->setAccessible(true);
3061+
}
30563062
$ref->setValue($server, $parser);
30573063

30583064
$server->listen($this->socket);
@@ -3069,7 +3075,9 @@ public function testNewConnectionWillInvokeParserOnceAndInvokeRequestHandlerWhen
30693075
$parser->expects($this->once())->method('handle');
30703076

30713077
$ref = new \ReflectionProperty($server, 'parser');
3072-
$ref->setAccessible(true);
3078+
if (PHP_VERSION_ID < 80100) {
3079+
$ref->setAccessible(true);
3080+
}
30733081
$ref->setValue($server, $parser);
30743082

30753083
$server->listen($this->socket);
@@ -3092,7 +3100,9 @@ public function testNewConnectionWillInvokeParserOnceAndInvokeRequestHandlerWhen
30923100
$parser->expects($this->once())->method('handle');
30933101

30943102
$ref = new \ReflectionProperty($server, 'parser');
3095-
$ref->setAccessible(true);
3103+
if (PHP_VERSION_ID < 80100) {
3104+
$ref->setAccessible(true);
3105+
}
30963106
$ref->setValue($server, $parser);
30973107

30983108
$server->listen($this->socket);
@@ -3117,7 +3127,9 @@ public function testNewConnectionWillInvokeParserOnceAndInvokeRequestHandlerWhen
31173127
$parser->expects($this->once())->method('handle');
31183128

31193129
$ref = new \ReflectionProperty($server, 'parser');
3120-
$ref->setAccessible(true);
3130+
if (PHP_VERSION_ID < 80100) {
3131+
$ref->setAccessible(true);
3132+
}
31213133
$ref->setValue($server, $parser);
31223134

31233135
$server->listen($this->socket);
@@ -3142,7 +3154,9 @@ public function testNewConnectionWillInvokeParserTwiceAfterInvokingRequestHandle
31423154
$parser->expects($this->exactly(2))->method('handle');
31433155

31443156
$ref = new \ReflectionProperty($server, 'parser');
3145-
$ref->setAccessible(true);
3157+
if (PHP_VERSION_ID < 80100) {
3158+
$ref->setAccessible(true);
3159+
}
31463160
$ref->setValue($server, $parser);
31473161

31483162
$server->listen($this->socket);
@@ -3167,7 +3181,9 @@ public function testNewConnectionWillInvokeParserTwiceAfterInvokingRequestHandle
31673181
$parser->expects($this->exactly(2))->method('handle');
31683182

31693183
$ref = new \ReflectionProperty($server, 'parser');
3170-
$ref->setAccessible(true);
3184+
if (PHP_VERSION_ID < 80100) {
3185+
$ref->setAccessible(true);
3186+
}
31713187
$ref->setValue($server, $parser);
31723188

31733189
$server->listen($this->socket);
@@ -3193,7 +3209,9 @@ public function testNewConnectionWillInvokeParserOnceAfterInvokingRequestHandler
31933209
$parser->expects($this->once())->method('handle');
31943210

31953211
$ref = new \ReflectionProperty($server, 'parser');
3196-
$ref->setAccessible(true);
3212+
if (PHP_VERSION_ID < 80100) {
3213+
$ref->setAccessible(true);
3214+
}
31973215
$ref->setValue($server, $parser);
31983216

31993217
$server->listen($this->socket);
@@ -3219,7 +3237,9 @@ public function testNewConnectionWillInvokeParserTwiceAfterInvokingRequestHandle
32193237
$parser->expects($this->exactly(2))->method('handle');
32203238

32213239
$ref = new \ReflectionProperty($server, 'parser');
3222-
$ref->setAccessible(true);
3240+
if (PHP_VERSION_ID < 80100) {
3241+
$ref->setAccessible(true);
3242+
}
32233243
$ref->setValue($server, $parser);
32243244

32253245
$server->listen($this->socket);

0 commit comments

Comments
 (0)