Merge pull request #107 from skipperbent/development

Bugfix

README.md

@@ -103,6 +103,37 @@ SimpleRouter::group(['prefix' => 'v1', 'middleware' => '\MyWebsite\Middleware\So
 });
 ```
 
+#### ExceptionHandler example
+
+This is a basic example of an ExceptionHandler implementation:
+
+```php
+namespace BB\Handlers;
+
+use Pecee\Http\Request;
+use Pecee\SimpleRouter\RouterEntry;
+
+class CustomExceptionHandler implements IExceptionHandler {
+
+    public function handleError( Request $request, RouterEntry $router = null, \Exception $error) {
+
+        // If the error-code is 404; show another route which contains the page-not-found
+        if($error->getCode() === 404) {
+            // Load your custom 404-page view
+        }
+
+        // Output error as json if on api path.
+        if(stripos($request->getUri(), '/api') !== false) {
+            response()->json(['error' => $error->getMessage()]);
+        }
+
+        // Otherwise default exception will be thrown by the router.
+
+    }
+
+}
+``
+
 ### Sub-domain routing
 
 Route groups may also be used to route wildcard sub-domains. Sub-domains may be assigned route parameters just like route URIs, allowing you to capture a portion of the sub-domain for usage in your route or controller. The sub-domain may be specified using the ```domain``` key on the group attribute array:
@@ -145,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;
         }
@@ -168,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;
+        }
     }
 
 }
