Merge pull request #129 from skipperbent/v2-development

Bugfixes

README.md

@@ -18,7 +18,7 @@ The goal of this project is to create a router that is 100% compatible with the
 
 ### Features
 
-- Basic routing (get, post, put, delete) with support for custom multiple verbs.
+- Basic routing (`GET`, `POST`, `PUT`, `DELETE`) with support for custom multiple verbs.
 - Regular Expression Constraints for parameters.
 - Named routes.
 - Generating url to routes.
@@ -81,7 +81,9 @@ use Pecee\SimpleRouter\SimpleRouter;
 // Add CSRF support (if needed)
 SimpleRouter::csrfVerifier(new \Pecee\Http\Middleware\BaseCsrfVerifier());
 
-SimpleRouter::group(['prefix' => 'v1', 'middleware' => '\MyWebsite\Middleware\SomeMiddlewareClass'], function() {
+SimpleRouter::get('/page/404', 'ControllerPage@notFound', ['as' => 'page.notfound']);
+
+SimpleRouter::group(['prefix' => '/v1', 'middleware' => '\MyWebsite\Middleware\SomeMiddlewareClass'], function() {
 
     SimpleRouter::group(['prefix' => '/services', 'exceptionHandler' => '\MyProject\Handler\CustomExceptionHandler'], function() {
 
@@ -116,7 +118,7 @@ SimpleRouter::group(['prefix' => 'v1', 'middleware' => '\MyWebsite\Middleware\So
 This is a basic example of an ExceptionHandler implementation:
 
 ```php
-namespace BB\Handlers;
+namespace Demo\Handlers;
 
 use Pecee\Http\Request;
 use Pecee\SimpleRouter\RouterEntry;
@@ -127,7 +129,11 @@ class CustomExceptionHandler implements IExceptionHandler {
 
         // If the error-code is 404; show another route which contains the page-not-found
         if($error->getCode() === 404) {
-            // Load your custom 404-page view
+            // Throw your custom 404-page view
+            // - or -
+            // load another route with our 404 page
+            
+            return $request->setUri(url('page.notfound'));
         }
 
         // Output error as json if on api path.
@@ -140,7 +146,7 @@ class CustomExceptionHandler implements IExceptionHandler {
     }
 
 }
-``
+```
 
 ### Sub-domain routing
 
@@ -184,109 +190,36 @@ This is a simple example of an integration into a framework.
 The framework has it's own ```Router``` class which inherits from the ```SimpleRouter``` class. This allows the framework to add custom functionality.
 
 ```php
-namespace Pecee;
+namespace Demo;
 
-use Pecee\Exception\RouterException;
-use Pecee\Handler\ExceptionHandler;
-use Pecee\Http\Middleware\IMiddleware;
-use Pecee\SimpleRouter\RouterBase;
 use Pecee\SimpleRouter\SimpleRouter;
 
 class Router extends SimpleRouter {
 
-    protected static $defaultExceptionHandler;
-    protected static $defaultMiddlewares = array();
-
     public static function start($defaultNamespace = null) {
 
-        // Debug information
-        Debug::getInstance()->add('Router initialised.');
+        // change this to whatever makes sense in your project
+        require_once 'routes.php';
 
-        // Load framework specific controllers
-        static::get('/js-wrap', 'ControllerJs@wrap', ['namespace' => '\Pecee\Controller'])->setAlias('pecee.js.wrap');
-        static::get('/css-wrap', 'ControllerCss@wrap', ['namespace' => '\Pecee\Controller'])->setAlias('pecee.css.wrap');
-        static::get('/captcha', 'ControllerCaptcha@show', ['namespace' => '\Pecee\Controller']);
+        // Do initial stuff
+        parent::start('\\Demo\\Controllers');
 
-        // Load routes.php
-        $file = $_ENV['base_path'] . DIRECTORY_SEPARATOR . 'app' . DIRECTORY_SEPARATOR . 'routes.php';
-        if(file_exists($file)) {
-            require_once $file;
-        }
-
-        // Set default namespace
-        $defaultNamespace = '\\'.$_ENV['app_name'] . '\\Controller';
-
-        // Handle exceptions
-        try {
-
-            if(count(static::$defaultMiddlewares)) {
-                /* @var $middleware \Pecee\Http\Middleware\IMiddleware */
-                foreach(static::$defaultMiddlewares as $middleware) {
-                    $middleware = new $middleware();
-                    if(!($middleware instanceof IMiddleware)) {
-                        throw new RouterException('Middleware must be implement the IMiddleware interface.');
-                    }
-                    $middleware->handle(RouterBase::getInstance()->getRequest());
-                }
-            }
-
-            parent::start($defaultNamespace);
-        } catch(\Exception $e) {
-
-            $route = RouterBase::getInstance()->getLoadedRoute();
-
-            // Otherwise use the fallback default exceptions handler
-            if(static::$defaultExceptionHandler !== null) {
-                static::loadExceptionHandler(static::$defaultExceptionHandler, $route, $e);
-            }
-
-            throw $e;
-        }
-
-    }
-
-    protected static function loadExceptionHandler($class, $route, $e) {
-        $class = new $class();
-
-        if(!($class instanceof ExceptionHandler)) {
-            throw new \ErrorException('Exception handler must be an instance of \Pecee\Handler\ExceptionHandler');
-        }
-
-        $class->handleError(RouterBase::getInstance()->getRequest(), $route, $e);
-    }
-
-    public static function defaultExceptionHandler($handler) {
-        static::$defaultExceptionHandler = $handler;
-    }
-
-    /**
-     * Add default middleware that will be loaded before any route
-     * @param string|array $middlewares
-     */
-    public static function defaultMiddleware($middlewares) {
-        if(is_array($middlewares)) {
-            static::$defaultMiddlewares = $middlewares;
-        } else {
-            static::$defaultMiddlewares[] = $middlewares;
-        }
     }
 
 }
 ```
 
-#### Helper functions examples
-**This is a basic example of a helper function for generating urls.**
+## Helper functions
+
+To simplify to use of simple-router functionality, we recommend you add these helper functions to your project.
 
 ```php
-use Pecee\SimpleRouter\RouterBase;
+use Pecee\SimpleRouter\SimpleRouter;
+
 function url($controller, $parameters = null, $getParams = null) {
-    RouterBase::getInstance()->getRoute($controller, $parameters, $getParams);
+    SimpleRouter::getRoute($controller, $parameters, $getParams);
 }
-```
 
-**This is a basic example for getting the current csrf token**
-
-```php
 /**
  * Get current csrf-token
  * @return null|string
@@ -295,6 +228,30 @@ 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() {
+    return SimpleRouter::response();
+}
+
+/**
+ * Get input class
+ * @return \Pecee\Http\Input\Input
+ */
+function input() {
+    return SimpleRouter::request()->getInput();
+}
 ```
 
 ## Getting urls
@@ -330,7 +287,10 @@ use Pecee\Http\Middleware\BaseCsrfVerifier;
 
 class CsrfVerifier extends BaseCsrfVerifier {
 
-    protected $except = ['/companies/*', '/user/save'];
+    protected $except = [
+        '/companies/*', 
+        '/api'
+    ];
 
 }
 ```
@@ -348,7 +308,6 @@ Sometimes it can be necessary to keep urls stored in the database, file or simil
 To interfere with the router, we create a class that inherits from ```RouterBootManager```. This class will be loaded before any other rules in ```routes.php``` and allow us to "change" the current route, if any of our criteria are fulfilled (like coming from the url ```/my-cat-is-beatiful```).
 
 ```php
-
 use Pecee\Http\Request;
 use Pecee\SimpleRouter\RouterBootManager;
 
@@ -385,29 +344,20 @@ By doing this the route will now load the url ```/article/view/1``` instead of `
 
 The last thing we need to do, is to add our custom boot-manager to the ```routes.php``` file. You can create as many bootmanagers as you like and easily add them in your ```routes.php``` file.
 
-**routes.php example:**
-
-```php
-// Add new bootmanager
-SimpleRouter::addBootManager(new CustomRouterRules());
-
-// This rule is what our custom bootmanager will use.
-SimpleRouter::get('/article/view/{id}', 'ControllerArticle@view');
-```
-
 ## Easily overwrite route about to be loaded
 Sometimes it can be useful to manipulate the route that's about to be loaded, for instance if a user is not authenticated or if an error occurred within your Middleware that requires
 some other route to be initialised. 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\Http\Request``` object.
+the ```\Pecee\SimpleRouter\Http\Request``` object. All information about the current route is as a ```\Pecee\SimpleRouter\Http\Request``` object which can always be obtained on 
+the `RouterBase` instance. For easy access you can use the shortcut method `\Pecee\SimpleRouter\SimpleRouter::request()`.
 
 **Note:** Please note that it's only possible to change the route BEFORE any route has initially been loaded, so doing this in your custom ExceptionHandler or Middleware is highly recommended.
 
 ```php
-$route = Request::getInstance()->getLoadedRoute();
+$route = request()->getLoadedRoute();
 
 $route->setCallback('Example\MyCustomClass@hello');
 
-// -- or --
+// -- or you can rewrite by doing --
 
 $route->setClass('Example\MyCustomClass');
 $route->setMethod('hello');
@@ -419,28 +369,28 @@ We've added the `Input` class to easy access parameters from your Controller-cla
 
 **Return single parameter value (matches both GET, POST, FILE):**
 ```php
-$value = Request::getInstance()->getInput()->get('name');
+$value = input()->get('name');
 ```
 
 **Return parameter object (matches both GET, POST, FILE):**
 ```php
-$object = Request::getInstance()->getInput()->getObject('name');
+$object = input()->getObject('name');
 ```
 
 **Return specific GET parameter (where name is the name of your parameter):**
 ```php
-$object = Request::getInstance()->getInput()->get->name;
-$object = Request::getInstance()->getInput()->post->name;
-$object = Request::getInstance()->getInput()->file->name;
+$object = input()->get->name;
+$object = input()->post->name;
+$object = input()->file->name;
 ```
 
 **Return all parameters:**
 ```php
 // Get all
-$objects = Request::getInstance()->getInput()->all();
+$values = input()->all();
 
 // Only match certain keys
-$objects = Request::getInstance()->getInput()->all([
+$values = input()->all([
     'company_name',
     'user_id'
 ]);
@@ -460,22 +410,9 @@ All object inherits from `InputItem` class and will always contain these methods
 - `getError()` - get file upload error.
 
 
-### Easy access your input
-Create a helper function to easily get access to the input elements.
+### Easy access to methods
 
-Example:
-
-```php
-/**
- * Get input class
- * @return \Pecee\Http\Input\Input
- */
-function input() {
-    return \Pecee\Http\Request::getInstance()->getInput();
-}
-```
-
-Then you can easily do something like this in your controller:
+Below example requires you to have the helper functions added. Please refer to the helper functions section in the documentation.
 
 ```php
 // Get parameter site_id or default-value 2
@@ -488,6 +425,7 @@ This is some sites that uses the simple-router project in production.
 - [holla.dk](http://www.holla.dk)
 - [ninjaimg.com](http://ninjaimg.com)
 - [bookandbegin.com](https://bookandbegin.com)
+- [dscuz.com](https://www.dscuz.com)
 
 ## Documentation
 While I work on a better documentation, please refer to the Laravel 5 routing documentation here:

demo-project/README.md

@@ -2,31 +2,30 @@
 
 This project is here to give you a basic understanding of how to setup and using simple-php-router.
 
-Please note that this demo-project only covers how to integrate simple-php-project in a project without a framework. If you are using some sort of PHP framework in your project 
-the implementation might vary.
+Please note that this demo-project only covers how to integrate the `simple-php-router` in a project without a framework. If you are using some sort of PHP framework in your project the implementation might vary.
 
 **What we won't cover:**
 
 - How to setup a solution that fits your need. This is a basic demo to help you get started.
-- How to add Controllers, Middlewares or ExceptionHandlers with cool functionality.
+- Understanding of MVC; including Controllers, Middlewares or ExceptionHandlers.
 - How to integrate into third party frameworks.
 
 **What we cover:**
 
 - How to get up and running fast - from scratch.
-- How to set ExceptionHandlers, Middlewares and Controllers working.
+- How to get ExceptionHandlers, Middlewares and Controllers working.
 - How to setup your webservers.
 
 ## Installation
 
-- Navigate to the `demo-project` folder and run `composer install`.
+- Navigate to the `demo-project` folder in terminal and run `composer update` to install the latest version.
 - Point your webserver to `demo-project/public`.
 
 ### Setting up Nginx
 
-If you are using Nginx remember to enable url-rewriting.
+If you are using Nginx please make sure that url-rewriting is enabled.
 
-You can easily do this by adding the following configuration for the Nginx configuration for the demo-project.
+You can easily enable url-rewriting by adding the following configuration for the Nginx configuration-file for the demo-project.
 
 ```
 location / {
@@ -36,8 +35,7 @@ location / {
 
 ### Setting up Apache
 
-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 `.htaccess` support is enabled in the Apache configuration - or add the rules manually.
+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.
 
 ## Folder structure
 
@@ -48,26 +46,24 @@ check that `.htaccess` support is enabled in the Apache configuration - or add t
 
 ## Notes
 
-The demo project has it's own `Router` class implemented which extends the `SimpleRouter` class with further functionality such as 
-default exceptionhandlers and middlewares. This class can be useful adding functionality that are required before and after routing 
-occurs or add extra functionality to the router. 
+The demo project has it's own `Router` class implementation which extends the `SimpleRouter` class with further functionality. 
+This class can be useful adding additional functionality that are required before and after routing occurs or any extra functionality belonging to the router itself. 
 
-In this project we also use our custom router-class to autoload the `routes.php` file.
+In this project we also use our custom router-class to autoload the `routes.php` file from our custom location (`app/routes.php`).
 
-Please check the `routes.php` file in `demo-project/app` for all the urls/rules in the project.
+Please check the `routes.php` file in `demo-project/app` for all the urls/rules available in the project.
 
 ### CSRF-verifier
 
-We've added a custom CSRF-verifier middleware called `CsrfVerifier` and disabled CSRF checks for all calls to `/api/*`.
+For the purpose of this demo, we've added a custom CSRF-verifier middleware called `CsrfVerifier` and disabled CSRF checks for all calls to `/api/*`. This will ensure that CSRF form-checks are not applied when calling our demo api url.
 
 ### Exception handlers
 
-The included `CustomExceptionHandler` class returns a json response for errors received on calls to `/api/*` or otherwise just forms a simple formatted error response.
+The included `CustomExceptionHandler` class returns a very basic json response for errors received on calls to `/api/*` or otherwise just a simple formatted error response.
 
 ### Middlewares
 
-`ApiVerification` class is added to all calls to `/api/*`. This simple class just adds some data to the `Request` object, which is returned in one of the methods in the 
-`ApiController` class.
+`ApiVerification` class is added to all calls to `/api/*`. This simple class just adds some data to the `Request` object, which is returned in one of the methods in the `ApiController` class. We've added this class to demonstrate that you can use middlewares to ensure that the user has the correct authentication - before router loads the controller itself.
 
 ### Urls
 

demo-project/app/Controllers/ApiController.php

@@ -1,7 +1,7 @@
 <?php
 namespace Demo\Controllers;
 
-use Pecee\Http\Request;
+use Pecee\SimpleRouter\SimpleRouter;
 
 class ApiController {
 
@@ -9,7 +9,7 @@ class ApiController {
 
         // The variable authenticated is set to true in the ApiVerification middleware class.
 
-        $request = Request::getInstance();
+        $request = SimpleRouter::request();
 
         header('content-type: application/json');
 

demo-project/app/Controllers/DefaultController.php

@@ -22,4 +22,8 @@ class DefaultController {
 
     }
 
+    public function notFound() {
+        echo 'Page not found';
+    }
+
 }

demo-project/app/Handlers/CustomExceptionHandler.php

@@ -21,8 +21,14 @@ class CustomExceptionHandler implements IExceptionHandler {
 
         // else we just throw the error
         if($error->getCode() == 404) {
-            die(sprintf('An error occurred (%s):<br/>%s', $error->getCode(), $error->getMessage()));
+
+            // Return 404 path
+            $request->setUri('/404');
+            return $request;
+
         }
+
+        throw $error;
     }
 
 }

demo-project/app/Router.php

@@ -7,78 +7,21 @@
 
 namespace Demo;
 
-use Pecee\Exception\RouterException;
-use Pecee\Handler\IExceptionHandler;
-use Pecee\Http\Middleware\IMiddleware;
-use Pecee\SimpleRouter\RouterBase;
 use Pecee\SimpleRouter\SimpleRouter;
 
 class Router extends SimpleRouter {
 
-    protected static $defaultExceptionHandler;
-    protected static $defaultMiddlewares = array();
-
     public static function start($defaultNamespace = null) {
 
-        // change this to whatever makes sense in your project
+        // Load our helpers
+        require_once 'helpers.php';
+
+        // Load our custom routes
         require_once 'routes.php';
 
-        // Handle exceptions
-        try {
+        // Do initial stuff
+        parent::start('\\Demo\\Controllers');
 
-            if(count(static::$defaultMiddlewares)) {
-                /* @var $middleware \Pecee\Http\Middleware\IMiddleware */
-                foreach(static::$defaultMiddlewares as $middleware) {
-                    $middleware = new $middleware();
-                    if(!($middleware instanceof IMiddleware)) {
-                        throw new RouterException('Middleware must be implement the IMiddleware interface.');
-                    }
-                    $middleware->handle(RouterBase::getInstance()->getRequest());
-                }
-            }
-
-            // Set default namespace
-            $defaultNamespace = '\\Demo\\Controllers';
-
-            parent::start($defaultNamespace);
-        } catch(\Exception $e) {
-
-            $route = RouterBase::getInstance()->getLoadedRoute();
-
-            // Otherwise use the fallback default exceptions handler
-            if(static::$defaultExceptionHandler !== null) {
-                static::loadExceptionHandler(static::$defaultExceptionHandler, $route, $e);
-            }
-
-            throw $e;
-        }
-
-    }
-
-    protected static function loadExceptionHandler($class, $route, $e) {
-        $class = new $class();
-
-        if(!($class instanceof IExceptionHandler)) {
-            throw new \ErrorException('Exception handler must be an instance of \Pecee\Handler\IExceptionHandler');
-        }
-
-        $class->handleError(RouterBase::getInstance()->getRequest(), $route, $e);
-    }
-
-    public static function defaultExceptionHandler($handler) {
-        static::$defaultExceptionHandler = $handler;
-    }
-
-    /**
-     * Add default middleware that will be loaded before any route
-     * @param string|array $middlewares
-     */
-    public static function defaultMiddleware($middlewares) {
-        if(is_array($middlewares)) {
-            static::$defaultMiddlewares = $middlewares;
-        } else {
-            static::$defaultMiddlewares[] = $middlewares;
-        }
     }
 
 }

demo-project/app/helpers.php

@@ -0,0 +1,31 @@
+<?php
+use \Pecee\SimpleRouter\SimpleRouter;
+
+function url($controller, $parameters = null, $getParams = null) {
+    SimpleRouter::getRoute($controller, $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() {
+    return SimpleRouter::response();
+}

demo-project/app/routes.php

@@ -6,14 +6,18 @@
 use Demo\Router;
 
 Router::csrfVerifier(new \Demo\Middlewares\CsrfVerifier());
-Router::defaultExceptionHandler('\Demo\Handlers\CustomExceptionHandler');
 
-Router::get('/', 'DefaultController@index')->setAlias('home');
-Router::get('/contact', 'DefaultController@contact')->setAlias('contact');
-Router::basic('/companies', 'DefaultController@companies')->setAlias('companies');
-Router::basic('/companies/{id}', 'DefaultController@companies')->setAlias('companies');
+Router::group(['exceptionHandler' => 'Demo\Handlers\CustomExceptionHandler'], function() {
+
+    Router::get('/', 'DefaultController@index')->setAlias('home');
+    Router::get('/contact', 'DefaultController@contact')->setAlias('contact');
+    Router::get('/404', 'DefaultController@notFound')->setAlias('404');
+    Router::basic('/companies', 'DefaultController@companies')->setAlias('companies');
+    Router::basic('/companies/{id}', 'DefaultController@companies')->setAlias('companies');
+
+    // Api
+    Router::group(['prefix' => '/api', 'middleware' => 'Demo\Middlewares\ApiVerification'], function() {
+        Router::resource('/demo', 'ApiController');
+    });
 
-// Api
-Router::group(['prefix' => '/api', 'middleware' => 'Demo\Middlewares\ApiVerification'], function() {
-    Router::resource('/demo', 'ApiController');
 });

src/Pecee/Http/Input/Input.php

@@ -20,7 +20,13 @@ class Input {
      */
     public $file;
 
-    public function __construct() {
+    /**
+     * @var Request
+     */
+    protected $request;
+
+    public function __construct(Request &$request) {
+        $this->request = $request;
         $this->setGet();
         $this->setPost();
         $this->setFile();
@@ -32,17 +38,31 @@ class Input {
      * @return array
      */
     public function all(array $filter = null) {
-        $output = $this->get->getData();
-        $output = array_merge($output, $this->post->getData());
 
-        if($filter !== null) {
-            $tmp = array();
-            foreach($output as $key => $val) {
-                if(in_array($key, $filter)) {
-                    $tmp[$key] = $val;
+        $output = $_POST;
+
+        if($this->request->getMethod() === 'post') {
+
+            $contents = file_get_contents('php://input');
+
+            if (stripos(trim($contents), '{') === 0) {
+                $output = json_decode($contents, true);
+                if($output === false) {
+                    $output = array();
                 }
             }
-            return $tmp;
+        }
+
+        $output = array_merge($_GET, $output);
+
+        if($filter !== null) {
+            $output = array_filter($output, function ($key) use ($filter) {
+                if (in_array($key, $filter)) {
+                    return true;
+                }
+
+                return false;
+            }, ARRAY_FILTER_USE_KEY);
         }
 
         return $output;
@@ -58,7 +78,7 @@ class Input {
             return ($key !== null) ? $element[$key] : $element;
         }
 
-        if(Request::getInstance()->getMethod() !== 'get') {
+        if($this->request->getMethod() !== 'get') {
 
             $element = $this->post->findFirst($index);
 
@@ -87,7 +107,7 @@ class Input {
 
         if($item !== null) {
 
-            if(is_array($item) || $item instanceof InputFile) {
+            if($item instanceof InputCollection || $item instanceof InputFile) {
                 return $item;
             }
 
@@ -111,10 +131,10 @@ class Input {
                     continue;
                 }
 
-                $output = array();
+                $output = new InputCollection();
 
                 foreach($get as $k => $g) {
-                    $output[$k] = new InputItem($k, $g);
+                    $output->{$k} = new InputItem($k, $g);
                 }
 
                 $this->get->{$key} = $output;
@@ -125,12 +145,10 @@ class Input {
     public function setPost() {
         $this->post = new InputCollection();
 
-        $postVars = array();
+        $postVars = $_POST;
 
-        if(isset($_SERVER['REQUEST_METHOD']) && in_array($_SERVER['REQUEST_METHOD'], ['PUT', 'PATCH', 'DELETE'])) {
+        if(in_array($this->request->getMethod(), ['put', 'patch', 'delete'])) {
             parse_str(file_get_contents('php://input'), $postVars);
-        } else {
-            $postVars = $_POST;
         }
 
         if(count($postVars)) {
@@ -141,10 +159,10 @@ class Input {
                     continue;
                 }
 
-                $output = array();
+                $output = new InputCollection();
 
-                foreach($post as $k=>$p) {
-                    $output[$k] = new InputItem($k, $p);
+                foreach($post as $k => $p) {
+                    $output->{$k} = new InputItem($k, $p);
                 }
 
                 $this->post->{strtolower($key)} = $output;
@@ -172,7 +190,7 @@ class Input {
                     continue;
                 }
 
-                $output = array();
+                $output = new InputCollection();
 
                 foreach($value['name'] as $k=>$val) {
                     // Strip empty values
@@ -183,7 +201,7 @@ class Input {
                         $file->setType($value['type'][$k]);
                         $file->setTmpName($value['tmp_name'][$k]);
                         $file->setError($value['error'][$k]);
-                        $output[$k] = $file;
+                        $output->{$k} = $file;
                     }
                 }
 

src/Pecee/Http/Request.php

@@ -26,7 +26,7 @@ class Request {
         $this->uri = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : array();
         $this->method = (isset($_POST['_method'])) ? strtolower($_POST['_method']) : (isset($_SERVER['REQUEST_METHOD']) ? strtolower($_SERVER['REQUEST_METHOD']) : array());
         $this->headers = $this->getAllHeaders();
-        $this->input = new Input();
+        $this->input = new Input($this);
     }
 
     protected function getAllHeaders() {
@@ -96,7 +96,10 @@ class Request {
      * @return string
      */
     public function getIp() {
-        return ((isset($_SERVER['HTTP_X_FORWARDED_FOR']) && strlen($_SERVER['HTTP_X_FORWARDED_FOR'])) ? $_SERVER['HTTP_X_FORWARDED_FOR'] : $_SERVER['REMOTE_ADDR']);
+        if(isset($_SERVER['HTTP_CF_CONNECTING_IP'])) {
+            return $_SERVER['HTTP_CF_CONNECTING_IP'];
+        }
+        return ((isset($_SERVER['HTTP_X_FORWARDED_FOR']) && strlen($_SERVER['HTTP_X_FORWARDED_FOR'])) ? $_SERVER['HTTP_X_FORWARDED_FOR'] : isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : null);
     }
 
     /**

src/Pecee/Http/Response.php

@@ -4,6 +4,12 @@ namespace Pecee\Http;
 
 class Response {
 
+    protected $request;
+
+    public function __construct(Request &$request) {
+        $this->request = $request;
+    }
+
     /**
      * Set the http status code
      *
@@ -31,7 +37,7 @@ class Response {
     }
 
     public function refresh() {
-        $this->redirect(Request::getInstance()->getUri());
+        $this->redirect($this->request->getUri());
     }
 
     /**

src/Pecee/SimpleRouter/RouterBase.php

@@ -5,12 +5,14 @@ use Pecee\Exception\RouterException;
 use Pecee\Handler\IExceptionHandler;
 use Pecee\Http\Middleware\BaseCsrfVerifier;
 use Pecee\Http\Request;
+use Pecee\Http\Response;
 
 class RouterBase {
 
     protected static $instance;
 
     protected $request;
+    protected $response;
     protected $currentRoute;
     protected $routes;
     protected $processedRoutes;
@@ -21,10 +23,13 @@ class RouterBase {
     protected $baseCsrfVerifier;
     protected $exceptionHandlers;
 
-    // TODO: clean up - cut some of the methods down to smaller pieces
-
     public function __construct() {
-        $this->request = Request::getInstance();
+        $this->reset();
+    }
+
+    public function reset() {
+        $this->request = new Request();
+        $this->response = new Response($this->request);
         $this->routes = array();
         $this->backStack = array();
         $this->controllerUrlMap = array();
@@ -86,15 +91,22 @@ class RouterBase {
             $this->currentRoute = $route;
 
             if($route instanceof RouterGroup && is_callable($route->getCallback())) {
-                $group = $route;
 
-                $group->renderRoute($this->request);
-                $mergedSettings = array_merge($settings, $group->getMergeableSettings());
+                $route->renderRoute($this->request);
+
+                if($route->matchRoute($this->request)) {
+
+                    $group = $route;
+
+                    $mergedSettings = array_merge($settings, $group->getMergeableSettings());
+
+                    // Add ExceptionHandler
+                    if ($group->getExceptionHandler() !== null) {
+                        $this->exceptionHandlers[] = $route;
+                    }
 
-                // Add ExceptionHandler
-                if($group->matchRoute($this->request) && $group->getExceptionHandler() !== null) {
-                    $this->exceptionHandlers[] = $route;
                 }
+
             }
 
             $this->currentRoute = null;
@@ -109,64 +121,68 @@ class RouterBase {
         }
     }
 
-    public function routeRequest() {
+    public function routeRequest($original = true) {
 
         $originalUri = $this->request->getUri();
 
-        // Initialize boot-managers
-        if(count($this->bootManagers)) {
-            /* @var $manager RouterBootManager */
-            foreach($this->bootManagers as $manager) {
-                $this->request = $manager->boot($this->request);
-
-                if(!($this->request instanceof Request)) {
-                    throw new RouterException('Custom router bootmanager "'. get_class($manager) .'" must return instance of Request.');
-                }
-            }
-        }
-
-        // Verify csrf token for request
-        if($this->baseCsrfVerifier !== null) {
-            $this->baseCsrfVerifier->handle($this->request);
-        }
-
-        // Loop through each route-request
-        $this->processRoutes($this->routes);
-
         $routeNotAllowed = false;
 
-        $max = count($this->controllerUrlMap);
+        try {
 
-        /* @var $route RouterEntry */
-        for($i = 0; $i < $max; $i++) {
+            // Initialize boot-managers
+            if(count($this->bootManagers)) {
+                /* @var $manager RouterBootManager */
+                foreach($this->bootManagers as $manager) {
+                    $this->request = $manager->boot($this->request);
 
-            $route = $this->controllerUrlMap[$i];
-
-            $routeMatch = $route->matchRoute($this->request);
-
-            if($routeMatch) {
-
-                if(count($route->getRequestMethods()) && !in_array($this->request->getMethod(), $route->getRequestMethods())) {
-                    $routeNotAllowed = true;
-                    continue;
+                    if(!($this->request instanceof Request)) {
+                        throw new RouterException('Custom router bootmanager "'. get_class($manager) .'" must return instance of Request.');
+                    }
                 }
-
-                $routeNotAllowed = false;
-
-                $this->request->rewrite_uri = $this->request->uri;
-                $this->request->setUri($originalUri);
-
-                $this->request->loadedRoute = $route;
-                $route->loadMiddleware($this->request);
-
-                try {
-                    $this->request->loadedRoute->renderRoute($this->request);
-                } catch(\Exception $e) {
-                    $this->handleException($e);
-                }
-
-                break;
             }
+
+            // Loop through each route-request
+            $this->processRoutes($this->routes);
+
+            if($original === true) {
+                // Verify csrf token for request
+                if ($this->baseCsrfVerifier !== null) {
+                    $this->baseCsrfVerifier->handle($this->request);
+                }
+            }
+
+            $max = count($this->controllerUrlMap);
+
+            /* @var $route RouterEntry */
+            for ($i = 0; $i < $max; $i++) {
+
+                $route = $this->controllerUrlMap[$i];
+
+                $routeMatch = $route->matchRoute($this->request);
+
+                if ($routeMatch) {
+
+                    if (count($route->getRequestMethods()) && !in_array($this->request->getMethod(), $route->getRequestMethods())) {
+                        $routeNotAllowed = true;
+                        continue;
+                    }
+
+                    $routeNotAllowed = false;
+
+                    $this->request->rewrite_uri = $this->request->uri;
+                    $this->request->setUri($originalUri);
+
+                    $this->request->loadedRoute = $route;
+                    $route->loadMiddleware($this->request);
+
+                    $this->request->loadedRoute->renderRoute($this->request);
+
+                    break;
+                }
+            }
+
+        } catch(\Exception $e) {
+            $this->handleException($e);
         }
 
         if($routeNotAllowed) {
@@ -180,6 +196,8 @@ class RouterBase {
 
     protected function handleException(\Exception $e) {
 
+        $request = null;
+
         /* @var $route RouterGroup */
         foreach ($this->exceptionHandlers as $route) {
             $route->loadMiddleware($this->request);
@@ -190,7 +208,13 @@ class RouterBase {
                 throw new RouterException('Exception handler must implement the IExceptionHandler interface.');
             }
 
-            $handler->handleError($this->request, $this->request->loadedRoute, $e);
+            $request = $handler->handleError($this->request, $this->request->loadedRoute, $e);
+        }
+
+        if($request !== null) {
+            $this->request = $request;
+            $this->routeRequest(false);
+            return;
         }
 
         throw $e;
@@ -270,6 +294,14 @@ class RouterBase {
         return $this->request;
     }
 
+    /**
+     * Get response
+     * @return Response
+     */
+    public function getResponse() {
+        return $this->response;
+    }
+
     /**
      * Get base csrf verifier class
      * @return BaseCsrfVerifier
@@ -291,15 +323,16 @@ class RouterBase {
 
     public function arrayToParams(array $getParams = null, $includeEmpty = true) {
 
-        if(is_array($getParams)) {
+        if(is_array($getParams) && count($getParams)) {
             if ($includeEmpty === false) {
                 $getParams = array_filter($getParams, function ($item) {
                     return (!empty($item));
                 });
             }
 
-            return http_build_query($getParams);
+            return '?' . http_build_query($getParams);
         }
+
         return '';
     }
 
@@ -321,10 +354,10 @@ class RouterBase {
         $url = $domain . '/' . trim($route->getUrl(), '/');
 
         if(($route instanceof RouterController || $route instanceof RouterResource) && $method !== null) {
-            $url .= $method;
-        }
+            if($method !== null) {
+                $url .= $method;
+            }
 
-        if($route instanceof RouterController || $route instanceof RouterResource) {
             if(count($parameters)) {
                 $url .= join('/', $parameters);
             }
@@ -354,8 +387,8 @@ class RouterBase {
 
         $url = rtrim($url, '/') . '/';
 
-        if($getParams !== null && count($getParams)) {
-            $url .= '?' . $this->arrayToParams($getParams);
+        if($getParams !== null) {
+            $url .= $this->arrayToParams($getParams);
         }
 
         return $url;
@@ -377,8 +410,8 @@ class RouterBase {
 
             $url = parse_url($this->request->getUri(), PHP_URL_PATH);
 
-            if(count($getParams)) {
-                $url .= '?' . $this->arrayToParams($getParams);
+            if($getParams !== null) {
+                $url .= $this->arrayToParams($getParams);
             }
 
             return $url;
@@ -399,12 +432,15 @@ class RouterBase {
             $route = $this->controllerUrlMap[$i];
 
             // Check an alias exist, if the matches - use it
-            if($route instanceof RouterRoute && $route->hasAlias($controller)) {
-                return $this->processUrl($route, $route->getMethod(), $parameters, $getParams);
-            }
+            if($route instanceof RouterRoute) {
 
-            if($route instanceof RouterRoute && !is_callable($route->getCallback()) && stripos($route->getCallback(), '@') !== false) {
-                $c = $route->getCallback();
+                if($route->hasAlias($controller)) {
+                    return $this->processUrl($route, $route->getMethod(), $parameters, $getParams);
+                }
+
+                if(!is_callable($route->getCallback()) && stripos($route->getCallback(), '@') !== false) {
+                    $c = $route->getCallback();
+                }
             } else if($route instanceof RouterController || $route instanceof RouterResource) {
                 $c = $route->getController();
             }
@@ -449,22 +485,22 @@ class RouterBase {
 
         $url = '/' . trim(join('/', $url), '/') . '/';
 
-        if($getParams !== null && count($getParams)) {
-            $url .= '?' . $this->arrayToParams($getParams);
+        if($getParams !== null) {
+            $url .= $this->arrayToParams($getParams);
         }
 
         return $url;
     }
 
+    /**
+     * Get current router instance
+     * @return static
+     */
     public static function getInstance() {
-        if(self::$instance === null) {
-            self::$instance = new static();
+        if(static::$instance === null) {
+            static::$instance = new static();
         }
-        return self::$instance;
-    }
-
-    public static function reset() {
-        self::$instance = null;
+        return static::$instance;
     }
 
 }

src/Pecee/SimpleRouter/RouterEntry.php

@@ -310,7 +310,7 @@ abstract class RouterEntry {
             if($max) {
                 for($i = 0; $i < $max; $i++) {
                     $name = $parameterNames[$i];
-                    $parameterValue = (isset($parameterValues[$name['name']]) && !empty($parameterValues[$name['name']])) ? $parameterValues[$name['name']] : null;
+                    $parameterValue = isset($parameterValues[$name['name']]) ? $parameterValues[$name['name']] : null;
 
                     if($name['required'] && $parameterValue === null) {
                         throw new RouterException('Missing required parameter ' . $name['name'], 404);

src/Pecee/SimpleRouter/RouterGroup.php

@@ -97,9 +97,12 @@ class RouterGroup extends RouterEntry {
         if($this->getMiddleware() !== null && isset($settings['middleware'])) {
 
             if(!is_array($this->getMiddleware())) {
-                $middlewares = [$this->getMiddleware(), $settings['middleware']];
+                $middlewares = [
+                    $this->getMiddleware(),
+                    $settings['middleware']
+                ];
             } else {
-                $middlewares = array_push($settings['middleware']);
+                $middlewares = array_push($settings['middleware'], $this->getMiddleware());
             }
 
             $settings['middleware'] = array_unique(array_reverse($middlewares));

src/Pecee/SimpleRouter/SimpleRouter.php

@@ -128,4 +128,12 @@ class SimpleRouter {
         return RouterBase::getInstance()->getRoute($controller, $parameters, $getParams);
     }
 
+    public static function request() {
+        return RouterBase::getInstance()->getRequest();
+    }
+
+    public static function response() {
+        return RouterBase::getInstance()->getResponse();
+    }
+
 }

test/Dummy/DummyController.php

@@ -11,4 +11,8 @@ class DummyController {
         echo 'Params: ' . join(', ', $params);
     }
 
+    public function notFound() {
+        echo 'not found';
+    }
+
 }

test/Dummy/Handler/ExceptionHandler.php

@@ -0,0 +1,8 @@
+<?php
+class ExceptionHandler implements \Pecee\Handler\IExceptionHandler {
+
+    public function handleError(\Pecee\Http\Request $request, \Pecee\SimpleRouter\RouterEntry $router = null, \Exception $error){
+        throw $error;
+    }
+
+}

test/GroupTest.php

@@ -7,19 +7,11 @@ class GroupTest extends PHPUnit_Framework_TestCase  {
 
     protected $result;
 
-    public function __construct() {
-        // Initial setup
-        $_SERVER['HTTP_HOST'] = 'example.com';
-        $_SERVER['REQUEST_URI'] = '/api/v1/test';
-        $_SERVER['REQUEST_METHOD'] = 'get';
-    }
-
     protected function group() {
         $this->result = true;
     }
 
     public function testGroup() {
-        \Pecee\SimpleRouter\RouterBase::reset();
 
         $this->result = false;
 
@@ -35,9 +27,10 @@ class GroupTest extends PHPUnit_Framework_TestCase  {
     }
 
     public function testNestedGroup() {
-        \Pecee\SimpleRouter\RouterBase::reset();
 
-        \Pecee\Http\Request::getInstance()->setUri('/api/v1/test');
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/api/v1/test');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
 
         \Pecee\SimpleRouter\SimpleRouter::group(['prefix' => '/api'], function() {
             \Pecee\SimpleRouter\SimpleRouter::group(['prefix' => '/v1'], function() {

test/MiddlewareTest.php

@@ -2,29 +2,25 @@
 
 require_once 'Dummy/DummyMiddleware.php';
 require_once 'Dummy/DummyController.php';
+require_once 'Dummy/Handler/ExceptionHandler.php';
 
 class MiddlewareTest extends PHPUnit_Framework_TestCase  {
 
-    public function __construct() {
-        // Initial setup
-        $_SERVER['HTTP_HOST'] = 'example.com';
-        $_SERVER['REQUEST_URI'] = '/my/test/url';
-        $_SERVER['REQUEST_METHOD'] = 'get';
-    }
-
     public function testMiddlewareFound() {
 
-        \Pecee\Http\Request::getInstance()->setMethod('get');
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/my/test/url');
 
-        \Pecee\SimpleRouter\RouterBase::reset();
-
-        \Pecee\SimpleRouter\SimpleRouter::get('/my/test/url', 'DummyController@start', ['middleware' => 'DummyMiddleware']);
+        \Pecee\SimpleRouter\SimpleRouter::group(['exceptionHandler' => 'ExceptionHandler'], function() {
+            \Pecee\SimpleRouter\SimpleRouter::get('/my/test/url', 'DummyController@start', ['middleware' => 'DummyMiddleware']);
+        });
 
         $found = false;
 
         try {
             \Pecee\SimpleRouter\SimpleRouter::start();
-        }catch(Exception $e) {
+        }catch(\Exception $e) {
             $found = ($e instanceof MiddlewareLoadedException);
         }
 

test/RouterRouteTest.php

@@ -2,48 +2,63 @@
 
 require_once 'Dummy/DummyMiddleware.php';
 require_once 'Dummy/DummyController.php';
+require_once 'Dummy/Handler/ExceptionHandler.php';
 
 class RouterRouteTest extends PHPUnit_Framework_TestCase  {
 
-    public function __construct() {
-        // Initial setup
-        $_SERVER['HTTP_HOST'] = 'example.com';
-        $_SERVER['REQUEST_URI'] = '/my/test/url';
-        $_SERVER['REQUEST_METHOD'] = 'get';
+
+    public function testNotFound() {
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/test-param1-param2');
+
+        \Pecee\SimpleRouter\SimpleRouter::group(['exceptionHandler' => 'ExceptionHandler'], function() {
+            \Pecee\SimpleRouter\SimpleRouter::get('/non-existing-path', 'DummyController@start');
+        });
+
+        $found = false;
+
+        try {
+            \Pecee\SimpleRouter\SimpleRouter::start();
+        }catch(\Exception $e) {
+            $found = ($e instanceof \Pecee\Exception\RouterException && $e->getCode() == 404);
+        }
+
+        $this->assertTrue($found);
+
     }
 
     public function testGet() {
-
-        \Pecee\SimpleRouter\RouterBase::reset();
-
-        \Pecee\Http\Request::getInstance()->setMethod('get');
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/my/test/url');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
 
         \Pecee\SimpleRouter\SimpleRouter::get('/my/test/url', 'DummyController@start');
         \Pecee\SimpleRouter\SimpleRouter::start();
     }
 
     public function testPost() {
-        \Pecee\Http\Request::getInstance()->setMethod('post');
-
-        \Pecee\SimpleRouter\RouterBase::reset();
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/my/test/url');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('post');
 
         \Pecee\SimpleRouter\SimpleRouter::post('/my/test/url', 'DummyController@start');
         \Pecee\SimpleRouter\SimpleRouter::start();
     }
 
     public function testPut() {
-        \Pecee\Http\Request::getInstance()->setMethod('put');
-
-        \Pecee\SimpleRouter\RouterBase::reset();
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/my/test/url');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('put');
 
         \Pecee\SimpleRouter\SimpleRouter::put('/my/test/url', 'DummyController@start');
         \Pecee\SimpleRouter\SimpleRouter::start();
     }
 
     public function testDelete() {
-        \Pecee\Http\Request::getInstance()->setMethod('delete');
-
-        \Pecee\SimpleRouter\RouterBase::reset();
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/my/test/url');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('delete');
 
         \Pecee\SimpleRouter\SimpleRouter::delete('/my/test/url', 'DummyController@start');
         \Pecee\SimpleRouter\SimpleRouter::start();
@@ -51,10 +66,9 @@ class RouterRouteTest extends PHPUnit_Framework_TestCase  {
     }
 
     public function testMethodNotAllowed() {
-
-        \Pecee\SimpleRouter\RouterBase::reset();
-
-        \Pecee\Http\Request::getInstance()->setMethod('post');
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/my/test/url');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('post');
 
         \Pecee\SimpleRouter\SimpleRouter::get('/my/test/url', 'DummyController@start');
 
@@ -68,10 +82,9 @@ class RouterRouteTest extends PHPUnit_Framework_TestCase  {
 
     public function testSimpleParam() {
 
-        \Pecee\SimpleRouter\RouterBase::reset();
-
-        \Pecee\Http\Request::getInstance()->setMethod('get');
-        \Pecee\Http\Request::getInstance()->setUri('/test-param1');
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/test-param1');
 
         \Pecee\SimpleRouter\SimpleRouter::get('/test-{param1}', 'DummyController@param');
         \Pecee\SimpleRouter\SimpleRouter::start();
@@ -80,24 +93,22 @@ class RouterRouteTest extends PHPUnit_Framework_TestCase  {
 
     public function testMultiParam() {
 
-        \Pecee\SimpleRouter\RouterBase::reset();
-
-        \Pecee\Http\Request::getInstance()->setMethod('get');
-        \Pecee\Http\Request::getInstance()->setUri('/test-param1-param2');
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/test-param1-param2');
 
         \Pecee\SimpleRouter\SimpleRouter::get('/test-{param1}-{param2}', 'DummyController@param');
         \Pecee\SimpleRouter\SimpleRouter::start();
 
     }
 
-    public function testPathParam() {
+    public function testPathParamRegex() {
 
-        \Pecee\SimpleRouter\RouterBase::reset();
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/test/path/123123');
 
-        \Pecee\Http\Request::getInstance()->setMethod('get');
-        \Pecee\Http\Request::getInstance()->setUri('/test/path/param1');
-
-        \Pecee\SimpleRouter\SimpleRouter::get('/test/path/{param}', 'DummyController@param');
+        \Pecee\SimpleRouter\SimpleRouter::get('/test/path/{myParam}', 'DummyController@param', ['where' => ['myParam' => '([0-9]+)']]);
         \Pecee\SimpleRouter\SimpleRouter::start();
 
     }