Merge pull request #228 from skipperbent/v3-development

Development
2026-06-17 16:57:53 +00:00 · 2017-03-05 17:10:27 +01:00 · 2017-03-05 17:09:46 +01:00 · 2017-03-01 03:39:33 +01:00 · 2017-02-26 09:18:35 +01:00 · 2017-02-15 03:29:16 +01:00
39 changed files with 1023 additions and 657 deletions
@@ -15,71 +15,72 @@ If you want a great new feature or experience any issues what-so-ever, please fe

 ## Table of Contents

- Gettings started
-	- Requirements
-	- Notes
-	- Features
-	- Installation
-		- Setting up Apache
-		- Setting up Nginx
-		- Setting up simple-php-router
-		- Helper methods
+- [Getting started](#getting-started)
+	- [Requirements](#requirements)
+	- [Notes](#notes-1)
+	- [Features](#features)
+	- [Installation](#installation)
+		- [Setting up Apache](#setting-up-apache)
+		- [Setting up Nginx](#setting-up-nginx)
+		- [Configuration](#configuration)
+		- [Helper functions](#helper-functions)

- Routes
-	- Basic routing
-		- Available methods
-		- Multiple HTTP-verbs
-	- Route parameters
-		- Required parameters
-		- Optional parameters
-		- Regular expression constraints
-		- Regular expression route-match
-	- Named routes
-		- Generating URLs To Named Routes
-	- Router groups
-		- Middleware
-		- Namespaces
-		- Subdomain-routing
-		- Route prefixes
-	- Form Method Spoofing
-	- Accessing The Current Route
-	- Other examples
+- [Routes](#routes)
+	- [Basic routing](#basic-routing)
+		- [Available methods](#available-methods)
+		- [Multiple HTTP-verbs](#multiple-http-verbs)
+	- [Route parameters](#route-parameters)
+		- [Required parameters](#required-parameters)
+		- [Optional parameters](#optional-parameters)
+		- [Regular expression constraints](#regular-expression-constraints)
+		- [Regular expression route-match](#regular-expression-route-match)
+	- [Named routes](#named-routes)
+		- [Generating URLs To Named Routes](#generating-urls-to-named-routes)
+	- [Router groups](#router-groups)
+		- [Middleware](#middleware)
+		- [Namespaces](#namespaces)
+		- [Subdomain-routing](#subdomain-routing)
+		- [Route prefixes](#route-prefixes)
+	- [Form Method Spoofing](#form-method-spoofing)
+	- [Accessing The Current Route](#accessing-the-current-route)
+	- [Other examples](#other-examples)

- CSRF-protection
-	- Adding CSRF-verifier
-	- Getting CSRF-token
+- [CSRF-protection](#csrf-protection)
+	- [Adding CSRF-verifier](#adding-csrf-verifier)
+	- [Getting CSRF-token](#getting-csrf-token)

- Middleware
-	- Example
- ExceptionHandler
-	- Example
+- [Middlewares](#middlewares)
+	- [Example](#example)
+- [ExceptionHandler](#exceptionhandler)
+	- [Example](#example-1)

- Urls
- 	- Get by name (single route)
- 	- Get by name (controller route)
- 	- Get by class
- 	- Get by custom names for methods on a controller/resource route
- 	- Getting REST/resource controller urls
+- [Urls](#urls)
+ 	- [Get by name (single route)](#get-by-name-single-route)
+ 	- [Get by name (controller route)](#get-by-name-controller-route)
+ 	- [Get by class](#get-by-class)
+ 	- [Get by custom names for methods on a controller/resource route](#using-custom-names-for-methods-on-a-controllerresource-route)
+ 	- [Getting REST/resource controller urls](#getting-restresource-controller-urls)
+ 	- [Get the current url](#get-the-current-url)

- Input & parameters
-	- Return single parameter value
-	- Return single parameter object
-	- Managing files
-	- Return all parameters
+- [Input & parameters](#input--parameters)
+    - [Using the Input class to manage parameters](#using-the-input-class-to-manage-parameters)
+	    - [Get single parameter value](#get-single-parameter-value)
+	    - [Get parameter object](#get-parameter-object)
+	    - [Managing files](#managing-files)
+	    - [Get all parameters](#get-all-parameters)

- Advanced
-	- Bootmanager: loading routes dynamically
-	- Ovewrite route about to be loaded
-		- Examples
-		- Rewriting to new route
-		- Changing callback
+- [Advanced](#advanced)
+	- [Bootmanager: loading routes dynamically](#bootmanager-loading-routes-dynamically)
+	- [Url rewriting](#url-rewriting)
+		- [Rewrite using callback](#rewrite-using-callback)
+		- [Rewrite using url](#rewrite-using-url)

-	- Adding routes manually
-	- Extending
+	- [Adding routes manually](#adding-routes-manually)
+	- [Extending](#extending)

- Credits
-	- Sites
-	- License
+- [Credits](#credits)
+	- [Sites](#sites)
+	- [License](#license)

 ___

@@ -154,7 +155,7 @@ location / {

 Nothing special is required for Apache to work. We've include the `.htaccess` file in the `public` folder. If rewriting is not working for you, please check that the `mod_rewrite` module (htaccess support) is enabled in the Apache configuration.

-### Setting up simple-php-router
+### Configuration

 Create a new file, name it `routes.php` and place it in your library folder. This will be the file where you define all the routes for your project.

@@ -192,8 +193,6 @@ To implement the functions below, simply copy the code to a new file and require

 ```php
 <?php
-use Pecee\SimpleRouter\SimpleRouter;
-
 /**
 * Get url for a route by using either name/alias, class or method name.
 *
@@ -211,41 +210,43 @@ use Pecee\SimpleRouter\SimpleRouter;
 * @param array|null $getParams
 * @return string
 */
-function url($name = null, $parameters = null, $getParams = null) {
-    SimpleRouter::getUrl($name, $parameters, $getParams);
+function url($name = null, $parameters = null, $getParams = null)
+{
+    return SimpleRouter::getUrl($name, $parameters, $getParams);
 }

 /**
- * Get current csrf-token
- * @return null|string
- */
-function csrf_token() {
-    $token = new \Pecee\CsrfToken();
-    return $token->getToken();
-}
-
-/**
- * Get request object
- * @return \Pecee\Http\Request
- */
-function request() {
-    return SimpleRouter::request();
-}
-
-/**
- * Get response object
 * @return \Pecee\Http\Response
 */
-function response() {
+function response()
+{
    return SimpleRouter::response();
 }

+/**
+ * @return \Pecee\Http\Request
+ */
+function request()
+{
+    return SimpleRouter::request();
+}
+
 /**
 * Get input class
 * @return \Pecee\Http\Input\Input
 */
-function input() {
-    return SimpleRouter::request()->getInput();
+function input()
+{
+    return request()->getInput();
+}
+
+function redirect($url, $code = null)
+{
+    if ($code !== null) {
+        response()->httpCode($code);
+    }
+
+    response()->redirect($url);
 }
 ```

@@ -421,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
    });
@@ -436,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
@@ -479,7 +485,8 @@ HTML forms do not support `PUT`, `PATCH` or `DELETE` actions. So, when defining
 You can access information about the current route loaded by using the following method:

 ```php
-SimpleRouter::router()->getLoadedRoute();
+SimpleRouter::request()->getLoadedRoute();
+request()->getLoadedRoute();
 ```

 ## Other examples
@@ -493,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]+']]);
@@ -503,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);


    /**
@@ -519,7 +526,7 @@ SimpleRouter::group(['middleware' => '\Demo\Middlewares\Site', 'exceptionHandler
     * etc.
     */

-    SimpleRouter::controller('/animals', 'ControllerAnimals');
+    SimpleRouter::controller('/animals', ControllerAnimals::class);

 });

@@ -584,13 +591,19 @@ namespace Demo\Middlewares;

 use Pecee\Http\Middleware\IMiddleware;
 use Pecee\Http\Request;
-use Pecee\SimpleRouter\Route\ILoadableRoute;

 class CustomMiddleware implements Middleware {

-    public function handle(Request $request, ILoadableRoute &$route) {
+    public function handle(Request $request) {

-        $request->setUri(url('home'));
+        // Authenticate user, will be available using request()->user
+        $request->user = User::authenticate();
+
+        // If authentication failed, redirect request to user-login page.
+        if($request->user === null) {
+            $request->setRewriteUrl(url('user.login'));
+            return $request;
+        }

    }
 }
@@ -614,11 +627,10 @@ namespace Demo\Handlers;
 use Pecee\Handlers\IExceptionHandler;
 use Pecee\Http\Request;
 use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;
-use Pecee\SimpleRouter\Route\ILoadableRoute;

 class CustomExceptionHandler implements IExceptionHandler
 {
-	public function handleError(Request $request, ILoadableRoute &$route = null, \Exception $error)
+	public function handleError(Request $request, \Exception $error)
 	{

 		/* You can use the exception handler to format errors depending on the request and type. */
@@ -635,14 +647,9 @@ class CustomExceptionHandler implements IExceptionHandler
 		/* The router will throw the NotFoundHttpException on 404 */
 		if($error instanceof NotFoundHttpException) {

-			/*
-			 * Render your own custom 404-view, rewrite the request to another route,
-			 * or simply return the $request object to ignore the error and continue on rendering the route.
-			 *
-			 * The code below will make the router render our page.notfound route.
-			 */
+			// Render custom 404-page

-			$request->setUri(url('page.notfound'));
+			$request->setRewriteCallback('Demo\Controllers\PageController@notFound');
 			return $request;

 		}
@@ -660,7 +667,7 @@ class CustomExceptionHandler implements IExceptionHandler

 By default all controller and resource routes will use a simplified version of their url as name.

-### Get routes using custom name (single route)
+### Get by name (single route)

 ```php
 SimpleRouter::get('/product-view/{id}', 'ProductsController@show', ['as' => 'product']);
@@ -673,10 +680,10 @@ url('product', null, ['category' => 'shoes']);
 # /product-view/?category=shoes
 ```

-### Getting the url using the name (controller route)
+### 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']);
@@ -688,7 +695,7 @@ url('picture', 'view');
 # /images/view/
 ```

-### Getting the url using class
+### Get by class

 ```php
 SimpleRouter::get('/product-view/{id}', 'ProductsController@show', ['as' => 'product']);
@@ -705,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');

@@ -716,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');
@@ -731,7 +738,7 @@ url('phones.edit');
 # /phones/edit/
 ```

-### Return the current url
+### Get the current url

 ```php
 url();
@@ -748,7 +755,7 @@ url(null, null, ['q' => 'cars']);

 We've added the `Input` class to easy access and manage parameters from your Controller-classes.

-**Return single parameter value (matches both GET, POST, FILE):**
+### Get single parameter value:

 If items is grouped in the html, it will return an array of items.

@@ -758,7 +765,7 @@ If items is grouped in the html, it will return an array of items.
 $value = input()->get($index, $defaultValue, $methods);
 ```

-**Return parameter object (matches both GET, POST, FILE):**
+### Get parameter object

 Will return an instance of `InputItem` or `InputFile` depending on the type.

@@ -774,7 +781,7 @@ If items is grouped in the html, it will return an array of items.
 $object = input()->getObject($index, $defaultValue = null, $methods = null);
 ```

-**Return specific GET parameter (where name is the name of your parameter):**
+### Return specific GET parameter (where name is the name of your parameter):

 ```php
 # -- match any (default) --
@@ -798,9 +805,11 @@ $object = input()->get($index, $defaultValue, 'file');
 $object = input()->findGet($index, $defaultValue);
 $object = input()->findPost($index, $defaultValue);
 $object = input()->findFile($index, $defaultValue);
+```

-# -- examples --
+### Managing files

+```php
 /**
 * In this small example we loop through a collection of files
 * added on the page like this
@@ -818,9 +827,10 @@ foreach(input()->get('images', []) as $image)

    }
 }
+
 ```

-**Return all parameters:**
+### Get all parameters

 ```php
 // Get all
@@ -860,7 +870,132 @@ $siteId = input()->get('site_id', 2, ['post', 'get']);

 # Advanced

-## Load routes dynamicially using the router bootmanager
+## Url rewriting
+Sometimes it can be useful to manipulate the route about to be loaded.
+simple-php-router allows you to easily change the route about to be executed.
+All information about the current route is stored in the ```\Pecee\SimpleRouter\Router``` instance's `loadedRoute` property.
+
+For easy access you can use the shortcut method `\Pecee\SimpleRouter\SimpleRouter::router()`.
+
+
+```php
+use Pecee\SimpleRouter;
+$request = SimpleRouter::request();
+$request->setRewriteCallback('Example\MyCustomClass@hello');
+
+// -- or you can rewrite by url --
+
+$request->setRewriteUrl('/my-rewrite-url');
+```
+
+### Examples
+
+It's only possible to change the route BEFORE the route has initially been rendered. You can use the `Request` object to manipulate the route which are about to be loaded.
+
+#### Rewrite using callback
+
+This method is most efficient, as it will render the route immediately.
+
+This method is useful for rendering 404-pages etc.
+
+You can also change the callback by modifying the `$route` parameter. This is perfect if you just want to display a view quickly - or change the callback depending
+on some criteria's for the request.
+
+The callback below will fire immediately after the `Middleware` or `ExceptionHandler` has been loaded, as they are loaded before the route is rendered.
+If you wish to change the callback from outside, please have this in mind.
+
+The example below will render `DefaultController@notFound` regardless of the url.
+
+**NOTE: Use this method if you want to load another controller. No additional middlewares or rules will be loaded.**
+
+#### Middleware example
+
+```php
+namespace Demo\Middlewares;
+
+use Pecee\Http\Middleware\IMiddleware;
+use Pecee\Http\Request;
+
+class CustomMiddleware implements IMiddleware {
+
+    public function handle(Request $request) {
+
+        $request->setRewriteCallback('Demo\Controllers\DefaultController@notFound');
+        return $request;
+
+    }
+
+}
+```
+
+#### Exception handler example
+
+```php
+namespace Demo\Handlers;
+
+use Pecee\Handlers\IExceptionHandler;
+use Pecee\Http\Request;
+use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;
+
+class CustomExceptionHandler implements IExceptionHandler
+{
+	public function handleError(Request $request, \Exception $error)
+	{
+		/* The router will throw the NotFoundHttpException on 404 */
+		if($error instanceof NotFoundHttpException) {
+
+			/*
+			 * Render your own custom 404-view, rewrite the request to another route,
+			 * or simply return the $request object to ignore the error and continue on rendering the route.
+			 *
+			 * The code below will make the router render our page.notfound route.
+			 */
+
+			$request->setRewriteCallback('Demo\Controllers\DefaultController@notFound');
+			return $request;
+
+		}
+
+		throw $error;
+
+	}
+
+}
+```
+
+#### Rewrite using url
+
+The example below will cause the router to reload the request and reinitialize all the routes. This method is slower, but will ensure that all middlewares and rules for the route is loaded.
+
+This method is useful if you want to redirect a url to another-url which is dependent on a middleware. You can also add a custom rule by calling `$request->setRewriteRoute($route)` if
+you want to customize request-methods or use another route-type like `RouteController` etc.
+
+We are using the `url()` helper function to get the uri to another route added in the `routes.php` file.
+
+**NOTE: Use this method if you want to fully load another route using it's settings (request method, middlewares etc).**
+
+#### Middleware example
+
+The example below will redirect the request to the `home`-route.
+
+```php
+namespace Demo\Middlewares;
+
+use Pecee\Http\Middleware\IMiddleware;
+use Pecee\Http\Request;
+
+class CustomMiddleware implements IMiddleware {
+
+    public function handle(Request $request) {
+
+        $request->setRewriteUrl(url('home'));
+        return $request;
+
+    }
+}
+```
+
+# Bootmanager: loading routes dynamically

 Sometimes it can be necessary to keep urls stored in the database, file or similar. In this example, we want the url ```/my-cat-is-beatiful``` to load the route ```/article/view/1``` which the router knows, because it's defined in the ```routes.php``` file.

@@ -876,7 +1011,7 @@ class CustomRouterRules implement IRouterBootManager {

        $rewriteRules = [
            '/my-cat-is-beatiful' => '/article/view/1',
-            '/horses-are-great' => '/article/view/2'
+            '/horses-are-great'   => '/article/view/2',
        ];

        foreach($rewriteRules as $url => $rule) {
@@ -884,11 +1019,11 @@ class CustomRouterRules implement IRouterBootManager {
            // If the current uri matches the url, we use our custom route

            if($request->getUri() === $url) {
-                $request->setUri($rule);
+                $request->setRewriteUrl($rule);
+                return $request;
            }
        }

-        return $request;
    }

 }
@@ -906,82 +1041,6 @@ The last thing we need to do, is to add our custom boot-manager to the ```routes
 SimpleRouter::addBootManager(new CustomRouterRules());
 ```

-## Easily overwrite route about to be loaded
-Sometimes it can be useful to manipulate the route about to be loaded.
-simple-php-router allows you to easily change the route about to be executed.
-All information about the current route is stored in the ```\Pecee\SimpleRouter\Router``` instance's `loadedRoute` property.
-
-For easy access you can use the shortcut method `\Pecee\SimpleRouter\SimpleRouter::router()`.
-
-
-```php
-use Pecee\SimpleRouter;
-$route = SimpleRouter::router()->getLoadedRoute();
-
-$route->setCallback('Example\MyCustomClass@hello');
-
-// -- or you can rewrite by doing --
-
-$route->setClass('Example\MyCustomClass');
-$route->setMethod('hello');
-```
-
-### Examples
-
-It's only possible to change the route BEFORE the route has initially been loaded. If you want to redirect to another route, we highly recommend that you
-modify the `IRoute` object from a `Middleware` or `ExceptionHandler`, like the examples below.
-
-#### Rewriting to new route
-
-The example below will cause the router to re-route the request with another url. We are using the `url()` helper function to get the uri to another route added in the `routes.php` file.
-
-**NOTE: Use this method if you want to fully load another route using it's settings (request method etc).**
-
-
-```php
-namespace Demo\Middlewares;
-
-use Pecee\Http\Middleware\IMiddleware;
-use Pecee\Http\Request;
-use Pecee\SimpleRouter\Route\ILoadableRoute;
-
-class CustomMiddleware implements Middleware {
-
-    public function handle(Request $request, ILoadableRoute &$route) {
-
-        $request->setUri(url('home'));
-
-    }
-}
-```
-
-#### Changing callback
-You can also change the callback by modifying the `$route` parameter. This is perfect if you just want to display a view quickly - or change the callback depending
-on some criteria's for the request.
-
-The callback below will fire immediately after the `Middleware` or `ExceptionHandler` has been loaded, as they are loaded before the route is rendered.
-If you wish to change the callback from outside, please have this in mind.
-
-**NOTE: Use this method if you want to load another controller. No additional middlewares or rules will be loaded.**
-
-```php
-namespace Demo\Middlewares;
-
-use Pecee\Http\Middleware\IMiddleware;
-use Pecee\Http\Request;
-use Pecee\SimpleRouter\Route\ILoadableRoute;
-
-class CustomMiddleware implements Middleware {
-
-    public function handle(Request $request, ILoadableRoute &$route) {
-
-        $route->callback('DefaultController@home');
-
-    }
-
-}
-```
-
 ## Adding routes manually

 The ```SimpleRouter``` class referenced in the previous example, is just a simple helper class that knows how to communicate with the ```Router``` class.
@@ -991,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() {

@@ -1000,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');

@@ -1042,6 +1101,7 @@ class Router extends SimpleRouter {
 # Credits

 ## Sites
+
 This is some sites that uses the simple-router project in production.

 - [holla.dk](http://www.holla.dk)
@@ -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/"
+    }
+  }
 }
@@ -1,7 +1,7 @@
 <?php
 namespace Pecee\Controllers;

-interface IRestController
+interface IResourceController
 {

    /**
@@ -2,16 +2,14 @@
 namespace Pecee\Handlers;

 use Pecee\Http\Request;
-use Pecee\SimpleRouter\Route\ILoadableRoute;

 interface IExceptionHandler
 {
    /**
     * @param Request $request
-     * @param ILoadableRoute $route
     * @param \Exception $error
     * @return Request|null
     */
-    public function handleError(Request $request, ILoadableRoute &$route = null, \Exception $error);
+    public function handleError(Request $request, \Exception $error);

 }
@@ -12,6 +12,8 @@ interface IInputItem

    public function setName($name);

+    public function getValue();
+
    public function __toString();

 }
@@ -93,7 +93,9 @@ class Input

            $path = $original[$property];

-            foreach (array_values($index) as $i) {
+            $fileValues = array_values($index);
+
+            foreach ($fileValues as $i) {
                $path = $path[$i];
            }

@@ -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']);
@@ -127,7 +127,7 @@ class InputFile implements IInputItem
     */
    public function getExtension()
    {
-        return pathinfo($this->getName(), PATHINFO_EXTENSION);
+        return pathinfo($this->getFilename(), PATHINFO_EXTENSION);
    }

    /**
@@ -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 [
@@ -4,7 +4,6 @@ namespace Pecee\Http\Middleware;
 use Pecee\CsrfToken;
 use Pecee\Http\Middleware\Exceptions\TokenMismatchException;
 use Pecee\Http\Request;
-use Pecee\SimpleRouter\Route\ILoadableRoute;

 class BaseCsrfVerifier implements IMiddleware
 {
@@ -55,7 +54,7 @@ class BaseCsrfVerifier implements IMiddleware
        return false;
    }

-    public function handle(Request $request, ILoadableRoute &$route = null)
+    public function handle(Request $request)
    {

        if ($this->skip($request) === false && in_array($request->getMethod(), ['post', 'put', 'delete'], false) === true) {
@@ -2,15 +2,13 @@
 namespace Pecee\Http\Middleware;

 use Pecee\Http\Request;
-use Pecee\SimpleRouter\Route\ILoadableRoute;

 interface IMiddleware
 {
    /**
     * @param Request $request
-     * @param ILoadableRoute $route
     * @return Request|null
     */
-    public function handle(Request $request, ILoadableRoute &$route);
+    public function handle(Request $request);

 }
@@ -2,6 +2,9 @@
 namespace Pecee\Http;

 use Pecee\Http\Input\Input;
+use Pecee\SimpleRouter\Route\ILoadableRoute;
+use Pecee\SimpleRouter\Route\RouteUrl;
+use Pecee\SimpleRouter\SimpleRouter;

 class Request
 {
@@ -12,6 +15,17 @@ class Request
    protected $method;
    protected $input;

+    /**
+     * @var ILoadableRoute|null
+     */
+    protected $rewriteRoute;
+    protected $rewriteUrl;
+
+    /**
+     * @var ILoadableRoute|null
+     */
+    protected $loadedRoute;
+
    public function __construct()
    {
        $this->parseHeaders();
@@ -111,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
@@ -213,6 +238,103 @@ class Request
        $this->method = $method;
    }

+    /**
+     * Set rewrite route
+     *
+     * @param ILoadableRoute $route
+     * @return static
+     */
+    public function setRewriteRoute(ILoadableRoute $route)
+    {
+        $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 ILoadableRoute|null
+     */
+    public function getRewriteRoute()
+    {
+        return $this->rewriteRoute;
+    }
+
+    /**
+     * Get rewrite url
+     *
+     * @return string
+     */
+    public function getRewriteUrl()
+    {
+        return $this->rewriteUrl;
+    }
+
+    /**
+     * Set rewrite url
+     *
+     * @param string $rewriteUrl
+     * @return static
+     */
+    public function setRewriteUrl($rewriteUrl)
+    {
+        $this->rewriteUrl = $rewriteUrl;
+
+        return $this;
+    }
+
+    /**
+     * Set rewrite callback
+     * @param string $callback
+     * @return static
+     */
+    public function setRewriteCallback($callback)
+    {
+        return $this->setRewriteRoute(new RouteUrl($this->uri, $callback));
+    }
+
+    /**
+     * Get loaded route
+     * @return ILoadableRoute|null
+     */
+    public function getLoadedRoute()
+    {
+        return $this->loadedRoute;
+    }
+
+    /**
+     * Set loaded route
+     *
+     * @param ILoadableRoute $route
+     * @return static
+     */
+    public function setLoadedRoute(ILoadableRoute $route)
+    {
+        $this->loadedRoute = $route;
+
+        return $this;
+    }
+
    public function __isset($name)
    {
        return array_key_exists($name, $this->data);
@@ -3,4 +3,5 @@ namespace Pecee\SimpleRouter\Exceptions;

 class NotFoundHttpException extends HttpException
 {
+
 }
@@ -20,9 +20,8 @@ interface ILoadableRoute extends IRoute
     * Loads and renders middlewares-classes
     *
     * @param Request $request
-     * @param ILoadableRoute $route
     */
-    public function loadMiddleware(Request $request, ILoadableRoute $route);
+    public function loadMiddleware(Request $request);

    public function getUrl();

@@ -8,10 +8,11 @@ interface IRoute
    /**
     * Method called to check if a domain matches
     *
+     * @param string $route
     * @param Request $request
     * @return bool
     */
-    public function matchRoute(Request $request);
+    public function matchRoute($route, Request $request);

    /**
     * Called when route is matched.
@@ -23,14 +23,13 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
     * Loads and renders middlewares-classes
     *
     * @param Request $request
-     * @param ILoadableRoute $route
     * @throws HttpException
     */
-    public function loadMiddleware(Request $request, ILoadableRoute $route)
+    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++) {

@@ -38,18 +37,17 @@ 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');
                }

-                $middleware->handle($request, $route);
+                $middleware->handle($request);
            }
        }
    }

    public function matchRegex(Request $request, $url)
    {
-
        /* Match on custom defined regular expression */

        if ($this->regex === null) {
@@ -83,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);
            }
        }
@@ -107,46 +105,44 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
     */
    public function findUrl($method = null, $parameters = null, $name = null)
    {
-        $url = '';
-
-        $parameters = (array)$parameters;
+        $url = $this->getUrl();

        if ($this->getGroup() !== null && count($this->getGroup()->getDomains()) > 0) {
-            $url .= '//' . $this->getGroup()->getDomains()[0];
+            $url = '//' . $this->getGroup()->getDomains()[0] . $url;
        }

-        $url .= $this->getUrl();
-
-        $params = array_merge($this->getParameters(), $parameters);
-
-        /* Url that contains parameters that aren't recognized */
+        /* Contains parameters that aren't recognized and will be appended at the end of the url */
        $unknownParams = [];

-        /* Create the param string - {} */
+        /* Create the param string - {parameter} */
        $param1 = $this->paramModifiers[0] . '%s' . $this->paramModifiers[1];

-        /* Create the param string with the optional symbol - {?} */
+        /* Create the param string with the optional symbol - {parameter?} */
        $param2 = $this->paramModifiers[0] . '%s' . $this->paramOptionalSymbol . $this->paramModifiers[1];

-        /* Let's parse the values of any {} parameter in the url */
+        /* Replace any {parameter} in the url with the correct value */

+        $params = $this->getParameters();
        $max = count($params) - 1;
        $keys = array_keys($params);

        for ($i = $max; $i >= 0; $i--) {
            $param = $keys[$i];
-            $value = $params[$param];
+            $value = $value = ($parameters !== null && array_key_exists($param, $parameters)) ? $parameters[$param] : $params[$param];

-            $value = isset($parameters[$param]) ? $parameters[$param] : $value;
+            /* If parameter is specifically set to null - use the original-defined value */
+            if ($value === null && isset($this->originalParameters[$param])) {
+                $value = $this->originalParameters[$param];
+            }

            if (stripos($url, $param1) !== false || stripos($url, $param) !== false) {
+                /* Add parameter to the correct position */
                $url = str_ireplace([sprintf($param1, $param), sprintf($param2, $param)], $value, $url);
            } else {
                $unknownParams[$param] = $value;
            }
        }

-        /** @noinspection AliasFunctionsUsageInspection */
        $url .= join('/', $unknownParams);

        return rtrim($url, '/') . '/';
@@ -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,23 +98,21 @@ 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 = [];

-            $parameterNamesRegex = [];
-            $parameterNames = $parameters[1];
-            $parameterRequired = [];
+        if (preg_match_all('/' . $regex . '/', $route, $parameters)) {

-            $urlParts = preg_split('/\{[^}]+\}/is', rtrim($route, '/'));
+            $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;
-                    $regex = sprintf('(?P<%s>%s)', $name, $regex) . $parameters[2][$key];
+                    $regex = sprintf('\-?\/?(?P<%s>%s)', $name, $regex) . $parameters[2][$key];

                }

@@ -122,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] = $matches[$name];
+            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;
@@ -406,7 +412,7 @@ abstract class Route implements IRoute
     */
    public function where(array $options)
    {
-        return $this->where($options);
+        return $this->setWhere($options);
    }

    /**
@@ -442,7 +448,7 @@ abstract class Route implements IRoute
            $this->originalParameters = $parameters;
        }

-        $this->parameters = $parameters;
+        $this->parameters = array_merge($this->parameters, $parameters);

        return $this;
    }
@@ -83,34 +83,32 @@ class RouteController extends LoadableRoute implements IControllerRoute
        return '/' . trim($url, '/') . '/';
    }

-    public function matchRoute(Request $request)
+    public function matchRoute($url, Request $request)
    {
-        $url = parse_url(urldecode($request->getUri()), PHP_URL_PATH);
+        $url = parse_url(urldecode($url), PHP_URL_PATH);
        $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;
@@ -40,13 +40,14 @@ class RouteGroup extends Route implements IGroupRoute
    /**
     * Method called to check if route matches
     *
+     * @param string $url
     * @param Request $request
     * @return bool
     */
-    public function matchRoute(Request $request)
+    public function matchRoute($url, Request $request)
    {
        /* Skip if prefix doesn't match */
-        if ($this->prefix !== null && stripos($request->getUri(), $this->prefix) === false) {
+        if ($this->prefix !== null && stripos($url, $this->prefix) === false) {
            return false;
        }

@@ -61,9 +61,9 @@ class RouteResource extends LoadableRoute implements IControllerRoute

    public function findUrl($method = null, $parameters = null, $name = null)
    {
-        $method = array_search($name, $this->names, false);
-        if ($method !== false) {
-            return rtrim($this->url . $this->urls[$method], '/') . '/';
+        $url = array_search($name, $this->names, false);
+        if ($url !== false) {
+            return rtrim($this->url . $this->urls[$url], '/') . '/';
        }

        return $this->url;
@@ -76,48 +76,50 @@ class RouteResource extends LoadableRoute implements IControllerRoute
        return true;
    }

-    public function matchRoute(Request $request)
+    public function matchRoute($url, Request $request)
    {
-        $url = parse_url(urldecode($request->getUri()), PHP_URL_PATH);
+        $url = parse_url(urldecode($url), PHP_URL_PATH);
        $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;
        }

        $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']);
        }

@@ -11,15 +11,15 @@ class RouteUrl extends LoadableRoute
        $this->setCallback($callback);
    }

-    public function matchRoute(Request $request)
+    public function matchRoute($url, Request $request)
    {
-        $url = parse_url(urldecode($request->getUri()), PHP_URL_PATH);
+        $url = parse_url(urldecode($url), PHP_URL_PATH);
        $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;
-
    }

 }
@@ -69,38 +69,7 @@ class Router
     */
    protected $exceptionHandlers;

-    /**
-     * The current loaded route
-     * @var ILoadableRoute|null
-     */
-    protected $loadedRoute;
-
-    /**
-     * List over route changes (to avoid endless-looping)
-     * @var array
-     */
-    protected $routeRewrites = [];
-
-    /**
-     * If the route has been rewritten/changed this property will contain the original url.
-     * @var string
-     */
-    protected $originalUrl;
-
-    /**
-     * 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();
    }
@@ -143,6 +112,7 @@ class Router
     * @param array $routes
     * @param IGroupRoute|null $group
     * @param IRoute|null $parent
+     * @throws NotFoundHttpException
     */
    protected function processRoutes(array $routes, IGroupRoute $group = null, IRoute $parent = null)
    {
@@ -151,6 +121,8 @@ class Router

        $exceptionHandlers = [];

+        $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUri();
+
        /* @var $route IRoute */
        for ($i = $max; $i >= 0; $i--) {

@@ -167,7 +139,7 @@ class Router
                    $route->renderRoute($this->request);
                    $this->processingRoute = false;

-                    if ($route->matchRoute($this->request) === true) {
+                    if ($route->matchRoute($url, $this->request) === true) {

                        /* Add exception handlers */
                        if (count($route->getExceptionHandlers()) > 0) {
@@ -202,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 = [];

@@ -214,53 +186,56 @@ 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)
    {
-        $this->loadedRoute = null;
        $routeNotAllowed = false;

        try {
-            /* 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];
-
-                    $this->request = $manager->boot($this->request);
-
-                    if (!($this->request instanceof Request)) {
-                        throw new HttpException('Bootmanager "' . get_class($manager) . '" must return instance of ' . Request::class, 500);
-                    }
-                }
-            }

            if ($rewrite === false) {
-
-                /* Loop through each route-request */
-                $this->processRoutes($this->routes);
+                $this->loadRoutes();

                if ($this->csrfVerifier !== null) {

                    /* Verify csrf token for request */
                    $this->csrfVerifier->handle($this->request);
                }
-
-                $this->originalUrl = $this->request->getUri();
            }

+            $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUri();
+
            $max = count($this->processedRoutes) - 1;

-            /* @var $route IRoute */
+            /* @var $route ILoadableRoute */
            for ($i = $max; $i >= 0; $i--) {

                $route = $this->processedRoutes[$i];

                /* If the route matches */
-                if ($route->matchRoute($this->request) === true) {
+                if ($route->matchRoute($url, $this->request) === true) {

                    /* Check if request method matches */
                    if (count($route->getRequestMethods()) > 0 && in_array($this->request->getMethod(), $route->getRequestMethods(), false) === false) {
@@ -268,12 +243,23 @@ class Router
                        continue;
                    }

-                    $this->loadedRoute = $route;
-                    $this->loadedRoute->loadMiddleware($this->request, $this->loadedRoute);
+                    $route->loadMiddleware($this->request);

-                    /* If the request has changed, we reinitialize the router */
-                    if ($this->request->getUri() !== $this->originalUrl && in_array($this->request->getUri(), $this->routeRewrites) === false) {
-                        $this->routeRewrites[] = $this->request->getUri();
+                    $rewriteRoute = $this->request->getRewriteRoute();
+
+                    if ($rewriteRoute !== null) {
+                        $rewriteRoute->loadMiddleware($this->request);
+                        $rewriteRoute->renderRoute($this->request);
+
+                        return;
+                    }
+
+                    /* If the request has changed */
+                    $rewriteUrl = $this->request->getRewriteUrl();
+
+                    if ($rewriteUrl !== null && $rewriteUrl !== $url) {
+                        unset($this->processedRoutes[$i]);
+                        $this->processedRoutes = array_values($this->processedRoutes);
                        $this->routeRequest(true);

                        return;
@@ -281,8 +267,8 @@ class Router

                    /* Render route */
                    $routeNotAllowed = false;
-                    $this->request->setUri($this->originalUrl);
-                    $this->loadedRoute->renderRoute($this->request);
+                    $this->request->setLoadedRoute($route);
+                    $route->renderRoute($this->request);

                    break;
                }
@@ -296,35 +282,48 @@ class Router
            $this->handleException(new HttpException('Route or method not allowed', 403));
        }

-        if ($this->loadedRoute === null) {
+        if ($this->request->getLoadedRoute() === null) {
            $this->handleException(new NotFoundHttpException('Route not found: ' . $this->request->getUri(), 404));
        }
    }

    protected function handleException(\Exception $e)
    {
+        $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUri();
+
        $max = count($this->exceptionHandlers);

        /* @var $handler IExceptionHandler */
        for ($i = 0; $i < $max; $i++) {

            $handler = $this->exceptionHandlers[$i];
-
            $handler = new $handler();

-            if (!($handler instanceof IExceptionHandler)) {
+            if (($handler instanceof IExceptionHandler) === false) {
                throw new HttpException('Exception handler must implement the IExceptionHandler interface.', 500);
            }

-            $request = $handler->handleError($this->request, $this->loadedRoute, $e);
+            if ($handler->handleError($this->request, $e) !== null) {

-            /* If the request has changed */
-            if ($request !== null && $this->request->getUri() !== $this->originalUrl && in_array($request->getUri(), $this->routeRewrites) === false) {
-                $this->request = $request;
-                $this->routeRewrites[] = $request->getUri();
-                $this->routeRequest(true);
+                $rewriteRoute = $this->request->getRewriteRoute();

-                return;
+                if ($rewriteRoute !== null) {
+                    $rewriteRoute->loadMiddleware($this->request);
+                    $rewriteRoute->renderRoute($this->request);
+
+                    return;
+                }
+
+                $rewriteUrl = $this->request->getRewriteUrl();
+
+                /* If the request has changed */
+                if ($rewriteUrl !== null && $rewriteUrl !== $url) {
+                    unset($this->exceptionHandlers[$i]);
+                    $this->exceptionHandlers = array_values($this->exceptionHandlers);
+                    $this->routeRequest(true);
+
+                    return;
+                }
            }
        }

@@ -337,7 +336,7 @@ class Router

            if ($includeEmpty === false) {
                $getParams = array_filter($getParams, function ($item) {
-                    return (!empty($item));
+                    return (trim($item) !== '');
                });
            }

@@ -437,9 +436,11 @@ class Router
            return (($url === '') ? '/' : $url . '/') . $this->arrayToParams($getParams);
        }

+        $loadedRoute = $this->request->getLoadedRoute();
+
        /* If nothing is defined and a route is loaded we use that */
-        if ($name === null && $this->loadedRoute !== null) {
-            return $this->loadedRoute->findUrl($this->loadedRoute->getMethod(), $parameters, $name) . $this->arrayToParams($getParams);
+        if ($name === null && $loadedRoute !== null) {
+            return $loadedRoute->findUrl($loadedRoute->getMethod(), $parameters, $name) . $this->arrayToParams($getParams);
        }

        /* We try to find a match on the given name */
@@ -548,13 +549,4 @@ class Router
        return $this;
    }

-    /**
-     * Get loaded route
-     * @return ILoadableRoute|null
-     */
-    public function getLoadedRoute()
-    {
-        return $this->loadedRoute;
-    }
-
 }
@@ -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;
+    }
+
 }
@@ -2,24 +2,19 @@

 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);
-	}
-
-	public function notFound()
-	{
-		echo 'not found';
-	}
-
-	public function silent() {
-
+		echo join(', ', func_get_args());
 	}

 }
@@ -1,12 +1,11 @@
 <?php
 require_once 'Exceptions/MiddlewareLoadedException.php';

-use Pecee\Http\Middleware\IMiddleware;
 use Pecee\Http\Request;

-class DummyMiddleware implements IMiddleware
+class DummyMiddleware implements \Pecee\Http\Middleware\IMiddleware
 {
-	public function handle(Request $request, \Pecee\SimpleRouter\Route\ILoadableRoute &$route)
+	public function handle(Request $request)
 	{
 		throw new MiddlewareLoadedException('Middleware loaded!');
 	}
@@ -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;
+    }
+
+}
@@ -2,7 +2,7 @@

 class ExceptionHandler implements \Pecee\Handlers\IExceptionHandler
 {
-	public function handleError(\Pecee\Http\Request $request, \Pecee\SimpleRouter\Route\ILoadableRoute &$route = null, \Exception $error)
+	public function handleError(\Pecee\Http\Request $request, \Exception $error)
 	{
 	    echo $error->getMessage();
 	}
@@ -0,0 +1,14 @@
+<?php
+
+class ExceptionHandlerFirst implements \Pecee\Handlers\IExceptionHandler
+{
+	public function handleError(\Pecee\Http\Request $request, \Exception $error)
+	{
+	    global $stack;
+	    $stack[] = static::class;
+
+		$request->setUri('/');
+		return $request;
+	}
+
+}
@@ -0,0 +1,14 @@
+<?php
+
+class ExceptionHandlerSecond implements \Pecee\Handlers\IExceptionHandler
+{
+	public function handleError(\Pecee\Http\Request $request, \Exception $error)
+	{
+        global $stack;
+        $stack[] = static::class;
+
+        $request->setUri('/');
+        return $request;
+	}
+
+}
@@ -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');
+	}
+
+}
@@ -1,13 +0,0 @@
-<?php
-
-class TestExceptionHandlerFirst implements \Pecee\Handlers\IExceptionHandler
-{
-	public function handleError(\Pecee\Http\Request $request, \Pecee\SimpleRouter\Route\ILoadableRoute &$route = null, \Exception $error)
-	{
-	    echo 'ExceptionHandler 1 loaded' . chr(10);
-
-		$request->setUri('/');
-		return $request;
-	}
-
-}
@@ -1,13 +0,0 @@
-<?php
-
-class TestExceptionHandlerSecond implements \Pecee\Handlers\IExceptionHandler
-{
-	public function handleError(\Pecee\Http\Request $request, \Pecee\SimpleRouter\Route\ILoadableRoute &$route = null, \Exception $error)
-	{
-        echo 'ExceptionHandler 2 loaded' . chr(10);
-
-        $request->setUri('/');
-        return $request;
-	}
-
-}
@@ -1,12 +0,0 @@
-<?php
-
-class TestExceptionHandlerThird implements \Pecee\Handlers\IExceptionHandler
-{
-	public function handleError(\Pecee\Http\Request $request, \Pecee\SimpleRouter\Route\ILoadableRoute &$route = null, \Exception $error)
-	{
-        echo 'ExceptionHandler 3 loaded' . chr(10);
-
-		throw new ExceptionHandlerException('All good!', 666);
-	}
-
-}
@@ -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;
+    }
+}
@@ -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();

    }

@@ -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;
+    }
+
+}
@@ -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');
    }

 }
@@ -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);
+
+    }
+
+}
@@ -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);
+
+    }
+
+}
@@ -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');
+    }
+
 }
@@ -3,99 +3,90 @@
 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 = [])
-    {
-        return SimpleRouter::getUrl($name, $parameters, $getParams);
-    }

    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']));
+
+        TestRouter::router()->reset();

    }
Author	SHA1	Message	Date
Simon Sessingø	94d0764631	Merge pull request #228 from skipperbent/v3-development Development	2017-03-05 17:10:27 +01:00
Simon Sessingø	ff3f1bdcdd	Development - Fixed issue #227 causing custom resource-routes not to be loaded after latest update. - Optimized `RouteResource` class. - Renamed `IRestController` to `IResourceController`. - Added unit-tests for RouterResource. - Simplified unit-tests with the `TestRouter` custom router class.	2017-03-05 17:09:46 +01:00
Simon Sessingø	3e75d6ec0b	Merge pull request #225 from skipperbent/v3-development Development	2017-03-01 03:39:33 +01:00
Simon Sessingø	8c5d8c2dc9	Development - Fixed: namespace being prepended on `RouterController` routes with absolute namespaces. - Fixed: match domain on `RouteController` and `RouteResource`. - Fixed: strict url-matching on `RouteController`. Fix should provide better url-matching. - Fixed: `RouterResource` always matching first url when having simular urls (ex: `/funny-cat` and `/funny-dog`). - Added `loadRoutes` method to `Router` class so routes now can be loaded without routing the request (useful when running in Cli etc). - Removed `getInstance` from `Router` class. Please use `SimpleRouter::router()` for singleton usage instead. - Added `getRemoteAddr` alias-method for `getIp` in `Request` class. - Added `getValue` to `IInputItem` interface. - Other minor optimizations. - Updated documentation with note on absolute/relative namespaces.	2017-02-26 09:18:35 +01:00
Simon Sessingø	9d2bffcd02	Merge pull request #222 from skipperbent/v3-development Development	2017-02-15 03:29:16 +01:00
Simon Sessingø	2a448fccd2	Development - Fixed: only set default namespace on relative callbacks. - Fixed: default-namespace not being set when calling `SimpleRouter::resource`. - Minor optimisations.	2017-02-15 03:28:34 +01:00
Simon Sessingø	e682cf0b7c	Merge pull request #219 from skipperbent/v3-development V3 development	2017-02-13 06:47:26 +01:00
Simon Sessingø	c87298ee24	Optimisations	2017-02-13 06:45:07 +01:00
Simon Sessingø	79414255e0	Development - Using `$request->setRewriteRoute($route);` rewrite-callback now renders any added middlewares on the route. - Rewrite callbacks now sets default-namespace on route, if defined.	2017-02-13 06:29:22 +01:00
Simon Sessingø	e913dd98da	Merge pull request #217 from skipperbent/v3-development Fixed: replace empty parameter-values with null.	2017-02-12 20:48:02 +01:00
Simon Sessingø	ccd3cf450e	Fixed: replace empty parameter-values with null.	2017-02-12 20:43:49 +01:00
Simon Sessingø	2654ca67db	Merge pull request #214 from skipperbent/v3-development Optimisations	2017-02-09 13:34:32 +01:00
Simon Sessingø	86c3e513c3	Optimisations	2017-02-09 13:33:36 +01:00
Simon Sessingø	ce276bd5b7	Version 3 - Easier rewrite management. - Optimisations. - Updated documentation.	2017-02-09 13:18:05 +01:00
Simon Sessingø	bf069c2d42	Fixed getExtension method in InputFile retuning empty value.	2017-02-01 07:51:35 +01:00
Simon Sessingø	523d49359b	Development - Fixed where method calling itself instead of setWhere. - Added unit-tests for regex.	2017-01-19 18:40:47 +01:00
Simon Sessingø	7cc2652bcd	getRoute optimisations.	2016-11-28 14:13:58 +01:00
Simon Sessingø	e26d55a810	`getUrl` will now use default-parameter value if specificially set to null when using `url()`.	2016-11-28 09:37:05 +01:00
Simon Sessingø	8f3ce68a5e	Optimised route-match behavior	2016-11-28 06:43:26 +01:00
Simon Sessingø	d25351f4f9	Fixed parameters not merged with default values	2016-11-28 05:53:02 +01:00