From 4d0d036be9422d315c472c6f9fc6fc40de7f7b2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9rald=20Plusquellec?= <gplusquellec@gmail.com>
Date: Wed, 7 Jun 2017 14:58:27 +0200
Subject: [PATCH] testing

---
 composer.json          |   3 +-
 lib/controllerbase.php |  26 ++-----
 lib/helpers.php        | 150 ++++++++++++++++++++++++-----------------
 lib/lib.php            |  18 ++++-
 lib/octalia.php        |   8 +--
 lib/octaliasession.php |  98 +++++++++++++++++++++++++++
 lib/testcase.php       |  46 +++++++++++++
 7 files changed, 259 insertions(+), 90 deletions(-)
 create mode 100644 lib/octaliasession.php
 create mode 100644 lib/testcase.php

diff --git a/composer.json b/composer.json
index 8d4a2c3..af7047e 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,8 @@
     },
     "autoload": {
         "files": [
-            "lib/lib.php"
+            "lib/lib.php",
+            "lib/testcase.php"
         ]
     },
     "config": {
diff --git a/lib/controllerbase.php b/lib/controllerbase.php
index f064575..d70c8d8 100644
--- a/lib/controllerbase.php
+++ b/lib/controllerbase.php
@@ -314,32 +314,18 @@ protected function model($model, $force = false)
             return $this->models[$model];
         }
 
-        public function em()
+        public function em($model, $engine = 'engine', $force = false)
         {
-            return call_user_func_array('\\Octo\\em', func_get_args());
+            return em($model, $engine, $force);
         }
 
-        public function middleware()
+        public function middleware($class)
         {
-            $coreMiddlewares = Registry::get('core.middlewares', []);
-
-            $args = func_get_args();
-
-            $middlewares = array_shift($args);
-
-            if (!is_array($middlewares)) {
-                $middlewares = [$middlewares];
+            if (is_string($class)) {
+                $class = maker($class, [], false);
             }
 
-            $a = array_merge([$this], $args);
-
-            foreach ($middlewares as $middlewareKey) {
-                $middleware = isAke($coreMiddlewares, $middlewareKey, null);
-
-                if (is_callable($middleware)) {
-                    call_user_func_array($middleware, $a);
-                }
-            }
+            return $class->handle();
         }
 
         public function action($action)
diff --git a/lib/helpers.php b/lib/helpers.php
index cd4b1ea..fa13b9a 100644
--- a/lib/helpers.php
+++ b/lib/helpers.php
@@ -1,36 +1,36 @@
 <?php
     if (!function_exists('partial')) {
-        function partial()
+        function partial($file, $args = [])
         {
-            return call_user_func_array('\\Octo\\partial', func_get_args());
+            return Octo\partial($file, $args);
         }
     }
 
     if (!function_exists('guard')) {
-        function guard()
+        function guard($em = 'user')
         {
-            return call_user_func_array('\\Octo\\guard', func_get_args());
+            return Octo\guard($em);
         }
     }
 
     if (!function_exists('auth')) {
-        function auth()
+        function auth($em = 'user')
         {
-            return call_user_func_array('\\Octo\\guard', func_get_args());
+            return Octo\guard($em);
         }
     }
 
     if (!function_exists('vue')) {
-        function vue()
+        function vue($file, $args = [], $status = 200)
         {
-            return call_user_func_array('\\Octo\\vue', func_get_args());
+            return Octo\vue($file, $args, $status);
         }
     }
 
     if (!function_exists('em')) {
-        function em()
+        function em($model, $engine = 'engine', $force = false)
         {
-            return call_user_func_array('\\Octo\\em', func_get_args());
+            return Octo\em($model, $engine, $force);
         }
     }
 
@@ -49,65 +49,65 @@ function vd()
     }
 
     if (!function_exists('isAke')) {
-        function isAke()
+        function isAke($array, $k, $d = [])
         {
-            return call_user_func_array('\\Octo\\isAke', func_get_args());
+            return Octo\isAke($array, $k, $d);
         }
     }
 
     if (!function_exists('lib')) {
-        function lib()
+        function lib($lib, $args = [], $singleton = false)
         {
-            return call_user_func_array('\\Octo\\lib', func_get_args());
+            return Octo\lib($lib, $args, $singleton);
         }
     }
 
     if (!function_exists('maker')) {
-        function maker()
+        function maker($make, $args = [], $singleton = true)
         {
-            return call_user_func_array('\\Octo\\maker', func_get_args());
+            return Octo\maker($make, $args, $singleton);
         }
     }
 
     if (!function_exists('image')) {
-        function image()
+        function image($config = null)
         {
-            return call_user_func_array('\\Octo\\image', func_get_args());
+            return Octo\image($config);
         }
     }
 
     if (!function_exists('forever')) {
-        function forever()
+        function forever($ns = 'user')
         {
-            return call_user_func_array('\\Octo\\forever', func_get_args());
+            return Octo\forever($ns);
         }
     }
 
     if (!function_exists('item')) {
-        function item()
+        function item($attributes = [])
         {
-            return call_user_func_array('\\Octo\\item', func_get_args());
+            return Octo\item($attributes);
         }
     }
 
     if (!function_exists('isRoute')) {
-        function isRoute()
+        function isRoute($name, array $args = [])
         {
-            return call_user_func_array('\\Octo\\isRoute', func_get_args());
+            return Octo\isRoute($name, $args);
         }
     }
 
     if (!function_exists('path')) {
-        function path()
+        function path($k = null, $v = null, $d = null)
         {
-            return call_user_func_array('\\Octo\\path', func_get_args());
+            return Octo\path($k, $v, $d);
         }
     }
 
     if (!function_exists('coll')) {
-        function coll()
+        function coll(array $data = [])
         {
-            return call_user_func_array('\\Octo\\coll', func_get_args());
+            return Octo\coll($data);
         }
     }
 
