refatalsakka / framework

routes/admin/index.php

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

Indentation +142 added lines, -142 removed lines

@@ -4,211 +4,211 @@
 
 class Validation
 {
-  private $app;
+	private $app;
 
-  private $input;
+	private $input;
 
-  private $errors = [];
+	private $errors = [];
 
-  public function __construct(Application $app)
-  {
-    $this->app = $app;
-  }
+	public function __construct(Application $app)
+	{
+		$this->app = $app;
+	}
 
-  public function input($input)
-  {
-    $this->input = $input;
+	public function input($input)
+	{
+		$this->input = $input;
 
-    return $this;
-  }
+		return $this;
+	}
 
-  public function require($input = null, $msg = null)
-  {
-    if (! $this->input) $this->input = $input;
+	public function require($input = null, $msg = null)
+	{
+		if (! $this->input) $this->input = $input;
 
-    $value = $this->value($this->input);
+		$value = $this->value($this->input);
 
-    if (! $value) {
+		if (! $value) {
 
-        $msg = $msg ?: 'This input is required';
+				$msg = $msg ?: 'This input is required';
 
-        $this->addError($this->input, $msg);
-    }
-    return $this;
-  }
+				$this->addError($this->input, $msg);
+		}
+		return $this;
+	}
 
-  public function email($input = null, $msg = null)
-  {
-    if (! $this->input) $this->input = $input;
+	public function email($input = null, $msg = null)
+	{
+		if (! $this->input) $this->input = $input;
 
-    $value = $this->value($this->input);
+		$value = $this->value($this->input);
 
-    if (! filter_var($value, FILTER_VALIDATE_EMAIL)) {
+		if (! filter_var($value, FILTER_VALIDATE_EMAIL)) {
 
-      $msg = $msg ?: sprintf('%s is not valid Email', ucfirst($this->input));
+			$msg = $msg ?: sprintf('%s is not valid Email', ucfirst($this->input));
 
-      $this->addError($this->input, $msg);
-    }
-    return $this;
-  }
+			$this->addError($this->input, $msg);
+		}
+		return $this;
+	}
 
-  public function number($input = null, $msg = null)
-  {
-    if (! $this->input) $this->input = $input;
+	public function number($input = null, $msg = null)
+	{
+		if (! $this->input) $this->input = $input;
 
-    $value = $this->value($this->input);
+		$value = $this->value($this->input);
 
-    if ($value) {
+		if ($value) {
 
-      if (! is_numeric($value)) {
+			if (! is_numeric($value)) {
 
-        $msg = $msg ?: 'the Input must be number';
+				$msg = $msg ?: 'the Input must be number';
 
-        $this->addError($this->input, $msg);
-      }
-    }
-    return $this;
-  }
+				$this->addError($this->input, $msg);
+			}
+		}
+		return $this;
+	}
 
-  public function text($input = null, $msg = null)
-  {
-    if (! $this->input) $this->input = $input;
+	public function text($input = null, $msg = null)
+	{
+		if (! $this->input) $this->input = $input;
 
-    $value = $this->value($this->input);
+		$value = $this->value($this->input);
 
-    if ($value) {
+		if ($value) {
 
-      if (is_numeric($value)) {
+			if (is_numeric($value)) {
 
-        $msg = $msg ?: 'the Input must be Text';
+				$msg = $msg ?: 'the Input must be Text';
 
-        $this->addError($this->input, $msg);
-      }
-    }
-    return $this;
-  }
+				$this->addError($this->input, $msg);
+			}
+		}
+		return $this;
+	}
 
-  public function minLen($length, $msg = null)
-  {
-    $value = $this->value($this->input);
+	public function minLen($length, $msg = null)
+	{
+		$value = $this->value($this->input);
 
-    if ($value) {
+		if ($value) {
 
-      if (strlen($value) < $length) {
+			if (strlen($value) < $length) {
 
-        $msg = $msg ?: 'This input must be at least ' . $length;
+				$msg = $msg ?: 'This input must be at least ' . $length;
 
-        $this->addError($this->input, $msg);
-      }
-    }
-    return $this;
-  }
+				$this->addError($this->input, $msg);
+			}
+		}
+		return $this;
+	}
 
-  public function maxLen($length, $msg = null)
-  {
-    $value = $this->value($this->input);
+	public function maxLen($length, $msg = null)
+	{
+		$value = $this->value($this->input);
 
-    if ($value) {
+		if ($value) {
 
-      if (strlen($value) > $length) {
+			if (strlen($value) > $length) {
 
-        $msg = $msg ?: 'This must be ' . $length . ' or fewer';
+				$msg = $msg ?: 'This must be ' . $length . ' or fewer';
 
-        $this->addError($this->input, $msg);
-      }
-    }
-    return $this;
-  }
+				$this->addError($this->input, $msg);
+			}
+		}
+		return $this;
+	}
 
-  public function match($input, $msg = null)
-  {
-    $valuePassword = $this->value($this->input);
+	public function match($input, $msg = null)
+	{
+		$valuePassword = $this->value($this->input);
 
-    $valueConfirm = $this->value($input);
+		$valueConfirm = $this->value($input);
 
-    if ($valuePassword && $valueConfirm ) {
+		if ($valuePassword && $valueConfirm ) {
 
-      if ($valuePassword !== $valueConfirm) {
+			if ($valuePassword !== $valueConfirm) {
 
-        $msg = $msg ?: 'Passwords does not match';
+				$msg = $msg ?: 'Passwords does not match';
 
-        $this->addError('match', $msg);
-      }
-    }
-    return $this;
-  }
+				$this->addError('match', $msg);
+			}
+		}
+		return $this;
+	}
 
-  public function unique(array $data, $msg = null)
-  {
-    $value = $this->value($this->input);
+	public function unique(array $data, $msg = null)
+	{
+		$value = $this->value($this->input);
 
-    $table = null;
-    $column = null;
+		$table = null;
+		$column = null;
 
-    $id = null;
-    $userId = null;
+		$id = null;
+		$userId = null;
 
-    if (count($data) == 2) {
+		if (count($data) == 2) {
 
-      list($table, $column) = $data;
+			list($table, $column) = $data;
 
-    } elseif (count($data) == 4) {
+		} elseif (count($data) == 4) {
 
-      list($table, $column, $id, $userId) = $data;
-    }
+			list($table, $column, $id, $userId) = $data;
+		}
 
-    $sql = $userId ? $column . ' = ? AND ' . $id . ' != ? ' : $column . ' = ?';
+		$sql = $userId ? $column . ' = ? AND ' . $id . ' != ? ' : $column . ' = ?';
 
-    $valueSql = $userId ? [$value, $userId] : $value;
+		$valueSql = $userId ? [$value, $userId] : $value;
 
-    $result = $this->app->db->select($column)->from($table)->where($sql, $valueSql)->fetch();
+		$result = $this->app->db->select($column)->from($table)->where($sql, $valueSql)->fetch();
 
-    if ($result) {
+		if ($result) {
 
-      $msg = $msg ?: sprintf('%s is already exist', ucfirst($this->input));
+			$msg = $msg ?: sprintf('%s is already exist', ucfirst($this->input));
 
-      $this->addError($this->input, $msg);
-    }
-    return $this;
-  }
+			$this->addError($this->input, $msg);
+		}
+		return $this;
+	}
 
-  public function message($msg = null)
-  {
-    $this->errors[] = $msg;
+	public function message($msg = null)
+	{
+		$this->errors[] = $msg;
 
-    return $this;
-  }
+		return $this;
+	}
 
-  public function passes()
-  {
-    return empty($this->errors);
-  }
+	public function passes()
+	{
+		return empty($this->errors);
+	}
 
-  public function fails()
-  {
-    return ! empty($this->errors);
-  }
+	public function fails()
+	{
+		return ! empty($this->errors);
+	}
 
-  public function getMsgs()
-  {
-    return $this->errors;
-  }
+	public function getMsgs()
+	{
+		return $this->errors;
+	}
 
-  private function value($input)
-  {
-    return $this->app->request->post($input);
-  }
+	private function value($input)
+	{
+		return $this->app->request->post($input);
+	}
 
-  public function addError($input, $msg)
-  {
-    if (! $this->checkError($input)) {
+	public function addError($input, $msg)
+	{
+		if (! $this->checkError($input)) {
 
-      $this->errors[$input] = $msg;
-    }
-  }
+			$this->errors[$input] = $msg;
+		}
+	}
 
-  private function checkError($input)
-  {
-    return array_key_exists($input, $this->errors);
-  }
+	private function checkError($input)
+	{
+		return array_key_exists($input, $this->errors);
+	}
 }
