[OPTIMISATION] Optimisations + bugfixes.

- Fixed references to Pecee framework.
- Fixed variables not being initialised before usage.
- Cleaned up duplicate checks.
- Other small optimisations and bugfixes.

src/Pecee/SimpleRouter/RouterBase.php

@@ -1,10 +1,8 @@
 <?php
 namespace Pecee\SimpleRouter;
 
-use Pecee\ArrayUtil;
 use Pecee\Http\Middleware\BaseCsrfVerifier;
 use Pecee\Http\Request;
-use Pecee\Url;
 
 class RouterBase {
 
@@ -42,8 +40,8 @@ class RouterBase {
         // Loop through each route-request
 
         $activeGroup = null;
-
         $routesCount = count($routes);
+        $mergedSettings = array();
 
         /* @var $route RouterEntry */
         for($i = 0; $i < $routesCount; $i++) {
@@ -123,7 +121,7 @@ class RouterBase {
 
             $routeMatch = $route->matchRoute($this->request);
 
-            if($routeMatch && !($routeMatch instanceof RouterGroup)) {
+            if($routeMatch) {
 
                 if(count($route->getRequestMethods()) && !in_array($this->request->getMethod(), $route->getRequestMethods())) {
                     $routeNotAllowed = true;
@@ -132,9 +130,9 @@ class RouterBase {
 
                 $routeNotAllowed = false;
 
-                $this->loadedRoute = $routeMatch;
-                $routeMatch->loadMiddleware($this->request);
-                $routeMatch->renderRoute($this->request);
+                $this->loadedRoute = $route;
+                $route->loadMiddleware($this->request);
+                $route->renderRoute($this->request);
                 break;
             }
         }
@@ -221,6 +219,15 @@ class RouterBase {
         return $this;
     }
 
+    protected function getParamsToArray($query) {
+        $output = array();
+        if($query[0] === '?') {
+            $query = substr($query, 1);
+        }
+        parse_str($query, $output);
+        return $output;
+    }
+
     protected function processUrl($route, $method = null, $parameters = null, $getParams = null) {
 
         $url = '/' . trim($route->getUrl(), '/');
@@ -254,7 +261,7 @@ class RouterBase {
         $url = rtrim($url, '/') . '/';
 
         if($getParams !== null && count($getParams)) {
-            $url .= '?'.Url::arrayToParams($getParams);
+            $url .= '?' . $this->getParamsToArray($getParams);
         }
 
         return $url;
@@ -328,13 +335,15 @@ class RouterBase {
         $url = array($controller);
 
         if(is_array($parameters)) {
-            ArrayUtil::append($url, $parameters);
+            foreach($parameters as $key => $value) {
+                array_push($url,$value);
+            }
         }
 
         $url = '/' . trim(join('/', $url), '/') . '/';
 
         if(is_array($getParams)) {
-            $url .= '?' . Url::arrayToParams($getParams);
+            $url .= '?' . $this->getParamsToArray($getParams);
         }
 
         return $url;

src/Pecee/SimpleRouter/RouterController.php

@@ -63,7 +63,7 @@ class RouterController extends RouterEntry {
                 // Set callback
                 $this->setCallback($this->controller . '@' . $this->method);
 
-                return $this;
+                return true;
             }
         }
         return null;

src/Pecee/SimpleRouter/RouterEntry.php

@@ -304,7 +304,7 @@ abstract class RouterEntry {
 
             $max = count($parameterNames);
 
-            if(count($max)) {
+            if($max) {
                 for($i = 0; $i < $max; $i++) {
                     $name = $parameterNames[$i];
                     $parameterValue = (isset($parameterValues[$name['name']]) && !empty($parameterValues[$name['name']])) ? $parameterValues[$name['name']] : null;
@@ -332,7 +332,7 @@ abstract class RouterEntry {
                         throw new RouterException($middleware . ' must be instance of Middleware');
                     }
 
-                    /* @var $class Middleware */
+                    /* @var $class IMiddleware */
                     $middleware->handle($request);
                 }
             } else {
@@ -341,7 +341,7 @@ abstract class RouterEntry {
                     throw new RouterException($this->getMiddleware() . ' must be instance of Middleware');
                 }
 
-                /* @var $class Middleware */
+                /* @var $class IMiddleware */
                 $middleware->handle($request);
             }
         }

src/Pecee/SimpleRouter/RouterGroup.php

@@ -10,7 +10,7 @@ class RouterGroup extends RouterEntry {
         parent::__construct();
     }
 
-    protected function matchDomain() {
+    protected function matchDomain(Request $request) {
         if($this->domain !== null) {
 
             if(is_array($this->domain)) {
@@ -20,7 +20,7 @@ class RouterGroup extends RouterEntry {
                 for($i = 0; $i < $max; $i++) {
                     $domain = $this->domain[$i];
 
-                    $parameters = $this->parseParameters($domain, request()->getHost(), '[^.]*');
+                    $parameters = $this->parseParameters($domain, $request->getHost(), '[^.]*');
 
                     if($parameters !== null) {
                         $this->parameters = $parameters;
@@ -31,7 +31,7 @@ class RouterGroup extends RouterEntry {
                 return null;
             }
 
-            $parameters = $this->parseParameters($this->domain, request()->getHost(), '[^.]*');
+            $parameters = $this->parseParameters($this->domain, $request->getHost(), '[^.]*');
 
             if ($parameters !== null) {
                 $this->parameters = $parameters;
@@ -60,7 +60,7 @@ class RouterGroup extends RouterEntry {
             throw new RouterException('Method not allowed');
         }
 
-        if($this->matchDomain() === null) {
+        if($this->matchDomain($request) === null) {
             return null;
         }
 

src/Pecee/SimpleRouter/RouterResource.php

@@ -45,7 +45,7 @@ class RouterResource extends RouterEntry {
     protected function call($method, $parameters) {
         $this->setCallback($this->controller . '@' . $method);
         $this->parameters = $parameters;
-        return $this;
+        return true;
     }
 
     public function matchRoute(Request $request) {

src/Pecee/SimpleRouter/RouterRoute.php

@@ -26,9 +26,9 @@ class RouterRoute extends RouterEntry {
         // Match on custom defined regular expression
         if($this->regexMatch) {
             $parameters = array();
-            if(preg_match('/('.$this->regexMatch.')/is', request()->getHost() . $url, $parameters)) {
+            if(preg_match('/('.$this->regexMatch.')/is', $request->getHost() . $url, $parameters)) {
                 $this->parameters = (!is_array($parameters[0]) ? array($parameters[0]) : $parameters[0]);
-                return $this;
+                return true;
             }
             return null;
         }
@@ -46,7 +46,7 @@ class RouterRoute extends RouterEntry {
                 $this->parameters = $parameters;
             }
 
-            return $this;
+            return true;
         }
 
         return null;

src/Pecee/SimpleRouter/SimpleRouter.php

@@ -19,7 +19,7 @@ class SimpleRouter {
      * @throws RouterException
      */
     public static function start($defaultNamespace = null) {
-        $router = RouterBase::GetInstance();
+        $router = RouterBase::getInstance();
         $router->setDefaultNamespace($defaultNamespace);
         $router->routeRequest();
     }