Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-13 07:18:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes #61

Browse Source
This commit is contained in:
Dennis Eichhorn 2016-08-19 13:19:45 +02:00
parent b3e689e481
commit 54c126b72b
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Router/RouteVerb.php
View File

@ -32,7 +32,7 @@ abstract class RouteVerb extends Enum
{ {
const GET = 1; const GET = 1;
const PUT = 2; const PUT = 2;
const SET = 3; const SET = 4;
const DELETE = 4; const DELETE = 8;
const ANY = 5; const ANY = 16;
} }

15
Router/Router.php
View File

@ -76,14 +76,14 @@ class Router
* *
* @param string $route Route regex * @param string $route Route regex
* @param mixed $destination Destination e.g. Module:function & verb * @param mixed $destination Destination e.g. Module:function & verb
* @param string $verb Request verb * @param int $verb Request verb
* *
* @return void * @return void
* *
* @since 1.0.0 * @since 1.0.0
* @author Dennis Eichhorn <d.eichhorn@oms.com> * @author Dennis Eichhorn <d.eichhorn@oms.com>
*/ */
public function add(string $route, $destination, string $verb = RouteVerb::GET) public function add(string $route, $destination, int $verb = RouteVerb::GET)
{ {
if(!isset($this->routes[$route])) { if(!isset($this->routes[$route])) {
$this->routes[$route] = []; $this->routes[$route] = [];
@ -99,6 +99,7 @@ class Router
* Route request. * Route request.
* *
* @param RequestAbstract $request Request to route * @param RequestAbstract $request Request to route
* @param int $verb Route verb
* *
* @return string[] * @return string[]
* *
@ -107,7 +108,7 @@ class Router
* @since 1.0.0 * @since 1.0.0
* @author Dennis Eichhorn <d.eichhorn@oms.com> * @author Dennis Eichhorn <d.eichhorn@oms.com>
*/ */
public function route($request, string $verb = RouteVerb::GET) : array public function route($request, int $verb = RouteVerb::GET) : array
{ {
if($request instanceof RequestAbstract) { if($request instanceof RequestAbstract) {
$uri = $request->getUri(); $uri = $request->getUri();
@ -134,17 +135,17 @@ class Router
* Match route and uri. * Match route and uri.
* *
* @param string $route Route * @param string $route Route
* @param string $routeVerb GET,POST for this route * @param int $routeVerb GET,POST for this route
* @param string $uri Uri * @param string $uri Uri
* @param string $remoteVerb Verb this request is using * @param int $remoteVerb Verb this request is using
* *
* @return bool * @return bool
* *
* @since 1.0.0 * @since 1.0.0
* @author Dennis Eichhorn <d.eichhorn@oms.com> * @author Dennis Eichhorn <d.eichhorn@oms.com>
*/ */
private function match(string $route, string $routeVerb, string $uri, string $remoteVerb = RouteVerb::GET) : bool private function match(string $route, int $routeVerb, string $uri, int $remoteVerb = RouteVerb::GET) : bool
{ {
return (bool) preg_match('~^' . $route . '$~', $uri) && ($routeVerb == RouteVerb::ANY || $remoteVerb == $routeVerb); return (bool) preg_match('~^' . $route . '$~', $uri) && ($routeVerb == RouteVerb::ANY || $remoteVerb & $routeVerb === $remoteVerb);
} }
} }