begin middleware management

src/Utils/Controller/LuRoute.php

@@ -11,6 +11,7 @@ use FastRoute\DataGenerator\GroupCountBased as DataGeneratorGroupCountBased;
 use FastRoute\Dispatcher\GroupCountBased as DispatcherGroupCountBased;
 use FastRoute\RouteCollector;
 use FastRoute\RouteParser\Std;
+use Luticate\Utils\Dbo\LuMiddlewareDbo;
 use Luticate\Utils\Dbo\LuRouteDbo;
 use Luticate\Utils\Middleware\LuAbstractMiddleware;
 
@@ -26,9 +27,9 @@ class LuRoute {
     private $_dispatcher = null;
 
     /**
-     * @var string[]
+     * @var LuMiddlewareDbo[]
      */
-    private $middleware = array('Luticate\Utils\ParametersMiddleware');
+    private $_middlewares = [];
 
     /**
      * @var LuRouteDbo[]
@@ -45,11 +46,19 @@ class LuRoute {
     }
 
     /**
-     * @param $middleware string
+     * @param $middleware mixed
      */
-    public function addMiddleware($middleware)
+    public function addMiddleware(mixed $middleware)
     {
-        $this->middleware[] = $middleware;
+        if (is_string($middleware)) {
+            $this->_middlewares[] = new LuMiddlewareDbo($middleware);
+        }
+        else if (is_array($middleware)) {
+            $this->_middlewares[] = LuMiddlewareDbo::jsonDeserialize($middleware);
+        }
+        else {
+            $this->_middlewares[] = $middleware;
+        }
     }
     
     public function setup()
@@ -70,16 +79,25 @@ class LuRoute {
     public function execute(LuRouteDbo $route, $parameters)
     {
         $middlewares = [];
-        foreach ($route->getMiddlewares() as $middlewareName) {
+        /**
+         * @var $middlewareDbo LuMiddlewareDbo
+         */
+        foreach (array_merge($this->_middlewares, $route->getMiddlewares()) as $middlewareDbo) {
+            $middlewareName = $middlewareDbo->getMiddleware();
             /**
              * @var $middleware LuAbstractMiddleware
              */
             $middleware = new $middlewareName();
+            $parameters["_middleware"] = array_merge($middlewareDbo->getParameters(), $route->getParameters());
             $parameters = $middleware->onBefore($route, $parameters);
-            $middlewares[] = $middleware;
+            $middlewares[] = [
+                'middleware' => $middleware,
+                'dbo' => $middlewareDbo
+            ];
         }
+        unset($parameters["_middleware"]);
 
-        $reflect = new \ReflectionMethod($route->getControllerClass(), $route->getControllerMethod());
+        $reflect = new \ReflectionMethod($route->getController(), $route->getAction());
         $params = $reflect->getParameters();
         $docs = new LuMethodDocParser($reflect->getDocComment());
         $docs->parse();
@@ -130,11 +148,14 @@ class LuRoute {
             }
         }
 
-        $controller = $route->getControllerClass();
+        $controller = $route->getController();
         $controllerInstance = new $controller();
-        $result = call_user_func_array(array($controllerInstance, $route->getControllerMethod()), $args);
+        $result = call_user_func_array(array($controllerInstance, $route->getAction()), $args);
 
-        foreach ($middlewares as $middleware) {
+        foreach ($middlewares as $middlewareArray) {
+            $middleware = $middlewareArray['middleware'];
+            $middlewareDbo = $middlewareArray['dbo'];
+            $parameters["_middleware"] = array_merge($middlewareDbo->getParameters(), $route->getParameters());
             $result = $middleware->onAfter($route, $parameters, $result);
         }
 
@@ -178,62 +199,69 @@ class LuRoute {
                 $json = json_decode($value, true);
                 $typedValue = call_user_func_array(array($class->getName(), "jsonDeserialize"), array($json));
             }
-            catch (LuDboDeserializeException $e)
-            {
-                throw $e;
-            }
-            catch (LuDboConstraintException $e)
-            {
-                throw $e;
-            }
             catch (\Exception $e)
             {
+                if ($e instanceof LuDboDeserializeException || $e instanceof LuDboConstraintException) {
+                    throw $e;
+                }
                 throw new LuBusinessException("Unable to parse JSON value for '" . $param->getName() . "'", 400, $e);
             }
         }
         return $typedValue;
     }
-
-    public function addRoute(string $httpMethod, string $url, string $controller, string $method, $permissions = array(), $middlewares = array())
-    {
-        if (!is_array($permissions)) {
-            $permissions = array($permissions);
-        }
-        if (!is_array($middlewares)) {
-            $middlewares = array($middlewares);
-        }
-
+    
+    public function addRoute2(LuRouteDbo $route) {
+        $controller = $route->getController();
         if (strpos($controller, "\\") === false) {
             $controller = "App\\Controller\\" . $controller . "Controller";
         }
+        $route->setController($controller);
+        $this->routes[] = $route;
+    }
 
+    public function addRoute(string $httpMethod, string $url, string $controller, string $method, $parameters = array(), $middlewares = array())
+    {
+        $middlewaresDbo = [];
+        foreach ($middlewares as $middleware) {
+            if (is_string($middleware)) {
+                $middlewaresDbo[] = new LuMiddlewareDbo($middleware);
+            }
+            else if (is_array($middleware)) {
+                $middlewaresDbo[] = LuMiddlewareDbo::jsonDeserialize($middleware);
+            }
+            else {
+                $middlewaresDbo[] = $middleware;
+            }
+        }
+        
         $route = new LuRouteDbo();
         $route->setUrl($url);
-        $route->setControllerClass($controller);
-        $route->setControllerMethod($method);
-        $route->setMiddlewares($middlewares);
-        $route->setPermissions($permissions);
+        $route->setController($controller);
+        $route->setAction($method);
+        $route->setMiddlewares($middlewaresDbo);
+        $route->setParameters($parameters);
         $route->setMethod($httpMethod);
-        $this->routes[] = $route;
+        
+        $this->addRoute2($route);
     }
     
-    public function get(string $url, string $controller, string $method, $permissions = array(), $middleware = array())
+    public function get(string $url, string $controller, string $method, $parameters = array(), $middleware = array())
     {
-        $this->addRoute("GET", $url, $controller, $method, $permissions, $middleware);
+        $this->addRoute("GET", $url, $controller, $method, $parameters, $middleware);
     }
 
-    public function post(string $url, string $controller, string $method, $permissions = array(), $middleware = array())
+    public function post(string $url, string $controller, string $method, $parameters = array(), $middleware = array())
     {
-        $this->addRoute("POST", $url, $controller, $method, $permissions, $middleware);
+        $this->addRoute("POST", $url, $controller, $method, $parameters, $middleware);
     }
 
-    public function put(string $url, string $controller, string $method, $permissions = array(), $middleware = array())
+    public function put(string $url, string $controller, string $method, $parameters = array(), $middleware = array())
     {
-        $this->addRoute("PUT", $url, $controller, $method, $permissions, $middleware);
+        $this->addRoute("PUT", $url, $controller, $method, $parameters, $middleware);
     }
 
-    public function delete(string $url, string $controller, string $method, $permissions = array(), $middleware = array())
+    public function delete(string $url, string $controller, string $method, $parameters = array(), $middleware = array())
     {
-        $this->addRoute("DELETE", $url, $controller, $method, $permissions, $middleware);
+        $this->addRoute("DELETE", $url, $controller, $method, $parameters, $middleware);
     }
 }

src/Utils/Controller/LuticateApplication.php

@@ -78,7 +78,7 @@ class LuticateApplication implements MessageComponentInterface
     public function setupRoutes()
     {
         $app = $this;
-        require_once __DIR__ . '/../../../../../../app/Route/routes.php';
+        require_once __DIR__ . '/../../../../../../app/routes.php';
         
         $this->_router->setup();
     }

src/Utils/Dbo/LuDbo.php

@@ -161,7 +161,7 @@ abstract class LuDbo implements \JsonSerializable {
             }
             call_user_func_array([$this, $constraint->getMethod()], $constraint->getArguments());
         }
-    } 
+    }
 
     /**
      * Generate a sample JSON object for the DBO

src/Utils/Dbo/LuMiddlewareDbo.php

@@ -11,13 +11,19 @@ namespace Luticate\Utils\Dbo;
 
 class LuMiddlewareDbo extends LuDbo
 {
-    function jsonSerialize()
+    /**
+     * LuMiddlewareDbo constructor.
+     * @param $middleware string
+     * @param $parameters array
+     */
+    public function __construct($middleware, $parameters = [])
     {
-        // TODO: Implement jsonSerialize() method.
+        $this->_middleware = $middleware;
+        $this->_parameters = $parameters;
     }
 
     /**
-     * @var $_name string
+     * @var $_middleware string
      */
     private $_middleware;
 