\ No newline at end of file

Core/System/PugView.php

Indentation +43 added lines, -43 removed lines

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

Core/System/File.php

Indentation +42 added lines, -42 removed lines

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

Core/System/Loader.php

Indentation +68 added lines, -68 removed lines

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

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

Indentation +56 added lines, -56 removed lines

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

Core/System/Route.php

Indentation +167 added lines, -167 removed lines

@@ -6,254 +6,254 @@
 
 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)
-  {
-    $this->app = $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 !== '/') {
+			if ($this->prefix !== '/') {
 
-        $url = $this->prefix . $url;
+				$url = $this->prefix . $url;
 
-        $url = rtrim($url, '/');
-      }
-    }
+				$url = rtrim($url, '/');
+			}
+		}
 
-    if ($this->basController) {
-      $action = $this->basController . '/' . $action;
-    }
+		if ($this->basController) {
+			$action = $this->basController . '/' . $action;
+		}
 
-    if (!empty($this->groupMiddleware)) {
+		if (!empty($this->groupMiddleware)) {
 
-      if (is_array($middleware)) {
+			if (is_array($middleware)) {
 
-        $middleware = array_merge($this->groupMiddleware[0], $middleware);
+				$middleware = array_merge($this->groupMiddleware[0], $middleware);
 
-      } else {
+			} else {
 
-        array_push($this->groupMiddleware[0], $middleware);
+				array_push($this->groupMiddleware[0], $middleware);
 
-        $middleware = $this->groupMiddleware[0];
-      }
-    }
+				$middleware = $this->groupMiddleware[0];
+			}
+		}
 
