refatalsakka / framework

Core/System/PugView.php

Indentation +13 added lines, -13 removed lines

@@ -6,21 +6,21 @@ 
 
 class PugView
 {
-  private $app;
+    private $app;
 
-  public function __construct(Application $app)
-  {
+    public function __construct(Application $app)
+    {
     $this->app = $app;
-  }
+    }
 
-  public function render($path, array $context)
-  {
+    public function render($path, array $context)
+    {
     $this->app->file->css();
     $pug = new Pug(array(
-      'pretty' => true,
-      'cache' => 'var/cache/pug',
-      'basedir' => 'template/',
-      'upToDateCheck' => false,
+        'pretty' => true,
+        'cache' => 'var/cache/pug',
+        'basedir' => 'template/',
+        'upToDateCheck' => false,
     ));
 
     $link = $this->app->request->link();
@@ -43,10 +43,10 @@ 
     $context += $this->app->config['website'];
 
     $context += [
-      'css' => $css,
-      'js'  => $js
+        'css' => $css,
+        'js'  => $js
     ];
 
     return $pug->render($file, $context);
-  }
+    }
 }
\ No newline at end of file

Core/System/File.php

Indentation +29 added lines, -29 removed lines

@@ -6,27 +6,27 @@ 
 
 class File
 {
-  const DS = DIRECTORY_SEPARATOR;
+    const DS = DIRECTORY_SEPARATOR;
 
-  private $root;
+    private $root;
 
-  public function __construct($root)
-  {
+    public function __construct($root)
+    {
     $this->root = $root;
-  }
+    }
 
-  public function root()
-  {
+    public function root()
+    {
     return $this->root;
-  }
+    }
 
-  public function exists($file)
-  {
+    public function exists($file)
+    {
     return file_exists($file);
-  }
+    }
 
-  public function call($file)
-  {
+    public function call($file)
+    {
     if ($this->exists($file)) {
 
     return require $file;
@@ -35,30 +35,30 @@ 
 
     throw new Exception("$file is not found");
     }
-  }
+    }
 
-  public function to($path, $ext = null)
-  {
+    public function to($path, $ext = null)
+    {
     return $this->root . static::DS . str_replace('/', static::DS, $path . $ext);
-  }
+    }
 
-  public function toPublic($target = null)
-  {
+    public function toPublic($target = null)
+    {
     return $this->to('public/' . $target);
-  }
+    }
 
-  public function images()
-  {
+    public function images()
+    {
     return $this->toPublic('images');
-  }
+    }
 
-  public function js()
-  {
+    public function js()
+    {
     return $this->toPublic('js');
-  }
+    }
 
-  public function css()
-  {
+    public function css()
+    {
     return $this->toPublic('css');
-  }
+    }
 }
\ No newline at end of file

Core/System/Session.php

Indentation +29 added lines, -29 removed lines

@@ -4,60 +4,60 @@
 
 class Session
 {
-  private $app;
+    private $app;
 
-  public function __construct(Application $app)
-  {
+    public function __construct(Application $app)
+    {
     $this->app = $app;
-  }
+    }
 
-  public function start()
-  {
+    public function start()
+    {
     ini_set('session.use_only_cookies', 1);
 
     if (! session_id()) {
-      session_start();
+        session_start();
+    }
     }
-  }
 
-  public function set($key, $value)
-  {
+    public function set($key, $value)
+    {
     $_SESSION[$key] = $value;
-  }
+    }
 
-  public function get($key, $default = null)
-  {
+    public function get($key, $default = null)
+    {
     return array_get($_SESSION, $key, $default);
-  }
+    }
 
-  public function pull($key)
-  {
+    public function pull($key)
+    {
     $value = $this->get($key);
 
     $this->remove($key);
 
     return $value;
-  }
+    }
 
-  public function has($key)
-  {
+    public function has($key)
+    {
     return isset($_SESSION[$key]);
-  }
+    }
 
-  public function all()
-  {
+    public function all()
+    {
     return $_SESSION;
-  }
+    }
 
-  public function remove($key)
-  {
+    public function remove($key)
+    {
     unset($_SESSION[$key]);
-  }
+    }
 
-  public function destroy()
-  {
+    public function destroy()
+    {
     session_destroy();
 
     unset($_SESSION);
-  }
+    }
 }
\ No newline at end of file

Core/System/Model.php

Indentation +42 added lines, -42 removed lines