src/Utils/Dbo/LuMiddlewareDboArray.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: robin
+ * Date: 6/5/16
+ * Time: 6:24 PM
+ */
+
+namespace Luticate\Utils\Dbo;
+
+
+class LuMiddlewareDboArray extends LuDbo
+{
+    /**
+     * @var LuMiddlewareDbo[]
+     */
+    protected $_array;
+    public function getArray()
+    {
+        return $this->_array;
+    }
+    public function setArray($value)
+    {
+        $this->_array = $value;
+    }
+
+    public function jsonSerialize()
+    {
+        return $this->_array;
+    }
+
+    public static function jsonDeserialize($json)
+    {
+        if (!is_array($json)) {
+            throw new LuDboDeserializeException("Invalid array value");
+        }
+        $dbo = new self();
+        $array = [];
+        foreach ($json as $data) {
+            $array[] = LuMiddlewareDbo::jsonDeserialize($data);
+        }
+        $dbo->setArray($array);
+        return $dbo;
+    }
+
+    public static function generateSample()
+    {
+        return [
+            LuMiddlewareDbo::generateSample(),
+            LuMiddlewareDbo::generateSample()
+        ];
+    }
+}

src/Utils/Dbo/LuRouteDbo.php

@@ -8,8 +8,13 @@
 
 namespace Luticate\Utils\Dbo;
 
