Merge pull request #124 from skipperbent/v2-development

V2 development

README.md

@@ -18,7 +18,7 @@ The goal of this project is to create a router that is 100% compatible with the
 
 ### Features
 
-- Basic routing (get, post, put, delete) with support for custom multiple verbs.
+- Basic routing (`GET`, `POST`, `PUT`, `DELETE`) with support for custom multiple verbs.
 - Regular Expression Constraints for parameters.
 - Named routes.
 - Generating url to routes.
@@ -204,8 +204,9 @@ class Router extends SimpleRouter {
 }
 ```
 
-#### Helper functions examples
-**This is a basic example of a helper function for generating urls.**
+## Helper functions
+
+To simplify to use of simple-router functionality, we recommend you add these helper functions to your project.
 
 ```php
 use Pecee\SimpleRouter\SimpleRouter;
@@ -238,6 +239,14 @@ function request() {
 function response() {
     return SimpleRouter::response();
 }
+
+/**
+ * Get input class
+ * @return \Pecee\Http\Input\Input
+ */
+function input() {
+    return SimpleRouter::request()->getInput();
+}
 ```
 
 ## Getting urls
@@ -327,16 +336,6 @@ By doing this the route will now load the url ```/article/view/1``` instead of `
 
 The last thing we need to do, is to add our custom boot-manager to the ```routes.php``` file. You can create as many bootmanagers as you like and easily add them in your ```routes.php``` file.
 
-**routes.php example:**
-
-```php
-// Add new bootmanager
-SimpleRouter::addBootManager(new CustomRouterRules());
-
-// This rule is what our custom bootmanager will use.
-SimpleRouter::get('/article/view/{id}', 'ControllerArticle@view');
-```
-
 ## Easily overwrite route about to be loaded
 Sometimes it can be useful to manipulate the route that's about to be loaded, for instance if a user is not authenticated or if an error occurred within your Middleware that requires
 some other route to be initialised. Simple PHP Router allows you to easily change the route about to be executed. All information about the current route is stored in
@@ -404,22 +403,9 @@ All object inherits from `InputItem` class and will always contain these methods
 - `getError()` - get file upload error.
 
 
-### Easy access your input
-Create a helper function to easily get access to the input elements.
+### Easy access to methods
 
-Example:
-
-```php
-/**
- * Get input class
- * @return \Pecee\Http\Input\Input
- */
-function input() {
-    return SimpleRouter::request()->getInput();
-}
-```
-
-Then you can easily do something like this in your controller:
+Below example requires you to have the helper functions added. Please refer to the helper functions section in the documentation.
 
 ```php
 // Get parameter site_id or default-value 2

src/Pecee/Http/Input/Input.php

@@ -38,17 +38,31 @@ class Input {
      * @return array
      */
     public function all(array $filter = null) {
-        $output = $this->get->getData();
-        $output = array_merge($output, $this->post->getData());
 
-        if($filter !== null) {
-            $tmp = array();
-            foreach($output as $key => $val) {
-                if(in_array($key, $filter)) {
-                    $tmp[$key] = $val;
+        $output = $_POST;
+
+        if($this->request->getMethod() === 'post') {
+
+            $contents = file_get_contents('php://input');
+
+            if (stripos(trim($contents), '{') === 0) {
+                $output = json_decode($contents, true);
+                if($output === false) {
+                    $output = array();
                 }
             }
-            return $tmp;
+        }
+
+        $output = array_merge($_GET, $output);
+
+        if($filter !== null) {
+            $output = array_filter($output, function ($key) use ($filter) {
+                if (in_array($key, $filter)) {
+                    return true;
+                }
+
+                return false;
+            }, ARRAY_FILTER_USE_KEY);
         }
 
         return $output;
@@ -93,7 +107,7 @@ class Input {
 
         if($item !== null) {
 
-            if(is_array($item) || $item instanceof InputFile) {
+            if($item instanceof InputCollection || $item instanceof InputFile) {
                 return $item;
             }
 
@@ -117,10 +131,10 @@ class Input {
                     continue;
                 }
 
-                $output = array();
+                $output = new InputCollection();
 
                 foreach($get as $k => $g) {
-                    $output[$k] = new InputItem($k, $g);
+                    $output->{$k} = new InputItem($k, $g);
                 }
 
                 $this->get->{$key} = $output;
@@ -131,12 +145,10 @@ class Input {
     public function setPost() {
         $this->post = new InputCollection();
 
-        $postVars = array();
+        $postVars = $_POST;
 
-        if(isset($_SERVER['REQUEST_METHOD']) && in_array($_SERVER['REQUEST_METHOD'], ['PUT', 'PATCH', 'DELETE'])) {
+        if(in_array($this->request->getMethod(), ['put', 'patch', 'delete'])) {
             parse_str(file_get_contents('php://input'), $postVars);
-        } else {
-            $postVars = $_POST;
         }
 
         if(count($postVars)) {
@@ -147,10 +159,10 @@ class Input {
                     continue;
                 }
 
-                $output = array();
+                $output = new InputCollection();
 
-                foreach($post as $k=>$p) {
-                    $output[$k] = new InputItem($k, $p);
+                foreach($post as $k => $p) {
+                    $output->{$k} = new InputItem($k, $p);
                 }
 
                 $this->post->{strtolower($key)} = $output;
@@ -178,7 +190,7 @@ class Input {
                     continue;
                 }
 
-                $output = array();
+                $output = new InputCollection();
 
                 foreach($value['name'] as $k=>$val) {
                     // Strip empty values
@@ -189,7 +201,7 @@ class Input {
                         $file->setType($value['type'][$k]);
                         $file->setTmpName($value['tmp_name'][$k]);
                         $file->setError($value['error'][$k]);
-                        $output[$k] = $file;
+                        $output->{$k} = $file;
                     }
                 }
 

src/Pecee/Http/Request.php

@@ -5,8 +5,21 @@ use Pecee\Http\Input\Input;
 
 class Request {
 
+    protected static $instance;
+
     protected $data;
 
+    /**
+     * Return new instance
+     * @return static
+     */
+    public static function getInstance() {
+        if(self::$instance === null) {
+            self::$instance = new static();
+        }
+        return self::$instance;
+    }
+
     public function __construct() {
         $this->data = array();
         $this->host = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : array();

src/Pecee/SimpleRouter/RouterGroup.php

@@ -97,9 +97,12 @@ class RouterGroup extends RouterEntry {
         if($this->getMiddleware() !== null && isset($settings['middleware'])) {
 
             if(!is_array($this->getMiddleware())) {
-                $middlewares = [$this->getMiddleware(), $settings['middleware']];
+                $middlewares = [
+                    $this->getMiddleware(),
+                    $settings['middleware']
+                ];
             } else {
-                $middlewares = array_push($settings['middleware']);
+                $middlewares = array_push($settings['middleware'], $this->getMiddleware());
             }
 
             $settings['middleware'] = array_unique(array_reverse($middlewares));