added injection to middleware

src/Utils/Business/LuInjector.php

@@ -0,0 +1,106 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: robin
+ * Date: 7/1/16
+ * Time: 10:17 PM
+ */
+
+namespace Luticate\Utils\Business;
+
+
+use Luticate\Utils\Dbo\LuDbo;
+use Luticate\Utils\Dbo\LuDboConstraintException;
+use Luticate\Utils\Dbo\LuDboDeserializeException;
+
+class LuInjector
+{
+    public static function inject($obj, string $methodName, array $parameters)
+    {
+        if (is_string($obj)) {
+            $className = $obj;
+            $objInstance = new $className();
+        }
+        else {
+            $className = get_class($obj);
+            $objInstance = $obj;
+        }
+        $reflect = new \ReflectionMethod($className, $methodName);
+        $params = $reflect->getParameters();
+        $docs = new LuMethodDocParser($reflect->getDocComment());
+        $docs->parse();
+
+        $args = [];
+        foreach ($params as $param) {
+
+            try {
+                $value = null;
+                if (array_key_exists($param->getName(), $parameters)) {
+                    $value = static::getParam($param, $parameters[$param->getName()]);
+                }
+                else if ($param->isOptional()) {
+                    $value = $param->getDefaultValue();
+                }
+                else {
+                    throw new LuDboDeserializeException("Missing parameter '" . $param->getName() . "'", 400);
+                }
+
+                if (array_key_exists($param->getName(), $docs->getParams())) {
+                    $doc = $docs->getParams()[$param->getName()];
+                    if (is_null($value) && $doc->isNotNull()) {
+                        throw new LuDboConstraintException("Parameter '" . $param->getName() . "' can not be null", 400);
+                    }
+
+                    if (!is_null($value)) {
+                        $value->checkConstraints($doc->getConstraints());
+                    }
+                }
+                $args[$param->getName()] = $value;
+            }
+            catch (LuDboConstraintException $e)
+            {
+                $paramName = $param->getName();
+                throw new LuBusinessException("Invalid value for '${paramName}': " . $e->getMessage(), 400, $e);
+            }
+            catch (LuDboDeserializeException $e)
+            {
+                $paramName = $param->getName();
+                throw new LuBusinessException("Failed to deserialize '${paramName}': " . $e->getMessage(), 400, $e);
+            }
+        }
+
+        $result = call_user_func_array(array($objInstance, $methodName), $args);
+        return $result;
+    }
+
+    public static function getClassName(\ReflectionParameter $param) {
+        preg_match('/\[\s\<\w+?>\s([\w]+)/s', $param->__toString(), $matches);
+        return isset($matches[1]) ? $matches[1] : null;
+    }
+
+    public static function getParam(\ReflectionParameter $param, $value)
+    {
+        $typedValue = null;
+        $className = static::getClassName($param);
+        if (is_null($className)) {
+            $typedValue = $value;
+        }
+        else {
+            $class = $param->getClass();
+            $className = is_null($class) ? "string" : $class->getName();
+            try
+            {
+                $json = json_decode($value, true);
+                $typedValue = LuDbo::deserializeValue($json, $className);
+            }
+            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;
+    }
+}

src/Utils/Controller/LuRoute.php

@@ -4,6 +4,7 @@ namespace Luticate\Utils\Controller;
 
 use FastRoute\Dispatcher;
 use Luticate\Utils\Business\LuBusinessException;
+use Luticate\Utils\Business\LuInjector;
 use Luticate\Utils\Business\LuMethodDocParser;
 use Luticate\Utils\Dbo\LuDboConstraintException;
 use Luticate\Utils\Dbo\LuDboDeserializeException;
@@ -83,86 +84,42 @@ class LuRoute {
          * @var $middlewareDbo LuMiddlewareDbo
          */
         foreach (array_merge($this->_middlewares, $route->getMiddlewares()) as $middlewareDbo) {
-            $middlewareName = $middlewareDbo->getMiddleware();
             /**
              * @var $middleware LuAbstractMiddleware
              */
+            $middlewareName = $middlewareDbo->getMiddleware();
             $middleware = new $middlewareName();
-            $parameters["_middleware"] = $middlewareDbo->getParameters();
-            foreach ($route->getParameters() as $key => $value) {
-                $parameters["_middleware"][$key] = $value;
+
+            $args = array_merge($middlewareDbo->getParameters(), $route->getParameters());
+            $args["_route"] = $route;
+            $args["_parameters"] = $parameters;
+            $args["_all"] = $args;
+
+            if (is_callable([$middleware, "onBefore"])) {
+                $parameters = LuInjector::inject($middleware, "onBefore", $args);
             }
-            $parameters = $middleware->onBefore($route, $parameters);
+
             $middlewares[] = [
                 'middleware' => $middleware,
                 'dbo' => $middlewareDbo
             ];
         }
-        unset($parameters["_middleware"]);
-
-        $reflect = new \ReflectionMethod($route->getController(), $route->getAction());
-        $params = $reflect->getParameters();
-        $docs = new LuMethodDocParser($reflect->getDocComment());
-        $docs->parse();
-
-        $args = array();
-        foreach ($params as $param) {
-
-            try {
-                if ($param->isOptional()) {
-                    $value = null;
-                    if (array_key_exists($param->getName(), $parameters)) {
-                        $value = $this->getParam($param, $parameters[$param->getName()]);
-                    }
-                    else {
-                        $value = $param->getDefaultValue();
-                    }
-                }
-                else {
-                    if (array_key_exists($param->getName(), $parameters)) {
-                        $value = $this->getParam($param, $parameters[$param->getName()]);
-                    }
-                    else {
-                        throw new LuDboDeserializeException("Missing parameter '" . $param->getName() . "'", 400);
-                    }
-                }
 
-                if (array_key_exists($param->getName(), $docs->getParams())) {
-                    $doc = $docs->getParams()[$param->getName()];
-                    if (is_null($value) && $doc->isNotNull()) {
-                        throw new LuDboConstraintException("Parameter '" . $param->getName() . "' can not be null", 400);
-                    }
-
-                    if (!is_null($value)) {
-                        $value->checkConstraints($doc->getConstraints());
-                    }
-                }
-                $args[$param->getName()] = $value;
-            }
-            catch (LuDboConstraintException $e)
-            {
-                $paramName = $param->getName();
-                throw new LuBusinessException("Invalid value for '${paramName}': " . $e->getMessage(), 400, $e);
-            }
-            catch (LuDboDeserializeException $e)
-            {
-                $paramName = $param->getName();
-                throw new LuBusinessException("Failed to deserialize '${paramName}': " . $e->getMessage(), 400, $e);
-            }
-        }
-
-        $controller = $route->getController();
-        $controllerInstance = new $controller();
-        $result = call_user_func_array(array($controllerInstance, $route->getAction()), $args);
+        $result = LuInjector::inject($route->getController(), $route->getAction(), $parameters);
 
         foreach ($middlewares as $middlewareArray) {
             $middleware = $middlewareArray['middleware'];
             $middlewareDbo = $middlewareArray['dbo'];
-            $parameters["_middleware"] = $middlewareDbo->getParameters();
-            foreach ($route->getParameters() as $key => $value) {
-                $parameters["_middleware"][$key] = $value;
+
+            $args = array_merge($middlewareDbo->getParameters(), $route->getParameters());
+            $args["_route"] = $route;
+            $args["_parameters"] = $parameters;
+            $args["_result"] = $result;
+            $args["_all"] = $args;
+
+            if (is_callable([$middleware, "onAfter"])) {
+                $result = LuInjector::inject($middleware, "onAfter", $args);
             }
-            $result = $middleware->onAfter($route, $parameters, $result);
         }
 
         return $result;
@@ -186,36 +143,6 @@ class LuRoute {
         }
     }
     
-    private function getClassName(\ReflectionParameter $param) {
-        preg_match('/\[\s\<\w+?>\s([\w]+)/s', $param->__toString(), $matches);
-        return isset($matches[1]) ? $matches[1] : null;
-    }
-
-    private function getParam(\ReflectionParameter $param, $value)
-    {
-        $typedValue = null;
-        $className = $this->getClassName($param);
-        if (is_null($className)) {
-            $typedValue = $value;
-        }
-        else {
-            $class = $param->getClass();
-            try
-            {
-                $json = json_decode($value, true);
-                $typedValue = call_user_func_array(array($class->getName(), "jsonDeserialize"), array($json));
-            }
-            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 addRoute2(LuRouteDbo $route) {
         $controller = $route->getController();
         if (strpos($controller, "\\") === false) {

src/Utils/Middleware/LuAbstractMiddleware.php

@@ -10,14 +10,13 @@ namespace Luticate\Utils\Middleware;
 
 use Luticate\Utils\Dbo\LuRouteDbo;
 
-abstract class LuAbstractMiddleware
+interface LuAbstractMiddleware
 {
     /**
-     * @param LuRouteDbo $route The route being executed
-     * @param $parameters array The request parameters
+     * @param $parameters array The injected parameters
      * @return mixed The requests parameters
      */
-    public abstract function onBefore(LuRouteDbo $route, $parameters);
+//    public function onBefore(...$parameters);
 
     /**
      * @param LuRouteDbo $route The route being executed
@@ -25,5 +24,5 @@ abstract class LuAbstractMiddleware
      * @param $result mixed The request result
      * @return mixed The request result
      */
-    public abstract function onAfter(LuRouteDbo $route, $parameters, $result);
+//    public function onAfter(LuRouteDbo $route, $parameters, $result);
 }

tests/LuRouteTest.php

@@ -60,47 +60,31 @@ class BasicTestController
     }
 }
 
-class BeforeMiddleware extends LuAbstractMiddleware {
+class BeforeMiddleware implements LuAbstractMiddleware {
 
-    public function onBefore(LuRouteDbo $route, $parameters)
+    public function onBefore($_parameters)
     {
-        $parameters["_user"] = "\"my user\"";
-        return $parameters;
-    }
-
-    public function onAfter(LuRouteDbo $route, $parameters, $result)
-    {
-        return $result;
+        $_parameters["_user"] = "\"my user\"";
+        return $_parameters;
     }
 }
 
-class AfterMiddleware extends LuAbstractMiddleware {
+class AfterMiddleware implements LuAbstractMiddleware {
 
-    public function onBefore(LuRouteDbo $route, $parameters)
-    {
-        return $parameters;
-    }
-
-    public function onAfter(LuRouteDbo $route, $parameters, $result)
+    public function onAfter()
     {
         return "AfterMiddleware";
     }
 }
 
-class AuthenticationMiddleware extends LuAbstractMiddleware {
+class AuthenticationMiddleware implements LuAbstractMiddleware {
 
-    public function onBefore(LuRouteDbo $route, $parameters)
+    public function onBefore($_parameters, $permissions = [])
     {
-        $permissions = $parameters['_middleware']['permissions'] ?? [];
         if ($permissions[0] != "ALLOWED") {
             throw new LuBusinessException("Unauthorized", 401);
         }
-        return $parameters;
-    }
-
-    public function onAfter(LuRouteDbo $route, $parameters, $result)
-    {
-        return $result;
+        return $_parameters;
     }
 }