-class LuRouteDbo
+class LuRouteDbo extends LuDbo
 {
+    /**
+     * @var string
+     */
+    private $_method;
+    
     /**
      * @var string
      */
@@ -18,57 +23,73 @@ class LuRouteDbo
     /**
      * @var string
      */
-    private $_controllerClass;
+    private $_controller;
 
     /**
      * @var string
      */
-    private $_controllerMethod;
+    private $_action;
 
     /**
-     * @return string
+     * @var LuMiddlewareDbo[]
+     */
+    private $_middlewares;
+
+    /**
+     * @var array
+     */
+    private $_parameters;
+
+    /**
+     * @return array
      */
-    public function getControllerClass()
+    public function getParameters()
     {
-        return $this->_controllerClass;
+        return $this->_parameters;
     }
 
     /**
-     * @param string $controllerClass
+     * @param array $parameters
      */
-    public function setControllerClass($controllerClass)
+    public function setParameters($parameters)
     {
-        $this->_controllerClass = $controllerClass;
+        $this->_parameters = $parameters;
     }
 
     /**
      * @return string
      */
-    public function getControllerMethod()
+    public function getController()
     {
-        return $this->_controllerMethod;
+        return $this->_controller;
     }
 
     /**
-     * @param string $controllerMethod
+     * @param string $controller
      */
-    public function setControllerMethod($controllerMethod)
+    public function setController($controller)
     {
-        $this->_controllerMethod = $controllerMethod;
+        $this->_controller = $controller;
     }
 
     /**
-     * @var string[]
+     * @return string
      */
-    private $_permissions;
+    public function getAction()
+    {
+        return $this->_action;
+    }
 
     /**
-     * @var string[]
+     * @param string $action
      */
-    private $_middlewares;
+    public function setAction($action)
+    {
+        $this->_action = $action;
+    }
 
     /**
-     * @return \string[]
+     * @return LuMiddlewareDbo[]
      */
     public function getMiddlewares()
     {
@@ -76,7 +97,7 @@ class LuRouteDbo
     }
 
     /**
-     * @param \string[] $middlewares
+     * @param LuMiddlewareDbo[] $middlewares
      */
     public function setMiddlewares($middlewares)
     {
@@ -84,9 +105,12 @@ class LuRouteDbo
     }
 
     /**
-     * @var string
+     * @param LuMiddlewareDbo $middleware
      */
-    private $_method;
+    public function addMiddleware($middleware)
+    {
+        $this->_middlewares[] = $middleware;
+    }
 
     /**
      * @return string
@@ -119,20 +143,4 @@ class LuRouteDbo
     {
         $this->_url = $url;
     }
-
-    /**
-     * @return \string[]
-     */
-    public function getPermissions()
-    {
-        return $this->_permissions;
-    }
-
-    /**
-     * @param \string[] $permissions
-     */
-    public function setPermissions($permissions)
-    {
-        $this->_permissions = $permissions;
-    }
 }

src/Utils/Dbo/LuRouteDboArray.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: robin
+ * Date: 6/5/16
+ * Time: 6:24 PM
+ */
+
+namespace Luticate\Utils\Dbo;
+
+
+class LuRouteDboArray extends LuDbo
+{
+    /**
+     * @var LuRouteDbo[]
+     */
+    protected $_array;
+    public function getArray()
+    {
+        return $this->_array;
+    }
+    public function setArray($value)
+    {
+        $this->_array = $value;
+    }
+
+    public function jsonSerialize()
+    {
+        return $this->_array;
+    }
+
+    public static function jsonDeserialize($json)
+    {
+        if (!is_array($json)) {
+            throw new LuDboDeserializeException("Invalid array value");
+        }
+        $dbo = new self();
+        $array = [];
+        foreach ($json as $data) {
+            $array[] = LuRouteDbo::jsonDeserialize($data);
+        }
+        $dbo->setArray($array);
+        return $dbo;
+    }
+
+    public static function generateSample()
+    {
+        return [
+            LuRouteDbo::generateSample(),
+            LuRouteDbo::generateSample()
+        ];
+    }
+}

src/Utils/Middleware/LuAbstractMiddleware.php

@@ -12,7 +12,18 @@ use Luticate\Utils\Dbo\LuRouteDbo;
 
 abstract class LuAbstractMiddleware
 {
-    public abstract function onBefore(LuRouteDbo $route, $parameters, ...$params);
-    
-    public abstract function onAfter(LuRouteDbo $route, $parameters, $result, ...$params);
+    /**
+     * @param LuRouteDbo $route The route being executed
+     * @param $parameters array The request parameters
+     * @return mixed The requests parameters
+     */
+    public abstract function onBefore(LuRouteDbo $route, $parameters);
+
+    /**
+     * @param LuRouteDbo $route The route being executed
+     * @param $parameters array The request parameters
+     * @param $result mixed The request result
+     * @return mixed The request result
+     */
+    public abstract function onAfter(LuRouteDbo $route, $parameters, $result);
 }