@@ -4,62 +4,62 @@ 
 
 abstract class Model
 {
-  protected $app;
+    protected $app;
 
-  protected $table;
+    protected $table;
 
-  public function __construct(Application $app)
-  {
+    public function __construct(Application $app)
+    {
     $this->app = $app;
-  }
+    }
 
-  public function __get($key)
-  {
+    public function __get($key)
+    {
     return $this->app->get($key);
-  }
+    }
 
-  public function __call($method, $args)
-  {
+    public function __call($method, $args)
+    {
     return call_user_func_array([$this->app->db, $method], $args);
-  }
+    }
 
-  public function all($limit = null)
-  {
+    public function all($limit = null)
+    {
     return $this->orderBy('id', 'DESC')->limit($limit)->fetchAll($this->table);
-  }
+    }
 
-  public function allEnable($limit = null)
-  {
+    public function allEnable($limit = null)
+    {
     return $this->orderBy('id', 'DESC')->where('enable = ?', 1)->limit($limit)->fetchAll($this->table);
-  }
+    }
 
-  public function get($value, $coulmn = 'id')
-  {
+    public function get($value, $coulmn = 'id')
+    {
     return $this->where($coulmn . ' = ?' , $value)->fetch($this->table);
-  }
+    }
 
-  public function getEnable($value, $coulmn = 'id')
-  {
+    public function getEnable($value, $coulmn = 'id')
+    {
     return $this->where($coulmn . ' = ? AND enable = ?' , [$value, 1])->fetch($this->table);
-  }
+    }
 
-  public function selectTable($coulmn)
-  {
+    public function selectTable($coulmn)
+    {
     return $this->select($coulmn)->fetchAll($this->table);
-  }
+    }
 
-  public function exists($value, $key = 'id')
-  {
+    public function exists($value, $key = 'id')
+    {
     return (bool) $this->select($key)->where($key .'=?' , $value)->fetch($this->table);
-  }
+    }
 
-  public function delete($id)
-  {
+    public function delete($id)
+    {
     return $this->where('id = ?' , $id)->delete($this->table);
-  }
+    }
 
-  public function hasOne($join, $id = null, $select = '*', $limit = null, $localId = null, $forginId = null)
-  {
+    public function hasOne($join, $id = null, $select = '*', $limit = null, $localId = null, $forginId = null)
+    {
     $join = rtrim($join, 'Model');
 
     $file = $this->app->file->to( 'App/Models/' . $join . 'Model', '.php');
@@ -75,10 +75,10 @@ 
     $join = $this->load->model($join)->table;
 
     return $this->db->select($select)->from($table)->join($join, $localId, $forginId)->where($table . '.id = ?', $id)->limit($limit)->fetch();
-  }
+    }
 
-  public function hasMany($join, $id = null, $select = '*', $limit = null, $localId = null, $forginId = null)
-  {
+    public function hasMany($join, $id = null, $select = '*', $limit = null, $localId = null, $forginId = null)
+    {
     $join = rtrim($join, 'Model');
 
     $file = $this->app->file->to( 'App/Models/' . $join . 'Model', '.php');
@@ -94,10 +94,10 @@ 
     $join = $this->load->model($join)->table;
 
     return $this->db->select($select)->from($table)->join($join, $localId, $forginId)->where($table . '.id = ?', $id)->limit($limit)->fetchAll();
-  }
+    }
 
-  public function join($join, $limit = null, $enable = null, $localId = null, $forginId = null)
-  {
+    public function join($join, $limit = null, $enable = null, $localId = null, $forginId = null)
+    {
     $join = rtrim($join, 'Model');
 
     $file = $this->app->file->to( 'App/Models/' . $join . 'Model', '.php');
@@ -114,9 +114,9 @@ 
 
     if ($enable) {
 
-      return $this->db->select()->from($table)->join($join, $localId, $forginId)->where('enable = ?', 1)->limit($limit)->fetchAll();
+        return $this->db->select()->from($table)->join($join, $localId, $forginId)->where('enable = ?', 1)->limit($limit)->fetchAll();
     }
 
     return $this->db->select()->from($table)->join($join, $localId, $forginId)->limit($limit)->fetchAll();
-  }
+    }
 }
\ No newline at end of file

Core/System/Route.php

Indentation +73 added lines, -73 removed lines

