added luticate application

composer.json

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

src/Utils/Business/LuBusiness.php

@@ -60,7 +60,7 @@ abstract class LuBusiness {
      */
     public static function unauthorized($reason = 'Unauthorized')
     {
-        abort(401, $reason);
+        throw new LuBusinessException($reason, 401);
     }
 
     /**
@@ -68,7 +68,7 @@ abstract class LuBusiness {
      */
     public static function notFound($reason = 'Resource not found')
     {
-        abort(404, $reason);
+        throw new LuBusinessException($reason, 404);
     }
 
     /**
@@ -76,7 +76,7 @@ abstract class LuBusiness {
      */
     public static function badInput($reason = 'Invalid user input')
     {
-        abort(400, $reason);
+        throw new LuBusinessException($reason, 400);
     }
 
     /**

src/Utils/Controller/LuRoute.php

@@ -3,7 +3,6 @@
 namespace Luticate\Utils\Controller;
 
 use FastRoute\Dispatcher;
-use Luticate\Utils\Business\LuBusiness;
 use Luticate\Utils\Business\LuBusinessException;
 use Luticate\Utils\Business\LuDocParser;
 use Luticate\Utils\Dbo\LuDboConstraintException;
@@ -71,17 +70,17 @@ class LuRoute {
         $routeCollector = new RouteCollector(new Std(), new DataGeneratorGroupCountBased());
 
         foreach ($this->getRoutes() as $route) {
-            $routeCollector->addRoute($route->getMethod(), $route->getUrl(), function() use($route)
+            $routeCollector->addRoute($route->getMethod(), $route->getUrl(), function($parameters) use($route)
             {
                 $router = static::getInstance();
-                return $router->execute($route);
+                return $router->execute($route, $parameters);
             });
         }
 
         $this->_dispatcher = new DispatcherGroupCountBased($routeCollector->getData());
     }
 
-    public function execute(LuRouteDbo $route)
+    public function execute(LuRouteDbo $route, $parameters)
     {
         $middlewares = [];
         foreach ($route->getMiddlewares() as $middlewareName) {
@@ -89,7 +88,7 @@ class LuRoute {
              * @var $middleware LuAbstractMiddleware
              */
             $middleware = new $middlewareName();
-            $middleware->onBefore($route);
+            $middleware->onBefore($route, $parameters);
             $middlewares[] = $middleware;
         }
 
