fixed static calls

src/Utils/LuBusiness.php

@@ -2,12 +2,7 @@
 
 namespace Luticate\Utils;
 
-class LuBusiness {
-
-    /**
-     * @var LuDataAccess
-     */
-    protected $dataAccess = null;
+abstract class LuBusiness {
 
     /**
      * @param string $name
@@ -19,25 +14,16 @@ class LuBusiness {
         return array_key_exists($name, LuController::$parameters) ? LuController::$parameters[$name] : $default;
     }
 
-    /**
-     * @param string $name
-     * @param mixed  $value
-     */
-    public static function setParam($name, $value)
-    {
-        LuController::$parameters[$name] = $value;
-    }
-
     /**
      * @param string[] $params
      * @return bool
      */
     public static function hasParam(array $params)
     {
-        foreach ($params as $p)
-        {
-            if (!array_key_exists($p, LuController::$parameters))
+        foreach ($params as $p) {
+            if (!array_key_exists($p, LuController::$parameters)) {
                 return false;
+            }
         }
         return true;
     }
@@ -107,13 +93,6 @@ class LuBusiness {
         return $default;
     }
 
-    public static function __callStatic($name, $arguments)
-    {
-        $class = get_called_class();
-        $me = new $class();
-        return call_user_func_array(array($me, '_' . $name), $arguments);
-    }
-
     /**
      * @param $page int
      * @param $perPage int
@@ -122,28 +101,36 @@ class LuBusiness {
      * @param $query string
      * @return LuDbo[]
      */
-    public function _search($page, $perPage, $column, $order, $query = null)
+    public static function search($page, $perPage, $column, $order, $query = null)
     {
-        return $this->dataAccess->search($page, $perPage, $column, $order, $query);
+        return static::getDataAccess()->search($page, $perPage, $column, $order, $query);
     }
 
     /**
      * @param $id int
      * @return LuDbo|null
      */
-    public function _getById($id)
+    public static function getById($id)
     {
-        $data = $this->dataAccess->getById($id);
+        $data = static::getDataAccess()->getById($id);
         if (is_null($data))
-            $this->notFound();
+            self::notFound();
         return $data;
     }
 
     /**
      * @param $id int
      */
-    public function _deleteById($id)
+    public static function deleteById($id)
+    {
+        static::getDataAccess()->deleteById($id);
+    }
+
+    /**
+     * @return LuDataAccess
+     */
+    protected static function getDataAccess()
     {
-        $this->dataAccess->deleteById($id);
+        return null;
     }
 }

src/Utils/LuDataAccess.php

@@ -3,23 +3,6 @@
 namespace Luticate\Utils;
 
 abstract class LuDataAccess {
-
-    public function __construct()
-    {
-    }
-
-    public static function __callStatic($name, $arguments)
-    {
-        $class = get_called_class();
-        $me = new $class();
-        return call_user_func_array(array($me, '_' . $name), $arguments);
-    }
-
-    /**
-     * @var LuModel
-     */
-    protected $model = null;
-
     /**
      * @param $page int
      * @param $perPage int
@@ -28,9 +11,9 @@ abstract class LuDataAccess {
      * @param $query string
      * @return LuModel[]
      */
-    protected function search_($page, $perPage, $column, $order, $query)
+    protected static function search_($page, $perPage, $column, $order, $query)
     {
-        return $this->model;
+        return static::getModel();
     }
 
     /**
@@ -56,16 +39,16 @@ abstract class LuDataAccess {
      * @param $query string
      * @return LuDbo[]
      */
-    public function search($page, $perPage, $column, $order, $query = null)
+    public static function search($page, $perPage, $column, $order, $query = null)
     {
         if (is_null($query))
-            $data = $this->model;
+            $data = static::getModel();
         else
-            $data = $this->search_($page, $perPage, $column, $order, $query);
+            $data = static::search_($page, $perPage, $column, $order, $query);
 
         $data = $data->orderBy($column, $order)->take($perPage)->offset($page * $perPage)->get();
 
-        $tab = $this->arrayToDbo($data);
+        $tab = self::arrayToDbo($data);
         return $tab;
     }
 
@@ -73,18 +56,18 @@ abstract class LuDataAccess {
      * @param $id int
      * @return LuModel
      */
-    protected function _getModelById($id)
+    protected static function _getModelById($id)
     {
-        return $this->model->where('id', '=', $id)->first();
+        return static::getModel()->where('id', '=', $id)->first();
     }
 
     /**
      * @param $id int
      * @return LuDbo|null
      */
-    public function _getById($id)
+    public static function getById($id)
     {
-        $data = $this->_getModelById($id);
+        $data = self::_getModelById($id);
         if (is_null($data))
             return null;
         return $data->toDbo();
@@ -93,9 +76,9 @@ abstract class LuDataAccess {
     /**
      * @param $id int
      */
-    public function deleteById($id)
+    public static function deleteById($id)
     {
-        $data = $this->_getModelById($id);
+        $data = self::_getModelById($id);
         if (is_null($data))
             return;
         $data->delete();
@@ -105,9 +88,9 @@ abstract class LuDataAccess {
      * @param $data LuDbo
      * @return int
      */
-    public function _addId($data)
+    public static function addId($data)
     {
-        $data = $this->model->fromDBO($data);
+        $data = static::getModel()->fromDBO($data);
         $data->save();
         return $data->id;
     }
@@ -115,9 +98,9 @@ abstract class LuDataAccess {
     /**
      * @param $data LuDbo
      */
-    public function _add($data)
+    public static function add($data)
     {
-        $data = $this->model->fromDBO($data);
+        $data = static::getModel()->fromDBO($data);
         $data->save();
     }
 
@@ -126,9 +109,9 @@ abstract class LuDataAccess {
      * @param $data LuDbo
      * @return LuDbo|null
      */
-    public function _editById($id, $data)
+    public static function editById($id, $data)
     {
-        return $this->model->fromDBO($data, $this->_getModelById($id))->save();
+        return static::getModel()->fromDBO($data, self::_getModelById($id))->save();
     }
 
     /**
@@ -138,9 +121,9 @@ abstract class LuDataAccess {
      * @param int $perPage
      * @return array
      */
-    public function _getMultiple($predicates, $orders, $page = 0, $perPage = PHP_INT_MAX)
+    public static function getMultiple($predicates, $orders, $page = 0, $perPage = PHP_INT_MAX)
     {
-        $model = $this->model;
+        $model = static::getModel();
         foreach($predicates as $predicate)
         {
             $model = $model->where($predicate[0], $predicate[1], $predicate[2]);
@@ -155,4 +138,12 @@ abstract class LuDataAccess {
 
         return new LuMultipleDbo($count, $dbo);
     }
+
+    /**
+     * @return LuModel
+     */
+    private static function getModel()
+    {
+        return null;
+    }
 }

src/Utils/LuOutputFormatter.php

@@ -10,26 +10,23 @@ class LuOutputFormatter
     public static function getResponse()
     {
         return array(
-            "version" => self::$APP_VERSION,
-            "code" => 200,
-            "success" => true,
-            "data" => null
+            "Version" => self::$APP_VERSION,
+            "Data" => null,
+            "Message" => null
         );
     }
 
     public static function formatSuccess($data)
     {
         $r = self::getResponse();
-        $r["data"] = $data;
+        $r["Data"] = $data;
         return $r;
     }
 
     public static function formatError($code, $message)
     {
         $r = self::getResponse();
-        $r["success"] = false;
-        $r["code"] = $code;
-        $r["message"] = $message;
+        $r["Message"] = $message;
         return $r;
     }
 }

src/Utils/LuRoute.php

@@ -2,35 +2,35 @@
 
 namespace Luticate\Utils;
 
-class LuRoute {
+use Illuminate\Http\Request;
 
+class LuRoute {
     /**
      * @var callable
      */
-    private $isAllowed = null;
+    private $_middleware;
 
     /**
-     * @param $func callable
+     * @param $middleware callable
      */
-    public function setPermissionFunction(callable $func)
+    public function setMiddleware($middleware)
     {
-        $this->isAllowed = $func;
+        $this->_middleware = $middleware;
     }
 
     private function getOptions($url, $business, $method, $permissions = array())
     {
-        $callback = $this->isAllowed;
-        return [function() use($business, $method, $permissions, $callback)
+        $middleware = $this->_middleware;
+        return [function(Request $request) use($business, $method, $permissions, $middleware)
         {
-            if ($permissions == null) {
-                $permissions = array();
-            }
-            else if (!is_array($permissions)) {
+            if (!is_array($permissions)) {
                 $permissions = array($permissions);
             }
-            if ($callback != null && !$callback($permissions)) {
-                abort(401, "User does not have this permission");
+
+            if ($middleware != null && !$middleware($permissions, $request)) {
+                abort(401);
             }
+
             $controller = new LuController();
 
             if (strpos($business, "\\") === false)

test/TestBusiness.php

@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * Created by PhpStorm.
+ * User: robin
+ * Date: 9/27/15
+ * Time: 5:01 PM
+ */
+
+require_once("../vendor/autoload.php");
+require_once("TestDataAccess.php");
+
+
+class TestBusiness extends \Luticate\Utils\LuBusiness
+{
+    protected static function getDataAccess()
+    {
+        return new TestDataAccess();
+    }
+}
+
+var_dump(TestBusiness::getById(42));

test/TestDataAccess.php

@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Created by PhpStorm.
+ * User: robin
+ * Date: 9/27/15
+ * Time: 5:21 PM
+ */
+
+class FakeModel
+{
+    public static function where($col, $operator, $value)
+    {
+        return new FakeModel();
+    }
+
+    public function first()
+    {
+        return new FakeModel();
+    }
+    public function toDbo()
+    {
+        return new FakeModel();
+    }
+}
+
+class TestDataAccess extends \Luticate\Utils\LuDataAccess {
+    protected static function getModel()
+    {
+        return new FakeModel();
+    }
+}