Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
6 changed files
with
154 additions
and
53 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| <?php | ||
| namespace Slim\Middleware; | ||
|
|
||
| use FastRoute\Dispatcher; | ||
| use Psr\Http\Message\ResponseInterface; | ||
| use Psr\Http\Message\ServerRequestInterface; | ||
| use Slim\Interfaces\RouterInterface; | ||
|
|
||
| /** | ||
| * Perform routing and store matched route to the request's attributes | ||
| */ | ||
| class RoutingMiddleware | ||
| { | ||
| protected $router; | ||
|
|
||
| public function __construct(RouterInterface $router) | ||
| { | ||
| $this->router = $router; | ||
| } | ||
|
|
||
| /** | ||
| * Invoke | ||
| * | ||
| * @param ServerRequestInterface $request PSR7 server request | ||
| * @param ResponseInterface $response PSR7 response | ||
| * @param callable $next Middleware callable | ||
| * @return ResponseInterface PSR7 response | ||
| */ | ||
| public function __invoke(ServerRequestInterface $request, ResponseInterface $response, callable $next) | ||
| { | ||
| $request = $this->performRouting($request); | ||
| return $next($request, $response); | ||
| } | ||
|
|
||
| /** | ||
| * Perform routing | ||
| * | ||
| * @param ServerRequestInterface $request PSR7 server request | ||
| * @return ServerRequestInterface | ||
| */ | ||
| public function performRouting(ServerRequestInterface $request) | ||
| { | ||
| $routeInfo = $this->router->dispatch($request); | ||
|
|
||
| if ($routeInfo[0] === Dispatcher::FOUND) { | ||
| $routeArguments = []; | ||
| foreach ($routeInfo[2] as $k => $v) { | ||
| $routeArguments[$k] = urldecode($v); | ||
| } | ||
|
|
||
| $route = $this->router->lookupRoute($routeInfo[1]); | ||
| $route->prepare($request, $routeArguments); | ||
|
|
||
| // add route to the request's attributes | ||
| $request = $request->withAttribute('route', $route); | ||
| } | ||
|
|
||
| // routeInfo to the request's attributes | ||
| $routeInfo['request'] = [$request->getMethod(), (string) $request->getUri()]; | ||
| return $request->withAttribute('routeInfo', $routeInfo); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| <?php | ||
| /** | ||
| * Slim Framework (https://slimframework.com) | ||
| * | ||
| * @link https://github.com/slimphp/Slim | ||
| * @copyright Copyright (c) 2011-2017 Josh Lockhart | ||
| * @license https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License) | ||
| */ | ||
| namespace Slim\Tests\Middleware; | ||
|
|
||
| use Closure; | ||
| use FastRoute\Dispatcher; | ||
| use PHPUnit\Framework\TestCase; | ||
| use Psr\Http\Message\ResponseInterface; | ||
| use Psr\Http\Message\ServerRequestInterface; | ||
| use Slim\Http\Body; | ||
| use Slim\Http\Headers; | ||
| use Slim\Http\Request; | ||
| use Slim\Http\Response; | ||
| use Slim\Http\Uri; | ||
| use Slim\Middleware\RoutingMiddleware; | ||
| use Slim\Router; | ||
|
|
||
| class RoutingMiddlewareTest extends TestCase | ||
| { | ||
| protected function getRouter() | ||
| { | ||
| $router = new Router(); | ||
| $router->map(['GET'], '/hello/{name}', null); | ||
|
|
||
| return $router; | ||
| } | ||
|
|
||
| public function testRouteIsStoredOnSuccessfulMatch() | ||
| { | ||
| $router = $this->getRouter(); | ||
| $mw = new RoutingMiddleware($router); | ||
|
|
||
| $uri = Uri::createFromString('https://example.com:443/hello/foo'); | ||
| $body = new Body(fopen('php://temp', 'r+')); | ||
| $request = new Request('GET', $uri, new Headers(), [], [], $body); | ||
| $response = new Response(); | ||
|
|
||
| $next = function (ServerRequestInterface $req, ResponseInterface $res) { | ||
| // route is available | ||
| $route = $req->getAttribute('route'); | ||
| $this->assertNotNull($route); | ||
| $this->assertEquals('foo', $route->getArgument('name')); | ||
|
|
||
| // routeInfo is available | ||
| $routeInfo = $req->getAttribute('routeInfo'); | ||
| $this->assertInternalType('array', $routeInfo); | ||
| return $res; | ||
| }; | ||
| Closure::bind($next, $this); // bind test class so we can test request object | ||
|
|
||
| $result = $mw($request, $response, $next); | ||
| } | ||
|
|
||
| public function testRouteIsNotStoredOnMethodNotAllowed() | ||
| { | ||
| $router = $this->getRouter(); | ||
| $mw = new RoutingMiddleware($router); | ||
|
|
||
| $uri = Uri::createFromString('https://example.com:443/hello/foo'); | ||
| $body = new Body(fopen('php://temp', 'r+')); | ||
| $request = new Request('POST', $uri, new Headers(), [], [], $body); | ||
| $response = new Response(); | ||
|
|
||
| $next = function (ServerRequestInterface $req, ResponseInterface $res) { | ||
| // route is not available | ||
| $route = $req->getAttribute('route'); | ||
| $this->assertNull($route); | ||
|
|
||
| // routeInfo is available | ||
| $routeInfo = $req->getAttribute('routeInfo'); | ||
| $this->assertInternalType('array', $routeInfo); | ||
| $this->assertEquals(Dispatcher::METHOD_NOT_ALLOWED, $routeInfo[0]); | ||
|
|
||
|
|
||
| return $res; | ||
| }; | ||
| Closure::bind($next, $this); // bind test class so we can test request object | ||
| $result = $mw($request, $response, $next); | ||
| } | ||
| } |