Skip to content

Commit

Permalink
Add route middleware tests + Fix StyleCI config (#197)
Browse files Browse the repository at this point in the history
  • Loading branch information
vjik committed Apr 2, 2023
1 parent fe45dfe commit 19adc71
Show file tree
Hide file tree
Showing 2 changed files with 77 additions and 4 deletions.
57 changes: 53 additions & 4 deletions tests/Middleware/RouterTest.php
Expand Up @@ -22,6 +22,7 @@
use Yiisoft\Router\RouteCollection;
use Yiisoft\Router\RouteCollectionInterface;
use Yiisoft\Router\RouteCollector;
use Yiisoft\Router\Tests\Support\CustomResponseMiddleware;
use Yiisoft\Router\UrlMatcherInterface;
use Yiisoft\Test\Support\Container\SimpleContainer;

Expand Down Expand Up @@ -134,6 +135,47 @@ public function testGetArguments(): void
$this->assertSame(['parameter' => 'value'], $currentRoute->getArguments());
}

public function dataRouteMiddleware(): array
{
return [
'callable' => [
201,
static fn () => new Response(201),
],
'array' => [
202,
[
'class' => CustomResponseMiddleware::class,
'__construct()' => [202],
],
],
'class' => [
404,
CustomResponseMiddleware::class,
],
];
}

/**
* @dataProvider dataRouteMiddleware
*/
public function testRouteMiddleware(int $expectedCode, mixed $middleware): void
{
$response = $this->processWithRouter(
request: new ServerRequest('GET', '/'),
routes: new RouteCollection(
(new RouteCollector())->addRoute(
Route::get('/')
->middleware($middleware)
->action(static fn () => new Response(200))
)
),
containerDefinitions: [CustomResponseMiddleware::class => new CustomResponseMiddleware(404)],
);

$this->assertSame($expectedCode, $response->getStatusCode());
}

private function getMatcher(?RouteCollectionInterface $routeCollection = null): UrlMatcherInterface
{
$middleware = $this->createRouteMiddleware();
Expand Down Expand Up @@ -191,9 +233,15 @@ public function createResponse(int $code = 200, string $reasonPhrase = ''): Resp

private function createRouterMiddleware(
?RouteCollectionInterface $routeCollection = null,
?CurrentRoute $currentRoute = null
?CurrentRoute $currentRoute = null,
array $containerDefinitions = [],
): Router {
$container = new SimpleContainer([ResponseFactoryInterface::class => $this->createResponseFactory()]);
$container = new SimpleContainer(
array_merge(
[ResponseFactoryInterface::class => $this->createResponseFactory()],
$containerDefinitions,
)
);

return new Router(
$this->getMatcher($routeCollection),
Expand All @@ -206,10 +254,11 @@ private function createRouterMiddleware(
private function processWithRouter(
ServerRequestInterface $request,
?RouteCollectionInterface $routes = null,
?CurrentRoute $currentRoute = null
?CurrentRoute $currentRoute = null,
array $containerDefinitions = [],
): ResponseInterface {
return $this
->createRouterMiddleware($routes, $currentRoute)
->createRouterMiddleware($routes, $currentRoute, $containerDefinitions)
->process($request, $this->createRequestHandler());
}

Expand Down
24 changes: 24 additions & 0 deletions tests/Support/CustomResponseMiddleware.php
@@ -0,0 +1,24 @@
<?php

declare(strict_types=1);

namespace Yiisoft\Router\Tests\Support;

use Nyholm\Psr7\Response;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Server\MiddlewareInterface;
use Psr\Http\Server\RequestHandlerInterface;

final class CustomResponseMiddleware implements MiddlewareInterface
{
public function __construct(
private int $code,
) {
}

public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
{
return new Response($this->code);
}
}

0 comments on commit 19adc71

Please sign in to comment.