Merge pull request #119 from skipperbent/development

Optimised for cli-usage

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,9 +81,7 @@ use Pecee\SimpleRouter\SimpleRouter;
 // Add CSRF support (if needed)
 SimpleRouter::csrfVerifier(new \Pecee\Http\Middleware\BaseCsrfVerifier());
 
-SimpleRouter::get('/page/404', 'ControllerPage@notFound', ['as' => 'page.notfound']);
-
-SimpleRouter::group(['prefix' => '/v1', 'middleware' => '\MyWebsite\Middleware\SomeMiddlewareClass'], function() {
+SimpleRouter::group(['prefix' => 'v1', 'middleware' => '\MyWebsite\Middleware\SomeMiddlewareClass'], function() {
 
     SimpleRouter::group(['prefix' => '/services', 'exceptionHandler' => '\MyProject\Handler\CustomExceptionHandler'], function() {
 
@@ -129,11 +127,7 @@ class CustomExceptionHandler implements IExceptionHandler {
 
         // If the error-code is 404; show another route which contains the page-not-found
         if($error->getCode() === 404) {
-            // Throw your custom 404-page view
-            // - or -
-            // load another route with our 404 page
-            
-            return $request->setUri(url('page.notfound'));
+            // Load your custom 404-page view
         }
 
         // Output error as json if on api path.
@@ -202,6 +196,7 @@ class Router extends SimpleRouter {
         require_once 'routes.php';
 
         // Do initial stuff
+
         parent::start('\\Demo\\Controllers');
 
     }
@@ -209,17 +204,19 @@ class Router extends SimpleRouter {
 }
 ```
 
-## Helper functions
-
-To simplify to use of simple-router functionality, we recommend you add these helper functions to your project.
+#### Helper functions examples
+**This is a basic example of a helper function for generating urls.**
 
 ```php
-use Pecee\SimpleRouter\SimpleRouter;
-
+use Pecee\SimpleRouter\RouterBase;
 function url($controller, $parameters = null, $getParams = null) {
-    SimpleRouter::getRoute($controller, $parameters, $getParams);
+    RouterBase::getInstance()->getRoute($controller, $parameters, $getParams);
 }
+```
 
+**This is a basic example for getting the current csrf token**
+
+```php
 /**
  * Get current csrf-token
  * @return null|string
@@ -228,30 +225,6 @@ 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
@@ -287,10 +260,7 @@ use Pecee\Http\Middleware\BaseCsrfVerifier;
 
 class CsrfVerifier extends BaseCsrfVerifier {
 
-    protected $except = [
-        '/companies/*', 
-        '/api'
-    ];
+    protected $except = ['/companies/*', '/user/save'];
 
 }
 ```
@@ -344,20 +314,29 @@ 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. 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()`.
+the ```\Pecee\SimpleRouter\Http\Request``` object.
 
 **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()->getLoadedRoute();
+$route = Request::getInstance()->getLoadedRoute();
 
 $route->setCallback('Example\MyCustomClass@hello');
 
-// -- or you can rewrite by doing --
+// -- or --
 
 $route->setClass('Example\MyCustomClass');
 $route->setMethod('hello');
@@ -369,28 +348,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 = input()->get('name');
+$value = Request::getInstance()->getInput()->get('name');
 ```
 
 **Return parameter object (matches both GET, POST, FILE):**
 ```php
-$object = input()->getObject('name');
+$object = Request::getInstance()->getInput()->getObject('name');
 ```
 
 **Return specific GET parameter (where name is the name of your parameter):**
 ```php
-$object = input()->get->name;
-$object = input()->post->name;
-$object = input()->file->name;
+$object = Request::getInstance()->getInput()->get->name;
+$object = Request::getInstance()->getInput()->post->name;
+$object = Request::getInstance()->getInput()->file->name;
 ```
 
 **Return all parameters:**
 ```php
 // Get all
-$values = input()->all();
+$objects = Request::getInstance()->getInput()->all();
 
 // Only match certain keys
-$values = input()->all([
+$objects = Request::getInstance()->getInput()->all([
     'company_name',
     'user_id'
 ]);
@@ -410,9 +389,22 @@ All object inherits from `InputItem` class and will always contain these methods
 - `getError()` - get file upload error.
 
 
-### Easy access to methods
+### Easy access your input
+Create a helper function to easily get access to the input elements.
 
-Below example requires you to have the helper functions added. Please refer to the helper functions section in the documentation.
+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:
 
 ```php
 // Get parameter site_id or default-value 2

demo-project/app/Controllers/ApiController.php

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

demo-project/app/Router.php

@@ -13,13 +13,11 @@ class Router extends SimpleRouter {
 
     public static function start($defaultNamespace = null) {
 
-        // Load our helpers
-        require_once 'helpers.php';
-
-        // Load our custom routes
+        // change this to whatever makes sense in your project
         require_once 'routes.php';
 
         // Do initial stuff
+
         parent::start('\\Demo\\Controllers');
 
     }

demo-project/app/helpers.php

@@ -1,31 +0,0 @@
-<?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();
-}

src/Pecee/Http/Input/Input.php

@@ -20,13 +20,7 @@ class Input {
      */
     public $file;
 
-    /**
-     * @var Request
-     */
-    protected $request;
-
-    public function __construct(Request &$request) {
-        $this->request = $request;
+    public function __construct() {
         $this->setGet();
         $this->setPost();
         $this->setFile();
@@ -38,31 +32,17 @@ class Input {
      * @return array
      */
     public function all(array $filter = null) {
-
-        $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();
-                }
-            }
-        }
-
-        $output = array_merge($_GET, $output);
+        $output = $this->get->getData();
+        $output = array_merge($output, $this->post->getData());
 
         if($filter !== null) {
-            $output = array_filter($output, function ($key) use ($filter) {
-                if (in_array($key, $filter)) {
-                    return true;
+            $tmp = array();
+            foreach($output as $key => $val) {
+                if(in_array($key, $filter)) {
+                    $tmp[$key] = $val;
                 }
-
-                return false;
-            }, ARRAY_FILTER_USE_KEY);
+            }
+            return $tmp;
         }
 
         return $output;
@@ -78,7 +58,7 @@ class Input {
             return ($key !== null) ? $element[$key] : $element;
         }
 
-        if($this->request->getMethod() !== 'get') {
+        if(Request::getInstance()->getMethod() !== 'get') {
 
             $element = $this->post->findFirst($index);
 
@@ -107,7 +87,7 @@ class Input {
 
         if($item !== null) {
 
-            if($item instanceof InputCollection || $item instanceof InputFile) {
+            if(is_array($item) || $item instanceof InputFile) {
                 return $item;
             }
 
@@ -131,10 +111,10 @@ class Input {
                     continue;
                 }
 
-                $output = new InputCollection();
+                $output = array();
 
                 foreach($get as $k => $g) {
-                    $output->{$k} = new InputItem($k, $g);
+                    $output[$k] = new InputItem($k, $g);
                 }
 
                 $this->get->{$key} = $output;
@@ -145,10 +125,12 @@ class Input {
     public function setPost() {
         $this->post = new InputCollection();
 
-        $postVars = $_POST;
+        $postVars = array();
 
-        if(in_array($this->request->getMethod(), ['put', 'patch', 'delete'])) {
+        if(isset($_SERVER['REQUEST_METHOD']) && in_array($_SERVER['REQUEST_METHOD'], ['PUT', 'PATCH', 'DELETE'])) {
             parse_str(file_get_contents('php://input'), $postVars);
+        } else {
+            $postVars = $_POST;
         }
 
         if(count($postVars)) {
@@ -159,10 +141,10 @@ class Input {
                     continue;
                 }
 
-                $output = new InputCollection();
+                $output = array();
 
-                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;
@@ -190,7 +172,7 @@ class Input {
                     continue;
                 }
 
-                $output = new InputCollection();
+                $output = array();
 
                 foreach($value['name'] as $k=>$val) {
                     // Strip empty values
@@ -201,7 +183,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);
+        $this->input = new Input();
     }
 
     protected function getAllHeaders() {
@@ -96,9 +96,6 @@ class Request {
      * @return string
      */
     public function getIp() {
-        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,12 +4,6 @@ namespace Pecee\Http;
 
 class Response {
 
-    protected $request;
-
-    public function __construct(Request &$request) {
-        $this->request = $request;
-    }
-
     /**
      * Set the http status code
      *
@@ -37,7 +31,7 @@ class Response {
     }
 
     public function refresh() {
-        $this->redirect($this->request->getUri());
+        $this->redirect(Request::getInstance()->getUri());
     }
 
     /**

src/Pecee/SimpleRouter/RouterBase.php

@@ -5,14 +5,12 @@ 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;
@@ -23,13 +21,10 @@ class RouterBase {
     protected $baseCsrfVerifier;
     protected $exceptionHandlers;
 
-    public function __construct() {
-        $this->reset();
-    }
+    // TODO: clean up - cut some of the methods down to smaller pieces
 
-    public function reset() {
-        $this->request = new Request();
-        $this->response = new Response($this->request);
+    public function __construct() {
+        $this->request = Request::getInstance();
         $this->routes = array();
         $this->backStack = array();
         $this->controllerUrlMap = array();
@@ -91,22 +86,15 @@ class RouterBase {
             $this->currentRoute = $route;
 
             if($route instanceof RouterGroup && is_callable($route->getCallback())) {
+                $group = $route;
 
-                $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;
-                    }
+                $group->renderRoute($this->request);
+                $mergedSettings = array_merge($settings, $group->getMergeableSettings());
 
+                // Add ExceptionHandler
+                if($group->matchRoute($this->request) && $group->getExceptionHandler() !== null) {
+                    $this->exceptionHandlers[] = $route;
                 }
-
             }
 
             $this->currentRoute = null;
@@ -125,8 +113,6 @@ class RouterBase {
 
         $originalUri = $this->request->getUri();
 
-        $routeNotAllowed = false;
-
         try {
 
             // Initialize boot-managers
@@ -151,6 +137,8 @@ class RouterBase {
                 }
             }
 
+            $routeNotAllowed = false;
+
             $max = count($this->controllerUrlMap);
 
             /* @var $route RouterEntry */
@@ -294,14 +282,6 @@ class RouterBase {
         return $this->request;
     }
 
-    /**
-     * Get response
-     * @return Response
-     */
-    public function getResponse() {
-        return $this->response;
-    }
-
     /**
      * Get base csrf verifier class
      * @return BaseCsrfVerifier
@@ -354,10 +334,10 @@ class RouterBase {
         $url = $domain . '/' . trim($route->getUrl(), '/');
 
         if(($route instanceof RouterController || $route instanceof RouterResource) && $method !== null) {
-            if($method !== null) {
-                $url .= $method;
-            }
+            $url .= $method;
+        }
 
+        if($route instanceof RouterController || $route instanceof RouterResource) {
             if(count($parameters)) {
                 $url .= join('/', $parameters);
             }
@@ -432,15 +412,12 @@ class RouterBase {
             $route = $this->controllerUrlMap[$i];
 
             // Check an alias exist, if the matches - use it
-            if($route instanceof RouterRoute) {
+            if($route instanceof RouterRoute && $route->hasAlias($controller)) {
+                return $this->processUrl($route, $route->getMethod(), $parameters, $getParams);
+            }
 
-                if($route->hasAlias($controller)) {
-                    return $this->processUrl($route, $route->getMethod(), $parameters, $getParams);
-                }
-
-                if(!is_callable($route->getCallback()) && stripos($route->getCallback(), '@') !== false) {
-                    $c = $route->getCallback();
-                }
+            if($route instanceof RouterRoute && !is_callable($route->getCallback()) && stripos($route->getCallback(), '@') !== false) {
+                $c = $route->getCallback();
             } else if($route instanceof RouterController || $route instanceof RouterResource) {
                 $c = $route->getController();
             }
@@ -492,10 +469,6 @@ class RouterBase {
         return $url;
     }
 
-    /**
-     * Get current router instance
-     * @return static
-     */
     public static function getInstance() {
         if(static::$instance === null) {
             static::$instance = new static();
@@ -503,4 +476,8 @@ class RouterBase {
         return static::$instance;
     }
 
+    public static function reset() {
+        static::$instance = null;
+    }
+
 }

src/Pecee/SimpleRouter/RouterGroup.php

@@ -97,12 +97,9 @@ 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'], $this->getMiddleware());
+                $middlewares = array_push($settings['middleware']);
             }
 
             $settings['middleware'] = array_unique(array_reverse($middlewares));

src/Pecee/SimpleRouter/SimpleRouter.php

@@ -128,12 +128,4 @@ 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/GroupTest.php

@@ -12,6 +12,7 @@ class GroupTest extends PHPUnit_Framework_TestCase  {
     }
 
     public function testGroup() {
+        \Pecee\SimpleRouter\RouterBase::reset();
 
         $this->result = false;
 
@@ -27,10 +28,9 @@ class GroupTest extends PHPUnit_Framework_TestCase  {
     }
 
     public function testNestedGroup() {
+        \Pecee\SimpleRouter\RouterBase::reset();
 
-        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
-        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/api/v1/test');
-        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
+        \Pecee\Http\Request::getInstance()->setUri('/api/v1/test');
 
         \Pecee\SimpleRouter\SimpleRouter::group(['prefix' => '/api'], function() {
             \Pecee\SimpleRouter\SimpleRouter::group(['prefix' => '/v1'], function() {

test/MiddlewareTest.php

@@ -7,10 +7,10 @@ require_once 'Dummy/Handler/ExceptionHandler.php';
 class MiddlewareTest extends PHPUnit_Framework_TestCase  {
 
     public function testMiddlewareFound() {
+        \Pecee\SimpleRouter\RouterBase::reset();
 
-        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
-        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
-        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/my/test/url');
+        \Pecee\Http\Request::getInstance()->setMethod('get');
+        \Pecee\Http\Request::getInstance()->setUri('/my/test/url');
 
         \Pecee\SimpleRouter\SimpleRouter::group(['exceptionHandler' => 'ExceptionHandler'], function() {
             \Pecee\SimpleRouter\SimpleRouter::get('/my/test/url', 'DummyController@start', ['middleware' => 'DummyMiddleware']);

test/RouterRouteTest.php

@@ -5,12 +5,13 @@ require_once 'Dummy/DummyController.php';
 require_once 'Dummy/Handler/ExceptionHandler.php';
 
 class RouterRouteTest extends PHPUnit_Framework_TestCase  {
-
+  
 
     public function testNotFound() {
-        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
-        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
-        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/test-param1-param2');
+        \Pecee\SimpleRouter\RouterBase::reset();
+
+        \Pecee\Http\Request::getInstance()->setMethod('get');
+        \Pecee\Http\Request::getInstance()->setUri('/test-param1-param2');
 
         \Pecee\SimpleRouter\SimpleRouter::group(['exceptionHandler' => 'ExceptionHandler'], function() {
             \Pecee\SimpleRouter\SimpleRouter::get('/non-existing-path', 'DummyController@start');
@@ -29,36 +30,37 @@ class RouterRouteTest extends PHPUnit_Framework_TestCase  {
     }
 
     public function testGet() {
-        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
-        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/my/test/url');
-        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
+
+        \Pecee\SimpleRouter\RouterBase::reset();
+
+        \Pecee\Http\Request::getInstance()->setMethod('get');
 
         \Pecee\SimpleRouter\SimpleRouter::get('/my/test/url', 'DummyController@start');
         \Pecee\SimpleRouter\SimpleRouter::start();
     }
 
     public function testPost() {
-        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
-        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/my/test/url');
-        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('post');
+        \Pecee\Http\Request::getInstance()->setMethod('post');
+
+        \Pecee\SimpleRouter\RouterBase::reset();
 
         \Pecee\SimpleRouter\SimpleRouter::post('/my/test/url', 'DummyController@start');
         \Pecee\SimpleRouter\SimpleRouter::start();
     }
 
     public function testPut() {
-        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
-        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/my/test/url');
-        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('put');
+        \Pecee\Http\Request::getInstance()->setMethod('put');
+
+        \Pecee\SimpleRouter\RouterBase::reset();
 
         \Pecee\SimpleRouter\SimpleRouter::put('/my/test/url', 'DummyController@start');
         \Pecee\SimpleRouter\SimpleRouter::start();
     }
 
     public function testDelete() {
-        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
-        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/my/test/url');
-        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('delete');
+        \Pecee\Http\Request::getInstance()->setMethod('delete');
+
+        \Pecee\SimpleRouter\RouterBase::reset();
 
         \Pecee\SimpleRouter\SimpleRouter::delete('/my/test/url', 'DummyController@start');
         \Pecee\SimpleRouter\SimpleRouter::start();
@@ -66,9 +68,10 @@ class RouterRouteTest extends PHPUnit_Framework_TestCase  {
     }
 
     public function testMethodNotAllowed() {
-        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
-        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/my/test/url');
-        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('post');
+
+        \Pecee\SimpleRouter\RouterBase::reset();
+
+        \Pecee\Http\Request::getInstance()->setMethod('post');
 
         \Pecee\SimpleRouter\SimpleRouter::get('/my/test/url', 'DummyController@start');
 
@@ -82,9 +85,10 @@ class RouterRouteTest extends PHPUnit_Framework_TestCase  {
 
     public function testSimpleParam() {
 
-        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
-        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
-        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/test-param1');
+        \Pecee\SimpleRouter\RouterBase::reset();
+
+        \Pecee\Http\Request::getInstance()->setMethod('get');
+        \Pecee\Http\Request::getInstance()->setUri('/test-param1');
 
         \Pecee\SimpleRouter\SimpleRouter::get('/test-{param1}', 'DummyController@param');
         \Pecee\SimpleRouter\SimpleRouter::start();
@@ -93,22 +97,24 @@ class RouterRouteTest extends PHPUnit_Framework_TestCase  {
 
     public function testMultiParam() {
 
-        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
-        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
-        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/test-param1-param2');
+        \Pecee\SimpleRouter\RouterBase::reset();
+
+        \Pecee\Http\Request::getInstance()->setMethod('get');
+        \Pecee\Http\Request::getInstance()->setUri('/test-param1-param2');
 
         \Pecee\SimpleRouter\SimpleRouter::get('/test-{param1}-{param2}', 'DummyController@param');
         \Pecee\SimpleRouter\SimpleRouter::start();
 
     }
 
-    public function testPathParamRegex() {
+    public function testPathParam() {
 
-        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
-        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
-        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/test/path/123123');
+        \Pecee\SimpleRouter\RouterBase::reset();
 
-        \Pecee\SimpleRouter\SimpleRouter::get('/test/path/{myParam}', 'DummyController@param', ['where' => ['myParam' => '([0-9]+)']]);
+        \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::start();
 
     }