Merge pull request #100 from skipperbent/development

Development

README.md

@@ -176,20 +176,33 @@ 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 MyProject;
+<?php
+<?php
+namespace Pecee;
 
+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.');
+
+        // 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']);
+
         // Load routes.php
-        $file = $_ENV['base_path'] . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'routes.php';
+        $file = $_ENV['base_path'] . DIRECTORY_SEPARATOR . 'app' . DIRECTORY_SEPARATOR . 'routes.php';
         if(file_exists($file)) {
             require_once $file;
         }
@@ -199,20 +212,57 @@ class Router extends SimpleRouter {
 
         // 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) {
 
-            if(self::$defaultExceptionHandler !== null) {
-                $class = new self::$defaultExceptionHandler();
-                $class->handleError(RouterBase::getInstance()->getRequest(), $route, $e);
+            $route = RouterBase::getInstance()->getLoadedRoute();
+
+            // Otherwise use the fallback default exceptions handler
+            if(static::$defaultExceptionHandler !== null) {
+                static::loadExceptionHandler(static::$defaultExceptionHandler, $route, $e);
             }
 
             throw $e;
         }
+
     }
 
-    public static function setDefaultExceptionHandler($handler) {
-        self::$defaultExceptionHandler = $handler;
+    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;
+        }
     }
 
 }

src/Pecee/Http/Input/Input.php

@@ -49,12 +49,13 @@ class Input {
     }
 
     public function getObject($index, $default = null) {
+        $key = (strpos($index, '[') > -1) ? substr($index, strpos($index, '[')+1, strpos($index, ']') - strlen($index)) : null;
         $index = (strpos($index, '[') > -1) ? substr($index, 0, strpos($index, '[')) : $index;
 
         $element = $this->get->findFirst($index);
 
         if($element !== null) {
-            return $element;
+            return ($key !== null) ? $element[$key] : $element;
         }
 
         if(Request::getInstance()->getMethod() !== 'get') {
@@ -62,12 +63,12 @@ class Input {
             $element = $this->post->findFirst($index);
 
             if ($element !== null) {
-                return $element;
+                return ($key !== null) ? $element[$key] : $element;
             }
 
             $element = $this->file->findFirst($index);
             if ($element !== null) {
-                return $element;
+                return ($key !== null) ? $element[$key] : $element;
             }
         }
 
@@ -82,21 +83,14 @@ class Input {
      */
     public function get($index, $default = null) {
 
-        $key = (strpos($index, '[') > -1) ? substr($index, strpos($index, '[')+1, strpos($index, ']') - strlen($index)) : null;
-        $index = (strpos($index, '[') > -1) ? substr($index, 0, strpos($index, '[')) : $index;
-
         $item = $this->getObject($index);
 
         if($item !== null) {
 
-            if($item instanceof InputFile) {
+            if(is_array($item) || $item instanceof InputFile) {
                 return $item;
             }
 
-            if (is_array($item->getValue())) {
-                return ($key !== null && isset($item->getValue()[$key])) ? $item->getValue()[$key] : $item->getValue();
-            }
-
             return (trim($item->getValue()) === '') ? $default : $item->getValue();
         }
 
@@ -119,7 +113,7 @@ class Input {
                     $output[$k] = new InputItem($k, $g);
                 }
 
-                $this->get->{$key} = new InputItem($key, $output);
+                $this->get->{$key} = $output;
             }
         }
     }
@@ -149,7 +143,7 @@ class Input {
                     $output[$k] = new InputItem($k, $p);
                 }
 
-                $this->post->{strtolower($key)} = new InputItem($key, $output);
+                $this->post->{strtolower($key)} = $output;
             }
         }
     }
@@ -189,7 +183,7 @@ class Input {
                     }
                 }
 
-                $this->file->{strtolower($key)} = new InputItem($key, $output);
+                $this->file->{strtolower($key)} = $output;
             }
         }
     }

src/Pecee/SimpleRouter/RouterBase.php