-    $routes = [
-      'url'         => $url,
-      'pattern'     => $this->generatePattern($url),
-      'action'      => $this->getAction($action),
-      'method'      => $requestMethos,
-      'middleware'  => $middleware
-    ];
+		$routes = [
+			'url'         => $url,
+			'pattern'     => $this->generatePattern($url),
+			'action'      => $this->getAction($action),
+			'method'      => $requestMethos,
+			'middleware'  => $middleware
+		];
 
-    $this->routes[] = $routes;
+		$this->routes[] = $routes;
 
-    return $this;
-  }
+		return $this;
+	}
 
-  public function group($groupOptions, callable $callback)
-  {
-    $prefix = $groupOptions['prefix'];
-    $controller = $groupOptions['controller'];
-    $middlewareFrom = array_shift($groupOptions['middleware']);
-    $middleware = $groupOptions['middleware'];
+	public function group($groupOptions, callable $callback)
+	{
+		$prefix = $groupOptions['prefix'];
+		$controller = $groupOptions['controller'];
+		$middlewareFrom = array_shift($groupOptions['middleware']);
+		$middleware = $groupOptions['middleware'];
 
-    $url = ltrim($this->app->request->url(), '/');
-    $check = '/' . explode('/', $url)[0];
+		$url = ltrim($this->app->request->url(), '/');
+		$check = '/' . explode('/', $url)[0];
 
-    if ($check !== $prefix) {
-      return $this;
-    }
+		if ($check !== $prefix) {
+			return $this;
+		}
 
-    $this->prefix = $prefix;
-    $this->basController = $controller;
-    $this->middlewareFrom = $middlewareFrom;
-    $this->groupMiddleware = $middleware;
+		$this->prefix = $prefix;
+		$this->basController = $controller;
+		$this->middlewareFrom = $middlewareFrom;
+		$this->groupMiddleware = $middleware;
 
-    $callback($this);
+		$callback($this);
 
-    return $this;
-  }
+		return $this;
+	}
 
-  public function package($url, $controller)
-  {
-    $this->add("$url", "$controller");
-    $this->add("$url/add", "$controller@add", "POST");
-    $this->add("$url/submit", "$controller@submit", "POST");
-    $this->add("$url/edit/:id", "$controller@edit", "POST");
-    $this->add("$url/save/:id", "$controller@save", "POST");
-    $this->add("$url/delete/:id", "$controller@delete", "POST");
+	public function package($url, $controller)
+	{
+		$this->add("$url", "$controller");
+		$this->add("$url/add", "$controller@add", "POST");
+		$this->add("$url/submit", "$controller@submit", "POST");
+		$this->add("$url/edit/:id", "$controller@edit", "POST");
+		$this->add("$url/save/:id", "$controller@save", "POST");
+		$this->add("$url/delete/:id", "$controller@delete", "POST");
 
-    return $this;
-  }
+		return $this;
+	}
 
-  public function generatePattern($url)
-  {
-    $pattern = '#^';
-    $pattern .= str_replace([':text', ':id'], ['([a-zA-Z0-9-]+)', '(\d+)'], $url);
-    $pattern .= '$#';
+	public function generatePattern($url)
+	{
+		$pattern = '#^';
+		$pattern .= str_replace([':text', ':id'], ['([a-zA-Z0-9-]+)', '(\d+)'], $url);
+		$pattern .= '$#';
 
-    return $pattern;
-  }
+		return $pattern;
+	}
 
