Commit e05250c

author

Fady Michel

committed

add middleware psr15

1 parent 071c6c8 commit e05250cCopy full SHA for e05250c

File tree

+11

-22

lines changed

+11

-22

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ class Route`
`44`	`44`	`* ]`
`45`	`45`	`* @param array $methods`
`46`	`46`	`*/`
`47`		`- public function __construct(string $name, string $path, array $parameters, array $methods = ['GET', 'POST'])`
	`47`	`+ public function __construct(string $name, string $path, array $parameters, array $methods = ['GET'])`
`48`	`48`	`{`
`49`	`49`	`if ($methods === []) {`
`50`	`50`	`throw new \InvalidArgumentException('HTTP methods argument was empty; must contain at least one method');`

Lines changed: 1 addition & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,22 +37,11 @@ public function add(Route $route): self`
`37`	`37`	`return $this;`
`38`	`38`	`}`
`39`	`39`
`40`		`- /**`
`41`		`- * @param ServerRequestInterface $serverRequest`
`42`		`- * @return Route`
`43`		`- * @throws \Exception`
`44`		`- */`
`45`	`40`	`public function match(ServerRequestInterface $serverRequest): Route`
`46`	`41`	`{`
`47`	`42`	`return $this->matchFromPath($serverRequest->getUri()->getPath(), $serverRequest->getMethod());`
`48`	`43`	`}`
`49`	`44`
`50`		`- /**`
`51`		`- * @param string $path`
`52`		`- * @param string $method`
`53`		`- * @return Route`
`54`		`- * @throws \Exception`
`55`		`- */`
`56`	`45`	`public function matchFromPath(string $path, string $method): Route`
`57`	`46`	`{`
`58`	`47`	`foreach ($this->routes as $route) {`
`@@ -62,7 +51,7 @@ public function matchFromPath(string $path, string $method): Route`
`62`	`51`	`return $route;`
`63`	`52`	`}`
`64`	`53`
`65`		`- throw new RouteNotFound('No route found for '.$method, self::NO_ROUTE);`
	`54`	`+ throw new RouteNotFound('No route found for ' . $method, self::NO_ROUTE);`
`66`	`55`	`}`
`67`	`56`
`68`	`57`	`public function generateUri(string $name, array $parameters = []): string`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace DevCoder;`
`4`	`4`
	`5`	`+use DevCoder\Exception\RouteNotFound;`
`5`	`6`	`use Psr\Http\Message\ServerRequestInterface;`
`6`	`7`
`7`	`8`	`/**`
`@@ -13,23 +14,23 @@ interface RouterInterface`
`13`	`14`	`/**`
`14`	`15`	`* @param ServerRequestInterface $serverRequest`
`15`	`16`	`* @return Route`
`16`		`- * @throws \Exception if no found route.`
	`17`	`+ * @throws RouteNotFound if no found route.`
`17`	`18`	`*/`
`18`	`19`	`public function match(ServerRequestInterface $serverRequest) : Route;`
`19`	`20`
`20`	`21`	`/**`
`21`	`22`	`* @param string $path`
`22`	`23`	`* @param string $method`
`23`	`24`	`* @return Route`
`24`		`- * @throws \Exception if no found route.`
	`25`	`+ * @throws RouteNotFound if no found route.`
`25`	`26`	`*/`
`26`	`27`	`public function matchFromPath(string $path, string $method) : Route;`
`27`	`28`
`28`	`29`	`/**`
`29`	`30`	`* @param string $name`
`30`	`31`	`* @param array $parameters`
`31`	`32`	`* @return string`
`32`		`- * @throws \Exception if unable to generate the given URI.`
	`33`	`+ * @throws \InvalidArgumentException if unable to generate the given URI.`
`33`	`34`	`*/`
`34`	`35`	`public function generateUri(string $name, array $parameters = []) : string;`
`35`	`36`	`}`

Lines changed: 5 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace DevCoder;`
`4`	`4`
	`5`	`+use DevCoder\Exception\RouteNotFound;`
`5`	`6`	`use Exception;`
`6`	`7`	`use Psr\Http\Message\ResponseFactoryInterface;`
`7`	`8`	`use Psr\Http\Message\ResponseInterface;`
`@@ -23,16 +24,12 @@ final class RouterMiddleware implements MiddlewareInterface`
`23`	`24`	`* @var RouterInterface`
`24`	`25`	`*/`
`25`	`26`	`private $router;`
	`27`	`+`
`26`	`28`	`/**`
`27`	`29`	`* @var ResponseFactoryInterface`
`28`	`30`	`*/`
`29`	`31`	`private $responseFactory;`
`30`	`32`
`31`		`- /**`
`32`		`- * RouterMiddleware constructor.`
`33`		`- * @param RouterInterface $router`
`34`		`- * @param ResponseFactoryInterface $responseFactory`
`35`		`- */`
`36`	`33`	`public function __construct(RouterInterface $router, ResponseFactoryInterface $responseFactory)`
`37`	`34`	`{`
`38`	`35`	`$this->router = $router;`
`@@ -54,8 +51,10 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface`
`54`	`51`	`$request = $request->withAttribute($key, $value);`
`55`	`52`	`}`
`56`	`53`
`57`		`- } catch (Exception$exception) {`
	`54`	`+ } catch (RouteNotFound$e) {`
`58`	`55`	`return $this->responseFactory->createResponse(404);`
	`56`	`+ } catch (\Throwable $e) {`
	`57`	`+ throw $e;`
`59`	`58`	`}`
`60`	`59`
`61`	`60`	`return $handler->handle($request);`

Comments

(0)