@@ -119,9 +119,9 @@ function memory()
     }
 
     if (!function_exists('dyn')) {
-        function dyn()
+        function dyn($class = null)
         {
-            return call_user_func_array('\\Octo\\dyn', func_get_args());
+            return Octo\dyn($class);
         }
     }
 
@@ -140,60 +140,58 @@ function upper()
     }
 
     if (!function_exists('o')) {
-        function o()
+        function o(array $o = [])
         {
-            return call_user_func_array('\\Octo\\o', func_get_args());
+            return Octo\o($o);
         }
     }
 
     if (!function_exists('start_session')) {
-        function start_session()
+        function start_session($ns = 'web')
         {
-            echo call_user_func_array('\\Octo\\start_session', func_get_args());
+            return Octo\start_session($ns);
         }
     }
 
     if (!function_exists('session')) {
-        function session()
+        function session($context = 'web')
         {
-            echo call_user_func_array('\\Octo\\session', func_get_args());
+            echo Octo\session($context);
         }
     }
 
     if (!function_exists('_')) {
-        function _()
+        function _($segment, $args = [], $locale = null)
         {
-            echo call_user_func_array('\\Octo\\trans', func_get_args());
+            echo Octo\trans($segment, $args, $locale);
         }
     }
 
     if (!function_exists('trans')) {
-        function trans()
+        function trans($segment, $args = [], $locale = null)
         {
-            return call_user_func_array('\\Octo\\trans', func_get_args());
+            return Octo\trans($segment, $args, $locale);
         }
     }
 
     if (!function_exists('lng')) {
-        function lng()
+        function lng($context = 'web')
         {
-            return call_user_func_array('\\Octo\\lng', func_get_args());
+            return Octo\lng($context);
         }
     }
 
     if (!function_exists('request')) {
-        function request()
+        function request($k = null, $d = null)
         {
-            $callable = ['\\Octo\\Input', 'request'];
-
-            return call_user_func_array($callable, func_get_args());
+            return Octo\Input::method($k, $d);
         }
     }
 
     if (!function_exists('url')) {
-        function url()
+        function url($name, array $args = [])
         {
-            return call_user_func_array('\\Octo\\url', func_get_args());
+            return Octo\url($name, $args);
         }
     }
 
@@ -205,9 +203,9 @@ function redirect()
     }
 
     if (!function_exists('auth')) {
-        function auth()
+        function auth($em = 'user')
         {
-            return call_user_func_array('\\Octo\\auth', func_get_args());
+            return Octo\auth($em);
         }
     }
 
@@ -226,16 +224,23 @@ function current_url()
     }
 
     if (!function_exists('layout')) {
-        function layout()
+        function layout($file, $page = null, $sections = null)
         {
-            return call_user_func_array('\\Octo\\layout', func_get_args());
+            return Octo\layout($file, $page, $sections);
         }
     }
 
     if (!function_exists('actual')) {
-        function actual()
+        function actual($key = null, $value = null)
+        {
+            return Octo\actual($key, $value);
+        }
+    }
+
+    if (!function_exists('back')) {
+        function back($url = null)
         {
-            return call_user_func_array('\\Octo\\actual', func_get_args());
+            return Octo\back($url);
         }
     }
 