@@ -6,70 +6,70 @@ 
 
 class Route
 {
-  const NEXT = '_NEXT_';
+    const NEXT = '_NEXT_';
 
-  private $app;
+    private $app;
 
-  private $routes = [];
+    private $routes = [];
 
-  public $current = [];
+    public $current = [];
 
-  private $prefix;
+    private $prefix;
 
-  private $basController;
+    private $basController;
 
-  private $middlewareFrom;
+    private $middlewareFrom;
 
-  private $groupMiddleware = [];
+    private $groupMiddleware = [];
 
-  public function __construct(Application $app)
-  {
+    public function __construct(Application $app)
+    {
     $this->app = $app;
-  }
+    }
 
-  public function add($url, $action, $requestMethos = 'GET', $middleware = [])
-  {
+    public function add($url, $action, $requestMethos = 'GET', $middleware = [])
+    {
     if ($this->prefix) {
 
-      if ($this->prefix !== '/') {
+        if ($this->prefix !== '/') {
 
         $url = $this->prefix . $url;
 
         $url = rtrim($url, '/');
-      }
+        }
     }
 
-      if ($this->basController) $action = $this->basController . '/' . $action;
+        if ($this->basController) $action = $this->basController . '/' . $action;
 
     if ($this->groupMiddleware) {
 
-      if (is_array($middleware)) {
+        if (is_array($middleware)) {
 
         $middleware = array_merge($this->groupMiddleware[0], $middleware);
 
-      } else {
+        } else {
 
         array_push($this->groupMiddleware[0], $middleware);
 
         $middleware = $this->groupMiddleware[0];
-      }
+        }
     }
 
     $routes = [
-      'url'       => $url,
-      'pattern'   => $this->generatePattern($url),
-      'action'    => $this->getAction($action),
-      'method'    => $requestMethos,
-      'middleware' => $middleware
+        'url'       => $url,
+        'pattern'   => $this->generatePattern($url),
+        'action'    => $this->getAction($action),
+        'method'    => $requestMethos,
+        'middleware' => $middleware
     ];
 
     $this->routes[] = $routes;
 
     return $this;
-  }
+    }
 
-  public function group($groupOptions, callable $callback)
-  {
+    public function group($groupOptions, callable $callback)
+    {
     $prefix = $groupOptions['prefix'];
     $controller = $groupOptions['controller'];
     $middlewareFrom = array_shift($groupOptions['middleware']);
@@ -85,10 +85,10 @@ 
     $callback($this);
 
     return $this;
-  }
+    }
 
-  public function package($url, $controller)
-  {
+    public function package($url, $controller)
+    {
     $this->add("$url", "$controller");
     $this->add("$url/add", "$controller@add", "POST");
     $this->add("$url/submit", "$controller@submit", "POST");
@@ -97,19 +97,19 @@ 
     $this->add("$url/delete/:id", "$controller@delete", "POST");
 
     return $this;
-  }
+    }
 
-  public function generatePattern($url)
-  {
+    public function generatePattern($url)
+    {
     $pattern = '#^';
     $pattern .= str_replace([':text', ':id'], ['([a-zA-Z0-9-]+)', '(\d+)'], $url);
     $pattern .= '$#';
 
     return $pattern;
-  }
+    }
 
-  public function getAction($action)
-  {
+    public function getAction($action)
+    {
     $action = str_replace('/', '\\', $action);
 
     $action = (strpos($action, '@') != 0) ? $action : $action . '@index';
@@ -117,49 +117,49 @@ 
     $action = explode('@', $action);
 
     return $action;
-  }
+    }
 
-  public function getProperRoute()
-  {
+    public function getProperRoute()
+    {
     foreach($this->routes as $route) {
 
         if ($this->isMatching($route['pattern']) && $this->isMatchingRequestMethod($route['method'])) {
 
-          $this->current = $route;
+            $this->current = $route;
 
-          $output = '';
+            $output = '';
 
-          if ($route['middleware']) {
+            if ($route['middleware']) {
 
             if (is_array($route['middleware'])) {
 
-              foreach($route['middleware'] as $middleware) {
+                foreach($route['middleware'] as $middleware) {
 
                 $output = $this->middleware($middleware);
 
                 if ($output != '') break;
-              }
+                }
 
             } else {
 
-              $output = $this->middleware($route['middleware']);
+                $output = $this->middleware($route['middleware']);
 
-              if ($output != '') break;
+                if ($output != '') break;
+            }
             }
-          }
 
             if ($output == '') {
 
-              list($controller, $method) = $route['action'];
+                list($controller, $method) = $route['action'];
 
-              $arguments = $this->getArgumentsFor($route['pattern']);
+                $arguments = $this->getArgumentsFor($route['pattern']);
 
-              $output = (string) $this->app->load->action($controller, $method, $arguments);
+                $output = (string) $this->app->load->action($controller, $method, $arguments);
 
-              return $output;
+                return $output;
 
             } else {
-              break;
+                break;
             }
         }
     }
@@ -167,42 +167,42 @@ 
     $output = (string) $this->app->load->action('notFound', 'index', []);
 
     return $output;
-  }
+    }
 
-  public function isMatching($pattern)
-  {
+    public function isMatching($pattern)
+    {
     $url = $this->app->request->url();
 
     return preg_match($pattern, $url);
-  }
+    }
 
-  private function isMatchingRequestMethod($method)
-  {
+    private function isMatchingRequestMethod($method)
+    {
     $methods = ['GET', 'POST'];
 
     if (($method == 'both') && in_array($this->app->request->method(), $methods)) return true;
 
     if (is_array($method)) {
 
-      if (count($method) == 1) {
+        if (count($method) == 1) {
 
         $method = $method[0];
 
-      } else if (count($method) == 2) {
+        } else if (count($method) == 2) {
 
         if (in_array($method[0], $methods) && in_array($method[1], $methods)) return true;
 
-      } else {
+        } else {
 
         return false;
-      }
+        }
     }
 
     return $this->app->request->method() == $method;
-  }
+    }
 
-  public function getArgumentsFor($pattern)
-  {
+    public function getArgumentsFor($pattern)
+    {
     $url = $this->app->request->url();
 
     preg_match($pattern, $url, $matches);
@@ -210,15 +210,15 @@ 
     array_shift($matches);
 
     return $matches;
-  }
+    }
 
-  public function getCurrent($key)
-  {
+    public function getCurrent($key)
+    {
     return $this->current[$key];
-  }
+    }
 
-  private function middleware($middleware, $from = 'admin')
-  {
+    private function middleware($middleware, $from = 'admin')
+    {
     $middlewareInterface = 'App\\Middleware\\MiddlewaresInterface';
 
     $middlewares = $this->app->alias['middlewares'][$from];
@@ -226,7 +226,7 @@ 
     $middlewareClass = $middlewares[$middleware];
 
     if (! in_array($middlewareInterface, class_implements($middlewareClass))) {
-      throw new Exception("$middlewareClass not Implement");
+        throw new Exception("$middlewareClass not Implement");
     }
 
     $middlewareObject = new $middlewareClass;
@@ -236,5 +236,5 @@ 
     if ($output && $output === static::NEXT) $output = '';
 
     return $output;
-  }
+    }
 }
