refatalsakka / framework

Core/System/Model.php

Indentation +41 added lines, -41 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');
@@ -118,5 +118,5 @@ 
     }
 
     return $this->db->select()->from($table)->join($join, $localId, $forginId)->limit($limit)->fetchAll();
-  }
+    }
 }
\ No newline at end of file

Spacing +10 added lines, -10 removed lines

@@ -35,12 +35,12 @@ 
 
   public function get($value, $coulmn = 'id')
   {
-    return $this->where($coulmn . ' = ?' , $value)->fetch($this->table);
+    return $this->where($coulmn . ' = ?', $value)->fetch($this->table);
   }
 
   public function getEnable($value, $coulmn = 'id')
   {
-    return $this->where($coulmn . ' = ? AND enable = ?' , [$value, 1])->fetch($this->table);
+    return $this->where($coulmn . ' = ? AND enable = ?', [$value, 1])->fetch($this->table);
   }
 
   public function selectTable($coulmn)
@@ -50,23 +50,23 @@ 
 
   public function exists($value, $key = 'id')
   {
-    return (bool) $this->select($key)->where($key .'=?' , $value)->fetch($this->table);
+    return (bool) $this->select($key)->where($key . '=?', $value)->fetch($this->table);
   }
 
   public function delete($id)
   {
-    return $this->where('id = ?' , $id)->delete($this->table);
+    return $this->where('id = ?', $id)->delete($this->table);
   }
 
   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');
+    $file = $this->app->file->to('App/Models/' . $join . 'Model', '.php');
 
     $exists = $this->app->file->exists($file);
 
-    if (! $exists) return $join . ' Not Found';
+    if (!$exists) return $join . ' Not Found';
 
     $trace = debug_backtrace();
 
