begin luticate 2 changes

composer.json

@@ -8,7 +8,9 @@
         }
     ],
     "require": {
-    "guzzlehttp/guzzle": "^6.1"
+    "guzzlehttp/guzzle": "^6.1",
+    "nikic/fast-route": "^1.0",
+        "nesbot/carbon": "^1.21"
     },
     "require-dev": {
         "phpunit/phpunit": "5.3.*"

src/Utils/LuBusiness.php → src/Utils/Business/LuBusiness.php

@@ -1,6 +1,9 @@
 <?php
 
-namespace Luticate\Utils;
+namespace Luticate\Utils\Business;
+
+use Luticate\Utils\Dbo\LuDbo;
+use Luticate\Utils\LuDataAccess;
 
 abstract class LuBusiness {
     public static $parameters = array();

src/Utils/Business/LuBusinessException.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: robin
+ * Date: 6/5/16
+ * Time: 2:38 PM
+ */
+
+namespace Luticate\Utils\Business;
+
+
+class LuBusinessException extends \Exception
+{
+    public function __construct($message, $code, \Exception $previous = null)
+    {
+        parent::__construct($message, $code, $previous);
+    }
+}

src/Utils/LuLog.php → src/Utils/Business/LuLog.php

@@ -1,12 +1,10 @@
 <?php
 
-namespace Luticate\Utils;
-use Log;
+namespace Luticate\Utils\Business;
 
 class LuLog {
 
     public static function log($data)
     {
-        Log::info($data);
     }
 }

src/Utils/LuStringUtils.php → src/Utils/Business/LuStringUtils.php

@@ -6,11 +6,10 @@
  * Time: 11:28 PM
  */
 
-namespace Luticate\Utils;
+namespace Luticate\Utils\Business;
 
 use Carbon\Carbon;
 
-
 class LuStringUtils
 {
     public static function stringSnakeToCamelCase($string, $capitalizeFirstCharacter) {

src/Utils/Controller/LuController.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Luticate\Utils\Controller;
+
+use Luticate\Utils\Business\LuBusiness;
+
+abstract class LuController
+{
+    /**
+     * @return LuBusiness
+     */
+    protected abstract function getBusiness();
+}

src/Utils/Controller/LuRoute.php

@@ -0,0 +1,207 @@
+<?php
+
+namespace Luticate\Utils\Controller;
+
+use Luticate\Utils\Business\LuDocParser;
+use Luticate\Utils\Dbo\LuDboConstraintException;
+use Luticate\Utils\Dbo\LuDboDeserializeException;
+use FastRoute\DataGenerator\GroupCountBased as DataGeneratorGroupCountBased;
+use FastRoute\Dispatcher\GroupCountBased as DispatcherGroupCountBased;
+use FastRoute\RouteCollector;
+use FastRoute\RouteParser\Std;
+use Luticate\Utils\LuRouteDbo;
+
+class LuRoute {
+
+    const REG_UINT = "[0-9]+";
+    const REG_INT = "\\-?" . self::REG_UINT;
+    const REG_BOOL = "true|false";
+
+    /**
+     * @var DispatcherGroupCountBased
+     */
+    private $_dispatcher = null;
+
+    /**
+     * @var string[]
+     */
+    private $middleware = array('Luticate\Utils\ParametersMiddleware');
+
+    /**
+     * @var LuRouteDbo[]
+     */
+    private $routes = array();
+
+    /**
+     * @var LuRoute
+     */
+    private static $instance = null;
+
+    private function __construct()
+    {
+    }
+
+    public static function getInstance()
+    {
+        if (is_null(self::$instance)) {
+            self::$instance = new static();
+        }
+        return self::$instance;
+    }
+
+    public function getRoutes()
+    {
+        return $this->routes;
+    }
+
+    /**
+     * @param $middleware string
+     */
+    public function addMiddleware($middleware)
+    {
+        $this->middleware[] = $middleware;
+    }
+    
+    public function setup()
+    {
+        $routeCollector = new RouteCollector(new Std(), new DataGeneratorGroupCountBased());
+
+        foreach ($this->getRoutes() as $route) {
+            $routeCollector->addRoute($route->getMethod(), $route->getUrl(), function() use($route)
+            {
+                $router = static::getInstance();
+                $router->execute($route);
+            });
+        }
+
+        $this->_dispatcher = new DispatcherGroupCountBased($routeCollector->getData());
+    }
+
+    public function execute(LuRouteDbo $route)
+    {
+        $reflect = new \ReflectionMethod($route->getControllerClass(), $route->getControllerMethod());
+        $params = $reflect->getParameters();
+        $doc = new LuDocParser($reflect->getDocComment());
+        $doc->parse();
+
+        $args = array();
+        foreach ($params as $param) {
+
+            try {
+                if ($param->isOptional()) {
+                    $value = null;
+                    if (LuBusiness::hasParam([$param->getName()])) {
+                        $value = $this->getParam($param, LuBusiness::getParam($param->getName()));
+                    }
+                    else {
+                        $value = $param->getDefaultValue();
+                    }
+                    $args[$param->getName()] = $value;
+                }
+                else {
+                    $args[$param->getName()] = $this->getParam($param, LuBusiness::checkParam($param->getName()));
+                }
+                if (array_key_exists($param->getName(), $doc->getParams())) {
+                    foreach ($doc->getParams()[$param->getName()]->getConstraints() as $constraint) {
+                        call_user_func_array([$args[$param->getName()], $constraint->getMethod()],
+                            $constraint->getArguments());
+                    }
+                }
+            }
+            catch (LuDboConstraintException $e)
+            {
+                $paramName = $param->getName();
+                LuBusiness::badInput("Invalid value for '${paramName}': " . $e->getMessage());
+            }
+        }
+
+        $controller = $route->getControllerClass();
+        $controllerInstance = new $controller();
+        $result = call_user_func_array(array($controllerInstance, $route->getControllerMethod()), $args);
+
+        return LuOutputFormatter::formatSuccess($result);
+    }
+
+    public function dispatch(string $httpMethod, string $url)
+    {
+        $this->_dispatcher->dispatch($httpMethod, $url);
+    }
+    
+    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);
+                if (is_null($json)) {
+                    $json = $value . "";
+                }
+                $typedValue = call_user_func_array(array($class->getName(), "jsonDeserialize"), array($json));
+            }
+            catch (LuDboDeserializeException $e)
+            {
+                throw $e;
+            }
+            catch (\Exception $e)
+            {
+                LuLog::log($e);
+                LuBusiness::badInput("Unable to parse JSON value for '" . $param->getName() . "'");
+            }
+        }
+        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);
+        }
+
+        if (strpos($controller, "\\") === false) {
+            $controller = "App\\Controller\\" . $controller . "Controller";
+        }
+
+        $route = new LuRouteDbo();
+        $route->setUrl($url);
+        $route->setControllerClass($controller);
+        $route->setControllerMethod($method);
+        $route->setMiddlewares($middlewares);
+        $route->setPermissions($permissions);
+        $route->setMethod($httpMethod);
+        $this->routes[] = $route;
+    }
+    
+    public function get(string $url, string $controller, string $method, $permissions = array(), $middleware = array())
+    {
+        $this->addRoute("GET", $url, $controller, $method, $permissions, $middleware);
+    }
+
+    public function post(string $url, string $controller, string $method, $permissions = array(), $middleware = array())
+    {
+        $this->addRoute("POST", $url, $controller, $method, $permissions, $middleware);
+    }
+
+    public function put(string $url, string $controller, string $method, $permissions = array(), $middleware = array())
+    {
+        $this->addRoute("PUT", $url, $controller, $method, $permissions, $middleware);
+    }
+
+    public function delete(string $url, string $controller, string $method, $permissions = array(), $middleware = array())
+    {
+        $this->addRoute("DELETE", $url, $controller, $method, $permissions, $middleware);
+    }
+}