\ No newline at end of file

Braces +21 added lines, -7 removed lines

@@ -39,7 +39,9 @@ 
       }
     }
 
-      if ($this->basController) $action = $this->basController . '/' . $action;
+      if ($this->basController) {
+          $action = $this->basController . '/' . $action;
+      }
 
     if ($this->groupMiddleware) {
 
@@ -75,7 +77,9 @@ 
     $middlewareFrom = array_shift($groupOptions['middleware']);
     $middleware = $groupOptions['middleware'];
 
-    if ($this->app->request->url() !== $prefix) return $this;
+    if ($this->app->request->url() !== $prefix) {
+        return $this;
+    }
 
     $this->prefix = $prefix;
     $this->basController = $controller;
@@ -137,14 +141,18 @@ 
 
                 $output = $this->middleware($middleware);
 
-                if ($output != '') break;
+                if ($output != '') {
+                    break;
+                }
               }
 
             } else {
 
               $output = $this->middleware($route['middleware']);
 
-              if ($output != '') break;
+              if ($output != '') {
+                  break;
+              }
             }
           }
 
@@ -180,7 +188,9 @@ 
   {
     $methods = ['GET', 'POST'];
 
-    if (($method == 'both') && in_array($this->app->request->method(), $methods)) return true;
+    if (($method == 'both') && in_array($this->app->request->method(), $methods)) {
+        return true;
+    }
 
     if (is_array($method)) {
 
@@ -190,7 +200,9 @@ 
 
       } else if (count($method) == 2) {
 
-        if (in_array($method[0], $methods) && in_array($method[1], $methods)) return true;
+        if (in_array($method[0], $methods) && in_array($method[1], $methods)) {
+            return true;
+        }
 
       } else {
 
@@ -233,7 +245,9 @@ 
 
     $output = $middlewareObject->handle($this->app, static::NEXT);
 
-    if ($output && $output === static::NEXT) $output = '';
+    if ($output && $output === static::NEXT) {
+        $output = '';
+    }
 
     return $output;
   }

Core/System/Http/Request.php

Indentation +55 added lines, -55 removed lines

@@ -6,23 +6,23 @@ 
 
 class Request
 {
-  private $app;
+    private $app;
 
-  private $url;
+    private $url;
 
-  private $baseUrl;
+    private $baseUrl;
 
-  private $files = [];
+    private $files = [];
 
-  private $link;
+    private $link;
 
-  public function __construct(Application $app)
-  {
+    public function __construct(Application $app)
+    {
     $this->app = $app;
-  }
+    }
 
-  public function prepareUrl()
-  {
+    public function prepareUrl()
+    {
     $script = dirname($this->server('SCRIPT_NAME'));
 
     $requestUri = $this->server('REQUEST_URI');
@@ -31,10 +31,10 @@ 
 
     if (! in_array($script, ['/', '\\'])) {
 
-      $this->url = preg_replace('#^' . $script . '#', '', $requestUri);
+        $this->url = preg_replace('#^' . $script . '#', '', $requestUri);
     } else {
 
-      $this->url = $requestUri;
+        $this->url = $requestUri;
     }
 
     if ($this->url !== '/') $this->url = rtrim($this->url, '/');
@@ -43,11 +43,11 @@ 
 
     if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
 
-      $isSecure = true;
+        $isSecure = true;
 
     }
     elseif (! empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || ! empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') {
-      $isSecure = true;
+        $isSecure = true;
     }
 
     $REQUEST_PROTOCOL = $isSecure ? 'https' : 'http';
@@ -55,51 +55,51 @@ 
     $this->link = $REQUEST_PROTOCOL . '://' . $this->server('HTTP_HOST');
 
     $this->baseUrl = $this->link . $requestUri;
-  }
+    }
 
-  public function get($key)
-  {
+    public function get($key)
+    {
     $value = array_get($_GET, $key, $default);
 
     if (is_array($value)) {
-      $value = array_filter($value);
+        $value = array_filter($value);
     } else {
-      $value = trim($value);
+        $value = trim($value);
     }
 
     return $value;
-  }
+    }
 
-  public function post($key)
-  {
+    public function post($key)
+    {
     $value = array_get($_POST, $key, $default);
 
     if (is_array($value)) {
-      $value = array_filter($value);
+        $value = array_filter($value);
     } else {
-      $value = trim($value);
+        $value = trim($value);
     }
 
     return $value;
-  }
+    }
 
-  public function setPost($key, $value)
-  {
+    public function setPost($key, $value)
+    {
     $_POST[$key] = $value;
-  }
+    }
 
-  public function posts()
-  {
+    public function posts()
+    {
     return $_POST;
-  }
+    }
 
-  public function files()
-  {
+    public function files()
+    {
     return $_FILES;
-  }
+    }
 
-  public function file($input)
-  {
+    public function file($input)
+    {
     if (isset($this->files[$input])) return $this->files[$input];
 
     $upoadedFile = new UploadeFile($this->app, $input);
@@ -107,35 +107,35 @@ 
     $this->files[$input] = $upoadedFile;
 
     return $this->files[$input];
-  }
+    }
 
-  public function server($key)
-  {
+    public function server($key)
+    {
     return array_get($_SERVER, $key);
-  }
+    }
 
-  public function method()
-  {
+    public function method()
+    {
     return $this->server('REQUEST_METHOD');
-  }
+    }
 
-  public function referer()
-  {
+    public function referer()
+    {
     return $this->server('HTTP_REFERER');
-  }
+    }
 
-  public function baseUrl()
-  {
+    public function baseUrl()
+    {
     return $this->baseUrl;
-  }
+    }
 
-  public function url()
-  {
+    public function url()
+    {
     return $this->url;
-  }
+    }
 
-  public function link()
-  {
+    public function link()
+    {
     return $this->link;
-  }
+    }
 }