-  public function getAction($action)
-  {
-    $action = str_replace('/', '\\', $action);
+	public function getAction($action)
+	{
+		$action = str_replace('/', '\\', $action);
 
-    $action = (strpos($action, '@') != 0) ? $action : $action . '@index';
+		$action = (strpos($action, '@') != 0) ? $action : $action . '@index';
 
-    $action = explode('@', $action);
+		$action = explode('@', $action);
 
-    return $action;
-  }
+		return $action;
+	}
 
-  public function getProperRoute()
-  {
-    foreach ($this->routes as $route) {
+	public function getProperRoute()
+	{
+		foreach ($this->routes as $route) {
 
-      if ($this->isMatching($route['pattern']) && $this->isMatchingRequestMethod($route['method'])) {
+			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'])) {
+					if (is_array($route['middleware'])) {
 
-            foreach ($route['middleware'] as $middleware) {
+						foreach ($route['middleware'] as $middleware) {
 
-              $output = $this->middleware($middleware);
+							$output = $this->middleware($middleware);
 
-              if ($output != '') {
-                break;
-              }
-            }
+							if ($output != '') {
+								break;
+							}
+						}
 
-          } else {
+					} else {
 
-            $output = $this->middleware($route['middleware']);
+						$output = $this->middleware($route['middleware']);
 
-            if ($output != '') {
-              break;
-            }
-          }
-        }
+						if ($output != '') {
+							break;
+						}
+					}
+				}
 
-        if ($output == '') {
+				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;
 
-        }
-        break;
-      }
-    }
+				}
+				break;
+			}
+		}
 
-    $output = (string) $this->app->load->action('notFound', 'index', []);
+		$output = (string) $this->app->load->action('notFound', 'index', []);
 
-    return $output;
-  }
+		return $output;
+	}
 
-  public function isMatching($pattern)
-  {
-    $url = $this->app->request->url();
+	public function isMatching($pattern)
+	{
+		$url = $this->app->request->url();
 
-    $url = strtolower($url);
+		$url = strtolower($url);
 
-    return preg_match($pattern, $url);
-  }
+		return preg_match($pattern, $url);
+	}
 
-  private function isMatchingRequestMethod($method)
-  {
-    $methods = ['GET', 'POST'];
+	private function isMatchingRequestMethod($method)
+	{
+		$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)) {
+		if (is_array($method)) {
 
-      if (count($method) == 1) {
+			if (count($method) == 1) {
 
-        $method = $method[0];
+				$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;
-        }
+				if (in_array($method[0], $methods) && in_array($method[1], $methods)) {
+					return true;
+				}
 
-      } else {
+			} else {
 
-        return false;
-      }
-    }
+				return false;
+			}
+		}
 
-    return $this->app->request->method() == $method;
-  }
+		return $this->app->request->method() == $method;
+	}
 
-  public function getArgumentsFor($pattern)
-  {
-    $url = $this->app->request->url();
+	public function getArgumentsFor($pattern)
+	{
+		$url = $this->app->request->url();
 
-    preg_match($pattern, $url, $matches);
+		preg_match($pattern, $url, $matches);
 
-    array_shift($matches);
+		array_shift($matches);
 
-    return $matches;
-  }
+		return $matches;
+	}
 
-  public function getCurrent($key)
-  {
-    return $this->current[$key];
-  }
+	public function getCurrent($key)
+	{
+		return $this->current[$key];
+	}
 
-  private function middleware($middleware, $from = 'admin')
-  {
-    $middlewareInterface = 'App\\Middleware\\MiddlewaresInterface';
+	private function middleware($middleware, $from = 'admin')
+	{
+		$middlewareInterface = 'App\\Middleware\\MiddlewaresInterface';
 
-    $middlewares = $this->app->alias['middlewares'][$from];
+		$middlewares = $this->app->alias['middlewares'][$from];
 
-    $middlewareClass = $middlewares[$middleware];
+		$middlewareClass = $middlewares[$middleware];
 
-    if (!in_array($middlewareInterface, class_implements($middlewareClass))) {
-      throw new Exception("$middlewareClass not Implement");
-    }
+		if (!in_array($middlewareInterface, class_implements($middlewareClass))) {
+			throw new Exception("$middlewareClass not Implement");
+		}
 
-    $middlewareObject = new $middlewareClass;
+		$middlewareObject = new $middlewareClass;
 
-    $output = $middlewareObject->handle($this->app, static::NEXT);
+		$output = $middlewareObject->handle($this->app, static::NEXT);
 
-    if ($output && $output === static::NEXT) {
-      $output = '';
-    }
+		if ($output && $output === static::NEXT) {
+			$output = '';
+		}
 
-    return $output;
-  }
+		return $output;
+	}
 }
\ No newline at end of file

Core/System/Http/Response.php

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