@@ -81,11 +81,11 @@ 
   {
     $join = rtrim($join, 'Model');
 
-    $file = $this->app->file->to( 'App/Models/' . $join . 'Model', '.php');
+    $file = $this->app->file->to('App/Models/' . $join . 'Model', '.php');
 
     $exists = $this->app->file->exists($file);
 
-    if (! $exists) return $join . ' Not Found';
+    if (!$exists) return $join . ' Not Found';
 
     $trace = debug_backtrace();
 
@@ -100,11 +100,11 @@ 
   {
     $join = rtrim($join, 'Model');
 
-    $file = $this->app->file->to( 'App/Models/' . $join . 'Model', '.php');
+    $file = $this->app->file->to('App/Models/' . $join . 'Model', '.php');
 
     $exists = $this->app->file->exists($file);
 
-    if (! $exists) return $join . ' Not Found';
+    if (!$exists) return $join . ' Not Found';
 
     $trace = debug_backtrace();
 

Braces +9 added lines, -3 removed lines

@@ -66,7 +66,9 @@ 
 
     $exists = $this->app->file->exists($file);
 
-    if (! $exists) return $join . ' Not Found';
+    if (! $exists) {
+        return $join . ' Not Found';
+    }
 
     $trace = debug_backtrace();
 
@@ -85,7 +87,9 @@ 
 
     $exists = $this->app->file->exists($file);
 
-    if (! $exists) return $join . ' Not Found';
+    if (! $exists) {
+        return $join . ' Not Found';
+    }
 
     $trace = debug_backtrace();
 
@@ -104,7 +108,9 @@ 
 
     $exists = $this->app->file->exists($file);
 
-    if (! $exists) return $join . ' Not Found';
+    if (! $exists) {
+        return $join . ' Not Found';
+    }
 
     $trace = debug_backtrace();
 

Core/System/File.php

Indentation +32 added lines, -32 removed lines

@@ -6,59 +6,59 @@
 
 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)
-  {
-      return file_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;
+        return require $file;
 
     } else {
 
-      throw new Exception("$file is not found");
+        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/Loader.php

Indentation +42 added lines, -42 removed lines

@@ -6,56 +6,56 @@ 
 
 class Loader
 {
-  private $app;
+    private $app;
 
-  private $controllers = [];
+    private $controllers = [];
 
-  private $models = [];
+    private $models = [];
 
-  private $middlewares = [];
+    private $middlewares = [];
 
-  public function __construct(Application $app)
-  {
+    public function __construct(Application $app)
+    {
     $this->app = $app;
-  }
+    }
 
-  public function action($controller, $method, array $arguments)
-  {
+    public function action($controller, $method, array $arguments)
+    {
     $object = $this->controller($controller);
 
     return call_user_func([$object, $method], $arguments);
-  }
+    }
 
-  public function controller($controller)
-  {
+    public function controller($controller)
+    {
     $controller = $this->getControllerName($controller);
 
     if (! $this->hasController($controller)) {
-      $this->addController($controller);
+        $this->addController($controller);
     }
 
     return $this->getController($controller);
-  }
+    }
 
-  private function hasController($controller)
-  {
+    private function hasController($controller)
+    {
     return array_key_exists($controller, $this->controllers);
-  }
+    }
 
-  private function addController($controller)
-  {
+    private function addController($controller)
+    {
     $object = new $controller($this->app);
 
     $this->controllers[$controller] = $object;
-  }
+    }
 
-  private function getController($controller)
-  {
+    private function getController($controller)
+    {
     return $this->controllers[$controller];
-  }
+    }
 
-  private function getControllerName($controller)
-  {
+    private function getControllerName($controller)
+    {
     $controller .= strpos($controller, 'Controller') ? '' : 'Controller';
 
     $controller = str_replace('/', DS, $controller);
@@ -63,38 +63,38 @@ 
     $controller = 'App' . DS .'Controllers' . DS . $controller;
 
     return $controller;
-  }
+    }
 
-  public function model($model)
-  {
+    public function model($model)
+    {
     $model = $this->getModelName($model);
 
     if (! $this->hasModel($model)) {
-      $this->addModel($model);
+        $this->addModel($model);
     }
 
     return $this->getModel($model);
-  }
+    }
 
-  private function hasModel($model)
-  {
+    private function hasModel($model)
+    {
     return array_key_exists($model, $this->models);
-  }
+    }
 
-  private function addModel($model)
-  {
+    private function addModel($model)
+    {
     $object = new $model($this->app);
 
     $this->models[$model] = $object;
-  }
+    }
 
-  private function getModel($model)
-  {
+    private function getModel($model)
+    {
     return $this->models[$model];
-  }
+    }
 
-  private function getModelName($model)
-  {
+    private function getModelName($model)
+    {
     $model .= strpos($model, 'Model') ? '' : 'Model';
 
     $model = str_replace('/', DS, $model);
@@ -102,5 +102,5 @@ 
     $model = 'App' . DS . 'Models' . DS . $model;
 
     return $model;
-  }
+    }
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -30,7 +30,7 @@ 
   {
     $controller = $this->getControllerName($controller);
 
-    if (! $this->hasController($controller)) {
+    if (!$this->hasController($controller)) {
       $this->addController($controller);
     }
 
@@ -60,7 +60,7 @@ 
 
     $controller = str_replace('/', DS, $controller);
 
-    $controller = 'App' . DS .'Controllers' . DS . $controller;
+    $controller = 'App' . DS . 'Controllers' . DS . $controller;
 
     return $controller;
   }
@@ -69,7 +69,7 @@ 
   {
     $model = $this->getModelName($model);
 
-    if (! $this->hasModel($model)) {
+    if (!$this->hasModel($model)) {
       $this->addModel($model);
     }
 

Core/System/Application.php

Indentation +37 added lines, -37 removed lines

@@ -11,12 +11,12 @@ 
 
 class Application
 {
-  private $container = [];
+    private $container = [];
 
-  private static $instance;
+    private static $instance;
 
-  public function __construct(File $file)
-  {
+    public function __construct(File $file)
+    {
     $this->handleErrors();
 
     $this->share('file', $file);
@@ -26,9 +26,9 @@ 
     $this->share('alias', $this->file->call($this->file->to('config/alias', '.php')));
 
     $this->loadHelpers();
-  }
+    }
 
-  private function handleErrors() {
+    private function handleErrors() {
 
     $run = new Whoops();
 
@@ -44,15 +44,15 @@ 
     }
 
     $run->register();
-  }
+    }
 
-  public static function getInstance($file = null)
-  {
+    public static function getInstance($file = null)
+    {
     return static::$instance = is_null(static::$instance) ? new static($file) : static::$instance;
-  }
+    }
 
-  public function run()
-  {
+    public function run()
+    {
     $this->session->start();
 
     $this->request->prepareUrl();
@@ -66,32 +66,32 @@ 
     $this->response->setOutput($output);
 
     $this->response->send();
-  }
+    }
 
-  private function loadHelpers()
-  {
+    private function loadHelpers()
+    {
     $helpers = $this->file->to('Core/helpers', '.php');
 
     $this->file->call($helpers);
-  }
+    }
 
-  public function coreClasses()
-  {
+    public function coreClasses()
+    {
     return $this->alias['classes'];
-  }
+    }
 
-  public function share($key, $value)
-  {
+    public function share($key, $value)
+    {
     if ($value instanceof Closure) {
 
         $value = call_user_func($value, $this);
     }
 
     $this->container[$key] = $value;
-  }
+    }
 
-  public function get($key)
-  {
+    public function get($key)
+    {
     if (! $this->isSharing($key)) {
         if ($this->isCoreAlias($key)) {
 
@@ -103,27 +103,27 @@ 
         }
     }
     return $this->container[$key];
-  }
+    }
 
-  public function isSharing($key)
-  {
+    public function isSharing($key)
+    {
     return isset($this->container[$key]);
-  }
+    }
 
-  public function isCoreAlias($key)
-  {
+    public function isCoreAlias($key)
+    {
     return isset($this->coreClasses()[$key]);
-  }
+    }
 
-  public function createObject($key)
-  {
+    public function createObject($key)
+    {
     $object = $this->coreClasses()[$key];
 
     return new $object($this);
-  }
+    }
 
-  public function __get($key)
-  {
+    public function __get($key)
+    {
     return $this->get($key);
-  }
+    }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
 
   public function get($key)
   {
-    if (! $this->isSharing($key)) {
+    if (!$this->isSharing($key)) {
         if ($this->isCoreAlias($key)) {
 
             $this->share($key, $this->createObject($key));

Braces +3 added lines, -1 removed lines

@@ -59,7 +59,9 @@
 
     $this->file->call($this->file->to('config/constant.php'));
 
-    foreach (glob("routes/*.php") AS $route) $this->file->call($this->file->to($route));
+    foreach (glob("routes/*.php") AS $route) {
+        $this->file->call($this->file->to($route));
+    }
 
     $output = $this->route->getProperRoute();
 

Core/System/Route.php

Indentation +67 added lines, -67 removed lines

@@ -6,53 +6,53 @@ 
 
 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 = [
@@ -66,10 +66,10 @@ 
     $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,17 +167,17 @@ 
     $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;
@@ -186,23 +186,23 @@ 
 
         if (count($method) == 1) {
 
-          $method = $method[0];
+            $method = $method[0];
 
         } 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 {
 
-          return false;
+            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

Spacing +3 added lines, -3 removed lines

@@ -121,7 +121,7 @@ 
 
   public function getProperRoute()
   {
-    foreach($this->routes as $route) {
+    foreach ($this->routes as $route) {
 
         if ($this->isMatching($route['pattern']) && $this->isMatchingRequestMethod($route['method'])) {
 
@@ -133,7 +133,7 @@ 
 
             if (is_array($route['middleware'])) {
 
-              foreach($route['middleware'] as $middleware) {
+              foreach ($route['middleware'] as $middleware) {
 
                 $output = $this->middleware($middleware);
 
@@ -225,7 +225,7 @@ 
 
     $middlewareClass = $middlewares[$middleware];
 
-    if (! in_array($middlewareInterface, class_implements($middlewareClass))) {
+    if (!in_array($middlewareInterface, class_implements($middlewareClass))) {
       throw new Exception("$middlewareClass not Implement");
     }
 

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/PugView.php

Indentation +8 added lines, -8 removed lines

@@ -6,15 +6,15 @@ 
 
 class PugView
 {
-  private $app;
+    private $app;
 
-  public function __construct(Application $app)
-  {
-      $this->app = $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(
@@ -49,5 +49,5 @@ 
     ];
 
     return $pug->render($file, $context);
-  }
+    }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 
     //File Path
     $file = str_replace('/', DS, $path);
-    $file = $dir . DS . 'template' . DS  . $file . '.pug';
+    $file = $dir . DS . 'template' . DS . $file . '.pug';
 
     //Css Path
     $css = $this->app->file->css();

Core/System/Paginatio.php

Indentation +41 added lines, -41 removed lines

@@ -4,25 +4,25 @@ 
 
 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) {
@@ -30,61 +30,61 @@ 
     }
 
     $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/Controller.php

Indentation +9 added lines, -9 removed lines

@@ -4,15 +4,15 @@
 
 abstract class Controller
 {
-  protected $app;
+    protected $app;
 
-  public function __construct(Application $app)
-  {
-      $this->app = $app;
-  }
+    public function __construct(Application $app)
+    {
+        $this->app = $app;
+    }
 
-  public function __get($key)
-  {
-      return $this->app->get($key);
-  }
+    public function __get($key)
+    {
+        return $this->app->get($key);
+    }
 }
\ No newline at end of file

Core/System/Http/Request.php

Indentation +56 added lines, -56 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)
-  {
-      $this->app = $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

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
 
     if (strpos($requestUri, '?')) list($requestUri, $queryString) = explode('?', $requestUri);
 
-    if (! in_array($script, ['/', '\\'])) {
+    if (!in_array($script, ['/', '\\'])) {
 
       $this->url = preg_replace('#^' . $script . '#', '', $requestUri);
     } else {
@@ -46,7 +46,7 @@ 
       $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') {
+    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;
     }
 

Braces +10 added lines, -5 removed lines

@@ -27,7 +27,9 @@ 
 
     $requestUri = $this->server('REQUEST_URI');
 
-    if (strpos($requestUri, '?')) list($requestUri, $queryString) = explode('?', $requestUri);
+    if (strpos($requestUri, '?')) {
+        list($requestUri, $queryString) = explode('?', $requestUri);
+    }
 
     if (! in_array($script, ['/', '\\'])) {
 
@@ -37,7 +39,9 @@ 
       $this->url = $requestUri;
     }
 
-    if ($this->url !== '/') $this->url = rtrim($this->url, '/');
+    if ($this->url !== '/') {
+        $this->url = rtrim($this->url, '/');
+    }
 
     $isSecure = false;
 
@@ -45,8 +49,7 @@ 
 
       $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') {
+    } 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;
     }
 
@@ -100,7 +103,9 @@ 
 
   public function file($input)
   {
-    if (isset($this->files[$input])) return $this->files[$input];
+    if (isset($this->files[$input])) {
+        return $this->files[$input];
+    }
 
     $upoadedFile = new UploadeFile($this->app, $input);