Merge pull request #107 from skipperbent/development

Bugfix

README.md

@@ -481,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

@@ -97,6 +97,10 @@ class Input {
         return $default;
     }
 
+    public function exists($index) {
+        return ($this->getObject($index) !== null);
+    }
+
     public function setGet() {
         $this->get = new InputCollection();
 
@@ -123,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;

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

src/Pecee/SimpleRouter/RouterBase.php

@@ -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,11 +88,11 @@ 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());
 
                 // Add ExceptionHandler
-                if($route->matchRoute($this->request) && $route->getExceptionHandler() !== null) {
+                if($group->matchRoute($this->request) && $group->getExceptionHandler() !== null) {
                     $this->exceptionHandlers[] = $route;
                 }
             }
@@ -178,7 +180,7 @@ class RouterBase {
 
     protected function handleException(\Exception $e) {
 
-        /* @var $route RouterEntry */
+        /* @var $route RouterGroup */
         foreach ($this->exceptionHandlers as $route) {
             $route->loadMiddleware($this->request);
             $handler = $route->getExceptionHandler();
@@ -292,9 +294,7 @@ class RouterBase {
         if(is_array($getParams)) {
             if ($includeEmpty === false) {
                 $getParams = array_filter($getParams, function ($item) {
-                    if (!empty($item)) {
-                        return $item;
-                    }
+                    return (!empty($item));
                 });
             }
 

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/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();
+
+    }
+
 }