@@ -19,7 +19,6 @@ class RouterBase {
     protected $defaultNamespace;
     protected $bootManagers;
     protected $baseCsrfVerifier;
-    protected $middlewaresToLoad;
     protected $exceptionHandlers;
 
     // TODO: clean up - cut some of the methods down to smaller pieces
@@ -30,7 +29,6 @@ class RouterBase {
         $this->backStack = array();
         $this->controllerUrlMap = array();
         $this->bootManagers = array();
-        $this->middlewaresToLoad = array();
         $this->exceptionHandlers = array();
     }
 
@@ -91,12 +89,9 @@ class RouterBase {
                 $route->renderRoute($this->request);
                 $mergedSettings = array_merge($settings, $route->getMergeableSettings());
 
-                // Load middleware on group if route matches
-                if($route->getPrefix() !== null && $route->matchRoute($this->request)) {
-                    if($route->getExceptionHandler() !== null) {
-                        $this->exceptionHandlers[] = $route->getExceptionHandler();
-                    }
-                    $this->middlewaresToLoad[] = $route;
+                // Add ExceptionHandler
+                if($route->matchRoute($this->request) && $route->getExceptionHandler() !== null) {
+                    $this->exceptionHandlers[] = $route;
                 }
             }
 
@@ -136,22 +131,8 @@ class RouterBase {
         // Loop through each route-request
         $this->processRoutes($this->routes);
 
-        // Load group middlewares
-        /* @var $route RouterEntry */
-        foreach($this->middlewaresToLoad as $route) {
-            $route->loadMiddleware($this->request);
-        }
-
         $routeNotAllowed = false;
 
-        // Make sure routes with longer urls are rendered first
-        usort($this->controllerUrlMap, function($a, $b) {
-            if(strlen($a->getUrl()) < strlen($b->getUrl())) {
-                return 1;
-            }
-            return -1;
-        });
-
         $max = count($this->controllerUrlMap);
 
         /* @var $route RouterEntry */
@@ -197,8 +178,12 @@ class RouterBase {
 
     protected function handleException(\Exception $e) {
 
-        foreach ($this->exceptionHandlers as $handler) {
-            $handler = new $handler($this->request);
+        /* @var $route RouterEntry */
+        foreach ($this->exceptionHandlers as $route) {
+            $route->loadMiddleware($this->request);
+            $handler = $route->getExceptionHandler();
+            $handler = new $handler();
+
             if (!($handler instanceof IExceptionHandler)) {
                 throw new RouterException('Exception handler must implement the IExceptionHandler interface.');
             }
@@ -303,13 +288,17 @@ class RouterBase {
     }
 
     public function arrayToParams(array $getParams = null, $includeEmpty = true) {
-        if (is_array($getParams) && count($getParams) > 0) {
-            foreach ($getParams as $key => $val) {
-                if (!empty($val) || $includeEmpty) {
-                    $getParams[$key] = (is_array($val) ? $this->arrayToParams($val, $includeEmpty) : $key . '=' . $val);
-                }
+
+        if(is_array($getParams)) {
+            if ($includeEmpty === false) {
+                $getParams = array_filter($getParams, function ($item) {
+                    if (!empty($item)) {
+                        return $item;
+                    }
+                });
             }
-            return join('&', $getParams);
+
+            return http_build_query($getParams);
         }
         return '';
     }
@@ -386,8 +375,7 @@ class RouterBase {
         if($controller === null && $parameters === null) {
             $getParams = (is_array($getParams)) ? array_merge($_GET, $getParams) : $_GET;
 
-            $url = parse_url(Request::getInstance()->getUri());
-            $url = $url['path'];
+            $url = parse_url($this->request->getUri(), PHP_URL_PATH);
 
             if(count($getParams)) {
                 $url .= '?' . $this->arrayToParams($getParams);

src/Pecee/SimpleRouter/RouterGroup.php

@@ -92,6 +92,7 @@ class RouterGroup extends RouterEntry {
         if($this->getNamespace() !== null && isset($settings['namespace'])) {
             unset($settings['namespace']);
         }
+
         if(is_array($settings)) {
             $this->settings = array_merge($this->settings, $settings);
         }