refatalsakka / framework

App/Models/UsersGroupsModel.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
       $userGroup->pages = [];
 
-      foreach($userGroupInfos as $userGroupInfo) {
+      foreach ($userGroupInfos as $userGroupInfo) {
 
         $userGroup->pages[] = $userGroupInfo->page;
       }

Indentation +13 added lines, -13 removed lines

@@ -6,24 +6,24 @@
 
 class UsersGroupsModel extends Model
 {
-  protected $table = 'users_groups';
+	protected $table = 'users_groups';
 
-  public function get($id)
-  {
-    $userGroup = parent::get($id);
+	public function get($id)
+	{
+		$userGroup = parent::get($id);
 
-    if ($userGroup) {
+		if ($userGroup) {
 
-      $userGroupInfos = $this->hasMany('UsersGroupPermissionsModel', $id);
+			$userGroupInfos = $this->hasMany('UsersGroupPermissionsModel', $id);
 
-      $userGroup->pages = [];
+			$userGroup->pages = [];
 
-      foreach($userGroupInfos as $userGroupInfo) {
+			foreach($userGroupInfos as $userGroupInfo) {
 
-        $userGroup->pages[] = $userGroupInfo->page;
-      }
+				$userGroup->pages[] = $userGroupInfo->page;
+			}
 
-      return $userGroup;
-    }
-  }
+			return $userGroup;
+		}
+	}
 }
\ No newline at end of file

App/Models/SettingsModel.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
   public function loadAll()
   {
-    foreach($this->all() as $setting) {
+    foreach ($this->all() as $setting) {
 
       $this->settings[$setting->key] = $setting->value;
     }

Indentation +15 added lines, -15 removed lines

@@ -6,25 +6,25 @@
 
 class SettingsModel extends Model
 {
-  protected $table = 'settings';
+	protected $table = 'settings';
 
-  private $settings;
+	private $settings;
 
-  public function loadAll()
-  {
-    foreach($this->all() as $setting) {
+	public function loadAll()
+	{
+		foreach($this->all() as $setting) {
 
-      $this->settings[$setting->key] = $setting->value;
-    }
-  }
+			$this->settings[$setting->key] = $setting->value;
+		}
+	}
 
-  public function get($key)
-  {
-    return array_get($this->settings, $key);
-  }
+	public function get($key)
+	{
+		return array_get($this->settings, $key);
+	}
 
-  public function updateSettings()
-  {
+	public function updateSettings()
+	{
 
-  }
+	}
 }
\ No newline at end of file

routes/admin/index.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
   'middleware' => ['admin']
 ];
 
-$app->route->group($adminOptions, function ($route) {
+$app->route->group($adminOptions, function($route) {
 
   $route->add('/', 'Home');
 

Indentation +12 added lines, -12 removed lines

@@ -3,23 +3,23 @@
 $app = app();
 
 $adminOptions = [
-  'prefix' => '/admin',
-  'controller' => 'Admin',
-  'middleware' => ['admin']
+	'prefix' => '/admin',
+	'controller' => 'Admin',
+	'middleware' => ['admin']
 ];
 
 $app->route->group($adminOptions, function ($route) {
 
-  $route->add('/', 'Home');
+	$route->add('/', 'Home');
 
-  //Login
-  $route->add('/login', 'Login');
-  $route->add('/submit', 'Login@submit', 'POST');
-  $route->add('/logout', 'Logout');
+	//Login
+	$route->add('/login', 'Login');
+	$route->add('/submit', 'Login@submit', 'POST');
+	$route->add('/logout', 'Logout');
 
-  //Profile
-  $route->add('/profile', 'Profile', 'GET');
+	//Profile
+	$route->add('/profile', 'Profile', 'GET');
 
-  //Settings
-  $route->add('/settings', 'Settings');
+	//Settings
+	$route->add('/settings', 'Settings');
 });
\ No newline at end of file

Core/System/Application.php

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
 
   public function get($key)
   {
-    if (! $this->isSharing($key)) {
+    if (!$this->isSharing($key)) {
 
       if ($this->isCoreAlias($key)) {
 

Indentation +76 added lines, -76 removed lines

@@ -11,117 +11,117 @@
 
 class Application
 {
-  private $container = [];
+	private $container = [];
 
-  private static $instance;
+	private static $instance;
 
-  public function __construct(File $file)
-  {
-    $this->handleErrors();
+	public function __construct(File $file)
+	{
+		$this->handleErrors();
 
-    $this->share('file', $file);
+		$this->share('file', $file);
 
-    $this->share('config', $this->file->call($this->file->to('config', '.php')));
+		$this->share('config', $this->file->call($this->file->to('config', '.php')));
 
-    $this->share('alias', $this->file->call($this->file->to('config/alias', '.php')));
+		$this->share('alias', $this->file->call($this->file->to('config/alias', '.php')));
 
-    $this->loadHelpers();
-  }
+		$this->loadHelpers();
+	}
 
-  private function handleErrors() {
+	private function handleErrors() {
 
-    $run = new Whoops();
+		$run = new Whoops();
 
-    $run->prependHandler(new PrettyPageHandler());
+		$run->prependHandler(new PrettyPageHandler());
 
-    if (WhoopsMisc::isAjaxRequest()) {
+		if (WhoopsMisc::isAjaxRequest()) {
 
-      $jsonHandler = new JsonResponseHandler();
+			$jsonHandler = new JsonResponseHandler();
 
-      $jsonHandler->setJsonApi(true);
+			$jsonHandler->setJsonApi(true);
 
-      $run->prependHandler($jsonHandler);
-    }
+			$run->prependHandler($jsonHandler);
+		}
 
-    $run->register();
-  }
+		$run->register();
+	}
 
-  public static function getInstance($file = null)
-  {
-    return static::$instance = is_null(static::$instance) ? new static($file) : static::$instance;
-  }
+	public static function getInstance($file = null)
+	{
+		return static::$instance = is_null(static::$instance) ? new static($file) : static::$instance;
+	}
 
-  public function run()
-  {
-    $this->session->start();
+	public function run()
+	{
+		$this->session->start();
 
-    $this->request->prepareUrl();
+		$this->request->prepareUrl();
 
-    $this->file->call($this->file->to('config/constant.php'));
+		$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();
+		$output = $this->route->getProperRoute();
 
-    $this->response->setOutput($output);
+		$this->response->setOutput($output);
 
-    $this->response->send();
-  }
+		$this->response->send();
+	}
 
-  private function loadHelpers()
-  {
-    $helpers = $this->file->to('Core/helpers', '.php');
+	private function loadHelpers()
+	{
+		$helpers = $this->file->to('Core/helpers', '.php');
 
-    $this->file->call($helpers);
-  }
+		$this->file->call($helpers);
+	}
 
-  public function coreClasses()
-  {
-    return $this->alias['classes'];
-  }
+	public function coreClasses()
+	{
+		return $this->alias['classes'];
+	}
 
-  public function share($key, $value)
-  {
-    if ($value instanceof Closure) $value = call_user_func($value, $this);
+	public function share($key, $value)
+	{
+		if ($value instanceof Closure) $value = call_user_func($value, $this);
 
-    $this->container[$key] = $value;
-  }
+		$this->container[$key] = $value;
+	}
 
-  public function get($key)
-  {
-    if (! $this->isSharing($key)) {
+	public function get($key)
+	{
+		if (! $this->isSharing($key)) {
 
-      if ($this->isCoreAlias($key)) {
+			if ($this->isCoreAlias($key)) {
 
-        $this->share($key, $this->createObject($key));
+				$this->share($key, $this->createObject($key));
 
-      } else {
+			} else {
 
-        throw new Exception("$key is not found");
-      }
-    }
-    return $this->container[$key];
-  }
+				throw new Exception("$key is not found");
+			}
+		}
+		return $this->container[$key];
+	}
 
-  public function isSharing($key)
-  {
-    return isset($this->container[$key]);
-  }
+	public function isSharing($key)
+	{
+		return isset($this->container[$key]);
+	}
 
-  public function isCoreAlias($key)
-  {
-    return isset($this->coreClasses()[$key]);
-  }
+	public function isCoreAlias($key)
+	{
+		return isset($this->coreClasses()[$key]);
+	}
 
-  public function createObject($key)
-  {
-    $object = $this->coreClasses()[$key];
+	public function createObject($key)
+	{
+		$object = $this->coreClasses()[$key];
 
-    return new $object($this);
-  }
+		return new $object($this);
+	}
 
-  public function __get($key)
-  {
-    return $this->get($key);
-  }
+	public function __get($key)
+	{
+		return $this->get($key);
+	}
 }
\ No newline at end of file

Braces +6 added lines, -2 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();
 
@@ -82,7 +84,9 @@ 
 
   public function share($key, $value)
   {
-    if ($value instanceof Closure) $value = call_user_func($value, $this);
+    if ($value instanceof Closure) {
+    	$value = call_user_func($value, $this);
+    }
 
     $this->container[$key] = $value;
   }

Core/System/Http/Response.php

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);
     }

Indentation +40 added lines, -40 removed lines

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

Core/System/Paginatio.php

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;
     }
 

Indentation +61 added lines, -61 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)
-  {
-    $this->app = $app;
+	public function __construct(Application $app)
+	{
+		$this->app = $app;
 
-    $this->setCurrentPage();
-  }
+		$this->setCurrentPage();
+	}
 
-  private function setCurrentPage()
-  {
-    $page = $this->app->request->get('page');
+	private function setCurrentPage()
+	{
+		$page = $this->app->request->get('page');
 
-    if (! is_numeric($page) || $page < 1) {
-      $page = 1;
-    }
+		if (! is_numeric($page) || $page < 1) {
+			$page = 1;
+		}
 
-    $this->page = $page;
-  }
+		$this->page = $page;
+	}
 
-  public function page()
-  {
-    return $this->page;
-  }
+	public function page()
+	{
+		return $this->page;
+	}
 
-  public function itemsPerPage()
-  {
-    return $this->itemsPerPage;
-  }
+	public function itemsPerPage()
+	{
+		return $this->itemsPerPage;
+	}
 
-  public function totalItems()
-  {
-    return $this->totalItems;
-  }
+	public function totalItems()
+	{
+		return $this->totalItems;
+	}
 
-  public function last()
-  {
-    return $this->lastPage;
-  }
+	public function last()
+	{
+		return $this->lastPage;
+	}
 
-  public function next()
-  {
-    return $this->page + 1;
-  }
+	public function next()
+	{
+		return $this->page + 1;
+	}
 
-  public function prev()
-  {
-    return $this->page - 1;
-  }
+	public function prev()
+	{
+		return $this->page - 1;
+	}
 
-  public function setTotalItems($totalItems)
-  {
-    $this->totalItems = $totalItems;
+	public function setTotalItems($totalItems)
+	{
+		$this->totalItems = $totalItems;
 
-    return $this;
-  }
+		return $this;
+	}
 
-  public function setItemsPerPage($itemsPerPage)
-  {
-    $this->itemsPerPage = $itemsPerPage;
+	public function setItemsPerPage($itemsPerPage)
+	{
+		$this->itemsPerPage = $itemsPerPage;
 
-    return $this;
-  }
+		return $this;
+	}
 
-  public function paginate()
-  {
-    $this->setLastPage();
+	public function paginate()
+	{
+		$this->setLastPage();
 
-    return $this;
-  }
+		return $this;
+	}
 
-  private function setLastPage()
-  {
-    $this->lastPage = ceil($this->totalItems / $this->itemsPerPage);
-  }
+	private function setLastPage()
+	{
+		$this->lastPage = ceil($this->totalItems / $this->itemsPerPage);
+	}
 }
\ No newline at end of file

App/Middleware/Admin/RedirectMiddleware.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
   public function handle(Application $app, $next)
   {
 
-    if (! $this->session->has('error') || $this->session->get('error') != true) {
+    if (!$this->session->has('error') || $this->session->get('error') != true) {
 
       $this->url->redirectTo('/');
 

Indentation +8 added lines, -8 removed lines

@@ -7,16 +7,16 @@
 
 class RedirectMiddleware implements Middleware
 {
-  public function handle(Application $app, $next)
-  {
+	public function handle(Application $app, $next)
+	{
 
-    if (! $this->session->has('error') || $this->session->get('error') != true) {
+		if (! $this->session->has('error') || $this->session->get('error') != true) {
 
-      $this->url->redirectTo('/');
+			$this->url->redirectTo('/');
 
-    } else {
+		} else {
 
-      $this->session->remove('error');
-    }
-  }
+			$this->session->remove('error');
+		}
+	}
 }
\ No newline at end of file

Core/System/Http/Request.php

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;
     }
 

Indentation +94 added lines, -94 removed lines

@@ -6,136 +6,136 @@
 
 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()
-  {
-    $script = dirname($this->server('SCRIPT_NAME'));
+	public function prepareUrl()
+	{
+		$script = dirname($this->server('SCRIPT_NAME'));
 
-    $requestUri = $this->server('REQUEST_URI');
+		$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, ['/', '\\'])) {
+		if (! in_array($script, ['/', '\\'])) {
 
-      $this->url = preg_replace('#^' . $script . '#', '', $requestUri);
-    } else {
+			$this->url = preg_replace('#^' . $script . '#', '', $requestUri);
+		} else {
 
-      $this->url = $requestUri;
-    }
+			$this->url = $requestUri;
+		}
 
-    if ($this->url !== '/') $this->url = rtrim($this->url, '/');
+		if ($this->url !== '/') $this->url = rtrim($this->url, '/');
 
-    $isSecure = false;
+		$isSecure = false;
 
-    if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
+		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;
-    }
+		}
+		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;
+		}
 
-    $REQUEST_PROTOCOL = $isSecure ? 'https' : 'http';
+		$REQUEST_PROTOCOL = $isSecure ? 'https' : 'http';
 
-    $this->link = $REQUEST_PROTOCOL . '://' . $this->server('HTTP_HOST');
+		$this->link = $REQUEST_PROTOCOL . '://' . $this->server('HTTP_HOST');
 
-    $this->baseUrl = $this->link . $requestUri;
-  }
+		$this->baseUrl = $this->link . $requestUri;
+	}
 
-  public function get($key)
-  {
-    $value = array_get($_GET, $key);
+	public function get($key)
+	{
+		$value = array_get($_GET, $key);
 
-    if (is_array($value)) {
-      $value = array_filter($value);
-    } else {
-      $value = trim($value);
-    }
+		if (is_array($value)) {
+			$value = array_filter($value);
+		} else {
+			$value = trim($value);
+		}
 
-    return $value;
-  }
+		return $value;
+	}
 
-  public function post($key)
-  {
-    $value = array_get($_POST, $key);
+	public function post($key)
+	{
+		$value = array_get($_POST, $key);
 
-    if (is_array($value)) {
-      $value = array_filter($value);
-    } else {
-      $value = trim($value);
-    }
+		if (is_array($value)) {
+			$value = array_filter($value);
+		} else {
+			$value = trim($value);
+		}
 
-    return $value;
-  }
+		return $value;
+	}
 
-  public function setPost($key, $value)
-  {
-    $_POST[$key] = $value;
-  }
+	public function setPost($key, $value)
+	{
+		$_POST[$key] = $value;
+	}
 
-  public function posts()
-  {
-    return $_POST;
-  }
+	public function posts()
+	{
+		return $_POST;
+	}
 
-  public function files()
-  {
-    return $_FILES;
-  }
+	public function files()
+	{
+		return $_FILES;
+	}
 
-  public function file($input)
-  {
-    if (isset($this->files[$input])) return $this->files[$input];
+	public function file($input)
+	{
+		if (isset($this->files[$input])) return $this->files[$input];
 
-    $upoadedFile = new UploadeFile($this->app, $input);
+		$upoadedFile = new UploadeFile($this->app, $input);
 
-    $this->files[$input] = $upoadedFile;
+		$this->files[$input] = $upoadedFile;
 
-    return $this->files[$input];
-  }
+		return $this->files[$input];
+	}
 
-  public function server($key)
-  {
-    return array_get($_SERVER, $key);
-  }
+	public function server($key)
+	{
+		return array_get($_SERVER, $key);
+	}
 
-  public function method()
-  {
-    return $this->server('REQUEST_METHOD');
-  }
+	public function method()
+	{
+		return $this->server('REQUEST_METHOD');
+	}
 
-  public function referer()
-  {
-    return $this->server('HTTP_REFERER');
-  }
+	public function referer()
+	{
+		return $this->server('HTTP_REFERER');
+	}
 
-  public function baseUrl()
-  {
-    return $this->baseUrl;
-  }
+	public function baseUrl()
+	{
+		return $this->baseUrl;
+	}
 
-  public function url()
-  {
-    return $this->url;
-  }
+	public function url()
+	{
+		return $this->url;
+	}
 
-  public function link()
-  {
-    return $this->link;
-  }
+	public function link()
+	{
+		return $this->link;
+	}
 }
\ No newline at end of file

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);
 

