Merge pull request #120 from skipperbent/development

Development

src/Pecee/SimpleRouter/RouterBase.php

@@ -86,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;
@@ -483,4 +476,8 @@ class RouterBase {
         return static::$instance;
     }
 
+    public static function reset() {
+        static::$instance = null;
+    }
+
 }

test/GroupTest.php

@@ -12,6 +12,7 @@ class GroupTest extends PHPUnit_Framework_TestCase  {
     }
 
     public function testGroup() {
+        \Pecee\SimpleRouter\RouterBase::reset();
 
         $this->result = false;
 
@@ -27,9 +28,9 @@ class GroupTest extends PHPUnit_Framework_TestCase  {
     }
 
     public function testNestedGroup() {
+        \Pecee\SimpleRouter\RouterBase::reset();
 
-        \Pecee\SimpleRouter\RouterBase::getInstance()->getRequest()->setUri('/api/v1/test');
-        \Pecee\SimpleRouter\RouterBase::getInstance()->getRequest()->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,6 +7,7 @@ require_once 'Dummy/Handler/ExceptionHandler.php';
 class MiddlewareTest extends PHPUnit_Framework_TestCase  {
 
     public function testMiddlewareFound() {
+        \Pecee\SimpleRouter\RouterBase::reset();
 
         \Pecee\Http\Request::getInstance()->setMethod('get');
         \Pecee\Http\Request::getInstance()->setUri('/my/test/url');

test/RouterRouteTest.php

@@ -8,6 +8,7 @@ class RouterRouteTest extends PHPUnit_Framework_TestCase  {
   
 
     public function testNotFound() {
+        \Pecee\SimpleRouter\RouterBase::reset();
 
         \Pecee\Http\Request::getInstance()->setMethod('get');
         \Pecee\Http\Request::getInstance()->setUri('/test-param1-param2');
@@ -30,40 +31,46 @@ class RouterRouteTest extends PHPUnit_Framework_TestCase  {
 
     public function testGet() {
 
-        \Pecee\SimpleRouter\RouterBase::getInstance()->getRequest()->setUri('/my/test/url');
-        \Pecee\SimpleRouter\RouterBase::getInstance()->getRequest()->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()->getRequest()->setUri('/my/test/url');
         \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()->getRequest()->setUri('/my/test/url');
         \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()->getRequest()->setUri('/my/test/url');
         \Pecee\Http\Request::getInstance()->setMethod('delete');
 
+        \Pecee\SimpleRouter\RouterBase::reset();
+
         \Pecee\SimpleRouter\SimpleRouter::delete('/my/test/url', 'DummyController@start');
         \Pecee\SimpleRouter\SimpleRouter::start();
 
     }
 
     public function testMethodNotAllowed() {
-        \Pecee\SimpleRouter\RouterBase::getInstance()->getRequest()->setUri('/my/test/url');
+
+        \Pecee\SimpleRouter\RouterBase::reset();
+
         \Pecee\Http\Request::getInstance()->setMethod('post');
 
         \Pecee\SimpleRouter\SimpleRouter::get('/my/test/url', 'DummyController@start');
@@ -78,6 +85,8 @@ 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');
 
@@ -88,6 +97,8 @@ 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');
 
@@ -98,6 +109,8 @@ class RouterRouteTest extends PHPUnit_Framework_TestCase  {
 
     public function testPathParam() {
 
+        \Pecee\SimpleRouter\RouterBase::reset();
+
         \Pecee\Http\Request::getInstance()->setMethod('get');
         \Pecee\Http\Request::getInstance()->setUri('/test/path/param1');