@@ -384,7 +465,7 @@ Example:
  * @return \Pecee\Http\Input\Input
  */
 function input() {
-    return new \Pecee\Http\Input\Input();
+    return \Pecee\Http\Request::getInstance()->getInput();
 }
 ```
 
@@ -400,6 +481,7 @@ This is some sites that uses the simple-router project in production.
 
 - [holla.dk](http://www.holla.dk)
 - [ninjaimg.com](http://ninjaimg.com)
+- [bookandbegin.com](https://bookandbegin.com)
 
 ## Documentation
 While I work on a better documentation, please refer to the Laravel 5 routing documentation here:

src/Pecee/Http/Input/Input.php

@@ -1,6 +1,8 @@
 <?php
 namespace Pecee\Http\Input;
 
+use Pecee\Http\Request;
+
 class Input {
 
     /**
@@ -47,24 +49,27 @@ 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;
         }
 
-        $element = $this->post->findFirst($index);
+        if(Request::getInstance()->getMethod() !== 'get') {
 
-        if($element !== null) {
-            return $element;
-        }
+            $element = $this->post->findFirst($index);
 
-        $element = $this->file->findFirst($index);
+            if ($element !== null) {
+                return ($key !== null) ? $element[$key] : $element;
+            }
 
-        if($element !== null) {
-            return $element;
+            $element = $this->file->findFirst($index);
+            if ($element !== null) {
+                return ($key !== null) ? $element[$key] : $element;
+            }
         }
 
         return $default;
@@ -78,23 +83,24 @@ 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 (is_array($item->getValue())) {
-                return ($key !== null && isset($item->getValue()[$key])) ? $item->getValue()[$key] : $item->getValue();
+            if(is_array($item) || $item instanceof InputFile) {
+                return $item;
             }
 
-            return ($item->getValue() === null) ? $default : $item->getValue();
+            return (trim($item->getValue()) === '') ? $default : $item->getValue();
         }
 
         return $default;
     }
 
+    public function exists($index) {
+        return ($this->getObject($index) !== null);
+    }
+
     public function setGet() {
         $this->get = new InputCollection();
 
@@ -111,7 +117,7 @@ class Input {
                     $output[$k] = new InputItem($k, $g);
                 }
 
-                $this->get->{$key} = new InputItem($key, $output);
+                $this->get->{$key} = $output;
             }
         }
     }
@@ -121,7 +127,7 @@ class Input {
 
         $postVars = array();
 
-        if(in_array($_SERVER['REQUEST_METHOD'], ['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;
@@ -141,7 +147,7 @@ class Input {
                     $output[$k] = new InputItem($k, $p);
                 }
 
-                $this->post->{strtolower($key)} = new InputItem($key, $output);
+                $this->post->{strtolower($key)} = $output;
             }
         }
     }
@@ -181,7 +187,7 @@ class Input {
                     }
                 }
 
-                $this->file->{strtolower($key)} = new InputItem($key, $output);
+                $this->file->{strtolower($key)} = $output;
             }
         }
     }

src/Pecee/Http/Input/InputItem.php

@@ -46,6 +46,16 @@ class InputItem {
         return $this;
     }
 
+    /**
+     * Set input value
+     * @param string $value
+     * @return static $this
+     */
+    public function setValue($value) {
+        $this->value = $value;
+        return $this;
+    }
+
     public function __toString() {
         return (string)$this->getValue();
     }

src/Pecee/Http/Request.php

@@ -22,9 +22,9 @@ class Request {
 
     public function __construct() {
         $this->data = array();
-        $this->host = $_SERVER['HTTP_HOST'];
-        $this->uri = $_SERVER['REQUEST_URI'];
-        $this->method = (isset($_POST['_method'])) ? strtolower($_POST['_method']) : strtolower($_SERVER['REQUEST_METHOD']);
+        $this->host = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : array();
+        $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();
     }
@@ -125,13 +125,11 @@ class Request {
     }
 
     /**
-     * Get request input or default value
-     * @param string $name
-     * @param string $defaultValue
-     * @return mixed
+     * Get input class
+     * @return Input
      */
-    public function getInput($name, $defaultValue) {
-        return (isset($_REQUEST[$name]) ? $_REQUEST[$name] : $defaultValue);
+    public function getInput() {
+        return $this->input;
     }
 
     public function isFormatAccepted($format) {

src/Pecee/SimpleRouter/RouterBase.php

@@ -19,7 +19,7 @@ class RouterBase {
     protected $defaultNamespace;
     protected $bootManagers;
     protected $baseCsrfVerifier;
-    protected $middlewaresToLoad;
+    protected $exceptionHandlers;
 
     // TODO: clean up - cut some of the methods down to smaller pieces
 
@@ -29,7 +29,7 @@ class RouterBase {
         $this->backStack = array();
         $this->controllerUrlMap = array();
         $this->bootManagers = array();
-        $this->middlewaresToLoad = array();
+        $this->exceptionHandlers = array();
     }
 
     public function addRoute(RouterEntry $route) {
@@ -72,12 +72,14 @@ class RouterBase {
                 array_push($newPrefixes, trim($route->getPrefix(), '/'));
             }
 
+            /* @var $group RouterGroup */
+            $group = null;
+
             if(!($route instanceof RouterGroup)) {
                 if(is_array($newPrefixes) && count($newPrefixes) && $backStack) {
                     $route->setUrl( '/' . join('/', $newPrefixes) . $route->getUrl() );
                 }
 
-                $group = null;
                 $this->controllerUrlMap[] = $route;
             }
 
@@ -86,12 +88,12 @@ class RouterBase {
             if($route instanceof RouterGroup && is_callable($route->getCallback())) {
                 $group = $route;
 
-                $route->renderRoute($this->request);
-                $mergedSettings = array_merge($settings, $route->getMergeableSettings());
+                $group->renderRoute($this->request);
+                $mergedSettings = array_merge($settings, $group->getMergeableSettings());
 
-                // Load middleware on group if route matches
-                if($route->getPrefix() !== null && $route->matchRoute($this->request)) {
-                    $this->middlewaresToLoad[] = $route;
+                // Add ExceptionHandler
+                if($group->matchRoute($this->request) && $group->getExceptionHandler() !== null) {
+                    $this->exceptionHandlers[] = $route;
                 }
             }
 
@@ -111,13 +113,6 @@ class RouterBase {
 
         $originalUri = $this->request->getUri();
 
-        // Load group middlewares
-
-        /* @var $middleware RouterEntry */
-        foreach($this->middlewaresToLoad as $middleware) {
-            $middleware->loadMiddleware($this->request);
-        }
-
         // Initialize boot-managers
         if(count($this->bootManagers)) {
             /* @var $manager RouterBootManager */
@@ -140,14 +135,6 @@ class RouterBase {
 
         $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 */
@@ -187,14 +174,19 @@ class RouterBase {
         }
 
         if(!$this->request->loadedRoute) {
-            throw new RouterException(sprintf('Route not found: %s', $this->request->getUri()), 404);
+            $this->handleException(new RouterException(sprintf('Route not found: %s', $this->request->getUri()), 404));
         }
     }
 
     protected function handleException(\Exception $e) {
-        if($this->request->loadedRoute !== null && $this->request->loadedRoute->exceptionHandler !== null) {
-            $handler = new $this->request->loadedRoute->exceptionHandler();
-            if(!($handler instanceof IExceptionHandler)) {
+
+        /* @var $route RouterGroup */
+        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.');
             }
 
@@ -298,18 +290,20 @@ 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) {
+                    return (!empty($item));
+                });
             }
-            return join('&', $getParams);
+
+            return http_build_query($getParams);
         }
         return '';
     }
 
-    protected function processUrl($route, $method = null, $parameters = null, $getParams = null) {
+    protected function processUrl(RouterRoute $route, $method = null, $parameters = null, $getParams = null) {
 
         $domain = '';
 
@@ -381,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/RouterEntry.php

@@ -232,7 +232,7 @@ abstract class RouterEntry {
     }
 
     /**
-     * Dynamicially set settings value
+     * Dynamically set settings value
      *
      * @param string $name
      * @param mixed|null $value
@@ -249,7 +249,7 @@ abstract class RouterEntry {
         return new $name();
     }
 
-    protected function parseParameters($route, $url, $parameterRegex = '[a-z0-9]+') {
+    protected function parseParameters($route, $url, $parameterRegex = '[\w]+') {
         $parameterNames = array();
         $regex = '';
         $lastCharacter = '';
@@ -261,12 +261,6 @@ abstract class RouterEntry {
 
             $character = $route[$i];
 
-            // Skip "/" if we are at the end of a parameter
-            if($lastCharacter === '}' && $character === '/') {
-                $lastCharacter = $character;
-                continue;
-            }
-
             if($character === '{') {
                 // Remove "/" and "\" from regex
                 if(substr($regex, strlen($regex)-1) === '/') {
@@ -285,10 +279,10 @@ abstract class RouterEntry {
 
                 if($lastCharacter === '?') {
                     $parameter = substr($parameter, 0, strlen($parameter)-1);
-                    $regex .= '(?:\\/?(?P<'.$parameter.'>[^\/]+)?\\/?)';
+                    $regex .= '(?:\/?(?P<' . $parameter . '>'. $parameterRegex .')[^\/]?)?';
                     $required = false;
                 } else {
-                    $regex .= '\\/(?P<' . $parameter . '>'. $parameterRegex .')\\/';
+                    $regex .= '\/?(?P<' . $parameter . '>'. $parameterRegex .')[^\/]?';
                 }
                 $parameterNames[] = array('name' => $parameter, 'required' => $required);
                 $parameter = '';
@@ -307,7 +301,8 @@ abstract class RouterEntry {
 
         $parameterValues = array();
 
-        if(preg_match('/^'.$regex.'$/is', $url, $parameterValues)) {
+        if(preg_match('/^'.$regex.'\/?$/is', $url, $parameterValues)) {
+
             $parameters = array();
 
             $max = count($parameterNames);
@@ -399,7 +394,7 @@ abstract class RouterEntry {
     }
 
     /**
-     * Get allowed requeset methods
+     * Get allowed request methods
      *
      * @return array
      */

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);
         }

src/Pecee/SimpleRouter/RouterRoute.php

@@ -105,7 +105,7 @@ class RouterRoute extends RouterEntry {
         } else {
             return strtolower($this->getAlias()) === strtolower($name);
         }
-        
+
         return false;
     }
 

test/Dummy/DummyController.php

@@ -6,4 +6,9 @@ class DummyController {
         echo static::class . '@' .'start() OK';
     }
 
+    public function param($params = null) {
+        $params = func_get_args();
+        echo 'Params: ' . join(', ', $params);
+    }
+
 }

test/MiddlewareTest.php

@@ -20,17 +20,16 @@ class MiddlewareTest extends PHPUnit_Framework_TestCase  {
 
         \Pecee\SimpleRouter\SimpleRouter::get('/my/test/url', 'DummyController@start', ['middleware' => 'DummyMiddleware']);
 
+        $found = false;
+
         try {
             \Pecee\SimpleRouter\SimpleRouter::start();
         }catch(Exception $e) {
-            $this->assertTrue(($e instanceof MiddlewareLoadedException));
-            return;
+            $found = ($e instanceof MiddlewareLoadedException);
         }
 
-        throw new Exception('Middleware not loaded');
+        $this->assertTrue($found);
 
     }
 
-
-
 }

test/RouterRouteTest.php

@@ -66,4 +66,40 @@ 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');
+
+        \Pecee\SimpleRouter\SimpleRouter::get('/test-{param1}', 'DummyController@param');
+        \Pecee\SimpleRouter\SimpleRouter::start();
+
+    }
+
+    public function testMultiParam() {
+
+        \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 testPathParam() {
+
+        \Pecee\SimpleRouter\RouterBase::reset();
+
+        \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();
+
+    }
+
 }