Core/System/Database.php

Spacing +7 added lines, -7 removed lines

@@ -42,7 +42,7 @@ 
   {
     $this->app = $app;
 
-    if (! $this->isConnected()) {
+    if (!$this->isConnected()) {
       $this->connect();
     }
   }
@@ -59,7 +59,7 @@ 
     extract($data);
 
     try {
-      self::$connection  = new PDO('mysql:host=' . $server . ';dbname=' . $dbname, $dbuser, $dbpass);
+      self::$connection = new PDO('mysql:host=' . $server . ';dbname=' . $dbname, $dbuser, $dbpass);
 
       self::$connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 
@@ -94,9 +94,9 @@ 
 
   public function join($join, $localId = null, $forginId = null)
   {
-    if (! $localId)  $localId =  trim($join, 's' ). '_id';
+    if (!$localId)  $localId = trim($join, 's') . '_id';
 
-    if (! $forginId) $forginId =  'id';
+    if (!$forginId) $forginId = 'id';
 
     $sql = $join . ' ON ' . $this->table . '.' . $localId . ' = ' . $join . '.' . $forginId;
 
@@ -218,7 +218,7 @@ 
 
     if (!empty($this->orderBy)) {
 
-      $sql .= ' ORDER BY ' . implode (' ', $this->orderBy);
+      $sql .= ' ORDER BY ' . implode(' ', $this->orderBy);
     }
 
     if ($this->limit) {
@@ -232,7 +232,7 @@ 
     }
 
     if (!empty($this->groupBy)) {
-      $sql .= ' GROUP BY ' . implode(' ' , $this->groupBy);
+      $sql .= ' GROUP BY ' . implode(' ', $this->groupBy);
     }
 
     return $sql;
@@ -324,7 +324,7 @@ 
   {
     $sql = '';
 
-    foreach($this->data as $key => $value) {
+    foreach ($this->data as $key => $value) {
 
       $sql .= '`' . $key . '` = ? ,';
     }

Indentation +252 added lines, -252 removed lines

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

Braces +9 added lines, -3 removed lines

@@ -94,9 +94,13 @@ 
 
   public function join($join, $localId = null, $forginId = null)
   {
-    if (! $localId)  $localId =  trim($join, 's' ). '_id';
+    if (! $localId) {
+    	$localId =  trim($join, 's' ). '_id';
+    }
 
-    if (! $forginId) $forginId =  'id';
+    if (! $forginId) {
+    	$forginId =  'id';
+    }
 
     $sql = $join . ' ON ' . $this->table . '.' . $localId . ' = ' . $join . '.' . $forginId;
 
@@ -109,7 +113,9 @@ 
   {
     $sql = array_shift($bindings);
 
-    if (is_array($bindings[0])) $bindings = $bindings[0];
+    if (is_array($bindings[0])) {
+    	$bindings = $bindings[0];
+    }
 
     $this->addToBindings($bindings);