Skip to content

Improve PHP 8.5+ support by updating to Promise v3.3 and avoiding deprecated setAccessible() calls in tests #282

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Aug 19, 2025
Merged

Improve PHP 8.5+ support by updating to Promise v3.3 and avoiding deprecated setAccessible() calls in tests #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11eb3f1
Improve PHP 8.5+ support by avoiding deprecated reflection in tests
clue Aug 19, 2025
279571a
Improve PHP 8.5+ support by updating to Promise v3.3
clue Aug 19, 2025
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
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"nikic/fast-route": "^1.3",
"react/async": "^4.3 || ^3.1",
"react/http": "^1.11",
"react/promise": "^3.2",
"react/promise": "^3.3",
"react/socket": "^1.15"
},
"require-dev": {
Expand Down
68 changes: 51 additions & 17 deletions tests/AccessLogHandlerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,9 @@ public function testInvokeLogsRequest(): void
$logger = $this->createMock(LogStreamHandler::class);
// $handler->logger = $logger;
$ref = new \ReflectionProperty($handler, 'logger');
$ref->setAccessible(true);
if (PHP_VERSION_ID < 80100) {
$ref->setAccessible(true);
}
$ref->setValue($handler, $logger);

$request = new ServerRequest('GET', 'http://localhost:8080/users', [], '', '1.1', ['REMOTE_ADDR' => '127.0.0.1']);
Expand All @@ -154,7 +156,9 @@ public function testInvokeLogsRequestWithEncodedQueryParameters(): void
$logger = $this->createMock(LogStreamHandler::class);
// $handler->logger = $logger;
$ref = new \ReflectionProperty($handler, 'logger');
$ref->setAccessible(true);
if (PHP_VERSION_ID < 80100) {
$ref->setAccessible(true);
}
$ref->setValue($handler, $logger);

$request = new ServerRequest('GET', 'http://localhost:8080/?a=1&b=hello wörld', [], '', '1.1', ['REMOTE_ADDR' => '127.0.0.1']);
Expand All @@ -172,7 +176,9 @@ public function testInvokeLogsRequestWithEscapedSpecialCharactersInRequestMethod
$logger = $this->createMock(LogStreamHandler::class);
// $handler->logger = $logger;
$ref = new \ReflectionProperty($handler, 'logger');
$ref->setAccessible(true);
if (PHP_VERSION_ID < 80100) {
$ref->setAccessible(true);
}
$ref->setValue($handler, $logger);

$request = new ServerRequest('GE"T', 'http://localhost:8080/wörld', [], '', '1.1', ['REMOTE_ADDR' => '127.0.0.1']);
Expand All @@ -191,7 +197,9 @@ public function testInvokeLogsRequestForHeadRequestWithResponseSizeAsZero(): voi
$logger = $this->createMock(LogStreamHandler::class);
// $handler->logger = $logger;
$ref = new \ReflectionProperty($handler, 'logger');
$ref->setAccessible(true);
if (PHP_VERSION_ID < 80100) {
$ref->setAccessible(true);
}
$ref->setValue($handler, $logger);

$request = new ServerRequest('HEAD', 'http://localhost:8080/users', [], '', '1.1', ['REMOTE_ADDR' => '127.0.0.1']);
Expand All @@ -209,7 +217,9 @@ public function testInvokeLogsRequestForNoContentResponseWithResponseSizeAsZero(
$logger = $this->createMock(LogStreamHandler::class);
// $handler->logger = $logger;
$ref = new \ReflectionProperty($handler, 'logger');
$ref->setAccessible(true);
if (PHP_VERSION_ID < 80100) {
$ref->setAccessible(true);
}
$ref->setValue($handler, $logger);

$request = new ServerRequest('GET', 'http://localhost:8080/users', [], '', '1.1', ['REMOTE_ADDR' => '127.0.0.1']);
Expand All @@ -227,7 +237,9 @@ public function testInvokeLogsRequestForNotModifiedResponseWithResponseSizeAsZer
$logger = $this->createMock(LogStreamHandler::class);
// $handler->logger = $logger;
$ref = new \ReflectionProperty($handler, 'logger');
$ref->setAccessible(true);
if (PHP_VERSION_ID < 80100) {
$ref->setAccessible(true);
}
$ref->setValue($handler, $logger);

$request = new ServerRequest('GET', 'http://localhost:8080/users', [], '', '1.1', ['REMOTE_ADDR' => '127.0.0.1']);
Expand All @@ -245,7 +257,9 @@ public function testInvokeWithPlainProxyRequestLogsRequestWithRequestTargetInOri
$logger = $this->createMock(LogStreamHandler::class);
// $handler->logger = $logger;
$ref = new \ReflectionProperty($handler, 'logger');
$ref->setAccessible(true);
if (PHP_VERSION_ID < 80100) {
$ref->setAccessible(true);
}
$ref->setValue($handler, $logger);

$request = new ServerRequest('GET', 'http://localhost:8080/users', [], '', '1.1', ['REMOTE_ADDR' => '127.0.0.1']);
Expand All @@ -264,7 +278,9 @@ public function testInvokeWithConnectProxyRequestLogsRequestWithRequestTargetInA
$logger = $this->createMock(LogStreamHandler::class);
// $handler->logger = $logger;
$ref = new \ReflectionProperty($handler, 'logger');
$ref->setAccessible(true);
if (PHP_VERSION_ID < 80100) {
$ref->setAccessible(true);
}
$ref->setValue($handler, $logger);

$request = new ServerRequest('CONNECT', 'example.com:8080', [], '', '1.1', ['REMOTE_ADDR' => '127.0.0.1']);
Expand All @@ -283,7 +299,9 @@ public function testInvokeWithOptionsAsteriskRequestLogsRequestWithRequestTarget
$logger = $this->createMock(LogStreamHandler::class);
// $handler->logger = $logger;
$ref = new \ReflectionProperty($handler, 'logger');
$ref->setAccessible(true);
if (PHP_VERSION_ID < 80100) {
$ref->setAccessible(true);
}
$ref->setValue($handler, $logger);

$request = new ServerRequest('OPTIONS', 'http://example.com:8080', [], '', '1.1', ['REMOTE_ADDR' => '127.0.0.1']);
Expand All @@ -302,7 +320,9 @@ public function testInvokeWithDeferredNextLogsRequest(): void
$logger = $this->createMock(LogStreamHandler::class);
// $handler->logger = $logger;
$ref = new \ReflectionProperty($handler, 'logger');
$ref->setAccessible(true);
if (PHP_VERSION_ID < 80100) {
$ref->setAccessible(true);
}
$ref->setValue($handler, $logger);

$request = new ServerRequest('GET', 'http://localhost:8080/users', [], '', '1.1', ['REMOTE_ADDR' => '127.0.0.1']);
Expand All @@ -320,7 +340,9 @@ public function testInvokeWithCoroutineNextLogsRequest(): void
$logger = $this->createMock(LogStreamHandler::class);
// $handler->logger = $logger;
$ref = new \ReflectionProperty($handler, 'logger');
$ref->setAccessible(true);
if (PHP_VERSION_ID < 80100) {
$ref->setAccessible(true);
}
$ref->setValue($handler, $logger);

$request = new ServerRequest('GET', 'http://localhost:8080/users', [], '', '1.1', ['REMOTE_ADDR' => '127.0.0.1']);
Expand Down Expand Up @@ -348,7 +370,9 @@ public function testInvokeWithStreamingResponseLogsRequest(): void
$logger = $this->createMock(LogStreamHandler::class);
// $handler->logger = $logger;
$ref = new \ReflectionProperty($handler, 'logger');
$ref->setAccessible(true);
if (PHP_VERSION_ID < 80100) {
$ref->setAccessible(true);
}
$ref->setValue($handler, $logger);

$stream = new ThroughStream();
Expand All @@ -369,7 +393,9 @@ public function testInvokeWithStreamingResponseThatClosesAfterSomeTimeLogsReques
$logger = $this->createMock(LogStreamHandler::class);
// $handler->logger = $logger;
$ref = new \ReflectionProperty($handler, 'logger');
$ref->setAccessible(true);
if (PHP_VERSION_ID < 80100) {
$ref->setAccessible(true);
}
$ref->setValue($handler, $logger);

$stream = new ThroughStream();
Expand All @@ -391,7 +417,9 @@ public function testInvokeWithClosedStreamingResponseLogsRequest(): void
$logger = $this->createMock(LogStreamHandler::class);
// $handler->logger = $logger;
$ref = new \ReflectionProperty($handler, 'logger');
$ref->setAccessible(true);
if (PHP_VERSION_ID < 80100) {
$ref->setAccessible(true);
}
$ref->setValue($handler, $logger);

$stream = new ThroughStream();
Expand All @@ -411,7 +439,9 @@ public function testInvokeWithStreamingResponsePrintsNothingIfStreamIsPending():
$logger = $this->createMock(LogStreamHandler::class);
// $handler->logger = $logger;
$ref = new \ReflectionProperty($handler, 'logger');
$ref->setAccessible(true);
if (PHP_VERSION_ID < 80100) {
$ref->setAccessible(true);
}
$ref->setValue($handler, $logger);

$stream = new ThroughStream();
Expand All @@ -430,7 +460,9 @@ public function testInvokeWithRemoteAddrAttributeLogsRequestWithIpFromAttribute(
$logger = $this->createMock(LogStreamHandler::class);
// $handler->logger = $logger;
$ref = new \ReflectionProperty($handler, 'logger');
$ref->setAccessible(true);
if (PHP_VERSION_ID < 80100) {
$ref->setAccessible(true);
}
$ref->setValue($handler, $logger);

$request = new ServerRequest('GET', 'http://localhost:8080/users', [], '', '1.1', ['REMOTE_ADDR' => '127.0.0.1']);
Expand All @@ -449,7 +481,9 @@ public function testInvokeWithoutRemoteAddressLogsRequestWithDashAsPlaceholder()
$logger = $this->createMock(LogStreamHandler::class);
// $handler->logger = $logger;
$ref = new \ReflectionProperty($handler, 'logger');
$ref->setAccessible(true);
if (PHP_VERSION_ID < 80100) {
$ref->setAccessible(true);
}
$ref->setValue($handler, $logger);

$request = new ServerRequest('GET', 'http://localhost:8080/users');
Expand Down
36 changes: 27 additions & 9 deletions tests/AppMiddlewareTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ public function testGetMethodWithMiddlewareAddsGetRouteOnRouter(): void
$router->expects($this->once())->method('map')->with(['GET'], '/', $middleware, $controller);

$ref = new \ReflectionProperty($app, 'router');
$ref->setAccessible(true);
if (PHP_VERSION_ID < 80100) {
$ref->setAccessible(true);
}
$ref->setValue($app, $router);

$app->get('/', $middleware, $controller);
Expand All @@ -44,7 +46,9 @@ public function testHeadMethodWithMiddlewareAddsHeadRouteOnRouter(): void
$router->expects($this->once())->method('map')->with(['HEAD'], '/', $middleware, $controller);

$ref = new \ReflectionProperty($app, 'router');
$ref->setAccessible(true);
if (PHP_VERSION_ID < 80100) {
$ref->setAccessible(true);
}
$ref->setValue($app, $router);

$app->head('/', $middleware, $controller);
Expand All @@ -61,7 +65,9 @@ public function testPostMethodWithMiddlewareAddsPostRouteOnRouter(): void
$router->expects($this->once())->method('map')->with(['POST'], '/', $middleware, $controller);

$ref = new \ReflectionProperty($app, 'router');
$ref->setAccessible(true);
if (PHP_VERSION_ID < 80100) {
$ref->setAccessible(true);
}
$ref->setValue($app, $router);

$app->post('/', $middleware, $controller);
Expand All @@ -78,7 +84,9 @@ public function testPutMethodWithMiddlewareAddsPutRouteOnRouter(): void
$router->expects($this->once())->method('map')->with(['PUT'], '/', $middleware, $controller);

$ref = new \ReflectionProperty($app, 'router');
$ref->setAccessible(true);
if (PHP_VERSION_ID < 80100) {
$ref->setAccessible(true);
}
$ref->setValue($app, $router);

$app->put('/', $middleware, $controller);
Expand All @@ -95,7 +103,9 @@ public function testPatchMethodWithMiddlewareAddsPatchRouteOnRouter(): void
$router->expects($this->once())->method('map')->with(['PATCH'], '/', $middleware, $controller);

$ref = new \ReflectionProperty($app, 'router');
$ref->setAccessible(true);
if (PHP_VERSION_ID < 80100) {
$ref->setAccessible(true);
}
$ref->setValue($app, $router);

$app->patch('/', $middleware, $controller);
Expand All @@ -112,7 +122,9 @@ public function testDeleteMethodWithMiddlewareAddsDeleteRouteOnRouter(): void
$router->expects($this->once())->method('map')->with(['DELETE'], '/', $middleware, $controller);

$ref = new \ReflectionProperty($app, 'router');
$ref->setAccessible(true);
if (PHP_VERSION_ID < 80100) {
$ref->setAccessible(true);
}
$ref->setValue($app, $router);

$app->delete('/', $middleware, $controller);
Expand All @@ -129,7 +141,9 @@ public function testOptionsMethodWithMiddlewareAddsOptionsRouteOnRouter(): void
$router->expects($this->once())->method('map')->with(['OPTIONS'], '/', $middleware, $controller);

$ref = new \ReflectionProperty($app, 'router');
$ref->setAccessible(true);
if (PHP_VERSION_ID < 80100) {
$ref->setAccessible(true);
}
$ref->setValue($app, $router);

$app->options('/', $middleware, $controller);
Expand All @@ -146,7 +160,9 @@ public function testAnyMethodWithMiddlewareAddsAllHttpMethodsOnRouter(): void
$router->expects($this->once())->method('map')->with(['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'], '/', $middleware, $controller);

$ref = new \ReflectionProperty($app, 'router');
$ref->setAccessible(true);
if (PHP_VERSION_ID < 80100) {
$ref->setAccessible(true);
}
$ref->setValue($app, $router);

$app->any('/', $middleware, $controller);
Expand All @@ -163,7 +179,9 @@ public function testMapMethodWithMiddlewareAddsGivenMethodsOnRouter(): void
$router->expects($this->once())->method('map')->with(['GET', 'POST'], '/', $middleware, $controller);

$ref = new \ReflectionProperty($app, 'router');
$ref->setAccessible(true);
if (PHP_VERSION_ID < 80100) {
$ref->setAccessible(true);
}
$ref->setValue($app, $router);

$app->map(['GET', 'POST'], '/', $middleware, $controller);
Expand Down
Loading