Merge pull request #96 from skipperbent/development

Development

README.md

@@ -384,7 +384,7 @@ Example:
  * @return \Pecee\Http\Input\Input
  */
 function input() {
-    return new \Pecee\Http\Input\Input();
+    return \Pecee\Http\Request::getInstance()->getInput();
 }
 ```
 

src/Pecee/Http/Input/Input.php

@@ -55,16 +55,18 @@ class Input {
             return $element;
         }
 
-        $element = $this->post->findFirst($index);
+        if(request()->getMethod() !== 'get') {
 
-        if($element !== null) {
-            return $element;
-        }
+            $element = $this->post->findFirst($index);
 
-        $element = $this->file->findFirst($index);
+            if ($element !== null) {
+                return $element;
+            }
 
-        if($element !== null) {
-            return $element;
+            $element = $this->file->findFirst($index);
+            if ($element !== null) {
+                return $element;
+            }
         }
 
         return $default;
@@ -85,11 +87,15 @@ class Input {
 
         if($item !== null) {
 
+            if($item instanceof InputFile) {
+                return $item;
+            }
+
             if (is_array($item->getValue())) {
                 return ($key !== null && isset($item->getValue()[$key])) ? $item->getValue()[$key] : $item->getValue();
             }
 
-            return ($item->getValue() === null) ? $default : $item->getValue();
+            return (trim($item->getValue()) === '') ? $default : $item->getValue();
         }
 
         return $default;

src/Pecee/Http/Request.php

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

@@ -111,13 +111,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 */
@@ -138,6 +131,12 @@ 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
@@ -309,7 +308,7 @@ class RouterBase {
         return '';
     }
 
-    protected function processUrl($route, $method = null, $parameters = null, $getParams = null) {
+    protected function processUrl(RouterRoute $route, $method = null, $parameters = null, $getParams = null) {
 
         $domain = '';