Fixed urls not being visible

- Group only loads if prefix matches (if any).

src/Pecee/Http/Request.php

@@ -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/SimpleRouter/RouterBase.php

@@ -86,15 +86,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;
@@ -113,6 +120,8 @@ class RouterBase {
 
         $originalUri = $this->request->getUri();
 
+        $routeNotAllowed = false;
+
         try {
 
             // Initialize boot-managers
@@ -137,8 +146,6 @@ class RouterBase {
                 }
             }
 
-            $routeNotAllowed = false;
-
             $max = count($this->controllerUrlMap);
 
             /* @var $route RouterEntry */
@@ -303,15 +310,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 '';
     }
 
@@ -366,8 +374,8 @@ class RouterBase {
 
         $url = rtrim($url, '/') . '/';
 
-        if($getParams !== null && count($getParams)) {
-            $url .= '?' . $this->arrayToParams($getParams);
+        if($getParams !== null) {
+            $url .= $this->arrayToParams($getParams);
         }
 
         return $url;
@@ -389,8 +397,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;
@@ -461,8 +469,8 @@ class RouterBase {
 
         $url = '/' . trim(join('/', $url), '/') . '/';
 
-        if($getParams !== null && count($getParams)) {
-            $url .= '?' . $this->arrayToParams($getParams);
+        if($getParams !== null) {
+            $url .= $this->arrayToParams($getParams);
         }
 
         return $url;
@@ -475,8 +483,4 @@ class RouterBase {
         return static::$instance;
     }
 
-    public static function reset() {
-        static::$instance = null;
-    }
-
 }

test/GroupTest.php

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

test/MiddlewareTest.php

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