Merge pull request #230 from skipperbent/v3-development

V3 development

README.md

@@ -422,7 +422,7 @@ Route groups allow you to share route attributes, such as middleware or namespac
 To assign middleware to all routes within a group, you may use the middleware key in the group attribute array. Middleware are executed in the order they are listed in the array:
 
 ```php
-SimpleRouter::group(['middleware' => '\Demo\Middleware\Auth'], function () {
+SimpleRouter::group(['middleware' => \Demo\Middleware\Auth::class], function () {
     SimpleRouter::get('/', function ()    {
         // Uses Auth Middleware
     });
@@ -437,6 +437,11 @@ SimpleRouter::group(['middleware' => '\Demo\Middleware\Auth'], function () {
 
 Another common use-case for route groups is assigning the same PHP namespace to a group of controllers using the `namespace` parameter in the group array:
 
+#### Note
+Group namespaces will only be added to routes with relative callbacks.
+For example if your route has an absolute callback like `\Demo\Controller\DefaultController@home`, the namespace from the route will not be prepended.
+To fix this you can make the callback relative by removing the `\` in the beginning of the callback.
+
 ```php
 SimpleRouter::group(['namespace' => 'Admin'], function () {
     // Controllers Within The "App\Http\Controllers\Admin" Namespace
@@ -495,7 +500,7 @@ use Pecee\SimpleRouter\SimpleRouter;
 /* Adding custom csrfVerifier here */
 SimpleRouter::csrfVerifier(new \Demo\Middlewares\CsrfVerifier());
 
-SimpleRouter::group(['middleware' => '\Demo\Middlewares\Site', 'exceptionHandler' => 'Handlers\CustomExceptionHandler'], function() {
+SimpleRouter::group(['middleware' => \Demo\Middlewares\Site::class, 'exceptionHandler' => \Demo\Handlers\CustomExceptionHandler::class], function() {
 
 
     SimpleRouter::get('/answers/{id}', 'ControllerAnswers@show', ['where' => ['id' => '[0-9]+']]);
@@ -505,7 +510,7 @@ SimpleRouter::group(['middleware' => '\Demo\Middlewares\Site', 'exceptionHandler
      * Restful resource (see IRestController interface for available methods)
      */
 
-    SimpleRouter::resource('/rest', 'ControllerRessource');
+    SimpleRouter::resource('/rest', ControllerRessource::class);
 
 
     /**
@@ -521,7 +526,7 @@ SimpleRouter::group(['middleware' => '\Demo\Middlewares\Site', 'exceptionHandler
      * etc.
      */
 
-    SimpleRouter::controller('/animals', 'ControllerAnimals');
+    SimpleRouter::controller('/animals', ControllerAnimals::class);
 
 });
 
@@ -678,7 +683,7 @@ url('product', null, ['category' => 'shoes']);
 ### Get by name (controller route)
 
 ```php
-SimpleRouter::controller('/images', 'ImagesController', ['as' => 'picture']);
+SimpleRouter::controller('/images', ImagesController::class, ['as' => 'picture']);
 
 url('picture@getView', null, ['category' => 'shoes']);
 url('picture', 'getView', ['category' => 'shoes']);
@@ -707,7 +712,7 @@ url('ImagesController@getImage', null, ['id' => 22]);
 ### Using custom names for methods on a controller/resource route
 
 ```php
-SimpleRouter::controller('gadgets', 'GadgetsController', ['names' => ['getIphoneInfo' => 'iphone']]);
+SimpleRouter::controller('gadgets', GadgetsController::class, ['names' => ['getIphoneInfo' => 'iphone']]);
 
 url('gadgets.iphone');
 
@@ -718,7 +723,7 @@ url('gadgets.iphone');
 ### Getting REST/resource controller urls
 
 ```php
-SimpleRouter::resource('/phones', 'PhonesController');
+SimpleRouter::resource('/phones', PhonesController::class);
 
 url('phones');
 url('phones.index');
@@ -1045,8 +1050,8 @@ If you are up for a challenge, want the full control or simply just want to crea
 use \Pecee\SimpleRouter\Router;
 use \Pecee\SimpleRouter\Route\RouteUrl;
 
-/* Grap the router instance */
-$router = Router::getInstance();
+/* Create new Router instance */
+$router = new Router();
 
 $route = new RouteUrl('/answer/1', function() {
 
@@ -1054,7 +1059,7 @@ $route = new RouteUrl('/answer/1', function() {
 
 });
 
-$route->setMiddleware('\Demo\Middlewares\AuthMiddleware');
+$route->setMiddleware(\Demo\Middlewares\AuthMiddleware::class);
 $route->setNamespace('\Demo\Controllers');
 $route->setPrefix('v1');
 

composer.json

@@ -1,26 +1,32 @@
 {
- 	"name": "pecee/simple-router",
- 	"description": "Simple, fast PHP router that is easy to get integrated and in almost any project. Heavily inspired by the Laravel router.",
- 	"keywords": [ "router", "routing", "laravel", "pecee" ],
-	"license": "MIT",
-	"support": {
-			"source": "https://github.com/skipperbent/simple-php-router/issues"
-    },
-	"authors": [
-    	{
-        	 "name": "Simon Sessingø",
-           	 "email": "simon.sessingoe@gmail.com"
-        }
-	],
-	"require": {
-		"php": ">=5.4.0"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "4.7.7"
-    },
-    "autoload": {
-        "psr-4": {
-            "Pecee\\": "src/Pecee/"
-        }
+  "name": "pecee/simple-router",
+  "description": "Simple, fast PHP router that is easy to get integrated and in almost any project. Heavily inspired by the Laravel router.",
+  "keywords": [
+    "router",
+    "routing",
+    "laravel",
+    "pecee",
+    "route"
+  ],
+  "license": "MIT",
+  "support": {
+    "source": "https://github.com/skipperbent/simple-php-router/issues"
+  },
+  "authors": [
+    {
+      "name": "Simon Sessingø",
+      "email": "simon.sessingoe@gmail.com"
     }
+  ],
+  "require": {
+    "php": ">=5.4.0"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "4.7.7"
+  },
+  "autoload": {
+    "psr-4": {
+      "Pecee\\": "src/Pecee/"
+    }
+  }
 }

src/Pecee/Controllers/IResourceController.php

@@ -1,7 +1,7 @@
 <?php
 namespace Pecee\Controllers;
 
-interface IRestController
+interface IResourceController
 {
 
     /**

src/Pecee/Http/Input/IInputItem.php

@@ -12,6 +12,8 @@ interface IInputItem
 
     public function setName($name);
 
+    public function getValue();
+
     public function __toString();
 
 }

src/Pecee/Http/Input/InputFile.php

@@ -43,8 +43,8 @@ class InputFile implements IInputItem
         ], $values);
 
         return (new static($values['index']))
-            ->setError($values['error'])
             ->setSize($values['size'])
+            ->setError($values['error'])
             ->setType($values['type'])
             ->setTmpName($values['tmp_name'])
             ->setFilename($values['name']);
@@ -199,7 +199,7 @@ class InputFile implements IInputItem
     }
 
     /**
-     * Return true if an upload error occured.
+     * Return true if an upload error occurred.
      *
      * @return bool
      */
@@ -256,6 +256,11 @@ class InputFile implements IInputItem
         return $this->getTmpName();
     }
 
+    public function getValue()
+    {
+        return $this->getFilename();
+    }
+
     public function toArray()
     {
         return [

src/Pecee/Http/Request.php

@@ -3,8 +3,8 @@ namespace Pecee\Http;
 
 use Pecee\Http\Input\Input;
 use Pecee\SimpleRouter\Route\ILoadableRoute;
-use Pecee\SimpleRouter\Route\IRoute;
 use Pecee\SimpleRouter\Route\RouteUrl;
+use Pecee\SimpleRouter\SimpleRouter;
 
 class Request
 {
@@ -125,6 +125,17 @@ class Request
         return $this->getHeader('remote-addr');
     }
 
+    /**
+     * Get remote address/ip
+     *
+     * @alias static::getIp
+     * @return string
+     */
+    public function getRemoteAddr()
+    {
+        return $this->getIp();
+    }
+
     /**
      * Get referer
      * @return string
@@ -237,13 +248,32 @@ class Request
     {
         $this->rewriteRoute = $route;
 
+        $callback = $route->getCallback();
+
+        /* Only add default namespace on relative callbacks */
+        if ($callback === null || $callback[0] !== '\\') {
+
+            $namespace = SimpleRouter::getDefaultNamespace();
+
+            if ($namespace !== null) {
+
+                if ($this->rewriteRoute->getNamespace() !== null) {
+                    $namespace .= '\\' . $this->rewriteRoute->getNamespace();
+                }
+
+                $this->rewriteRoute->setDefaultNamespace($namespace);
+
+            }
+
+        }
+
         return $this;
     }
 
     /**
      * Get rewrite route
      *
-     * @return IRoute|null
+     * @return ILoadableRoute|null
      */
     public function getRewriteRoute()
     {
@@ -280,9 +310,7 @@ class Request
      */
     public function setRewriteCallback($callback)
     {
-        $this->rewriteRoute = new RouteUrl($this->uri, $callback);
-
-        return $this;
+        return $this->setRewriteRoute(new RouteUrl($this->uri, $callback));
     }
 
     /**

src/Pecee/SimpleRouter/Route/LoadableRoute.php

@@ -27,9 +27,9 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      */
     public function loadMiddleware(Request $request)
     {
-        if (count($this->getMiddlewares()) > 0) {
+        $max = count($this->getMiddlewares());
 
-            $max = count($this->getMiddlewares());
+        if ($max > 0) {
 
             for ($i = 0; $i < $max; $i++) {
 
@@ -37,7 +37,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
 
                 $middleware = $this->loadClass($middleware);
 
-                if (!($middleware instanceof IMiddleware)) {
+                if (($middleware instanceof IMiddleware) === false) {
                     throw new HttpException($middleware . ' must be instance of Middleware');
                 }
 
@@ -48,7 +48,6 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
 
     public function matchRegex(Request $request, $url)
     {
-
         /* Match on custom defined regular expression */
 
         if ($this->regex === null) {
@@ -82,7 +81,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
 
             $regex = sprintf(static::PARAMETERS_REGEX_MATCH, $this->paramModifiers[0], $this->paramOptionalSymbol, $this->paramModifiers[1]);
 
-            if (preg_match_all('/' . $regex . '/is', $this->url, $matches)) {
+            if (preg_match_all('/' . $regex . '/', $this->url, $matches)) {
                 $this->parameters = array_fill_keys($matches[1], null);
             }
         }
@@ -146,8 +145,6 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
 
         $url .= join('/', $unknownParams);
 
-
-
         return rtrim($url, '/') . '/';
     }
 

src/Pecee/SimpleRouter/Route/Route.php

@@ -57,16 +57,21 @@ abstract class Route implements IRoute
 
     public function renderRoute(Request $request)
     {
-        if ($this->getCallback() !== null && is_callable($this->getCallback())) {
+        $callback = $this->getCallback();
+
+        if ($callback !== null && is_callable($callback)) {
 
             /* When the callback is a function */
-            call_user_func_array($this->getCallback(), $this->getParameters());
+            call_user_func_array($callback, $this->getParameters());
 
         } else {
 
             /* When the callback is a method */
-            $controller = explode('@', $this->getCallback());
-            $className = $this->getNamespace() . '\\' . $controller[0];
+            $controller = explode('@', $callback);
+
+            $namespace = $this->getNamespace();
+
+            $className = ($namespace !== null && $controller[0][0] !== '\\') ? $namespace . '\\' . $controller[0] : $controller[0];
 
             $class = $this->loadClass($className);
             $method = $controller[1];
@@ -93,15 +98,17 @@ abstract class Route implements IRoute
     {
         $regex = sprintf(static::PARAMETERS_REGEX_MATCH, $this->paramModifiers[0], $this->paramOptionalSymbol, $this->paramModifiers[1]);
 
-        if (preg_match_all('/' . $regex . '/is', $route, $parameters)) {
+        $parameters = [];
 
-            $urlParts = preg_split('/((\-?\/?)\{[^}]+\})/is', rtrim($route, '/'));
+        if (preg_match_all('/' . $regex . '/', $route, $parameters)) {
+
+            $urlParts = preg_split('/((\-?\/?)\{[^}]+\})/', rtrim($route, '/'));
 
             foreach ($urlParts as $key => $t) {
 
                 $regex = '';
 
-                if ($key < (count($parameters[1]))) {
+                if ($key < count($parameters[1])) {
 
                     $name = $parameters[1][$key];
                     $regex = isset($this->where[$name]) ? $this->where[$name] : $parameterRegex;
@@ -118,13 +125,16 @@ abstract class Route implements IRoute
             $urlRegex = preg_quote($route, '/');
         }
 
-        if (preg_match('/^' . $urlRegex . '(\/?)$/is', $url, $matches) > 0) {
+        if (preg_match('/^' . $urlRegex . '(\/?)$/', $url, $matches) > 0) {
 
             $values = [];
 
-            /* Only take matched parameters with name */
-            foreach ($parameters[1] as $name) {
-                $values[$name] = isset($matches[$name]) ? $matches[$name] : null;
+            if (isset($parameters[1])) {
+
+                /* Only take matched parameters with name */
+                foreach ($parameters[1] as $name) {
+                    $values[$name] = (isset($matches[$name]) && $matches[$name] !== '') ? $matches[$name] : null;
+                }
             }
 
             return $values;

src/Pecee/SimpleRouter/Route/RouteController.php

@@ -89,28 +89,26 @@ class RouteController extends LoadableRoute implements IControllerRoute
         $url = rtrim($url, '/') . '/';
 
         /* Match global regular-expression for route */
-        if ($this->matchRegex($request, $url) === true) {
-            return true;
+        $regexMatch = $this->matchRegex($request, $url);
+
+        if ($regexMatch === false || (stripos($url, $this->url) !== 0 && strtolower($url) !== strtolower($this->url))) {
+            return false;
         }
 
-        if (stripos($url, $this->url) === 0 && strtolower($url) === strtolower($this->url)) {
+        $strippedUrl = trim(str_ireplace($this->url, '/', $url), '/');
+        $path = explode('/', $strippedUrl);
 
-            $strippedUrl = trim(str_ireplace($this->url, '/', $url), '/');
+        if (count($path) > 0) {
 
-            $path = explode('/', $strippedUrl);
+            $method = (isset($path[0]) === false || trim($path[0]) === '') ? $this->defaultMethod : $path[0];
+            $this->method = $request->getMethod() . ucfirst($method);
 
-            if (count($path) > 0) {
+            $this->parameters = array_slice($path, 1);
 
-                $method = (!isset($path[0]) || trim($path[0]) === '') ? $this->defaultMethod : $path[0];
-                $this->method = $method;
+            // Set callback
+            $this->setCallback($this->controller . '@' . $this->method);
 
-                $this->parameters = array_slice($path, 1);
-
-                // Set callback
-                $this->setCallback($this->controller . '@' . $this->method);
-
-                return true;
-            }
+            return true;
         }
 
         return false;

src/Pecee/SimpleRouter/Route/RouteResource.php

@@ -82,42 +82,44 @@ class RouteResource extends LoadableRoute implements IControllerRoute
         $url = rtrim($url, '/') . '/';
 
         /* Match global regular-expression for route */
-        $domainMatch = $this->matchRegex($request, $url);
-        if ($domainMatch !== null) {
-            return $domainMatch;
+        $regexMatch = $this->matchRegex($request, $url);
+
+        if ($regexMatch === false || (stripos($url, $this->url) !== 0 && strtolower($url) !== strtolower($this->url))) {
+            return false;
         }
 
         $route = rtrim($this->url, '/') . '/{id?}/{action?}';
 
-        $parameters = $this->parseParameters($route, $url);
-        if ($parameters === null) {
+        $this->parameters = $this->parseParameters($route, $url);
+        if ($this->parameters === null) {
             return false;
         }
 
-        $this->parameters = (array)$parameters;
+        $action = strtolower(trim($this->parameters['action']));
+        $id = $this->parameters['id'];
 
-        $action = isset($this->parameters['action']) ? $this->parameters['action'] : null;
+        // Remove action parameter
         unset($this->parameters['action']);
 
         $method = $request->getMethod();
 
         // Delete
-        if ($method === static::REQUEST_TYPE_DELETE && isset($this->parameters['id'])) {
+        if ($method === static::REQUEST_TYPE_DELETE && $id !== null) {
             return $this->call($this->methodNames['destroy']);
         }
 
         // Update
-        if (isset($this->parameters['id']) && in_array($method, [static::REQUEST_TYPE_PATCH, static::REQUEST_TYPE_PUT], false)) {
+        if ($id !== null && in_array($method, [static::REQUEST_TYPE_PATCH, static::REQUEST_TYPE_PUT], false) === true) {
             return $this->call($this->methodNames['update']);
         }
 
         // Edit
-        if ($method === static::REQUEST_TYPE_GET && isset($this->parameters['id']) && strtolower($action) === 'edit') {
+        if ($method === static::REQUEST_TYPE_GET && $id !== null && $action === 'edit') {
             return $this->call($this->methodNames['edit']);
         }
 
         // Create
-        if ($method === static::REQUEST_TYPE_GET && strtolower($action) === 'create') {
+        if ($method === static::REQUEST_TYPE_GET && $id === 'create') {
             return $this->call($this->methodNames['create']);
         }
 
@@ -127,7 +129,7 @@ class RouteResource extends LoadableRoute implements IControllerRoute
         }
 
         // Show
-        if ($method === static::REQUEST_TYPE_GET && isset($this->parameters['id'])) {
+        if ($method === static::REQUEST_TYPE_GET && $id !== null) {
             return $this->call($this->methodNames['show']);
         }
 

src/Pecee/SimpleRouter/Route/RouteUrl.php

@@ -17,9 +17,9 @@ class RouteUrl extends LoadableRoute
         $url = rtrim($url, '/') . '/';
 
         /* Match global regular-expression for route */
-        $domainMatch = $this->matchRegex($request, $url);
-        if ($domainMatch !== null) {
-            return $domainMatch;
+        $regexMatch = $this->matchRegex($request, $url);
+        if ($regexMatch === false) {
+            return false;
         }
 
         /* Make regular expression based on route */
@@ -31,7 +31,6 @@ class RouteUrl extends LoadableRoute
         $this->setParameters($parameters);
 
         return true;
-
     }
 
 }

src/Pecee/SimpleRouter/Router.php

@@ -69,20 +69,7 @@ class Router
      */
     protected $exceptionHandlers;
 
-    /**
-     * Get current router instance
-     * @return static
-     */
-    public static function getInstance()
-    {
-        if (static::$instance === null) {
-            static::$instance = new static();
-        }
-
-        return static::$instance;
-    }
-
-    protected function __construct()
+    public function __construct()
     {
         $this->reset();
     }
@@ -187,7 +174,7 @@ class Router
 
             if (count($this->routeStack) > 0) {
 
-                /* Pop and grap the routes added when executing group callback earlier */
+                /* Pop and grab the routes added when executing group callback earlier */
                 $stack = $this->routeStack;
                 $this->routeStack = [];
 
@@ -199,6 +186,29 @@ class Router
         $this->exceptionHandlers = array_unique(array_merge($exceptionHandlers, $this->exceptionHandlers));
     }
 
+    /**
+     * Load routes
+     * @throws NotFoundHttpException
+     * @return void
+     */
+    public function loadRoutes()
+    {
+        /* Initialize boot-managers */
+        if (count($this->bootManagers) > 0) {
+
+            $max = count($this->bootManagers) - 1;
+
+            /* @var $manager IRouterBootManager */
+            for ($i = $max; $i >= 0; $i--) {
+                $manager = $this->bootManagers[$i];
+                $manager->boot($this->request);
+            }
+        }
+
+        /* Loop through each route-request */
+        $this->processRoutes($this->routes);
+    }
+
     public function routeRequest($rewrite = false)
     {
         $routeNotAllowed = false;
@@ -206,21 +216,7 @@ class Router
         try {
 
             if ($rewrite === false) {
-
-                /* Initialize boot-managers */
-                if (count($this->bootManagers) > 0) {
-
-                    $max = count($this->bootManagers) - 1;
-
-                    /* @var $manager IRouterBootManager */
-                    for ($i = $max; $i >= 0; $i--) {
-                        $manager = $this->bootManagers[$i];
-                        $manager->boot($this->request);
-                    }
-                }
-
-                /* Loop through each route-request */
-                $this->processRoutes($this->routes);
+                $this->loadRoutes();
 
                 if ($this->csrfVerifier !== null) {
 
@@ -249,8 +245,11 @@ class Router
 
                     $route->loadMiddleware($this->request);
 
-                    if ($this->request->getRewriteRoute() !== null) {
-                        $this->request->getRewriteRoute()->renderRoute($this->request);
+                    $rewriteRoute = $this->request->getRewriteRoute();
+
+                    if ($rewriteRoute !== null) {
+                        $rewriteRoute->loadMiddleware($this->request);
+                        $rewriteRoute->renderRoute($this->request);
 
                         return;
                     }
@@ -306,8 +305,11 @@ class Router
 
             if ($handler->handleError($this->request, $e) !== null) {
 
-                if ($this->request->getRewriteRoute() !== null) {
-                    $this->request->getRewriteRoute()->renderRoute($this->request);
+                $rewriteRoute = $this->request->getRewriteRoute();
+
+                if ($rewriteRoute !== null) {
+                    $rewriteRoute->loadMiddleware($this->request);
+                    $rewriteRoute->renderRoute($this->request);
 
                     return;
                 }
@@ -334,7 +336,7 @@ class Router
 
             if ($includeEmpty === false) {
                 $getParams = array_filter($getParams, function ($item) {
-                    return (!empty($item));
+                    return (trim($item) !== '');
                 });
             }
 

src/Pecee/SimpleRouter/SimpleRouter.php

@@ -33,6 +33,8 @@ class SimpleRouter
      */
     protected static $response;
 
+    protected static $router;
+
     /**
      * Start/route request
      *
@@ -284,6 +286,7 @@ class SimpleRouter
     public static function resource($url, $controller, array $settings = null)
     {
         $route = new RouteResource($url, $controller);
+        $route = static::addDefaultNamespace($route);
 
         if ($settings !== null) {
             $route->setSettings($settings);
@@ -348,7 +351,11 @@ class SimpleRouter
      */
     public static function router()
     {
-        return Router::getInstance();
+        if(static::$router === null) {
+            static::$router = new Router();
+        }
+
+        return static::$router;
     }
 
     /**
@@ -360,16 +367,35 @@ class SimpleRouter
     protected static function addDefaultNamespace(IRoute $route)
     {
         if (static::$defaultNamespace !== null) {
-            $namespace = static::$defaultNamespace;
 
-            if ($route->getNamespace() !== null) {
-                $namespace .= '\\' . $route->getNamespace();
+            $callback = $route->getCallback();
+
+            /* Only add default namespace on relative callbacks */
+            if ($callback === null || $callback[0] !== '\\') {
+
+                $namespace = static::$defaultNamespace;
+
+                $currentNamespace = $route->getNamespace();
+
+                if ($currentNamespace !== null) {
+                    $namespace .= '\\' . $currentNamespace;
+                }
+
+                $route->setDefaultNamespace($namespace);
+
             }
-
-            $route->setDefaultNamespace($namespace);
         }
 
         return $route;
     }
 
+    /**
+     * Get default namespace
+     * @return string
+     */
+    public static function getDefaultNamespace()
+    {
+        return static::$defaultNamespace;
+    }
+
 }

test/Dummy/DummyController.php

@@ -2,24 +2,34 @@
 
 class DummyController
 {
-	public function start()
+	public function method1()
 	{
-		echo static::class . '@' . 'start() OK';
+
 	}
 
+    public function method2()
+    {
+
+    }
+
 	public function param($params = null)
 	{
-		$params = func_get_args();
-		echo 'Params: ' . join(', ', $params);
+		echo join(', ', func_get_args());
 	}
 
-	public function notFound()
-	{
-		echo 'not found';
-	}
+	public function getTest()
+    {
+        echo 'getTest';
+    }
 
-	public function silent() {
+    public function postTest()
+    {
+        echo 'postTest';
+    }
 
-	}
+    public function putTest()
+    {
+        echo 'putTest';
+    }
 
 }

test/Dummy/Exceptions/ResponseException.php

@@ -0,0 +1,18 @@
+<?php
+
+class ResponseException extends \Exception
+{
+    protected $response;
+
+    public function __construct($response)
+    {
+        $this->response = $response;
+        parent::__construct('', 0);
+    }
+
+    public function getResponse()
+    {
+        return $this->response;
+    }
+
+}

test/Dummy/Handler/ExceptionHandlerFirst.php

@@ -1,10 +1,11 @@
 <?php
 
-class TestExceptionHandlerFirst implements \Pecee\Handlers\IExceptionHandler
+class ExceptionHandlerFirst implements \Pecee\Handlers\IExceptionHandler
 {
 	public function handleError(\Pecee\Http\Request $request, \Exception $error)
 	{
-	    echo 'ExceptionHandler 1 loaded' . chr(10);
+	    global $stack;
+	    $stack[] = static::class;
 
 		$request->setUri('/');
 		return $request;

test/Dummy/Handler/ExceptionHandlerSecond.php

@@ -1,10 +1,11 @@
 <?php
 
-class TestExceptionHandlerSecond implements \Pecee\Handlers\IExceptionHandler
+class ExceptionHandlerSecond implements \Pecee\Handlers\IExceptionHandler
 {
 	public function handleError(\Pecee\Http\Request $request, \Exception $error)
 	{
-        echo 'ExceptionHandler 2 loaded' . chr(10);
+        global $stack;
+        $stack[] = static::class;
 
         $request->setUri('/');
         return $request;

test/Dummy/Handler/ExceptionHandlerThird.php

@@ -0,0 +1,13 @@
+<?php
+
+class ExceptionHandlerThird implements \Pecee\Handlers\IExceptionHandler
+{
+	public function handleError(\Pecee\Http\Request $request, \Exception $error)
+	{
+        global $stack;
+        $stack[] = static::class;
+
+		throw new ResponseException('ExceptionHandler loaded');
+	}
+
+}

test/Dummy/Handler/TestExceptionHandlerThird.php

@@ -1,12 +0,0 @@
-<?php
-
-class TestExceptionHandlerThird implements \Pecee\Handlers\IExceptionHandler
-{
-	public function handleError(\Pecee\Http\Request $request, \Exception $error)
-	{
-        echo 'ExceptionHandler 3 loaded' . chr(10);
-
-		throw new ExceptionHandlerException('All good!', 666);
-	}
-
-}

test/Dummy/ResourceController.php

@@ -0,0 +1,39 @@
+<?php
+class ResourceController implements \Pecee\Controllers\IResourceController
+{
+
+    public function index()
+    {
+        echo 'index';
+    }
+
+    public function show($id)
+    {
+        echo 'show ' . $id;
+    }
+
+    public function store()
+    {
+        echo 'store';
+    }
+
+    public function create()
+    {
+        echo 'create';
+    }
+
+    public function edit($id)
+    {
+        echo 'edit ' . $id;
+    }
+
+    public function update($id)
+    {
+        echo 'update ' . $id;
+    }
+
+    public function destroy($id)
+    {
+        echo 'destroy ' . $id;
+    }
+}

test/GroupTest.php

@@ -2,8 +2,7 @@
 
 require_once 'Dummy/DummyMiddleware.php';
 require_once 'Dummy/DummyController.php';
-
-use Pecee\SimpleRouter\SimpleRouter as SimpleRouter;
+require_once 'Helpers/TestRouter.php';
 
 class GroupTest extends PHPUnit_Framework_TestCase
 {
@@ -13,82 +12,71 @@ class GroupTest extends PHPUnit_Framework_TestCase
     {
         $this->result = false;
 
-        SimpleRouter::group(['prefix' => '/group'], function () {
+        TestRouter::group(['prefix' => '/group'], function () {
             $this->result = true;
         });
 
         try {
-            SimpleRouter::start();
-        } catch (Exception $e) {
-            // ignore RouteNotFound exception
-        }
+            TestRouter::debug('/', 'get');
+        } catch(\Exception $e) {
 
+        }
         $this->assertTrue($this->result);
     }
 
     public function testNestedGroup()
     {
 
-        SimpleRouter::router()->reset();
-        SimpleRouter::request()->setUri('/api/v1/test');
-        SimpleRouter::request()->setMethod('get');
+        TestRouter::group(['prefix' => '/api'], function () {
 
-        SimpleRouter::group(['prefix' => '/api'], function () {
-
-            SimpleRouter::group(['prefix' => '/v1'], function () {
-                SimpleRouter::get('/test', 'DummyController@start');
+            TestRouter::group(['prefix' => '/v1'], function () {
+                TestRouter::get('/test', 'DummyController@method1');
             });
 
         });
 
-        SimpleRouter::start();
+        TestRouter::debug('/api/v1/test', 'get');
+
     }
 
-    public function testManyRoutes()
+    public function testMultipleRoutes()
     {
 
-        SimpleRouter::router()->reset();
-        SimpleRouter::request()->setUri('/my/match');
-        SimpleRouter::request()->setMethod('get');
+        TestRouter::group(['prefix' => '/api'], function () {
 
-        SimpleRouter::group(['prefix' => '/api'], function () {
-
-            SimpleRouter::group(['prefix' => '/v1'], function () {
-                SimpleRouter::get('/test', 'DummyController@start');
+            TestRouter::group(['prefix' => '/v1'], function () {
+                TestRouter::get('/test', 'DummyController@method1');
             });
 
         });
 
-        SimpleRouter::get('/my/match', 'DummyController@start');
+        TestRouter::get('/my/match', 'DummyController@method1');
 
-        SimpleRouter::group(['prefix' => '/service'], function () {
+        TestRouter::group(['prefix' => '/service'], function () {
 
-            SimpleRouter::group(['prefix' => '/v1'], function () {
-                SimpleRouter::get('/no-match', 'DummyController@start');
+            TestRouter::group(['prefix' => '/v1'], function () {
+                TestRouter::get('/no-match', 'DummyController@method1');
             });
 
         });
 
-        SimpleRouter::start();
+        TestRouter::debug('/my/match', 'get');
     }
 
     public function testUrls()
     {
-
-        SimpleRouter::router()->reset();
-        SimpleRouter::request()->setUri('/my/fancy/url/1');
-        SimpleRouter::request()->setMethod('get');
-
         // Test array name
-        SimpleRouter::get('/my/fancy/url/1', 'DummyController@start', ['as' => 'fancy1']);
+        TestRouter::get('/my/fancy/url/1', 'DummyController@method1', ['as' => 'fancy1']);
 
         // Test method name
-        SimpleRouter::get('/my/fancy/url/2', 'DummyController@start')->setName('fancy2');
+        TestRouter::get('/my/fancy/url/2', 'DummyController@method1')->setName('fancy2');
 
-        SimpleRouter::start();
+        TestRouter::debugNoReset('/my/fancy/url/1');
 
-        $this->assertEquals('/my/fancy/url/1/', SimpleRouter::getUrl('fancy1'));
-        $this->assertEquals('/my/fancy/url/2/', SimpleRouter::getUrl('fancy2'));
+        $this->assertEquals('/my/fancy/url/1/', TestRouter::getUrl('fancy1'));
+        $this->assertEquals('/my/fancy/url/2/', TestRouter::getUrl('fancy2'));
+
+        TestRouter::router()->reset();
 
     }
 

test/Helpers/TestRouter.php

@@ -0,0 +1,41 @@
+<?php
+
+class TestRouter extends \Pecee\SimpleRouter\SimpleRouter
+{
+
+    public static function debugNoReset($testUri, $testMethod = 'get')
+    {
+        static::request()->setUri($testUri);
+        static::request()->setMethod($testMethod);
+
+        static::start();
+    }
+
+    public static function debug($testUri, $testMethod = 'get')
+    {
+        try {
+            static::debugNoReset($testUri, $testMethod);
+        } catch(\Exception $e) {
+            static::router()->reset();
+            throw $e;
+        }
+
+        static::router()->reset();
+
+    }
+
+    public static function debugOutput($testUri, $testMethod = 'get')
+    {
+        $response = null;
+
+        // Route request
+        ob_start();
+        static::debug($testUri, $testMethod);
+        $response = ob_get_contents();
+        ob_end_clean();
+
+        // Return response
+        return $response;
+    }
+
+}

test/MiddlewareTest.php

@@ -3,39 +3,32 @@
 require_once 'Dummy/DummyMiddleware.php';
 require_once 'Dummy/DummyController.php';
 require_once 'Dummy/Handler/ExceptionHandler.php';
-
-use Pecee\SimpleRouter\SimpleRouter as SimpleRouter;
+require_once 'Helpers/TestRouter.php';
 
 class MiddlewareTest extends PHPUnit_Framework_TestCase
 {
     public function testMiddlewareFound()
     {
-        $this->setExpectedException('MiddlewareLoadedException');
+        $this->setExpectedException(MiddlewareLoadedException::class);
 
-        SimpleRouter::router()->reset();
-        SimpleRouter::request()->setMethod('get');
-        SimpleRouter::request()->setUri('/my/test/url');
-
-        SimpleRouter::group(['exceptionHandler' => 'ExceptionHandler'], function () {
-            SimpleRouter::get('/my/test/url', 'DummyController@start', ['middleware' => 'DummyMiddleware']);
+        TestRouter::group(['exceptionHandler' => 'ExceptionHandler'], function () {
+            TestRouter::get('/my/test/url', 'DummyController@method1', ['middleware' => 'DummyMiddleware']);
         });
 
-        SimpleRouter::start();
+        TestRouter::debug('/my/test/url', 'get');
+
     }
 
-    public function testNestedMiddlewareLoad()
+    public function testNestedMiddlewareDontLoad()
     {
-        $this->setExpectedException('MiddlewareLoadedException');
 
-        SimpleRouter::router()->reset();
-        SimpleRouter::request()->setMethod('get');
-        SimpleRouter::request()->setUri('/my/test/url');
-
-        SimpleRouter::group(['exceptionHandler' => 'ExceptionHandler', 'middleware' => 'DummyMiddleware'], function () {
-            SimpleRouter::get('/my/test/url', 'DummyController@start');
+        TestRouter::group(['exceptionHandler' => 'ExceptionHandler', 'middleware' => 'DummyMiddleware'], function () {
+            TestRouter::get('/middleware', 'DummyController@method1');
         });
 
-        SimpleRouter::start();
+        TestRouter::get('/my/test/url', 'DummyController@method1');
+
+        TestRouter::debug('/my/test/url', 'get');
     }
 
 }

test/RouterControllerTest.php

@@ -0,0 +1,42 @@
+<?php
+
+require_once 'Dummy/DummyController.php';
+require_once 'Helpers/TestRouter.php';
+
+class RouterControllerTest extends PHPUnit_Framework_TestCase
+{
+
+    public function testGet()
+    {
+        // Match normal route on alias
+        TestRouter::controller('/url', 'DummyController');
+
+        $response = TestRouter::debugOutput('/url/test', 'get');
+
+        $this->assertEquals('getTest', $response);
+
+    }
+
+    public function testPost()
+    {
+        // Match normal route on alias
+        TestRouter::controller('/url', 'DummyController');
+
+        $response = TestRouter::debugOutput('/url/test', 'post');
+
+        $this->assertEquals('postTest', $response);
+
+    }
+
+    public function testPut()
+    {
+        // Match normal route on alias
+        TestRouter::controller('/url', 'DummyController');
+
+        $response = TestRouter::debugOutput('/url/test', 'put');
+
+        $this->assertEquals('putTest', $response);
+
+    }
+
+}

test/RouterResourceTest.php

@@ -0,0 +1,70 @@
+<?php
+
+require_once 'Dummy/ResourceController.php';
+require_once 'Helpers/TestRouter.php';
+
+class RouterResourceTest extends PHPUnit_Framework_TestCase
+{
+
+    public function testResourceStore()
+    {
+        TestRouter::resource('/resource', 'ResourceController');
+        $response = TestRouter::debugOutput('/resource', 'post');
+
+        $this->assertEquals('store', $response);
+    }
+
+    public function testResourceCreate()
+    {
+        TestRouter::resource('/resource', 'ResourceController');
+        $response = TestRouter::debugOutput('/resource/create', 'get');
+
+        $this->assertEquals('create', $response);
+
+    }
+
+    public function testResourceIndex()
+    {
+        TestRouter::resource('/resource', 'ResourceController');
+        $response = TestRouter::debugOutput('/resource', 'get');
+
+        $this->assertEquals('index', $response);
+    }
+
+    public function testResourceDestroy()
+    {
+        TestRouter::resource('/resource', 'ResourceController');
+        $response = TestRouter::debugOutput('/resource/38', 'delete');
+
+        $this->assertEquals('destroy 38', $response);
+    }
+
+
+    public function testResourceEdit()
+    {
+        TestRouter::resource('/resource', 'ResourceController');
+        $response = TestRouter::debugOutput('/resource/38/edit', 'get');
+
+        $this->assertEquals('edit 38', $response);
+
+    }
+
+    public function testResourceUpdate()
+    {
+        TestRouter::resource('/resource', 'ResourceController');
+        $response = TestRouter::debugOutput('/resource/38', 'put');
+
+        $this->assertEquals('update 38', $response);
+
+    }
+
+    public function testResourceGet()
+    {
+        TestRouter::resource('/resource', 'ResourceController');
+        $response = TestRouter::debugOutput('/resource/38', 'get');
+
+        $this->assertEquals('show 38', $response);
+
+    }
+
+}

test/RouterRewriteTest.php

@@ -0,0 +1,60 @@
+<?php
+require_once 'Dummy/Exceptions/ResponseException.php';
+require_once 'Dummy/Handler/ExceptionHandlerFirst.php';
+require_once 'Dummy/Handler/ExceptionHandlerSecond.php';
+require_once 'Dummy/Handler/ExceptionHandlerThird.php';
+require_once 'Helpers/TestRouter.php';
+
+class RouteRewriteTest extends PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Redirects to another route through 3 exception handlers.
+     *
+     * You will see "ExceptionHandler 1 loaded" 2 times. This happen because
+     * the exceptionhandler is asking the router to reload.
+     *
+     * That means that the exceptionhandler is loaded again, but this time
+     * the router ignores the same rewrite-route to avoid loop - loads
+     * the second which have same behavior and is also ignored before
+     * throwing the final Exception in ExceptionHandler 3.
+     *
+     * So this tests:
+     * 1. If ExceptionHandlers loads
+     * 2. If ExceptionHandlers load in the correct order
+     * 3. If ExceptionHandlers can rewrite the page on error
+     * 4. If the router can avoid redirect-loop due to developer has started loop.
+     * 5. And finally if we reaches the last exception-handler and that the correct
+     *    exception-type is being thrown.
+     */
+    public function testExceptionHandlerRewrite()
+    {
+        global $stack;
+        $stack = [];
+
+        TestRouter::group(['exceptionHandler' => [ExceptionHandlerFirst::class, ExceptionHandlerSecond::class]], function () {
+
+            TestRouter::group(['exceptionHandler' => ExceptionHandlerThird::class], function () {
+
+                TestRouter::get('/my-path', 'DummyController@method1');
+
+            });
+        });
+
+        try {
+            TestRouter::debug('/my-non-existing-path', 'get');
+        } catch(\ResponseException $e) {
+
+        }
+
+        $expectedStack = [
+            ExceptionHandlerFirst::class,
+            ExceptionHandlerSecond::class,
+            ExceptionHandlerThird::class,
+        ];
+
+        $this->assertEquals($expectedStack, $stack);
+
+    }
+
+}

test/RouterRouteTest.php

@@ -3,12 +3,7 @@
 require_once 'Dummy/DummyMiddleware.php';
 require_once 'Dummy/DummyController.php';
 require_once 'Dummy/Exceptions/ExceptionHandlerException.php';
-require_once 'Dummy/Handler/TestExceptionHandlerFirst.php';
-require_once 'Dummy/Handler/TestExceptionHandlerSecond.php';
-require_once 'Dummy/Handler/TestExceptionHandlerThird.php';
-
-use Pecee\SimpleRouter\Exceptions\NotFoundHttpException as NotFoundHttpException;
-use Pecee\SimpleRouter\SimpleRouter as SimpleRouter;
+require_once 'Helpers/TestRouter.php';
 
 class RouterRouteTest extends PHPUnit_Framework_TestCase
 {
@@ -16,113 +11,57 @@ class RouterRouteTest extends PHPUnit_Framework_TestCase
 
     public function testMultiParam()
     {
-        SimpleRouter::router()->reset();
-        SimpleRouter::request()->setMethod('get');
-        SimpleRouter::request()->setUri('/test-param1-param2');
+        TestRouter::get('/test-{param1}-{param2}', function ($param1, $param2) {
 
-        SimpleRouter::get('/test-{param1}-{param2}', function($param1, $param2) {
-
-            if($param1 === 'param1' && $param2 === 'param2') {
+            if ($param1 === 'param1' && $param2 === 'param2') {
                 $this->result = true;
             }
 
         });
 
-        SimpleRouter::start();
+        TestRouter::debug('/test-param1-param2', 'get');
 
         $this->assertTrue($this->result);
 
     }
 
-    /**
-     * Redirects to another route through 3 exception handlers.
-     *
-     * You will see "ExceptionHandler 1 loaded" 2 times. This happen because
-     * the exceptionhandler is asking the router to reload.
-     *
-     * That means that the exceptionhandler is loaded again, but this time
-     * the router ignores the same rewrite-route to avoid loop - loads
-     * the second which have same behavior and is also ignored before
-     * throwing the final Exception in ExceptionHandler 3.
-     *
-     * So this tests:
-     * 1. If ExceptionHandlers loads
-     * 2. If ExceptionHandlers load in the correct order
-     * 3. If ExceptionHandlers can rewrite the page on error
-     * 4. If the router can avoid redirect-loop due to developer has started loop.
-     * 5. And finally if we reaches the last exception-handler and that the correct
-     *    exception-type is being thrown.
-     */
     public function testNotFound()
     {
-        $this->setExpectedException('ExceptionHandlerException');
-
-        SimpleRouter::router()->reset();
-        SimpleRouter::request()->setMethod('get');
-        SimpleRouter::request()->setUri('/test-param1-param2');
-
-        SimpleRouter::group(['exceptionHandler' => ['TestExceptionHandlerFirst', 'TestExceptionHandlerSecond']], function () {
-
-            SimpleRouter::group(['exceptionHandler' => 'TestExceptionHandlerThird'], function () {
-
-                SimpleRouter::get('/non-existing-path', 'DummyController@start');
-
-            });
-        });
-
-        SimpleRouter::start();
+        $this->setExpectedException('\Pecee\SimpleRouter\Exceptions\NotFoundHttpException');
+        TestRouter::get('/non-existing-path', 'DummyController@method1');
+        TestRouter::debug('/test-param1-param2', 'post');
     }
 
     public function testGet()
     {
-        SimpleRouter::router()->reset();
-        SimpleRouter::request()->setUri('/my/test/url');
-        SimpleRouter::request()->setMethod('get');
-
-        SimpleRouter::get('/my/test/url', 'DummyController@start');
-        SimpleRouter::start();
+        TestRouter::get('/my/test/url', 'DummyController@method1');
+        TestRouter::debug('/my/test/url', 'get');
     }
 
     public function testPost()
     {
-        SimpleRouter::router()->reset();
-        SimpleRouter::request()->setUri('/my/test/url');
-        SimpleRouter::request()->setMethod('post');
-
-        SimpleRouter::post('/my/test/url', 'DummyController@start');
-        SimpleRouter::start();
+        TestRouter::post('/my/test/url', 'DummyController@method1');
+        TestRouter::debug('/my/test/url', 'post');
     }
 
     public function testPut()
     {
-        SimpleRouter::router()->reset();
-        SimpleRouter::request()->setUri('/my/test/url');
-        SimpleRouter::request()->setMethod('put');
-
-        SimpleRouter::put('/my/test/url', 'DummyController@start');
-        SimpleRouter::start();
+        TestRouter::put('/my/test/url', 'DummyController@method1');
+        TestRouter::debug('/my/test/url', 'put');
     }
 
     public function testDelete()
     {
-        SimpleRouter::router()->reset();
-        SimpleRouter::request()->setUri('/my/test/url');
-        SimpleRouter::request()->setMethod('delete');
-
-        SimpleRouter::delete('/my/test/url', 'DummyController@start');
-        SimpleRouter::start();
+        TestRouter::delete('/my/test/url', 'DummyController@method1');
+        TestRouter::debug('/my/test/url', 'delete');
     }
 
     public function testMethodNotAllowed()
     {
-        SimpleRouter::router()->reset();
-        SimpleRouter::request()->setUri('/my/test/url');
-        SimpleRouter::request()->setMethod('post');
-
-        SimpleRouter::get('/my/test/url', 'DummyController@start');
+        TestRouter::get('/my/test/url', 'DummyController@method1');
 
         try {
-            SimpleRouter::start();
+            TestRouter::debug('/my/test/url', 'post');
         } catch (\Exception $e) {
             $this->assertEquals(403, $e->getCode());
         }
@@ -130,43 +69,60 @@ class RouterRouteTest extends PHPUnit_Framework_TestCase
 
     public function testSimpleParam()
     {
-        SimpleRouter::router()->reset();
-        SimpleRouter::request()->setMethod('get');
-        SimpleRouter::request()->setUri('/test-param1');
+        TestRouter::get('/test-{param1}', 'DummyController@param');
+        $response = TestRouter::debugOutput('/test-param1', 'get');
 
-        SimpleRouter::get('/test-{param1}', 'DummyController@param');
-        SimpleRouter::start();
+        $this->assertEquals('param1', $response);
     }
 
     public function testPathParamRegex()
     {
-        SimpleRouter::router()->reset();
-        SimpleRouter::request()->setMethod('get');
-        SimpleRouter::request()->setUri('/test/path/123123');
+        TestRouter::get('/test/path/{myParam}', 'DummyController@param', ['where' => ['myParam' => '([0-9]+)']]);
+        $response = TestRouter::debugOutput('/test/path/123123', 'get');
 
-        SimpleRouter::get('/test/path/{myParam}', 'DummyController@param', ['where' => ['myParam' => '([0-9]+)']]);
-        SimpleRouter::start();
+        $this->assertEquals('123123', $response);
     }
 
-    public function testDomainRoute()
+    public function testDomainAllowedRoute()
     {
-        SimpleRouter::router()->reset();
-        SimpleRouter::request()->setMethod('get');
-        SimpleRouter::request()->setUri('/test');
-        SimpleRouter::request()->setHost('hello.world.com');
-
         $this->result = false;
 
-        SimpleRouter::group(['domain' => '{subdomain}.world.com'], function () {
-            SimpleRouter::get('/test', function ($subdomain = null) {
+        TestRouter::group(['domain' => '{subdomain}.world.com'], function () {
+            TestRouter::get('/test', function ($subdomain = null) {
                 $this->result = ($subdomain === 'hello');
             });
         });
 
-        SimpleRouter::start();
+        TestRouter::request()->setHost('hello.world.com');
+        TestRouter::debug('/test', 'get');
 
         $this->assertTrue($this->result);
 
     }
 
+    public function testDomainNotAllowedRoute()
+    {
+        $this->result = false;
+
+        TestRouter::group(['domain' => '{subdomain}.world.com'], function () {
+            TestRouter::get('/test', function ($subdomain = null) {
+                $this->result = ($subdomain === 'hello');
+            });
+        });
+
+        TestRouter::request()->setHost('other.world.com');
+
+
+        TestRouter::debug('/test', 'get');
+
+        $this->assertFalse($this->result);
+
+    }
+
+    public function testRegEx()
+    {
+        TestRouter::get('/my/{path}', 'DummyController@method1')->where(['path' => '[a-zA-Z\-]+']);
+        TestRouter::debug('/my/custom-path', 'get');
+    }
+
 }

test/RouterUrlTest.php

@@ -3,111 +3,103 @@
 require_once 'Dummy/DummyMiddleware.php';
 require_once 'Dummy/DummyController.php';
 require_once 'Dummy/Handler/ExceptionHandler.php';
-
-use Pecee\SimpleRouter\SimpleRouter as SimpleRouter;
+require_once 'Helpers/TestRouter.php';
 
 class RouterUrlTest extends PHPUnit_Framework_TestCase
 {
-    protected $result = false;
 
-    protected function getUrl($name = null, $parameters = null, array $getParams = [])
+    public function testSimularUrls()
     {
-        return SimpleRouter::getUrl($name, $parameters, $getParams);
+        // Match normal route on alias
+        TestRouter::resource('/url11', 'DummyController@method1');
+        TestRouter::resource('/url1', 'DummyController@method1', ['as' => 'match']);
+
+        TestRouter::debugNoReset('/url1', 'get');
+
+        $this->assertEquals(TestRouter::getUrl('match'), TestRouter::getUrl());
+
+        TestRouter::router()->reset();
     }
 
     public function testUrls()
     {
-        SimpleRouter::router()->reset();
-        SimpleRouter::request()->setMethod('get');
-        SimpleRouter::request()->setUri('/');
-
         // Match normal route on alias
-        SimpleRouter::get('/', 'DummyController@silent', ['as' => 'home']);
+        TestRouter::get('/', 'DummyController@method1', ['as' => 'home']);
 
-        SimpleRouter::get('/about', 'DummyController@about');
+        TestRouter::get('/about', 'DummyController@about');
 
-        SimpleRouter::group(['prefix' => '/admin', 'as' => 'admin'], function () {
+        TestRouter::group(['prefix' => '/admin', 'as' => 'admin'], function () {
 
             // Match route with prefix on alias
-            SimpleRouter::get('/{id?}', 'DummyController@start', ['as' => 'home']);
+            TestRouter::get('/{id?}', 'DummyController@method2', ['as' => 'home']);
 
             // Match controller with prefix and alias
-            SimpleRouter::controller('/users', 'DummyController', ['as' => 'users']);
+            TestRouter::controller('/users', 'DummyController', ['as' => 'users']);
 
             // Match controller with prefix and NO alias
-            SimpleRouter::controller('/pages', 'DummyController');
+            TestRouter::controller('/pages', 'DummyController');
 
         });
 
-        SimpleRouter::group(['prefix' => 'api', 'as' => 'api'], function () {
+        TestRouter::group(['prefix' => 'api', 'as' => 'api'], function () {
 
             // Match resource controller
-            SimpleRouter::resource('phones', 'DummyController');
+            TestRouter::resource('phones', 'DummyController');
 
         });
 
-        SimpleRouter::controller('gadgets', 'DummyController', ['names' => ['getIphoneInfo' => 'iphone']]);
+        TestRouter::controller('gadgets', 'DummyController', ['names' => ['getIphoneInfo' => 'iphone']]);
 
         // Match controller with no prefix and no alias
-        SimpleRouter::controller('/cats', 'CatsController');
+        TestRouter::controller('/cats', 'CatsController');
 
         // Pretend to load page
-        SimpleRouter::start();
+        TestRouter::debugNoReset('/', 'get');
 
-        $this->assertEquals('/gadgets/iphoneinfo/', $this->getUrl('gadgets.iphone'));
+        $this->assertEquals('/gadgets/iphoneinfo/', TestRouter::getUrl('gadgets.iphone'));
 
-        $this->assertEquals('/api/phones/create/', $this->getUrl('api.phones.create'));
+        $this->assertEquals('/api/phones/create/', TestRouter::getUrl('api.phones.create'));
 
         // Should match /
-        $this->assertEquals('/', $this->getUrl('home'));
+        $this->assertEquals('/', TestRouter::getUrl('home'));
 
         // Should match /about/
-        $this->assertEquals('/about/', $this->getUrl('DummyController@about'));
+        $this->assertEquals('/about/', TestRouter::getUrl('DummyController@about'));
 
         // Should match /admin/
-        $this->assertEquals('/admin/', $this->getUrl('DummyController@start'));
+        $this->assertEquals('/admin/', TestRouter::getUrl('DummyController@method2'));
 
         // Should match /admin/
-        $this->assertEquals('/admin/', $this->getUrl('admin.home'));
+        $this->assertEquals('/admin/', TestRouter::getUrl('admin.home'));
 
         // Should match /admin/2/
-        $this->assertEquals('/admin/2/', $this->getUrl('admin.home', ['id' => 2]));
+        $this->assertEquals('/admin/2/', TestRouter::getUrl('admin.home', ['id' => 2]));
 
         // Should match /admin/users/
-        $this->assertEquals('/admin/users/', $this->getUrl('admin.users'));
+        $this->assertEquals('/admin/users/', TestRouter::getUrl('admin.users'));
 
         // Should match /admin/users/home/
-        $this->assertEquals('/admin/users/home/', $this->getUrl('admin.users@home'));
+        $this->assertEquals('/admin/users/home/', TestRouter::getUrl('admin.users@home'));
 
         // Should match /cats/
-        $this->assertEquals('/cats/', $this->getUrl('CatsController'));
+        $this->assertEquals('/cats/', TestRouter::getUrl('CatsController'));
 
         // Should match /cats/view/
-        $this->assertEquals('/cats/view/', $this->getUrl('CatsController', 'view'));
+        $this->assertEquals('/cats/view/', TestRouter::getUrl('CatsController', 'view'));
 
         // Should match /cats/view/
-        //$this->assertEquals('/cats/view/', $this->getUrl('CatsController', ['view']));
+        //$this->assertEquals('/cats/view/', TestRouter::getUrl('CatsController', ['view']));
 
         // Should match /cats/view/666
-        $this->assertEquals('/cats/view/666/', $this->getUrl('CatsController@getView', ['666']));
+        $this->assertEquals('/cats/view/666/', TestRouter::getUrl('CatsController@getView', ['666']));
 
         // Should match /funny/man/
-        $this->assertEquals('/funny/man/', $this->getUrl('/funny/man'));
+        $this->assertEquals('/funny/man/', TestRouter::getUrl('/funny/man'));
 
         // Should match /?jackdaniels=true&cola=yeah
-        $this->assertEquals('/?jackdaniels=true&cola=yeah', $this->getUrl('home', null, ['jackdaniels' => 'true', 'cola' => 'yeah']));
+        $this->assertEquals('/?jackdaniels=true&cola=yeah', TestRouter::getUrl('home', null, ['jackdaniels' => 'true', 'cola' => 'yeah']));
 
-    }
-
-    public function testRegEx()
-    {
-        SimpleRouter::router()->reset();
-        SimpleRouter::request()->setMethod('get');
-        SimpleRouter::request()->setUri('/my/custom-path');
-
-        SimpleRouter::get('/my/{path}', 'DummyController@start')->where(['path' => '[a-zA-Z\-]+']);
-
-        SimpleRouter::start();
+        TestRouter::router()->reset();
 
     }