src/Utils/Dbo/LuBoolDbo.php

@@ -8,10 +8,6 @@
 
 namespace Luticate\Utils\Dbo;
 
-
-use Luticate\Utils\LuBusiness;
-use Luticate\Utils\LuDbo;
-
 class LuBoolDbo extends LuDbo
 {
     /**

src/Utils/Dbo/LuBoolDboArray.php

@@ -8,10 +8,6 @@
 
 namespace Luticate\Utils\Dbo;
 
-
-use Luticate\Utils\LuBusiness;
-use Luticate\Utils\LuDbo;
-
 class LuBoolDboArray extends LuDbo
 {
     /**

src/Utils/LuDbo.php → src/Utils/Dbo/LuDbo.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Luticate\Utils;
+namespace Luticate\Utils\Dbo;
 
 abstract class LuDbo implements \JsonSerializable {
     /**

src/Utils/Dbo/LuFloatDbo.php

@@ -9,9 +9,6 @@
 namespace Luticate\Utils\Dbo;
 
 
-use Luticate\Utils\LuBusiness;
-use Luticate\Utils\LuDbo;
-
 class LuFloatDbo extends LuDbo
 {
     /**

src/Utils/Dbo/LuFloatDboArray.php

@@ -9,9 +9,6 @@
 namespace Luticate\Utils\Dbo;
 
 
-use Luticate\Utils\LuBusiness;
-use Luticate\Utils\LuDbo;
-
 class LuFloatDboArray extends LuDbo
 {
     /**

src/Utils/Dbo/LuIntDbo.php

@@ -9,9 +9,6 @@
 namespace Luticate\Utils\Dbo;
 
 
-use Luticate\Utils\LuBusiness;
-use Luticate\Utils\LuDbo;
-
 class LuIntDbo extends LuDbo
 {
     /**

src/Utils/Dbo/LuIntDboArray.php

@@ -9,9 +9,6 @@
 namespace Luticate\Utils\Dbo;
 
 
-use Luticate\Utils\LuBusiness;
-use Luticate\Utils\LuDbo;
-
 class LuIntDboArray extends LuDbo
 {
     /**

src/Utils/LuMultipleDbo.php → src/Utils/Dbo/LuMultipleDbo.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Luticate\Utils;
+namespace Luticate\Utils\Dbo;
 
-class LuMultipleDbo implements \JsonSerializable {
+class LuMultipleDbo extends LuDbo {
 
     /**
      * @var int
@@ -52,4 +52,17 @@ class LuMultipleDbo implements \JsonSerializable {
         }
         return new LuMultipleDbo($this->_count, $values);
     }
+    
+    public static function jsonDeserialize($json)
+    {
+        return new static($json["Count"], $json["Data"]);
+    }
+
+    public static function generateSample()
+    {
+        return [
+            "Count" => 42,
+            "Data" => []
+        ];
+    }
 }

src/Utils/Dbo/LuParameterConstraintDbo.php

@@ -9,8 +9,6 @@
 namespace Luticate\Utils\Dbo;
 
 
-use Luticate\Utils\LuDbo;
-
 class LuParameterConstraintDbo extends LuDbo
 {
     /**

src/Utils/Dbo/LuParameterDbo.php

@@ -8,8 +8,6 @@
 
 namespace Luticate\Utils\Dbo;
 
-use Luticate\Utils\LuDbo;
-
 class LuParameterDbo extends LuDbo
 {
     /**

src/Utils/LuRequestDbo.php → src/Utils/Dbo/LuRequestDbo.php

@@ -6,8 +6,7 @@
  * Time: 10:47 PM
  */
 
-namespace Luticate\Utils;
-
+namespace Luticate\Utils\Dbo;
 
 class LuRequestDbo extends LuDbo
 {

src/Utils/LuRouteDbo.php → src/Utils/Dbo/LuRouteDbo.php

@@ -8,7 +8,6 @@
 
 namespace Luticate\Utils;
 
-
 class LuRouteDbo
 {
     /**
@@ -19,121 +18,121 @@ class LuRouteDbo
     /**
      * @var string
      */
-    private $_businessClass;
+    private $_controllerClass;
 
     /**
      * @var string
      */
-    private $_businessMethod;
-
-    /**
-     * @var string[]
-     */
-    private $_permissions;
+    private $_controllerMethod;
 
     /**
-     * @var string[]
+     * @return string
      */
-    private $_middlware;
+    public function getControllerClass()
+    {
+        return $this->_controllerClass;
+    }
 
     /**
-     * @var string
+     * @param string $controllerClass
      */
-    private $_method;
+    public function setControllerClass($controllerClass)
+    {
+        $this->_controllerClass = $controllerClass;
+    }
 
     /**
      * @return string
      */
-    public function getMethod()
+    public function getControllerMethod()
     {
-        return $this->_method;
+        return $this->_controllerMethod;
     }
 
     /**
-     * @param string $method
+     * @param string $controllerMethod
      */
-    public function setMethod($method)
+    public function setControllerMethod($controllerMethod)
     {
-        $this->_method = $method;
+        $this->_controllerMethod = $controllerMethod;
     }
 
     /**
-     * @return string
+     * @var string[]
      */
-    public function getUrl()
-    {
-        return $this->_url;
-    }
+    private $_permissions;
 
     /**
-     * @param string $url
+     * @var string[]
      */
-    public function setUrl($url)
-    {
-        $this->_url = $url;
-    }
+    private $_middlewares;
 
     /**
-     * @return string
+     * @return \string[]
      */
-    public function getBusinessClass()
+    public function getMiddlewares()
     {
-        return $this->_businessClass;
+        return $this->_middlewares;
     }
 
     /**
-     * @param string $businessClass
+     * @param \string[] $middlewares
      */
-    public function setBusinessClass($businessClass)
+    public function setMiddlewares($middlewares)
     {
-        $this->_businessClass = $businessClass;
+        $this->_middlewares = $middlewares;
     }
 
+    /**
+     * @var string
+     */
+    private $_method;
+
     /**
      * @return string
      */
-    public function getBusinessMethod()
+    public function getMethod()
     {
-        return $this->_businessMethod;
+        return $this->_method;
     }
 
     /**
-     * @param string $businessMethod
+     * @param string $method
      */
-    public function setBusinessMethod($businessMethod)
+    public function setMethod($method)
     {
-        $this->_businessMethod = $businessMethod;
+        $this->_method = $method;
     }
 
     /**
-     * @return \string[]
+     * @return string
      */
-    public function getPermissions()
+    public function getUrl()
     {
-        return $this->_permissions;
+        return $this->_url;
     }
 
     /**
-     * @param \string[] $permissions
+     * @param string $url
      */
-    public function setPermissions($permissions)
+    public function setUrl($url)
     {
-        $this->_permissions = $permissions;
+        $this->_url = $url;
     }
 
     /**
      * @return \string[]
      */
-    public function getMiddlware()
+    public function getPermissions()
     {
-        return $this->_middlware;
+        return $this->_permissions;
     }
 
     /**
-     * @param \string[] $middlware
+     * @param \string[] $permissions
      */
-    public function setMiddlware($middlware)
+    public function setPermissions($permissions)
     {
-        $this->_middlware = $middlware;
+        $this->_permissions = $permissions;
     }
 }

src/Utils/LuSpDbo.php → src/Utils/Dbo/LuSpDbo.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Luticate\Utils;
+namespace Luticate\Utils\Dbo;
 
 abstract class LuSpDbo extends LuDbo
 {

src/Utils/Dbo/LuStringDbo.php

@@ -8,10 +8,6 @@
 
 namespace Luticate\Utils\Dbo;
 
-
-use Luticate\Utils\LuBusiness;
-use Luticate\Utils\LuDbo;
-
 class LuStringDbo extends LuDbo
 {
     /**

src/Utils/Dbo/LuStringDboArray.php

@@ -8,10 +8,6 @@
 
 namespace Luticate\Utils\Dbo;
 
-
-use Luticate\Utils\LuBusiness;
-use Luticate\Utils\LuDbo;
-
 class LuStringDboArray extends LuDbo
 {
     /**

src/Utils/LuController.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace Luticate\Utils;
-
-use Laravel\Lumen\Routing\Controller as BaseController;
-
-abstract class LuController extends BaseController
-{
-    /**
-     * @return LuBusiness
-     */
-    protected abstract function getBusiness();
-}

src/Utils/LuRoute.php

@@ -1,221 +0,0 @@
-<?php
-
-namespace Luticate\Utils;
-
-use Luticate\Utils\Business\LuDocParser;
-use Luticate\Utils\Dbo\LuDboConstraintException;
-use Luticate\Utils\Dbo\LuDboDeserializeException;
-
-class LuRoute {
-
-    const REG_UINT = "[0-9]+";
-    const REG_INT = "\\-?" . self::REG_UINT;
-    const REG_BOOL = "true|false";
-
-    /**
-     * @var string[]
-     */
-    private $middleware = array('Luticate\Utils\ParametersMiddleware');
-
-    /**
-     * @var LuRouteDbo[]
-     */
-    private $routes = array();
-
-    /**
-     * @var LuRoute
-     */
-    private static $instance = null;
-
-    private function __construct()
-    {
-
-    }
-
-    public static function getInstance()
-    {
-        if (is_null(self::$instance)) {
-            self::$instance = new LuRoute();
-        }
-        return self::$instance;
-    }
-
-    public function getRoutes()
-    {
-        return $this->routes;
-    }
-
-    /**
-     * @param $middleware string
-     */
-    public function addMiddleware($middleware)
-    {
-        $this->middleware[] = $middleware;
-    }
-
-    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);
-                if (is_null($json)) {
-                    $json = $value . "";
-                }
-                $typedValue = call_user_func_array(array($class->getName(), "jsonDeserialize"), array($json));
-            }
-            catch (LuDboDeserializeException $e)
-            {
-                throw $e;
-            }
-            catch (\Exception $e)
-            {
-                LuLog::log($e);
-                LuBusiness::badInput("Unable to parse JSON value for '" . $param->getName() . "'");
-            }
-        }
-        return $typedValue;
-    }
-
-    private function getOptions($httpMethod, $url, $controller, $method, $permissions, $middleware)
-    {
-        if (!is_array($permissions)) {
-            $permissions = array($permissions);
-        }
-        if (!is_array($middleware)) {
-            $middleware = array($middleware);
-        }
-        $permissions_string = implode(",", $permissions);
-        $middleware_string = [];
-        foreach (array_merge($this->middleware, $middleware) as $mid) {
-
-            $middleware_string[] = $mid . (strpos($mid, ":") !== false ? "," : ":") . $permissions_string;
-        }
-
-        if (strpos($controller, "\\") === false) {
-            $controller = "App\\Http\\Controller\\" . $controller . "Controller";
-        }
-
-        $route = new LuRouteDbo();
-        $route->setUrl($url);
-        $route->setBusinessClass($controller);
-        $route->setBusinessMethod($method);
-        $route->setMiddlware($middleware_string);
-        $route->setPermissions($permissions);
-        $route->setMethod($httpMethod);
-        $this->routes[] = $route;
-
-        $ctrl = $this;
-
-        return [function() use($controller, $method, $ctrl)
-        {
-            $reflect = new \ReflectionMethod($controller, $method);
-            $params = $reflect->getParameters();
-            $doc = new LuDocParser($reflect->getDocComment());
-            $doc->parse();
-
-            $args = array();
-            foreach ($params as $param) {
-
-                try {
-                    if ($param->isOptional()) {
-                        $value = null;
-                        if (LuBusiness::hasParam([$param->getName()])) {
-                            $value = $ctrl->getParam($param, LuBusiness::getParam($param->getName()));
-                        }
-                        else {
-                            $value = $param->getDefaultValue();
-                        }
-                        $args[$param->getName()] = $value;
-                    }
-                    else {
-                        $args[$param->getName()] = $ctrl->getParam($param, LuBusiness::checkParam($param->getName()));
-                    }
-                    if (array_key_exists($param->getName(), $doc->getParams())) {
-                        foreach ($doc->getParams()[$param->getName()]->getConstraints() as $constraint) {
-                            call_user_func_array([$args[$param->getName()], $constraint->getMethod()],
-                                $constraint->getArguments());
-                        }
-                    }
-                }
-                catch (LuDboConstraintException $e)
-                {
-                    $paramName = $param->getName();
-                    LuBusiness::badInput("Invalid value for '${paramName}': " . $e->getMessage());
-                }
-            }
-
-            $controllerInstance = new $controller();
-            $result = call_user_func_array(array($controllerInstance, $method), $args);
-
-            return LuOutputFormatter::formatSuccess($result);
-        }, 'middleware' => $middleware_string];
-    }
-
-    /**
-     * @param $url string
-     * @param $controller string
-     * @param $method string
-     * @param array $permissions string|string[]
-     * @param array $middleware string|string[]
-     * @return mixed
-     */
-    public function get($url, $controller, $method, $permissions = array(), $middleware = array())
-    {
-        global $app;
-        return $app->get($url, $this->getOptions("GET", $url, $controller, $method, $permissions, $middleware));
-    }
-
-    /**
-     * @param $url string
-     * @param $controller string
-     * @param $method string
-     * @param array $permissions string|string[]
-     * @param array $middleware string|string[]
-     * @return mixed
-     */
-    public function post($url, $controller, $method, $permissions = array(), $middleware = array())
-    {
-        global $app;
-        return $app->post($url, $this->getOptions("POST", $url, $controller, $method, $permissions, $middleware));
-    }
-
-    /**
-     * @param $url string
-     * @param $controller string
-     * @param $method string
-     * @param array $permissions string|string[]
-     * @param array $middleware string|string[]
-     * @return mixed
-     */
-    public function put($url, $controller, $method, $permissions = array(), $middleware = array())
-    {
-        global $app;
-        return $app->put($url, $this->getOptions("PUT", $url, $controller, $method, $permissions, $middleware));
-    }
-
-    /**
-     * @param $url string
-     * @param $controller string
-     * @param $method string
-     * @param array $permissions string|string[]
-     * @param array $middleware string|string[]
-     * @return mixed
-     */
-    public function delete($url, $controller, $method, $permissions = array(), $middleware = array())
-    {
-        global $app;
-        return $app->delete($url, $this->getOptions("DELETE", $url, $controller, $method, $permissions, $middleware));
-    }
-}

src/Utils/Middleware/LuAbstractMiddleware.php

@@ -0,0 +1,23 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: robin
+ * Date: 6/5/16
+ * Time: 2:58 PM
+ */
+
+namespace Luticate\Utils;
+
+
+abstract class LuAbstractMiddleware
+{
+    public function onBefore(LuRouteDbo $route, ...$params)
+    {
+        
+    }
+    
+    public function onAfter(LuRouteDbo $route, $output, ...$params)
+    {
+        
+    }
+}