\ No newline at end of file

Core/System/Http/Response.php

Indentation +22 added lines, -22 removed lines

@@ -6,44 +6,44 @@
 
 class Response
 {
-  private $app;
+    private $app;
 
-  private $headers = [];
+    private $headers = [];
 
-  private $content = '';
+    private $content = '';
 
-  public function __construct(Application $app)
-  {
+    public function __construct(Application $app)
+    {
     $this->app = $app;
-  }
+    }
 
-  public function setOutput($content)
-  {
+    public function setOutput($content)
+    {
     $this->content = $content;
-  }
+    }
 
-  public function setHeaders($header, $value)
-  {
+    public function setHeaders($header, $value)
+    {
     $this->headers[$header] = $value;
-  }
+    }
 
-  public function sendOutput()
-  {
+    public function sendOutput()
+    {
     echo $this->content;
-  }
+    }
 
-  public function sendHeaders()
-  {
+    public function sendHeaders()
+    {
     foreach($this->headers as $header => $value)
     {
-      header($header . ':' . $value);
+        header($header . ':' . $value);
+    }
     }
-  }
 
-  public function send()
-  {
+    public function send()
+    {
     $this->sendHeaders();
 
     $this->sendOutput();
-  }
+    }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 
   public function sendHeaders()
   {
-    foreach($this->headers as $header => $value)
+    foreach ($this->headers as $header => $value)
     {
       header($header . ':' . $value);
     }

Core/System/Paginatio.php

Indentation +42 added lines, -42 removed lines

@@ -4,87 +4,87 @@
 
 class Pagination
 {
-  private $app;
+    private $app;
 
-  private $totalItems;
+    private $totalItems;
 
-  private $itemsPerPage = 10;
+    private $itemsPerPage = 10;
 
-  private $lastPage;
+    private $lastPage;
 
-  private $page = 1;
+    private $page = 1;
 
-  public function __construct(Application $app)
-  {
+    public function __construct(Application $app)
+    {
     $this->app = $app;
 
     $this->setCurrentPage();
-  }
+    }
 
-  private function setCurrentPage()
-  {
+    private function setCurrentPage()
+    {
     $page = $this->app->request->get('page');
 
     if (! is_numeric($page) || $page < 1) {
-      $page = 1;
+        $page = 1;
     }
 
     $this->page = $page;
-  }
+    }
 
-  public function page()
-  {
+    public function page()
+    {
     return $this->page;
-  }
+    }
 
-  public function itemsPerPage()
-  {
+    public function itemsPerPage()
+    {
     return $this->itemsPerPage;
-  }
+    }
 
-  public function totalItems()
-  {
+    public function totalItems()
+    {
     return $this->totalItems;
-  }
+    }
 
-  public function last()
-  {
+    public function last()
+    {
     return $this->lastPage;
-  }
+    }
 
-  public function next()
-  {
+    public function next()
+    {
     return $this->page + 1;
-  }
+    }
 
-  public function prev()
-  {
+    public function prev()
+    {
     return $this->page - 1;
-  }
+    }
 
-  public function setTotalItems($totalItems)
-  {
+    public function setTotalItems($totalItems)
+    {
     $this->totalItems = $totalItems;
 
     return $this;
-  }
+    }
 
-  public function setItemsPerPage($itemsPerPage)
-  {
+    public function setItemsPerPage($itemsPerPage)
+    {
     $this->itemsPerPage = $itemsPerPage;
 
     return $this;
-  }
+    }
 
-  public function paginate()
-  {
+    public function paginate()
+    {
     $this->setLastPage();
 
     return $this;
-  }
+    }
 
-  private function setLastPage()
-  {
+    private function setLastPage()
+    {
     $this->lastPage = ceil($this->totalItems / $this->itemsPerPage);
-  }
+    }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
   {
     $page = $this->app->request->get('page');
 
-    if (! is_numeric($page) || $page < 1) {
+    if (!is_numeric($page) || $page < 1) {
       $page = 1;
     }
 

Core/System/Database.php

Indentation +123 added lines, -123 removed lines

@@ -8,92 +8,92 @@ 
 
 class Database
 {
-  private $app;
+    private $app;
 
-  private static $connection;
+    private static $connection;
 
-  private $table;
+    private $table;
 
-  private $rows;
+    private $rows;
 
-  private $lastId;
+    private $lastId;
 
-  private $data = [];
+    private $data = [];
 
-  private $bindings = [];
+    private $bindings = [];
 
-  private $selects = [];
+    private $selects = [];
 
-  private $joins = [];
+    private $joins = [];
 
-  private $wheres = [];
+    private $wheres = [];
 
-  private $havings = [];
+    private $havings = [];
 
-  private $orderBy = [];
+    private $orderBy = [];
 
-  private $limit;
+    private $limit;
 
-  private $offset;
+    private $offset;
 
-  private $groupBy = [];
+    private $groupBy = [];
 
-  public function __construct(Application $app)
-  {
+    public function __construct(Application $app)
+    {
     $this->app = $app;
 
     if (! $this->isConnected()) {
-      $this->connect();
+        $this->connect();
+    }
     }
-  }
 
-  private function  isConnected()
-  {
+    private function  isConnected()
+    {
     return static::$connection instanceof PDO;
-  }
+    }
 
-  private function connect()
-  {
+    private function connect()
+    {
     $data = $this->app->config['db'];
 
     extract($data);
 
     try {
-      static::$connection  = new PDO('mysql:host=' . $server . ';dbname=' . $dbname, $dbuser, $dbpass);
+        static::$connection  = new PDO('mysql:host=' . $server . ';dbname=' . $dbname, $dbuser, $dbpass);
 
-      static::$connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+        static::$connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 
-      static::$connection->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
+        static::$connection->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
 
-      static::$connection->exec('SET NAMES utf8');
+        static::$connection->exec('SET NAMES utf8');
 
     } catch (PDOException $e) {
 
-      throw new Exception($e->getMessage());
+        throw new Exception($e->getMessage());
+    }
     }
-  }
 
-  public function connection()
-  {
+    public function connection()
+    {
     return static::$connection;
-  }
+    }
 
-  public function table($table)
-  {
+    public function table($table)
+    {
     $this->table = $table;
 
     return $this;
-  }
+    }
 
-  public function select(...$select)
-  {
+    public function select(...$select)
+    {
     $this->selects = array_merge($this->selects, $select);
 
     return $this;
-  }
+    }
 
-  public function join($join, $localId = null, $forginId = null)
-  {
+    public function join($join, $localId = null, $forginId = null)
+    {
     if (! $localId)  $localId =  trim($join, 's' ). '_id';
 
     if (! $forginId) $forginId =  'id';
@@ -103,10 +103,10 @@ 
     $this->joins[] = $sql;
 
     return $this;
-  }
+    }
 
-  public function where(...$bindings)
-  {
+    public function where(...$bindings)
+    {
     $sql = array_shift($bindings);
 
     if (is_array($bindings[0])) $bindings = $bindings[0];
@@ -116,10 +116,10 @@ 
     $this->wheres[] = $sql;
 
     return $this;
-  }
+    }
 
-  public function having()
-  {
+    public function having()
+    {
     $bindings = func_get_args();
 
     $sql = array_shift($bindings);
@@ -129,40 +129,40 @@ 
     $this->havings[] = $sql;
 
     return $this;
-  }
+    }
 
-  public function groupBy(...$arguments)
-  {
+    public function groupBy(...$arguments)
+    {
     $this->groupBy = $arguments;
 
     return $this;
-  }
+    }
 
-  public function limit($limit, $offset = 0)
-  {
+    public function limit($limit, $offset = 0)
+    {
     $this->limit = $limit;
 
     $this->offset = $offset;
 
     return $this;
-  }
+    }
 
-  public function rows()
-  {
+    public function rows()
+    {
     return $this->rows;
-  }
+    }
 
-  public function orderBy($orderBy, $sort = 'ASC')
-  {
+    public function orderBy($orderBy, $sort = 'ASC')
+    {
     $this->orderBy = [$orderBy, $sort];
 
     return $this;
-  }
+    }
 
-  public function fetch($table = null)
-  {
+    public function fetch($table = null)
+    {
     if ($table) {
-      $this->table($table);
+        $this->table($table);
     }
 
     $sql = $this->fetchStatment();
@@ -174,12 +174,12 @@ 
     $this->rows = $query->rowCount();
 
     return $result;
-  }
+    }
 
-  public function fetchAll($table = null)
-  {
+    public function fetchAll($table = null)
+    {
     if ($table) {
-      $this->table($table);
+        $this->table($table);
     }
 
     $sql = $this->fetchStatment();
@@ -191,10 +191,10 @@ 
     $this->rows = $query->rowCount();
 
     return $results;
-  }
+    }
 
-  private function fetchStatment()
-  {
+    private function fetchStatment()
+    {
     $sql = 'SELECT ';
 
     $sql .= $this->selects ? implode(', ', $this->selects) : '*';
@@ -203,74 +203,74 @@ 
 
     if ($this->joins) {
 
-      $sql .= 'LEFT JOIN ' . implode(' ', $this->joins);
+        $sql .= 'LEFT JOIN ' . implode(' ', $this->joins);
     }
 
     if ($this->wheres) {
 
-      $sql .= ' WHERE ' . implode(' ', $this->wheres);
+        $sql .= ' WHERE ' . implode(' ', $this->wheres);
     }
 
     if ($this->havings) {
 
-      $sql .= ' HAVING ' . implode(' ', $this->havings) . ' ';
+        $sql .= ' HAVING ' . implode(' ', $this->havings) . ' ';
     }
 
     if ($this->orderBy) {
 
-      $sql .= ' ORDER BY ' . implode (' ', $this->orderBy);
+        $sql .= ' ORDER BY ' . implode (' ', $this->orderBy);
     }
 
     if ($this->limit) {
 
-      $sql .= ' LIMIT ' . $this->limit;
+        $sql .= ' LIMIT ' . $this->limit;
     }
 
     if ($this->offset) {
 
-      $sql .= ' OFFSET ' . $this->offset;
+        $sql .= ' OFFSET ' . $this->offset;
     }
 
     if ($this->groupBy) {
-      $sql .= ' GROUP BY ' . implode(' ' , $this->groupBy);
+        $sql .= ' GROUP BY ' . implode(' ' , $this->groupBy);
     }
 
     return $sql;
-  }
+    }
 
-  public function lastId()
-  {
+    public function lastId()
+    {
     return $this->lastId;
-  }
+    }
 
-  public function from($table)
-  {
+    public function from($table)
+    {
     return $this->table($table);
-  }
+    }
 
-  public function data($key, $value = null)
-  {
+    public function data($key, $value = null)
+    {
     if (is_array($key)) {
 
-      $this->data = array_merge($this->data, $key);
+        $this->data = array_merge($this->data, $key);
 
-      $this->addToBindings($key);
+        $this->addToBindings($key);
 
     } else {
 
-      $this->data[$key] = $value;
+        $this->data[$key] = $value;
 
-      $this->addToBindings($value);
+        $this->addToBindings($value);
 
     }
 
     return $this;
-  }
+    }
 
-  public function insert($table = null)
-  {
+    public function insert($table = null)
+    {
     if ($table) {
-      $this->table($table);
+        $this->table($table);
     }
 
     $sql = 'INSERT INTO ' . $this->table . ' SET ';
@@ -282,12 +282,12 @@ 
     $this->lastId = $this->connection()->lastInsertId();
 
     return $this;
-  }
+    }
 
-  public function update($table = null)
-  {
+    public function update($table = null)
+    {
     if ($table) {
-      $this->table($table);
+        $this->table($table);
     }
 
     $sql = 'UPDATE ' . $this->table . ' SET ';
@@ -295,69 +295,69 @@ 
     $sql .= $this->setField();
 
     if ($this->wheres) {
-      $sql .= ' WHERE ' . implode('', $this->wheres);
+        $sql .= ' WHERE ' . implode('', $this->wheres);
     }
 
     $this->query($sql, $this->bindings);
 
     return $this;
-  }
+    }
 
-  public function delete($table = null)
-  {
+    public function delete($table = null)
+    {
     if ($table) {
-      $this->table($table);
+        $this->table($table);
     }
 
     $sql = 'DELETE FROM ' . $this->table . ' ';
 
     if ($this->wheres) {
-      $sql .= ' WHERE ' . implode('', $this->wheres);
+        $sql .= ' WHERE ' . implode('', $this->wheres);
     }
 
     $this->query($sql, $this->bindings);
 
     return $this;
-  }
+    }
 
-  private function setField()
-  {
+    private function setField()
+    {
     $sql = '';
 
     foreach($this->data as $key => $value) {
 
-      $sql .= '`' . $key . '` = ? ,';
+        $sql .= '`' . $key . '` = ? ,';
     }
 
     $sql = rtrim($sql, ' ,');
 
     return $sql;
-  }
+    }
 
-  private function addToBindings($value)
-  {
+    private function addToBindings($value)
+    {
     if (is_array($value)) {
 
-      $this->bindings = array_merge($this->bindings, array_values($value));
+        $this->bindings = array_merge($this->bindings, array_values($value));
     } else {
 
-      $this->bindings[] = $value;
+        $this->bindings[] = $value;
+    }
     }
-  }
 
-  public function query(...$bindings)
-  {
+    public function query(...$bindings)
+    {
     $sql = array_shift($bindings);
 
     if (count($bindings) == 1 AND is_array($bindings[0])) {
-      $bindings = $bindings[0];
+        $bindings = $bindings[0];
     }
 
     try {
         $query = $this->connection()->prepare($sql);
 
         foreach ($bindings as $key => $value) {
-          $query->bindValue($key + 1, _e($value));
+            $query->bindValue($key + 1, _e($value));
         }
 
         $query->execute();
@@ -368,12 +368,12 @@ 
 
     } catch (PDOException $e) {
 
-      throw new Exception($e->getMessage());
+        throw new Exception($e->getMessage());
+    }
     }
-  }
 
-  private function reset()
-  {
+    private function reset()
+    {
     $this->table = null;
 
     $this->rows = 0;
@@ -397,5 +397,5 @@ 
     $this->offset = 0;
 
     $this->groupBy = [];
-  }
+    }
 }
\ No newline at end of file