diff --git a/composer.json b/composer.json index 378bc0c..e74b525 100644 --- a/composer.json +++ b/composer.json @@ -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": { diff --git a/tests/AccessLogHandlerTest.php b/tests/AccessLogHandlerTest.php index 11d714d..f3bfeb5 100644 --- a/tests/AccessLogHandlerTest.php +++ b/tests/AccessLogHandlerTest.php @@ -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']); @@ -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']); @@ -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']); @@ -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']); @@ -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']); @@ -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']); @@ -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']); @@ -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']); @@ -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']); @@ -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']); @@ -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']); @@ -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(); @@ -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(); @@ -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(); @@ -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(); @@ -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']); @@ -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'); diff --git a/tests/AppMiddlewareTest.php b/tests/AppMiddlewareTest.php index 36f6a61..7380eec 100644 --- a/tests/AppMiddlewareTest.php +++ b/tests/AppMiddlewareTest.php @@ -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); @@ -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); @@ -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); @@ -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); @@ -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); @@ -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); @@ -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); @@ -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); @@ -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); diff --git a/tests/AppTest.php b/tests/AppTest.php index b27919f..bb421e6 100644 --- a/tests/AppTest.php +++ b/tests/AppTest.php @@ -42,12 +42,16 @@ public function testConstructWithMiddlewareAssignsGivenMiddleware(): void $app = new App($middleware); $ref = new ReflectionProperty($app, 'handler'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handler = $ref->getValue($app); assert($handler instanceof MiddlewareHandler); $ref = new ReflectionProperty($handler, 'handlers'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handlers = $ref->getValue($handler); assert(is_array($handlers)); @@ -71,12 +75,16 @@ public function testConstructWithContainerAssignsDefaultHandlersAndContainerForR $app = new App($container); $ref = new ReflectionProperty($app, 'handler'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handler = $ref->getValue($app); assert($handler instanceof MiddlewareHandler); $ref = new ReflectionProperty($handler, 'handlers'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handlers = $ref->getValue($handler); assert(is_array($handlers)); @@ -87,7 +95,9 @@ public function testConstructWithContainerAssignsDefaultHandlersAndContainerForR $routeHandler = $handlers[2]; $ref = new ReflectionProperty($routeHandler, 'container'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $this->assertSame($container, $ref->getValue($routeHandler)); } @@ -102,12 +112,16 @@ public function testConstructWithContainerAndMiddlewareClassNameAssignsCallableF $app = new App($container, \stdClass::class); $ref = new ReflectionProperty($app, 'handler'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handler = $ref->getValue($app); assert($handler instanceof MiddlewareHandler); $ref = new ReflectionProperty($handler, 'handlers'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handlers = $ref->getValue($handler); assert(is_array($handlers)); @@ -119,7 +133,9 @@ public function testConstructWithContainerAndMiddlewareClassNameAssignsCallableF $routeHandler = $handlers[3]; $ref = new ReflectionProperty($routeHandler, 'container'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $this->assertSame($container, $ref->getValue($routeHandler)); } @@ -130,12 +146,16 @@ public function testConstructWithErrorHandlerOnlyAssignsErrorHandlerAfterDefault $app = new App($errorHandler); $ref = new ReflectionProperty($app, 'handler'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handler = $ref->getValue($app); assert($handler instanceof MiddlewareHandler); $ref = new ReflectionProperty($handler, 'handlers'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handlers = $ref->getValue($handler); assert(is_array($handlers)); @@ -150,12 +170,16 @@ public function testConstructWithErrorHandlerClassOnlyAssignsErrorHandlerAfterDe $app = new App(ErrorHandler::class); $ref = new ReflectionProperty($app, 'handler'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handler = $ref->getValue($app); assert($handler instanceof MiddlewareHandler); $ref = new ReflectionProperty($handler, 'handlers'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handlers = $ref->getValue($handler); assert(is_array($handlers)); @@ -172,12 +196,16 @@ public function testConstructWithContainerAndErrorHandlerAssignsErrorHandlerAfte $app = new App(new Container(), $errorHandler); $ref = new ReflectionProperty($app, 'handler'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handler = $ref->getValue($app); assert($handler instanceof MiddlewareHandler); $ref = new ReflectionProperty($handler, 'handlers'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handlers = $ref->getValue($handler); assert(is_array($handlers)); @@ -198,12 +226,16 @@ public function testConstructWithContainerAndErrorHandlerClassAssignsErrorHandle $app = new App($container, ErrorHandler::class); $ref = new ReflectionProperty($app, 'handler'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handler = $ref->getValue($app); assert($handler instanceof MiddlewareHandler); $ref = new ReflectionProperty($handler, 'handlers'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handlers = $ref->getValue($handler); assert(is_array($handlers)); @@ -228,12 +260,16 @@ public function testConstructWithMultipleContainersAndErrorHandlerClassAssignsEr $app = new App($unused, $container, ErrorHandler::class, $unused); $ref = new ReflectionProperty($app, 'handler'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handler = $ref->getValue($app); assert($handler instanceof MiddlewareHandler); $ref = new ReflectionProperty($handler, 'handlers'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handlers = $ref->getValue($handler); assert(is_array($handlers)); @@ -259,12 +295,16 @@ public function testConstructWithMultipleContainersAndMiddlewareAssignsErrorHand $app = new App($unused, $container, $middleware, $unused); $ref = new ReflectionProperty($app, 'handler'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handler = $ref->getValue($app); assert($handler instanceof MiddlewareHandler); $ref = new ReflectionProperty($handler, 'handlers'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handlers = $ref->getValue($handler); assert(is_array($handlers)); @@ -283,12 +323,16 @@ public function testConstructWithMiddlewareAndErrorHandlerAssignsGivenErrorHandl $app = new App($middleware, $errorHandler); $ref = new ReflectionProperty($app, 'handler'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handler = $ref->getValue($app); assert($handler instanceof MiddlewareHandler); $ref = new ReflectionProperty($handler, 'handlers'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handlers = $ref->getValue($handler); assert(is_array($handlers)); @@ -322,12 +366,16 @@ public function testConstructWithMultipleContainersAndMiddlewareAndErrorHandlerC $app = new App($unused, $container1, $middleware, $container2, ErrorHandler::class, $unused); $ref = new ReflectionProperty($app, 'handler'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handler = $ref->getValue($app); assert($handler instanceof MiddlewareHandler); $ref = new ReflectionProperty($handler, 'handlers'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handlers = $ref->getValue($handler); assert(is_array($handlers)); @@ -347,12 +395,16 @@ public function testConstructWithAccessLogHandlerAndErrorHandlerAssignsHandlersA $app = new App($accessLogHandler, $errorHandler); $ref = new ReflectionProperty($app, 'handler'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handler = $ref->getValue($app); assert($handler instanceof MiddlewareHandler); $ref = new ReflectionProperty($handler, 'handlers'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handlers = $ref->getValue($handler); assert(is_array($handlers)); @@ -373,12 +425,16 @@ public function testConstructWithAccessLogHandlerToDevNullAndErrorHandlerWillRem $app = new App($accessLogHandler, $errorHandler); $ref = new ReflectionProperty($app, 'handler'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handler = $ref->getValue($app); assert($handler instanceof MiddlewareHandler); $ref = new ReflectionProperty($handler, 'handlers'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handlers = $ref->getValue($handler); assert(is_array($handlers)); @@ -392,12 +448,16 @@ public function testConstructWithAccessLogHandlerClassAndErrorHandlerClassAssign $app = new App(AccessLogHandler::class, ErrorHandler::class); $ref = new ReflectionProperty($app, 'handler'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handler = $ref->getValue($app); assert($handler instanceof MiddlewareHandler); $ref = new ReflectionProperty($handler, 'handlers'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handlers = $ref->getValue($handler); assert(is_array($handlers)); @@ -420,12 +480,16 @@ public function testConstructWithContainerAndAccessLogHandlerClassAndErrorHandle $app = new App($container, AccessLogHandler::class, ErrorHandler::class); $ref = new ReflectionProperty($app, 'handler'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handler = $ref->getValue($app); assert($handler instanceof MiddlewareHandler); $ref = new ReflectionProperty($handler, 'handlers'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handlers = $ref->getValue($handler); assert(is_array($handlers)); @@ -450,12 +514,16 @@ public function testConstructWithContainerAndAccessLogHandlerClassAndErrorHandle $app = new App($container, AccessLogHandler::class, ErrorHandler::class); $ref = new ReflectionProperty($app, 'handler'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handler = $ref->getValue($app); assert($handler instanceof MiddlewareHandler); $ref = new ReflectionProperty($handler, 'handlers'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handlers = $ref->getValue($handler); assert(is_array($handlers)); @@ -473,12 +541,16 @@ public function testConstructWithMiddlewareBeforeAccessLogHandlerAndErrorHandler $app = new App($middleware, $accessLog, $errorHandler); $ref = new ReflectionProperty($app, 'handler'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handler = $ref->getValue($app); assert($handler instanceof MiddlewareHandler); $ref = new ReflectionProperty($handler, 'handlers'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handlers = $ref->getValue($handler); assert(is_array($handlers)); @@ -508,12 +580,16 @@ public function testConstructWithMultipleContainersAndAccessLogHandlerClassAndEr $app = new App($unused, $container, AccessLogHandler::class, ErrorHandler::class, $unused); $ref = new ReflectionProperty($app, 'handler'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handler = $ref->getValue($app); assert($handler instanceof MiddlewareHandler); $ref = new ReflectionProperty($handler, 'handlers'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handlers = $ref->getValue($handler); assert(is_array($handlers)); @@ -544,12 +620,16 @@ public function testConstructWithMultipleContainersAndMiddlewareAssignsDefaultHa $app = new App($unused, $container, $middleware, $unused); $ref = new ReflectionProperty($app, 'handler'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handler = $ref->getValue($app); assert($handler instanceof MiddlewareHandler); $ref = new ReflectionProperty($handler, 'handlers'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $handlers = $ref->getValue($handler); assert(is_array($handlers)); @@ -587,13 +667,17 @@ public function testConstructWithContainerWithListenAddressWillPassListenAddress // $sapi = $app->sapi; $ref = new \ReflectionProperty($app, 'sapi'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $sapi = $ref->getValue($app); assert($sapi instanceof ReactiveHandler); // $listenAddress = $sapi->listenAddress; $ref = new \ReflectionProperty($sapi, 'listenAddress'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $listenAddress = $ref->getValue($sapi); $this->assertEquals('0.0.0.0:8081', $listenAddress); @@ -608,7 +692,9 @@ public function testRunWillExecuteRunOnSapiHandler(): void // $app->sapi = $sapi; $ref = new \ReflectionProperty($app, 'sapi'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $ref->setValue($app, $sapi); $app->run(); @@ -622,7 +708,9 @@ public function testGetMethodAddsGetRouteOnRouter(): void $router->expects($this->once())->method('map')->with(['GET'], '/', $this->anything()); $ref = new ReflectionProperty($app, 'router'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $ref->setValue($app, $router); $app->get('/', function () { }); @@ -636,7 +724,9 @@ public function testHeadMethodAddsHeadRouteOnRouter(): void $router->expects($this->once())->method('map')->with(['HEAD'], '/', $this->anything()); $ref = new ReflectionProperty($app, 'router'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $ref->setValue($app, $router); $app->head('/', function () { }); @@ -650,7 +740,9 @@ public function testPostMethodAddsPostRouteOnRouter(): void $router->expects($this->once())->method('map')->with(['POST'], '/', $this->anything()); $ref = new ReflectionProperty($app, 'router'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $ref->setValue($app, $router); $app->post('/', function () { }); @@ -664,7 +756,9 @@ public function testPutMethodAddsPutRouteOnRouter(): void $router->expects($this->once())->method('map')->with(['PUT'], '/', $this->anything()); $ref = new ReflectionProperty($app, 'router'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $ref->setValue($app, $router); $app->put('/', function () { }); @@ -678,7 +772,9 @@ public function testPatchMethodAddsPatchRouteOnRouter(): void $router->expects($this->once())->method('map')->with(['PATCH'], '/', $this->anything()); $ref = new ReflectionProperty($app, 'router'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $ref->setValue($app, $router); $app->patch('/', function () { }); @@ -692,7 +788,9 @@ public function testDeleteMethodAddsDeleteRouteOnRouter(): void $router->expects($this->once())->method('map')->with(['DELETE'], '/', $this->anything()); $ref = new ReflectionProperty($app, 'router'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $ref->setValue($app, $router); $app->delete('/', function () { }); @@ -706,7 +804,9 @@ public function testOptionsMethodAddsOptionsRouteOnRouter(): void $router->expects($this->once())->method('map')->with(['OPTIONS'], '/', $this->anything()); $ref = new ReflectionProperty($app, 'router'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $ref->setValue($app, $router); $app->options('/', function () { }); @@ -720,7 +820,9 @@ public function testAnyMethodAddsRouteOnRouter(): void $router->expects($this->once())->method('map')->with(['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'], '/', $this->anything()); $ref = new ReflectionProperty($app, 'router'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $ref->setValue($app, $router); $app->any('/', function () { }); @@ -734,7 +836,9 @@ public function testMapMethodAddsRouteOnRouter(): void $router->expects($this->once())->method('map')->with(['GET', 'POST'], '/', $this->anything()); $ref = new ReflectionProperty($app, 'router'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $ref->setValue($app, $router); $app->map(['GET', 'POST'], '/', function () { }); @@ -768,7 +872,9 @@ public function testRedirectMethodAddsAnyRouteOnRouterWhichWhenInvokedReturnsRed })); $ref = new ReflectionProperty($app, 'router'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $ref->setValue($app, $router); $app->redirect('/', '/users'); @@ -800,7 +906,9 @@ public function testRedirectMethodWithCustomRedirectCodeAddsAnyRouteOnRouterWhic })); $ref = new ReflectionProperty($app, 'router'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $ref->setValue($app, $router); $app->redirect('/', '/users', 307); diff --git a/tests/ErrorHandlerTest.php b/tests/ErrorHandlerTest.php index 739a5ce..cc5ea02 100644 --- a/tests/ErrorHandlerTest.php +++ b/tests/ErrorHandlerTest.php @@ -422,7 +422,9 @@ public function testErrorInvalidExceptionReturnsError500(string $in, string $exp // $response = $handler->errorInvalidException($e); $ref = new \ReflectionMethod($handler, 'errorInvalidException'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $response = $ref->invoke($handler, $e); assert($response instanceof ResponseInterface); @@ -480,7 +482,9 @@ public function testErrorInvalidResponseReturnsError500($value, string $name): v // $response = $handler->errorInvalidResponse($value); $ref = new \ReflectionMethod($handler, 'errorInvalidResponse'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $response = $ref->invoke($handler, $value); assert($response instanceof ResponseInterface); @@ -502,7 +506,9 @@ public function testErrorInvalidCoroutineReturnsError500($value, string $name): // $response = $handler->errorInvalidCoroutine($value, $file, $line); $ref = new \ReflectionMethod($handler, 'errorInvalidCoroutine'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $response = $ref->invoke($handler, $value, $file, $line); assert($response instanceof ResponseInterface); diff --git a/tests/Io/LogStreamHandlerTest.php b/tests/Io/LogStreamHandlerTest.php index 2e8248a..8c773e7 100644 --- a/tests/Io/LogStreamHandlerTest.php +++ b/tests/Io/LogStreamHandlerTest.php @@ -200,7 +200,9 @@ public function testLogWithMemoryStreamWritesMessageWithCurrentDateAndTime(): vo $logger->log('Hello'); $ref = new \ReflectionProperty($logger, 'stream'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $stream = $ref->getValue($logger); assert(is_resource($stream)); diff --git a/tests/Io/ReactiveHandlerTest.php b/tests/Io/ReactiveHandlerTest.php index a0c1b83..e4a2fbb 100644 --- a/tests/Io/ReactiveHandlerTest.php +++ b/tests/Io/ReactiveHandlerTest.php @@ -30,7 +30,9 @@ public function testRunWillReportDefaultListeningAddressAndRunLoop(): void // $handler->logger = $logger; $ref = new \ReflectionProperty($handler, 'logger'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $ref->setValue($handler, $logger); // lovely: remove socket server on next tick to terminate loop @@ -63,7 +65,9 @@ public function testRunWillReportGivenListeningAddressAndRunLoop(): void // $handler->logger = $logger; $ref = new \ReflectionProperty($handler, 'logger'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $ref->setValue($handler, $logger); // lovely: remove socket server on next tick to terminate loop @@ -90,7 +94,9 @@ public function testRunWillReportGivenListeningAddressWithRandomPortAndRunLoop() // $handler->logger = $logger; $ref = new \ReflectionProperty($handler, 'logger'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $ref->setValue($handler, $logger); // lovely: remove socket server on next tick to terminate loop @@ -116,7 +122,9 @@ public function testRunWillRestartLoopUntilSocketIsClosed(): void // $handler->logger = $logger; $ref = new \ReflectionProperty($handler, 'logger'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $ref->setValue($handler, $logger); // lovely: remove socket server on next tick to terminate loop @@ -153,7 +161,9 @@ public function testRunWillListenForHttpRequestAndSendBackHttpResponseOverSocket // $handler->logger = $logger; $ref = new \ReflectionProperty($handler, 'logger'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $ref->setValue($handler, $logger); Loop::futureTick(function () use ($addr): void { @@ -202,7 +212,9 @@ public function testRunWillOnlyRestartLoopAfterAwaitingWhenFibersAreNotAvailable // $handler->logger = $logger; $ref = new \ReflectionProperty($handler, 'logger'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $ref->setValue($handler, $logger); Loop::futureTick(function () use ($addr, $logger): void { @@ -270,7 +282,9 @@ public function testRunWillReportHttpErrorForInvalidClientRequest(): void // $handler->logger = $logger; $ref = new \ReflectionProperty($handler, 'logger'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $ref->setValue($handler, $logger); Loop::futureTick(function () use ($addr, $logger): void { @@ -313,7 +327,9 @@ public function testRunWillStopWhenReceivingSigint(): void // $handler->logger = $logger; $ref = new \ReflectionProperty($handler, 'logger'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $ref->setValue($handler, $logger); Loop::futureTick(function () use ($logger) { @@ -340,7 +356,9 @@ public function testRunWillStopWhenReceivingSigterm(): void // $handler->logger = $logger; $ref = new \ReflectionProperty($handler, 'logger'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $ref->setValue($handler, $logger); Loop::futureTick(function () use ($logger) { diff --git a/tests/Io/RouteHandlerTest.php b/tests/Io/RouteHandlerTest.php index e76b3a9..a89fc79 100644 --- a/tests/Io/RouteHandlerTest.php +++ b/tests/Io/RouteHandlerTest.php @@ -24,7 +24,9 @@ public function testMapRouteWithControllerAddsRouteOnRouter(): void $router->expects($this->once())->method('addRoute')->with(['GET'], '/', $controller); $ref = new \ReflectionProperty($handler, 'routeCollector'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $ref->setValue($handler, $router); $handler->map(['GET'], '/', $controller); @@ -41,7 +43,9 @@ public function testMapRouteWithMiddlewareAndControllerAddsRouteWithMiddlewareHa $router->expects($this->once())->method('addRoute')->with(['GET'], '/', new MiddlewareHandler([$middleware, $controller])); $ref = new \ReflectionProperty($handler, 'routeCollector'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $ref->setValue($handler, $router); $handler->map(['GET'], '/', $middleware, $controller); @@ -61,7 +65,9 @@ public function testMapRouteWithClassNameAddsRouteOnRouterWithControllerCallable $router->expects($this->once())->method('addRoute')->with(['GET'], '/', $controller); $ref = new \ReflectionProperty($handler, 'routeCollector'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $ref->setValue($handler, $router); $handler->map(['GET'], '/', \stdClass::class); @@ -77,7 +83,9 @@ public function testMapRouteWithContainerAndControllerAddsRouteOnRouterWithContr $router->expects($this->once())->method('addRoute')->with(['GET'], '/', $controller); $ref = new \ReflectionProperty($handler, 'routeCollector'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $ref->setValue($handler, $router); $handler->map(['GET'], '/', new Container(), $controller); @@ -96,7 +104,9 @@ public function testMapRouteWithContainerAndControllerClassNameAddsRouteOnRouter $router->expects($this->once())->method('addRoute')->with(['GET'], '/', $controller); $ref = new \ReflectionProperty($handler, 'routeCollector'); - $ref->setAccessible(true); + if (PHP_VERSION_ID < 80100) { + $ref->setAccessible(true); + } $ref->setValue($handler, $router); assert($container instanceof Container);