Clientbase
/
wellrested
mirror of https://github.com/basemaster/wellrested.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Router registers handlers directly with routes

This commit is contained in:
PJ Dietz 2018-06-22 14:53:03 -04:00
parent 9b29f2a09e
commit 73b6e4ab83
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Routing/Router.php
View File

@ -141,7 +141,7 @@ class Router implements RouterInterface
public function register($method, $target, $middleware) public function register($method, $target, $middleware)
{ {
$route = $this->getRouteForTarget($target); $route = $this->getRouteForTarget($target);
$route->getMethodMap()->register($method, $middleware); $route->register($method, $middleware);
return $this; return $this;
} }

31
test/tests/unit/Routing/RouterTest.php
View File

@ -6,7 +6,6 @@ use Prophecy\Argument;
use WellRESTed\Dispatching\Dispatcher; use WellRESTed\Dispatching\Dispatcher;
use WellRESTed\Message\Response; use WellRESTed\Message\Response;
use WellRESTed\Message\ServerRequest; use WellRESTed\Message\ServerRequest;
use WellRESTed\Routing\MethodMapInterface;
use WellRESTed\Routing\Route\RouteFactory; use WellRESTed\Routing\Route\RouteFactory;
use WellRESTed\Routing\Route\RouteInterface; use WellRESTed\Routing\Route\RouteInterface;
use WellRESTed\Routing\Router; use WellRESTed\Routing\Router;
@ -15,7 +14,6 @@ use WellRESTed\Test\TestCase;
class RouterTest extends TestCase class RouterTest extends TestCase
{ {
private $methodMap;
private $factory; private $factory;
private $request; private $request;
private $response; private $response;
@ -27,12 +25,9 @@ class RouterTest extends TestCase
{ {
parent::setUp(); parent::setUp();
$this->methodMap = $this->prophesize(MethodMapInterface::class);
$this->methodMap->register(Argument::cetera());
$this->route = $this->prophesize(RouteInterface::class); $this->route = $this->prophesize(RouteInterface::class);
$this->route->__invoke(Argument::cetera())->willReturn(new Response()); $this->route->__invoke(Argument::cetera())->willReturn(new Response());
$this->route->getMethodMap()->willReturn($this->methodMap->reveal()); $this->route->register(Argument::cetera())->willReturn();
$this->route->getType()->willReturn(RouteInterface::TYPE_STATIC); $this->route->getType()->willReturn(RouteInterface::TYPE_STATIC);
$this->route->getTarget()->willReturn("/"); $this->route->getTarget()->willReturn("/");
$this->route->getPathVariables()->willReturn([]); $this->route->getPathVariables()->willReturn([]);
@ -77,11 +72,11 @@ class RouterTest extends TestCase
$this->factory->create("/")->shouldHaveBeenCalledTimes(1); $this->factory->create("/")->shouldHaveBeenCalledTimes(1);
} }
public function testPassesMethodAndMiddlewareToMethodMap() public function testPassesMethodAndMiddlewareToRoute()
{ {
$this->router->register("GET", "/", "middleware"); $this->router->register("GET", "/", "middleware");
$this->methodMap->register("GET", "middleware")->shouldHaveBeenCalled(); $this->route->register("GET", "middleware")->shouldHaveBeenCalled();
} }
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
@ -136,13 +131,13 @@ class RouterTest extends TestCase
public function testDispatchesStaticRouteBeforePrefixRoute() public function testDispatchesStaticRouteBeforePrefixRoute()
{ {
$staticRoute = $this->prophesize(RouteInterface::class); $staticRoute = $this->prophesize(RouteInterface::class);
$staticRoute->getMethodMap()->willReturn($this->methodMap->reveal()); $staticRoute->register(Argument::cetera())->willReturn();
$staticRoute->getTarget()->willReturn("/cats/"); $staticRoute->getTarget()->willReturn("/cats/");
$staticRoute->getType()->willReturn(RouteInterface::TYPE_STATIC); $staticRoute->getType()->willReturn(RouteInterface::TYPE_STATIC);
$staticRoute->__invoke(Argument::cetera())->willReturn(new Response()); $staticRoute->__invoke(Argument::cetera())->willReturn(new Response());
$prefixRoute = $this->prophesize(RouteInterface::class); $prefixRoute = $this->prophesize(RouteInterface::class);
$prefixRoute->getMethodMap()->willReturn($this->methodMap->reveal()); $prefixRoute->register(Argument::cetera())->willReturn();
$prefixRoute->getTarget()->willReturn("/cats/*"); $prefixRoute->getTarget()->willReturn("/cats/*");
$prefixRoute->getType()->willReturn(RouteInterface::TYPE_PREFIX); $prefixRoute->getType()->willReturn(RouteInterface::TYPE_PREFIX);
$prefixRoute->__invoke(Argument::cetera())->willReturn(new Response()); $prefixRoute->__invoke(Argument::cetera())->willReturn(new Response());
@ -165,13 +160,13 @@ class RouterTest extends TestCase
// Note: The longest route is also good for 2 points in Settlers of Catan. // Note: The longest route is also good for 2 points in Settlers of Catan.
$shortRoute = $this->prophesize(RouteInterface::class); $shortRoute = $this->prophesize(RouteInterface::class);
$shortRoute->getMethodMap()->willReturn($this->methodMap->reveal()); $shortRoute->register(Argument::cetera())->willReturn();
$shortRoute->getTarget()->willReturn("/animals/*"); $shortRoute->getTarget()->willReturn("/animals/*");
$shortRoute->getType()->willReturn(RouteInterface::TYPE_PREFIX); $shortRoute->getType()->willReturn(RouteInterface::TYPE_PREFIX);
$shortRoute->__invoke(Argument::cetera())->willReturn(new Response()); $shortRoute->__invoke(Argument::cetera())->willReturn(new Response());
$longRoute = $this->prophesize(RouteInterface::class); $longRoute = $this->prophesize(RouteInterface::class);
$longRoute->getMethodMap()->willReturn($this->methodMap->reveal()); $longRoute->register(Argument::cetera())->willReturn();
$longRoute->getTarget()->willReturn("/animals/cats/*"); $longRoute->getTarget()->willReturn("/animals/cats/*");
$longRoute->getType()->willReturn(RouteInterface::TYPE_PREFIX); $longRoute->getType()->willReturn(RouteInterface::TYPE_PREFIX);
$longRoute->__invoke(Argument::cetera())->willReturn(new Response()); $longRoute->__invoke(Argument::cetera())->willReturn(new Response());
@ -193,13 +188,13 @@ class RouterTest extends TestCase
public function testDispatchesPrefixRouteBeforePatternRoute() public function testDispatchesPrefixRouteBeforePatternRoute()
{ {
$prefixRoute = $this->prophesize(RouteInterface::class); $prefixRoute = $this->prophesize(RouteInterface::class);
$prefixRoute->getMethodMap()->willReturn($this->methodMap->reveal()); $prefixRoute->register(Argument::cetera())->willReturn();
$prefixRoute->getTarget()->willReturn("/cats/*"); $prefixRoute->getTarget()->willReturn("/cats/*");
$prefixRoute->getType()->willReturn(RouteInterface::TYPE_PREFIX); $prefixRoute->getType()->willReturn(RouteInterface::TYPE_PREFIX);
$prefixRoute->__invoke(Argument::cetera())->willReturn(new Response()); $prefixRoute->__invoke(Argument::cetera())->willReturn(new Response());
$patternRoute = $this->prophesize(RouteInterface::class); $patternRoute = $this->prophesize(RouteInterface::class);
$patternRoute->getMethodMap()->willReturn($this->methodMap->reveal()); $patternRoute->register(Argument::cetera())->willReturn();
$patternRoute->getTarget()->willReturn("/cats/{id}"); $patternRoute->getTarget()->willReturn("/cats/{id}");
$patternRoute->getType()->willReturn(RouteInterface::TYPE_PATTERN); $patternRoute->getType()->willReturn(RouteInterface::TYPE_PATTERN);
$patternRoute->__invoke(Argument::cetera())->willReturn(new Response()); $patternRoute->__invoke(Argument::cetera())->willReturn(new Response());
@ -220,7 +215,7 @@ class RouterTest extends TestCase
public function testDispatchesFirstMatchingPatternRoute() public function testDispatchesFirstMatchingPatternRoute()
{ {
$patternRoute1 = $this->prophesize(RouteInterface::class); $patternRoute1 = $this->prophesize(RouteInterface::class);
$patternRoute1->getMethodMap()->willReturn($this->methodMap->reveal()); $patternRoute1->register(Argument::cetera())->willReturn();
$patternRoute1->getTarget()->willReturn("/cats/{id}"); $patternRoute1->getTarget()->willReturn("/cats/{id}");
$patternRoute1->getType()->willReturn(RouteInterface::TYPE_PATTERN); $patternRoute1->getType()->willReturn(RouteInterface::TYPE_PATTERN);
$patternRoute1->getPathVariables()->willReturn([]); $patternRoute1->getPathVariables()->willReturn([]);
@ -228,7 +223,7 @@ class RouterTest extends TestCase
$patternRoute1->__invoke(Argument::cetera())->willReturn(new Response()); $patternRoute1->__invoke(Argument::cetera())->willReturn(new Response());
$patternRoute2 = $this->prophesize(RouteInterface::class); $patternRoute2 = $this->prophesize(RouteInterface::class);
$patternRoute2->getMethodMap()->willReturn($this->methodMap->reveal()); $patternRoute2->register(Argument::cetera())->willReturn();
$patternRoute2->getTarget()->willReturn("/cats/{name}"); $patternRoute2->getTarget()->willReturn("/cats/{name}");
$patternRoute2->getType()->willReturn(RouteInterface::TYPE_PATTERN); $patternRoute2->getType()->willReturn(RouteInterface::TYPE_PATTERN);
$patternRoute2->getPathVariables()->willReturn([]); $patternRoute2->getPathVariables()->willReturn([]);
@ -251,7 +246,7 @@ class RouterTest extends TestCase
public function testStopsTestingPatternsAfterFirstSuccessfulMatch() public function testStopsTestingPatternsAfterFirstSuccessfulMatch()
{ {
$patternRoute1 = $this->prophesize(RouteInterface::class); $patternRoute1 = $this->prophesize(RouteInterface::class);
$patternRoute1->getMethodMap()->willReturn($this->methodMap->reveal()); $patternRoute1->register(Argument::cetera())->willReturn();
$patternRoute1->getTarget()->willReturn("/cats/{id}"); $patternRoute1->getTarget()->willReturn("/cats/{id}");
$patternRoute1->getType()->willReturn(RouteInterface::TYPE_PATTERN); $patternRoute1->getType()->willReturn(RouteInterface::TYPE_PATTERN);
$patternRoute1->getPathVariables()->willReturn([]); $patternRoute1->getPathVariables()->willReturn([]);
@ -259,7 +254,7 @@ class RouterTest extends TestCase
$patternRoute1->__invoke(Argument::cetera())->willReturn(new Response()); $patternRoute1->__invoke(Argument::cetera())->willReturn(new Response());
$patternRoute2 = $this->prophesize(RouteInterface::class); $patternRoute2 = $this->prophesize(RouteInterface::class);
$patternRoute2->getMethodMap()->willReturn($this->methodMap->reveal()); $patternRoute2->register(Argument::cetera())->willReturn();
$patternRoute2->getTarget()->willReturn("/cats/{name}"); $patternRoute2->getTarget()->willReturn("/cats/{name}");
$patternRoute2->getType()->willReturn(RouteInterface::TYPE_PATTERN); $patternRoute2->getType()->willReturn(RouteInterface::TYPE_PATTERN);
$patternRoute2->getPathVariables()->willReturn([]); $patternRoute2->getPathVariables()->willReturn([]);