@@ -104,8 +103,8 @@ class LuRoute {
             try {
                 if ($param->isOptional()) {
                     $value = null;
-                    if (LuBusiness::hasParam([$param->getName()])) {
-                        $value = $this->getParam($param, LuBusiness::getParam($param->getName()));
+                    if (array_key_exists($param->getName(), $parameters)) {
+                        $value = $this->getParam($param, $parameters[$param->getName()]);
                     }
                     else {
                         $value = $param->getDefaultValue();
@@ -113,8 +112,14 @@ class LuRoute {
                     $args[$param->getName()] = $value;
                 }
                 else {
-                    $args[$param->getName()] = $this->getParam($param, LuBusiness::checkParam($param->getName()));
+                    if (array_key_exists($param->getName(), $parameters)) {
+                        $args[$param->getName()] = $this->getParam($param, $parameters[$param->getName()]);
+                    }
+                    else {
+                        throw new LuBusinessException("Missing parameter '" . $param->getName() . "'", 400);
+                    }
                 }
+                
                 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()],
@@ -125,7 +130,7 @@ class LuRoute {
             catch (LuDboConstraintException $e)
             {
                 $paramName = $param->getName();
-                LuBusiness::badInput("Invalid value for '${paramName}': " . $e->getMessage());
+                throw new LuBusinessException("Invalid value for '${paramName}': " . $e->getMessage(), 400, $e);
             }
         }
 
@@ -134,13 +139,13 @@ class LuRoute {
         $result = call_user_func_array(array($controllerInstance, $route->getControllerMethod()), $args);
 
         foreach ($middlewares as $middleware) {
-            $middleware->onAfter($route, $result);
+            $middleware->onAfter($route, $parameters, $result);
         }
 
         return $result;
     }
 
-    public function dispatch(string $httpMethod, string $url)
+    public function dispatch(string $httpMethod, string $url, $parameters)
     {
         $routeInfo = $this->_dispatcher->dispatch($httpMethod, $url);
 
@@ -152,8 +157,9 @@ class LuRoute {
         }
         else {
             $handler = $routeInfo[1];
-            $vars = $routeInfo[2];
-            $handler($vars);
+            $urlVars = $routeInfo[2];
+            $parameters = array_merge($parameters, $urlVars);
+            $handler($parameters);
         }
     }
     
@@ -185,8 +191,7 @@ class LuRoute {
             }
             catch (\Exception $e)
             {
-                LuLog::log($e);
-                LuBusiness::badInput("Unable to parse JSON value for '" . $param->getName() . "'");
+                throw new LuBusinessException("Unable to parse JSON value for '" . $param->getName() . "'", 400, $e);
             }
         }
         return $typedValue;

src/Utils/Controller/LuticateApplication.php

@@ -0,0 +1,110 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: robin
+ * Date: 6/4/16
+ * Time: 10:06 PM
+ */
+
+namespace App\WebSocket;
+
+use Luticate\Utils\Controller\LuRoute;
+use Ratchet\ConnectionInterface;
+use Ratchet\MessageComponentInterface;
+use Ratchet\Http\HttpServer;
+use Ratchet\Server\IoServer;
+use Ratchet\WebSocket\WsServer;
+
+class LuticateApplication implements MessageComponentInterface
+{
+    private $_version = 1.0;
+    private $_config = null;
+    private $_clients = null;
+    
+    private static $_app = null;
+    
+    public static function getInstance()
+    {
+        return self::$_app;
+    }
+
+    /**
+     * @param $configuration array
+     */
+    public function __construct($configuration)
+    {
+        $this->_config = $configuration;
+        $this->_clients = new \SplObjectStorage;
+        self::$_app = $this;
+    }
+
+    /**
+     * @param $version float
+     */
+    public function setVersion($version)
+    {
+        $this->_version = $version;
+    }
+
+    /**
+     * @return float
+     */
+    public function getVersion()
+    {
+        return $this->_version;
+    }
+    
+    public function setupRoutes()
+    {
+        require_once __DIR__ . '/../../../../../../routes.php';
+        $router = LuRoute::getInstance();
+        
+        $router->setup();
+    }
+    
+    public function runHttp()
+    {
+        $httpMethod = $_SERVER['REQUEST_METHOD'];
+        $url = $_SERVER['REQUEST_URI'];
+        $router = LuRoute::getInstance();
+
+        $parameters = array_merge($_GET, $_POST);
+
+        $router->dispatch($httpMethod, $url, $parameters);
+    }
+    
+    public function runWs()
+    {
+        $server = IoServer::factory(
+            new HttpServer(
+                new WsServer(
+                    $this
+                )
+            ),
+            $this->_config['websocket']['port'],
+            $this->_config['websocket']['address']
+        );
+
+        $server->run();
+    }
+
+    function onMessage(ConnectionInterface $from, $msg)
+    {
+        // TODO: Implement onMessage() method.
+    }
+
+    function onOpen(ConnectionInterface $conn)
+    {
+        $this->_clients->attach($conn);
+    }
+
+    function onClose(ConnectionInterface $conn)
+    {
+        $this->_clients->detach($conn);
+    }
+
+    function onError(ConnectionInterface $conn, \Exception $e)
+    {
+        $conn->close();
+    }
+}

src/Utils/Middleware/LuAbstractMiddleware.php

@@ -12,12 +12,12 @@ use Luticate\Utils\Dbo\LuRouteDbo;
 
 abstract class LuAbstractMiddleware
 {
-    public function onBefore(LuRouteDbo $route, ...$params)
+    public function onBefore(LuRouteDbo $route, $parameters, ...$params)
     {
         
     }
     
-    public function onAfter(LuRouteDbo $route, $result, ...$params)
+    public function onAfter(LuRouteDbo $route, $parameters, $result, ...$params)
     {
         
     }

src/Utils/Middleware/ParametersMiddleware.php

@@ -1,27 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: robin
- * Date: 10/19/15
- * Time: 10:20 PM
- */
-
-namespace Luticate\Utils;
-
-use Closure;
-use Illuminate\Http\Request;
-
-class ParametersMiddleware
-{
-    /**
-     * @param $request Request
-     * @param Closure $next
-     * @param ...$permissions
-     * @return mixed
-     */
-    public function handle($request, Closure $next, ...$permissions)
-    {
-        LuBusiness::$parameters = array_merge($_GET, $_POST, $request->route()[2], LuBusiness::$parameters);
-        return $next($request);
-    }
-}