clean controller

src/Utils/LuController.php

@@ -6,21 +6,4 @@ use Laravel\Lumen\Routing\Controller as BaseController;
 
 class LuController extends BaseController
 {
-    function execute($businessClass, $businessMethod)
-    {
-        $reflect = new \ReflectionMethod($businessClass, $businessMethod);
-        $params = $reflect->getParameters();
-
-        $args = array();
-        foreach ($params as $param) {
-            if ($param->isOptional()) {
-                $args[$param->getName()] = LuBusiness::getParam($param->getName(), $param->getDefaultValue());
-            }
-            else {
-                $args[$param->getName()] = LuBusiness::checkParam($param->getName());
-            }
-        }
-
-        return LuOutputFormatter::formatSuccess(forward_static_call_array(array($businessClass, $businessMethod), $args));
-    }
 }

src/Utils/LuRoute.php

@@ -49,7 +49,7 @@ class LuRoute {
         $this->middleware[] = $middleware;
     }
 
-    private function getOptions($httpMethod, $url, $business, $method, $permissions, $middleware)
+    private function getOptions($httpMethod, $url, $controller, $method, $permissions, $middleware)
     {
         if (!is_array($permissions)) {
             $permissions = array($permissions);
@@ -64,81 +64,92 @@ class LuRoute {
             $middleware_string[] = $mid . (strpos($mid, ":") !== false ? "," : ":") . $permissions_string;
         }
 
-        if (strpos($business, "\\") === false) {
-            $business = "App\\Http\\Business\\" . $business . "Business";
+        if (strpos($controller, "\\") === false) {
+            $controller = "App\\Http\\Controller\\" . $controller . "Controller";
         }
 
         $route = new LuRouteDbo();
         $route->setUrl($url);
-        $route->setBusinessClass($business);
+        $route->setBusinessClass($controller);
         $route->setBusinessMethod($method);
         $route->setMiddlware($middleware_string);
         $route->setPermissions($permissions);
         $route->setMethod($httpMethod);
         $this->routes[] = $route;
 
-        return [function() use($business, $method)
+        return [function() use($controller, $method)
         {
-            $controller = new LuController();
-
-            return $controller->execute($business, $method);
+            $reflect = new \ReflectionMethod($controller, $method);
+            $params = $reflect->getParameters();
+
+            $args = array();
+            foreach ($params as $param) {
+                if ($param->isOptional()) {
+                    $args[$param->getName()] = LuBusiness::getParam($param->getName(), $param->getDefaultValue());
+                }
+                else {
+                    $args[$param->getName()] = LuBusiness::checkParam($param->getName());
+                }
+            }
+
+            return LuOutputFormatter::formatSuccess(forward_static_call_array(array($controller, $method), $args));
         },
             'middleware' => $middleware_string];
     }
 
     /**
      * @param $url string
-     * @param $business string
+     * @param $controller string
      * @param $method string
      * @param array $permissions string|string[]
      * @param array $middleware string|string[]
      * @return mixed
      */
-    public function get($url, $business, $method, $permissions = array(), $middleware = array())
+    public function get($url, $controller, $method, $permissions = array(), $middleware = array())
     {
         global $app;
-        return $app->get($url, $this->getOptions("GET", $url, $business, $method, $permissions, $middleware));
+        return $app->get($url, $this->getOptions("GET", $url, $controller, $method, $permissions, $middleware));
     }
 
     /**
      * @param $url string
-     * @param $business string
+     * @param $controller string
      * @param $method string
      * @param array $permissions string|string[]
      * @param array $middleware string|string[]
      * @return mixed
      */
-    public function post($url, $business, $method, $permissions = array(), $middleware = array())
+    public function post($url, $controller, $method, $permissions = array(), $middleware = array())
     {
         global $app;
-        return $app->post($url, $this->getOptions("POST", $url, $business, $method, $permissions, $middleware));
+        return $app->post($url, $this->getOptions("POST", $url, $controller, $method, $permissions, $middleware));
     }
 
     /**
      * @param $url string
-     * @param $business string
+     * @param $controller string
      * @param $method string
      * @param array $permissions string|string[]
      * @param array $middleware string|string[]
      * @return mixed
      */
-    public function put($url, $business, $method, $permissions = array(), $middleware = array())
+    public function put($url, $controller, $method, $permissions = array(), $middleware = array())
     {
         global $app;
-        return $app->put($url, $this->getOptions("PUT", $url, $business, $method, $permissions, $middleware));
+        return $app->put($url, $this->getOptions("PUT", $url, $controller, $method, $permissions, $middleware));
     }
 
     /**
      * @param $url string
-     * @param $business string
+     * @param $controller string
      * @param $method string
      * @param array $permissions string|string[]
      * @param array $middleware string|string[]
      * @return mixed
      */
-    public function delete($url, $business, $method, $permissions = array(), $middleware = array())
+    public function delete($url, $controller, $method, $permissions = array(), $middleware = array())
     {
         global $app;
-        return $app->delete($url, $this->getOptions("DELETE", $url, $business, $method, $permissions, $middleware));
+        return $app->delete($url, $this->getOptions("DELETE", $url, $controller, $method, $permissions, $middleware));
     }
 }