@@ -284,23 +289,37 @@ function user($k = null)
     }
 
     if (!function_exists('magic')) {
-        function magic()
+        function magic($class, array $array = [])
         {
-            return call_user_func_array('\\Octo\\magic', func_get_args());
+            return Octo\magic($class, $array);
         }
     }
 
     if (!function_exists('context')) {
-        function context()
+        function context($context, array $array = [])
         {
-            return call_user_func_array('\\Octo\\context', func_get_args());
+            return Octo\context($context, $array);
         }
     }
 
     if (!function_exists('mockery')) {
-        function mockery()
+        function mockery($mock, array $args = [])
+        {
+            return Octo\mockery($mock, $args);
+        }
+    }
+
+    if (!function_exists('message')) {
+        function message()
         {
-            return call_user_func_array('\\Octo\\mockery', func_get_args());
+            return call_user_func_array('\\Octo\\message', func_get_args());
+        }
+    }
+
+    if (!function_exists('mailer')) {
+        function mailer()
+        {
+            return call_user_func_array('\\Octo\\mailer', func_get_args());
         }
     }
 
@@ -333,9 +352,16 @@ function bgQueue()
     }
 
     if (!function_exists('appenv')) {
-        function appenv()
+        function appenv($key, $default = null)
+        {
+            return Octo\appenv($key, $default);
+        }
+    }
+
+    if (!function_exists('appenv')) {
+        function be($user, $ns = 'web')
         {
-            return call_user_func_array('\\Octo\\appenv', func_get_args());
+            return Octo\be($user, $ns);
         }
     }
 
diff --git a/lib/lib.php b/lib/lib.php
index 6d72052..460a3e5 100755
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -2550,12 +2550,12 @@ function middlewares($when = 'before')
         }
 
         foreach ($middlewares as $middlewareClass) {
-            $middleware = app($middlewareClass);
+            $middleware = maker($middlewareClass, [], false);
             $methods    = get_class_methods($middleware);
             $method     = lcfirst(Strings::camelize('apply_' . $when));
 
             if (in_array($method, $methods)) {
-                call_user_func_array([$middleware, $method], [$request, app()]);
+                call_user_func_array([$middleware, $method], [$request, context("app")]);
             }
         }
     }
@@ -2769,6 +2769,8 @@ function maker($make, $args = [], $singleton = true)
     {
         static $binds = [];
 
+        $args = !is_array($args) ? $args->toArray() : $args;
+
         $callable = isAke($binds, $make, null);
 
         if ($callable && is_callable($callable) && $singleton) {
@@ -6072,6 +6074,8 @@ function guard($ns = 'web', $em = 'user')
         });
 
         $class->macro('login', function ($user) use ($ns) {
+            $user = !is_array($user) ? $user->toArray() : $user;
+
             session($ns)->setUser($user);
         });
 
@@ -6117,7 +6121,7 @@ function guard($ns = 'web', $em = 'user')
             $user = em($em)->find((int) $id);
 
             if ($user) {
-                session($ns)->setUser($user);
+                session($ns)->setUser($user->toArray());
                 go(urlFor($route));
             } else {
                 ptption('guard', "Unknown id.");
@@ -6125,6 +6129,7 @@ function guard($ns = 'web', $em = 'user')
         });
 
         $class->macro('logByUser', function ($user, $route = 'home') use ($ns) {
+            $user = !is_array($user) ? $user->toArray() : $user;
             session($ns)->setUser($user);
             go(urlFor($route));
         });
@@ -6154,6 +6159,13 @@ function guard($ns = 'web', $em = 'user')
         return $class;
     }
 
+    function be($user, $ns = 'web')
+    {
+        $user = !is_array($user) ? $user->toArray() : $user;
+
+        session($ns)->setUser($user);
+    }
+
     class OctoLab
     {
         public static function __callStatic($m, $a)
diff --git a/lib/octalia.php b/lib/octalia.php
index b498526..f2b1d0f 100644
--- a/lib/octalia.php
+++ b/lib/octalia.php
@@ -1041,7 +1041,7 @@ public function __call($m, $a)
                 $method = 'scope' . ucfirst(Strings::camelize($m));
 
                 if (in_array($method, $methods)) {
-                    return call_user_func_array([$entity, $method], $a);
+                    return call_user_func_array([$entity, $method], array_merge([$this], $a));
                 }
             }
 
@@ -1185,7 +1185,7 @@ public function __call($m, $a)
                     $value  = array_shift($a);
                 }
 
-                return $this->where([$field, $op, $value]);
+                return $this->where($field, $op, $value);
             }
 
             if (fnmatch('getBy*', $m) && strlen($m) > 5) {
@@ -1200,7 +1200,7 @@ public function __call($m, $a)
                     $value  = array_shift($a);
                 }
 
-                return $this->where([$field, $op, $value]);
+                return $this->where($field, $op, $value);
             }
 
             if (fnmatch('where*', $m) && strlen($m) > 5) {
@@ -1215,7 +1215,7 @@ public function __call($m, $a)
                     $value  = array_shift($a);
                 }
 
-                return $this->where([$field, $op, $value]);
+                return $this->where($field, $op, $value);
             }
 
             if (fnmatch('by*', $m) && strlen($m) > 2) {
diff --git a/lib/octaliasession.php b/lib/octaliasession.php
new file mode 100644
index 0000000..5c6feb2
--- /dev/null
+++ b/lib/octaliasession.php
@@ -0,0 +1,98 @@
+<?php
+    namespace Octo;
+
+    use SessionHandlerInterface as Handler;
+
+    class OctaliaSession implements Handler
+    {
+        private $db;
+
+        public function __construct()
+        {
+            $this->db = em('systemSession');
+        }
+
+        public function open($savePath = null, $sessionName = null)
+        {
+            return true;
+        }
+
+        public function close()
+        {
+            return true;
+        }
+
+        public function read($session_id)
+        {
+            $row = $this->db->firstOrCreate([
+                'session_id' => $session_id
+            ]);
+
+            if (!$row['data']) {
+                return '';
+            }
+
+            return $row['data'];
+        }
+
+        public function write($session_id, $data)
+        {
+            $row = $this->db->firstOrCreate([
+                'session_id' => $session_id
+            ]);
+
+            try {
+                $expiry_time    = time() + SESSION_DURATION;
+                $row->data      = $data;
+                $row->expiry    = $expiry_time;
+
+                $row->save();
+
+                return true;
+            } catch (\Exception $error) {
+                error_log($error);
+
+                exit;
+            }
+
+            return false;
+        }
+
+        public function destroy($session_id)
+        {
+            try {
+                $this->db->firstOrCreate([
+                    'session_id' => $session_id
+                ])->delete();
+
+                return true;
+            } catch (\Exception $error) {
+                error_log($error);
+
+                exit;
+            }
+
+            return false;
+        }
+
+        public function gc($maxlifetime = SESSION_DURATION)
+        {
+            try {
+                $this->db->where('expiry', '<', time())->delete();
+                    return true;
+            } catch (\Exception $error) {
+                error_log($error);
+
+                exit;
+            }
+
+            return false;
+        }
+    }
+    /**
+     * $session_handler = new OctaliaSession();
+     * session_set_save_handler($session_handler, true);
+     * session_name('MySessionName');
+     * start_session();
+     * session_regenerate_id(true);
+     */
diff --git a/lib/testcase.php b/lib/testcase.php
new file mode 100644
index 0000000..e289fdb
--- /dev/null
+++ b/lib/testcase.php
@@ -0,0 +1,46 @@
+<?php
+    namespace Octo;
+
+    use Mockery;
+    use PHPUnit_Framework_TestCase;
+
+    abstract class TestCase extends PHPUnit_Framework_TestCase
+    {
+        protected $app;
+
+        abstract public function makeApplication();
+
+        public function em($entity, $new = false)
+        {
+            return dbMemory($entity, $new);
+        }
+
+        protected function setUp()
+        {
+            if (!$this->app) {
+                $this->refreshApplication();
+            }
+        }
+
+        protected function refreshApplication()
+        {
+            putenv('APPLICATION_ENV=testing');
+
+            $this->app = $this->makeApplication();
+        }
+
+        protected function tearDown()
+        {
+            if ($this->app) {
+                $this->app = null;
+            }
+
+            if (property_exists($this, 'serverVariables')) {
+                $this->serverVariables = [];
+            }
+
+            if (class_exists('Mockery')) {
+                Mockery::close();
+            }
+        }
+    }