AnuTiger / F3

app.php

Indentation +122 added lines, -122 removed lines

@@ -1,148 +1,148 @@
 <?php
 
 class App extends Prefab{
-    public $db;
+	public $db;
 	public $app;
-    public $session;
+	public $session;
 
 	public function __construct() {
-	    $this->app = $this->app ?: Base::instance();
+		$this->app = $this->app ?: Base::instance();
 	}
 
-    static public function singleton() {
-        if (Registry::exists('APP'))
-            $app = Registry::get('APP');
-        else {
-            $app = new self;
-            Registry::set('APP',$app);
-        }
-        return $app;
-    }
+	static public function singleton() {
+		if (Registry::exists('APP'))
+			$app = Registry::get('APP');
+		else {
+			$app = new self;
+			Registry::set('APP',$app);
+		}
+		return $app;
+	}
 
-    public function db() {
-        return $this->db ?: $this->app->DB;
-    }
+	public function db() {
+		return $this->db ?: $this->app->DB;
+	}
 
-    public function session() {
-        return $this->session ?: $this->app->SESSION;
-    }
+	public function session() {
+		return $this->session ?: $this->app->SESSION;
+	}
 
 	public function user() {
 		return $this->authenticatedUser = $this->app->get('SESSION.USER')?:false;
 	}
 
-    public function initialized($def = null) {
-        return null !== $def ? $this->app->set('INITIALIZED', $def) : $this->app->get('INITIALIZED');
-    }
+	public function initialized($def = null) {
+		return null !== $def ? $this->app->set('INITIALIZED', $def) : $this->app->get('INITIALIZED');
+	}
 
-    public function config($key = null) {
-        return $this->app->get($key?:'CONFIG') ;
-    }
+	public function config($key = null) {
+		return $this->app->get($key?:'CONFIG') ;
+	}
 
-    public function status() {
-        return $this->app->IS_LIVE;
-    }
+	public function status() {
+		return $this->app->IS_LIVE;
+	}
 
-    public function run() {
-        $this->loadConfig();
-        $this->loadRoutes();
-        $this->checkForMaintenance();
-        $this->configureDebug();
-	    $this->configureDB();
-	    $this->configureSession();
-        $this->configureAssets();
+	public function run() {
+		$this->loadConfig();
+		$this->loadRoutes();
+		$this->checkForMaintenance();
+		$this->configureDebug();
+		$this->configureDB();
+		$this->configureSession();
+		$this->configureAssets();
 		$this->registerErrorHandler();
-	    $this->initialized(true);
+		$this->initialized(true);
 		$this->app->run();
-    }
-
-    public function loadRoutes($file = null){
-        if($file) {
-            $this->app->config(base_path('routes/'.$file));
-        }else{
-            foreach(glob(base_path('routes/*.ini')) as $file) {
-                $this->app->config($file);
-            }
-        }
-    }
-
-    public function loadConfig($file = null){
-        if($file) {
-            $this->app->config(base_path('config/'.$file));
-        }else{
-            foreach(glob(base_path('config/*.ini')) as $file) {
-                $this->app->config($file);
-            }
-        }
-    }
+	}
+
+	public function loadRoutes($file = null){
+		if($file) {
+			$this->app->config(base_path('routes/'.$file));
+		}else{
+			foreach(glob(base_path('routes/*.ini')) as $file) {
+				$this->app->config($file);
+			}
+		}
+	}
+
+	public function loadConfig($file = null){
+		if($file) {
+			$this->app->config(base_path('config/'.$file));
+		}else{
+			foreach(glob(base_path('config/*.ini')) as $file) {
+				$this->app->config($file);
+			}
+		}
+	}
 
 	public function checkForMaintenance() {
 		if(!$this->status()) {
-	       	template('maintenance');
-		    exit();
-        }
-	}
-
-    public function configureDebug() {
-	    if(!$this->app->DEV) {
-	        $this->app->set('DEBUG', 0);
-        }
-    }
-
-    public function configureDB() {
-        $type = strtolower($this->app->DB_TYPE);
-
-        if($type == 'jig'){
-            $this->db = new DB\Jig($this->app->DB_PATH, DB\Jig::FORMAT_JSON);
-        }else if($type == 'sql'){
-            $this->db = new DB\SQL($this->app->DB, $this->app->DB_USER, $this->app->DB_PSWD);
-        }else if($type == 'mongo'){
-            $this->db = new DB\Mongo($this->app->DB, $this->app->DB_USER);
-        }
-        $this->app->set('DB', $this->db);
-    }
-
-    public function configureSession() {
-        $type = strtolower($this->app->SESSION);
-
-        if($type) {
-            if($this->app->CSRF && ('jig' == $type || 'sql' == $type || 'mongo' == $type)) {
-                $this->configureCSRF($type);
-            }else if($this->app->CSRF){
-                $this->session = new Session(null, 'CSRF');
-            }else{
-                if($type == 'jig' || $type == 'mongo' || $type == 'sql'){
-                    if($type == 'jig' || $type == 'mongo'){
-                        $type = ucfirst($type);
-                    }else if($type == 'sql') {
-                        $type = strtoupper($type);
-                    }
-                    $session = str_ireplace('/', '', 'DB\/'.$type.'\Session');
-                    $this->session = new $session($this->app->DB);
-                }else{
-                    $this->session = new Session();
-                }
-            }
-            $this->app->set('SESSION', $this->session);
-        }
-    }
-
-    public function configureCSRF($type) {
-        if($type == 'jig' || $type == 'mongo'){
-            $type = ucfirst($type);
-        }else if($type == 'sql') {
-            $type = strtoupper($type);
-        }
-        $session = str_ireplace('/', '', 'DB\/'.$type.'\Session');
-        $this->session = new $session($this->app->DB, 'sessions', null, 'CSRF');
-    }
-
-    public function configureAssets() {
-        $assets = Assets::instance();
-        $this->app->set('ASSETS.onFileNotFound',function($file) use ($f3){
-            echo 'file not found: '.$file;
-        });
-    }
+		   	template('maintenance');
+			exit();
+		}
+	}
+
+	public function configureDebug() {
+		if(!$this->app->DEV) {
+			$this->app->set('DEBUG', 0);
+		}
+	}
+
+	public function configureDB() {
+		$type = strtolower($this->app->DB_TYPE);
+
+		if($type == 'jig'){
+			$this->db = new DB\Jig($this->app->DB_PATH, DB\Jig::FORMAT_JSON);
+		}else if($type == 'sql'){
+			$this->db = new DB\SQL($this->app->DB, $this->app->DB_USER, $this->app->DB_PSWD);
+		}else if($type == 'mongo'){
+			$this->db = new DB\Mongo($this->app->DB, $this->app->DB_USER);
+		}
+		$this->app->set('DB', $this->db);
+	}
+
+	public function configureSession() {
+		$type = strtolower($this->app->SESSION);
+
+		if($type) {
+			if($this->app->CSRF && ('jig' == $type || 'sql' == $type || 'mongo' == $type)) {
+				$this->configureCSRF($type);
+			}else if($this->app->CSRF){
+				$this->session = new Session(null, 'CSRF');
+			}else{
+				if($type == 'jig' || $type == 'mongo' || $type == 'sql'){
+					if($type == 'jig' || $type == 'mongo'){
+						$type = ucfirst($type);
+					}else if($type == 'sql') {
+						$type = strtoupper($type);
+					}
+					$session = str_ireplace('/', '', 'DB\/'.$type.'\Session');
+					$this->session = new $session($this->app->DB);
+				}else{
+					$this->session = new Session();
+				}
+			}
+			$this->app->set('SESSION', $this->session);
+		}
+	}
+
+	public function configureCSRF($type) {
+		if($type == 'jig' || $type == 'mongo'){
+			$type = ucfirst($type);
+		}else if($type == 'sql') {
+			$type = strtoupper($type);
+		}
+		$session = str_ireplace('/', '', 'DB\/'.$type.'\Session');
+		$this->session = new $session($this->app->DB, 'sessions', null, 'CSRF');
+	}
+
+	public function configureAssets() {
+		$assets = Assets::instance();
+		$this->app->set('ASSETS.onFileNotFound',function($file) use ($f3){
+			echo 'file not found: '.$file;
+		});
+	}
 
 	public function registerErrorHandler() {
 		if($this->app->DEV) {

Spacing +30 added lines, -30 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-class App extends Prefab{
+class App extends Prefab {
     public $db;
 	public $app;
     public $session;
@@ -14,7 +14,7 @@ 
             $app = Registry::get('APP');
         else {
             $app = new self;
-            Registry::set('APP',$app);
+            Registry::set('APP', $app);
         }
         return $app;
     }
@@ -28,7 +28,7 @@ 
     }
 
 	public function user() {
-		return $this->authenticatedUser = $this->app->get('SESSION.USER')?:false;
+		return $this->authenticatedUser = $this->app->get('SESSION.USER') ?: false;
 	}
 
     public function initialized($def = null) {
@@ -36,7 +36,7 @@ 
     }
 
     public function config($key = null) {
-        return $this->app->get($key?:'CONFIG') ;
+        return $this->app->get($key ?: 'CONFIG');
     }
 
     public function status() {
@@ -56,35 +56,35 @@ 
 		$this->app->run();
     }
 
-    public function loadRoutes($file = null){
-        if($file) {
+    public function loadRoutes($file = null) {
+        if ($file) {
             $this->app->config(base_path('routes/'.$file));
-        }else{
-            foreach(glob(base_path('routes/*.ini')) as $file) {
+        }else {
+            foreach (glob(base_path('routes/*.ini')) as $file) {
                 $this->app->config($file);
             }
         }
     }
 
-    public function loadConfig($file = null){
-        if($file) {
+    public function loadConfig($file = null) {
+        if ($file) {
             $this->app->config(base_path('config/'.$file));
-        }else{
-            foreach(glob(base_path('config/*.ini')) as $file) {
+        }else {
+            foreach (glob(base_path('config/*.ini')) as $file) {
                 $this->app->config($file);
             }
         }
     }
 
 	public function checkForMaintenance() {
-		if(!$this->status()) {
+		if (!$this->status()) {
 	       	template('maintenance');
 		    exit();
         }
 	}
 
     public function configureDebug() {
-	    if(!$this->app->DEV) {
+	    if (!$this->app->DEV) {
 	        $this->app->set('DEBUG', 0);
         }
     }
@@ -92,11 +92,11 @@ 
     public function configureDB() {
         $type = strtolower($this->app->DB_TYPE);
 
-        if($type == 'jig'){
+        if ($type == 'jig') {
             $this->db = new DB\Jig($this->app->DB_PATH, DB\Jig::FORMAT_JSON);
-        }else if($type == 'sql'){
+        }else if ($type == 'sql') {
             $this->db = new DB\SQL($this->app->DB, $this->app->DB_USER, $this->app->DB_PSWD);
-        }else if($type == 'mongo'){
+        }else if ($type == 'mongo') {
             $this->db = new DB\Mongo($this->app->DB, $this->app->DB_USER);
         }
         $this->app->set('DB', $this->db);
@@ -105,21 +105,21 @@ 
     public function configureSession() {
         $type = strtolower($this->app->SESSION);
 
-        if($type) {
-            if($this->app->CSRF && ('jig' == $type || 'sql' == $type || 'mongo' == $type)) {
+        if ($type) {
+            if ($this->app->CSRF && ('jig' == $type || 'sql' == $type || 'mongo' == $type)) {
                 $this->configureCSRF($type);
-            }else if($this->app->CSRF){
+            }else if ($this->app->CSRF) {
                 $this->session = new Session(null, 'CSRF');
-            }else{
-                if($type == 'jig' || $type == 'mongo' || $type == 'sql'){
-                    if($type == 'jig' || $type == 'mongo'){
+            }else {
+                if ($type == 'jig' || $type == 'mongo' || $type == 'sql') {
+                    if ($type == 'jig' || $type == 'mongo') {
                         $type = ucfirst($type);
-                    }else if($type == 'sql') {
+                    }else if ($type == 'sql') {
                         $type = strtoupper($type);
                     }
                     $session = str_ireplace('/', '', 'DB\/'.$type.'\Session');
                     $this->session = new $session($this->app->DB);
-                }else{
+                }else {
                     $this->session = new Session();
                 }
             }
@@ -128,9 +128,9 @@ 
     }
 
     public function configureCSRF($type) {
-        if($type == 'jig' || $type == 'mongo'){
+        if ($type == 'jig' || $type == 'mongo') {
             $type = ucfirst($type);
-        }else if($type == 'sql') {
+        }else if ($type == 'sql') {
             $type = strtoupper($type);
         }
         $session = str_ireplace('/', '', 'DB\/'.$type.'\Session');
@@ -139,15 +139,15 @@ 
 
     public function configureAssets() {
         $assets = Assets::instance();
-        $this->app->set('ASSETS.onFileNotFound',function($file) use ($f3){
+        $this->app->set('ASSETS.onFileNotFound', function($file) use ($f3){
             echo 'file not found: '.$file;
         });
     }
 
 	public function registerErrorHandler() {
-		if($this->app->DEV) {
+		if ($this->app->DEV) {
 			Falsum\Run::handler($this->app->DEBUG != 3);
-		}else{
+		}else {
 			$this->app->set('ONERROR', 'App\Core\Controllers\ErrorController->init');
 		}
 	}

Braces +13 added lines, -13 removed lines

@@ -10,9 +10,9 @@ 
 	}
 
     static public function singleton() {
-        if (Registry::exists('APP'))
-            $app = Registry::get('APP');
-        else {
+        if (Registry::exists('APP')) {
+                    $app = Registry::get('APP');
+        } else {
             $app = new self;
             Registry::set('APP',$app);
         }
@@ -59,7 +59,7 @@ 
     public function loadRoutes($file = null){
         if($file) {
             $this->app->config(base_path('routes/'.$file));
-        }else{
+        } else{
             foreach(glob(base_path('routes/*.ini')) as $file) {
                 $this->app->config($file);
             }
@@ -69,7 +69,7 @@ 
     public function loadConfig($file = null){
         if($file) {
             $this->app->config(base_path('config/'.$file));
-        }else{
+        } else{
             foreach(glob(base_path('config/*.ini')) as $file) {
                 $this->app->config($file);
             }
@@ -94,9 +94,9 @@ 
 
         if($type == 'jig'){
             $this->db = new DB\Jig($this->app->DB_PATH, DB\Jig::FORMAT_JSON);
-        }else if($type == 'sql'){
+        } else if($type == 'sql'){
             $this->db = new DB\SQL($this->app->DB, $this->app->DB_USER, $this->app->DB_PSWD);
-        }else if($type == 'mongo'){
+        } else if($type == 'mongo'){
             $this->db = new DB\Mongo($this->app->DB, $this->app->DB_USER);
         }
         $this->app->set('DB', $this->db);
@@ -108,18 +108,18 @@ 
         if($type) {
             if($this->app->CSRF && ('jig' == $type || 'sql' == $type || 'mongo' == $type)) {
                 $this->configureCSRF($type);
-            }else if($this->app->CSRF){
+            } else if($this->app->CSRF){
                 $this->session = new Session(null, 'CSRF');
-            }else{
+            } else{
                 if($type == 'jig' || $type == 'mongo' || $type == 'sql'){
                     if($type == 'jig' || $type == 'mongo'){
                         $type = ucfirst($type);
-                    }else if($type == 'sql') {
+                    } else if($type == 'sql') {
                         $type = strtoupper($type);
                     }
                     $session = str_ireplace('/', '', 'DB\/'.$type.'\Session');
                     $this->session = new $session($this->app->DB);
-                }else{
+                } else{
                     $this->session = new Session();
                 }
             }
@@ -130,7 +130,7 @@ 
     public function configureCSRF($type) {
         if($type == 'jig' || $type == 'mongo'){
             $type = ucfirst($type);
-        }else if($type == 'sql') {
+        } else if($type == 'sql') {
             $type = strtoupper($type);
         }
         $session = str_ireplace('/', '', 'DB\/'.$type.'\Session');
@@ -147,7 +147,7 @@ 
 	public function registerErrorHandler() {
 		if($this->app->DEV) {
 			Falsum\Run::handler($this->app->DEBUG != 3);
-		}else{
+		} else{
 			$this->app->set('ONERROR', 'App\Core\Controllers\ErrorController->init');
 		}
 	}

resources/lang/en.php

Indentation +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
 			'numeric' => 'The {0} must be a number.',
 			'regex' => 'The {0} format is invalid.',
 			'required' => 'The {0} field is required.',
-    		'same' => 'The {0} and {1} must match.',
+			'same' => 'The {0} and {1} must match.',
 			'size' => [
 				'numeric' => 'The {0} must be {1}.',
 				'file' => 'The {0} must be {1} kilobytes.',

helpers/Route.php

Indentation +2 added lines, -2 removed lines

@@ -30,8 +30,8 @@
 	}
 
 	public function is($route) {
-	    return Str::contains($this->current(), $route);
-    }
+		return Str::contains($this->current(), $route);
+	}
 
 	public function currentRouteName() {
 		return $this->getRoutes()[$this->current()][0][$this->type()][3];

Spacing +4 added lines, -4 removed lines

@@ -4,7 +4,7 @@ 
 	private $app;
 
 	public function __construct() {
-		if($this->app == null) {
+		if ($this->app == null) {
 			$this->app = f3();
 		}
 	}
@@ -18,7 +18,7 @@ 
 	}
 
 	public function has($route) {
-		if(str_contains($route, '/')){
+		if (str_contains($route, '/')) {
 			return array_key_exists($route, $this->getRoutes());
 		}
 
@@ -39,8 +39,8 @@ 
 
 	public function getRouteName($route) {
 		$response = null;
-		foreach($this->getNamedRoutes() as $name => $url) {
-			if($url == $route) {
+		foreach ($this->getNamedRoutes() as $name => $url) {
+			if ($url == $route) {
 				$response[] = $name;
 			}
 		}

helpers/Captcha.php

Indentation +15 added lines, -15 removed lines

@@ -73,22 +73,22 @@ 
 	public function verify($code) {
 		$this->startSession();
 
-        $n = $this->name;
+		$n = $this->name;
 
-        $valid = isset($_SESSION[$n])
-            && isset($_POST[$n])
-            && strlen($_POST[$n])
-            && ($_SESSION[$n] === crypt(strtolower($_POST[$n]), $this->salt()));
+		$valid = isset($_SESSION[$n])
+			&& isset($_POST[$n])
+			&& strlen($_POST[$n])
+			&& ($_SESSION[$n] === crypt(strtolower($_POST[$n]), $this->salt()));
 
-        if (isset($_POST[$n])) {
-            unset($_POST[$n]);
-        }
+		if (isset($_POST[$n])) {
+			unset($_POST[$n]);
+		}
 
-        if ($valid && isset($_SESSION[$n])) {
-            unset($_SESSION[$n]);
-        }
+		if ($valid && isset($_SESSION[$n])) {
+			unset($_SESSION[$n]);
+		}
 
-        return $valid;
+		return $valid;
 	}
 
 	private function startSession() {
@@ -97,7 +97,7 @@ 
 
 	private function setSession($string) {
 		$this->startSession();
-        $_SESSION[$this->name] = crypt(strtolower($string), $this->salt());
+		$_SESSION[$this->name] = crypt(strtolower($string), $this->salt());
 	}
 
 	private function _generate($length) {
@@ -105,6 +105,6 @@ 
 	}
 
 	private static function salt() {
-        return md5(__FILE__.filemtime(__FILE__));
-    }
+		return md5(__FILE__.filemtime(__FILE__));
+	}
 }
\ No newline at end of file

Spacing +12 added lines, -12 removed lines

@@ -29,36 +29,36 @@
 	* Captcha::instance()->render(array('type'=>'img','length'=>4,'class'=>array('img'=>'captcha-img','input'=>'captcha-input')));
 	 */
 	public function render($param, $url) {
-		if(is_array($param)){
+		if (is_array($param)) {
 			$func = null;
 			$length = null;
 			$imgClass = null;
 			$inputClass = null;
-			foreach($param as $key => $val) {
-				if('type' == $key) {
+			foreach ($param as $key => $val) {
+				if ('type' == $key) {
 					$func = $key;
 				}
-				if('length' == $key) {
+				if ('length' == $key) {
 					$length = $key;
 				}
-				if('class' == $key && is_array($key)) {
-					if(array_key_exists('img', $key)){
+				if ('class' == $key && is_array($key)) {
+					if (array_key_exists('img', $key)) {
 						$imgClass = $key['img'];
-					}else if(array_key_exists('input', $key)){
+					}else if (array_key_exists('input', $key)) {
 						$inputClass = $key['input'];
 					}
-				}else{
+				}else {
 					$imgClass = $inputClass = $key;
 				}
 			}
-			if(method_exists($this, $func)) {
+			if (method_exists($this, $func)) {
 				$response = $this->$key($length, $imgClass).$this->input($inputClass);
-			}else{
+			}else {
 				throw new Exception("Error Processing Captcha Method", 1);
 			}
-		}else if(is_numeric($param)){
+		}else if (is_numeric($param)) {
 			$response = $this->img($param).$this->input();
-		}else{
+		}else {
 			throw new Exception("Error Processing Captcha Parameters", 1);
 		}
 

Braces +5 added lines, -5 removed lines

@@ -44,21 +44,21 @@
 				if('class' == $key && is_array($key)) {
 					if(array_key_exists('img', $key)){
 						$imgClass = $key['img'];
-					}else if(array_key_exists('input', $key)){
+					} else if(array_key_exists('input', $key)){
 						$inputClass = $key['input'];
 					}
-				}else{
+				} else{
 					$imgClass = $inputClass = $key;
 				}
 			}
 			if(method_exists($this, $func)) {
 				$response = $this->$key($length, $imgClass).$this->input($inputClass);
-			}else{
+			} else{
 				throw new Exception("Error Processing Captcha Method", 1);
 			}
-		}else if(is_numeric($param)){
+		} else if(is_numeric($param)){
 			$response = $this->img($param).$this->input();
-		}else{
+		} else{
 			throw new Exception("Error Processing Captcha Parameters", 1);
 		}
 

helpers/Model.php

Spacing +6 added lines, -6 removed lines

@@ -19,7 +19,7 @@ 
 		);
 
 	public function __construct() {
-		if(property_exists($this, 'fields')) {
+		if (property_exists($this, 'fields')) {
 			$this->fieldConf = array_merge($this->fields, $this->fieldConf);
 		}
 
@@ -30,16 +30,16 @@ 
 
 	private function validate($caller, $parent) {
 		$valid = true;
-		foreach($this->getFieldConfiguration() as $field => $conf) {
-			if(isset($conf['type']) && !isset($conf['relType'])){
+		foreach ($this->getFieldConfiguration() as $field => $conf) {
+			if (isset($conf['type']) && !isset($conf['relType'])) {
 				$val = $this->get($field);
-				$model = strtolower(str_replace('\\','.',$class));
+				$model = strtolower(str_replace('\\', '.', $class));
 				// check required fields
 				if ($valid && isset($conf['required']))
-					$valid = \Validation::instance()->required($val,$field,'error.'.$model.'.'.$field);
+					$valid = \Validation::instance()->required($val, $field, 'error.'.$model.'.'.$field);
 				// check unique
 				if ($valid && isset($conf['unique']))
-					$valid = \Validation::instance()->unique($self,$val,$field,'error.'.$model.'.'.$field);
+					$valid = \Validation::instance()->unique($self, $val, $field, 'error.'.$model.'.'.$field);
 				if (!$valid)
 					break;
 			}

Braces +9 added lines, -6 removed lines

@@ -35,13 +35,16 @@
 				$val = $this->get($field);
 				$model = strtolower(str_replace('\\','.',$class));
 				// check required fields
-				if ($valid && isset($conf['required']))
-					$valid = \Validation::instance()->required($val,$field,'error.'.$model.'.'.$field);
+				if ($valid && isset($conf['required'])) {
+									$valid = \Validation::instance()->required($val,$field,'error.'.$model.'.'.$field);
+				}
 				// check unique
-				if ($valid && isset($conf['unique']))
-					$valid = \Validation::instance()->unique($self,$val,$field,'error.'.$model.'.'.$field);
-				if (!$valid)
-					break;
+				if ($valid && isset($conf['unique'])) {
+									$valid = \Validation::instance()->unique($self,$val,$field,'error.'.$model.'.'.$field);
+				}
+				if (!$valid) {
+									break;
+				}
 			}
 		}
 		return $valid;

helpers/Str.php

Indentation +168 added lines, -168 removed lines

@@ -2,233 +2,233 @@
 
 class Str extends Prefab {
 	protected static $snakeCache = [];
-    protected static $camelCache = [];
-    protected static $studlyCache = [];
+	protected static $camelCache = [];
+	protected static $studlyCache = [];
 	
 	public static function after($subject, $search) {
-        return $search === '' ? $subject : array_reverse(explode($search, $subject, 2))[0];
-    }
+		return $search === '' ? $subject : array_reverse(explode($search, $subject, 2))[0];
+	}
 
-    public static function before($subject, $search) {
-        return $search === '' ? $subject : explode($search, $subject)[0];
-    }
+	public static function before($subject, $search) {
+		return $search === '' ? $subject : explode($search, $subject)[0];
+	}
 
-    public static function camel($value) {
-        if (isset(static::$camelCache[$value])) {
-            return static::$camelCache[$value];
-        }
+	public static function camel($value) {
+		if (isset(static::$camelCache[$value])) {
+			return static::$camelCache[$value];
+		}
 
-        return static::$camelCache[$value] = lcfirst(static::studly($value));
-    }
+		return static::$camelCache[$value] = lcfirst(static::studly($value));
+	}
 
-    public static function contains($haystack, $needles) {
-        foreach ((array) $needles as $needle) {
-            if ($needle !== '' && mb_strpos($haystack, $needle) !== false) {
-                return true;
-            }
-        }
+	public static function contains($haystack, $needles) {
+		foreach ((array) $needles as $needle) {
+			if ($needle !== '' && mb_strpos($haystack, $needle) !== false) {
+				return true;
+			}
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    public static function endsWith($haystack, $needles) {
-        foreach ((array) $needles as $needle) {
-            if (substr($haystack, -strlen($needle)) === (string) $needle) {
-                return true;
-            }
-        }
+	public static function endsWith($haystack, $needles) {
+		foreach ((array) $needles as $needle) {
+			if (substr($haystack, -strlen($needle)) === (string) $needle) {
+				return true;
+			}
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    public static function finish($value, $cap) {
-        $quoted = preg_quote($cap, '/');
+	public static function finish($value, $cap) {
+		$quoted = preg_quote($cap, '/');
 
-        return preg_replace('/(?:'.$quoted.')+$/u', '', $value).$cap;
-    }
+		return preg_replace('/(?:'.$quoted.')+$/u', '', $value).$cap;
+	}
 
-    public static function is($pattern, $value) {
-        $patterns = is_array($pattern) ? $pattern : (array) $pattern;
+	public static function is($pattern, $value) {
+		$patterns = is_array($pattern) ? $pattern : (array) $pattern;
 
-        if (empty($patterns)) {
-            return false;
-        }
+		if (empty($patterns)) {
+			return false;
+		}
 
-        foreach ($patterns as $pattern) {
-            if ($pattern == $value) {
-                return true;
-            }
+		foreach ($patterns as $pattern) {
+			if ($pattern == $value) {
+				return true;
+			}
 
-            $pattern = preg_quote($pattern, '#');
-            $pattern = str_replace('\*', '.*', $pattern);
+			$pattern = preg_quote($pattern, '#');
+			$pattern = str_replace('\*', '.*', $pattern);
 
-            if (preg_match('#^'.$pattern.'\z#u', $value) === 1) {
-                return true;
-            }
-        }
+			if (preg_match('#^'.$pattern.'\z#u', $value) === 1) {
+				return true;
+			}
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    public static function kebab($value) {
-        return static::snake($value, '-');
-    }
+	public static function kebab($value) {
+		return static::snake($value, '-');
+	}
 
-    public static function length($value, $encoding = null) {
-        if ($encoding) {
-            return mb_strlen($value, $encoding);
-        }
+	public static function length($value, $encoding = null) {
+		if ($encoding) {
+			return mb_strlen($value, $encoding);
+		}
 
-        return mb_strlen($value);
-    }
+		return mb_strlen($value);
+	}
 
-    public static function limit($value, $limit = 100, $end = '...') {
-        if (mb_strwidth($value, 'UTF-8') <= $limit) {
-            return $value;
-        }
+	public static function limit($value, $limit = 100, $end = '...') {
+		if (mb_strwidth($value, 'UTF-8') <= $limit) {
+			return $value;
+		}
 
-        return rtrim(mb_strimwidth($value, 0, $limit, '', 'UTF-8')).$end;
-    }
+		return rtrim(mb_strimwidth($value, 0, $limit, '', 'UTF-8')).$end;
+	}
 
-    public static function lower($value) {
-        return mb_strtolower($value, 'UTF-8');
-    }
+	public static function lower($value) {
+		return mb_strtolower($value, 'UTF-8');
+	}
 
-    public static function words($value, $words = 100, $end = '...') {
-        preg_match('/^\s*+(?:\S++\s*+){1,'.$words.'}/u', $value, $matches);
+	public static function words($value, $words = 100, $end = '...') {
+		preg_match('/^\s*+(?:\S++\s*+){1,'.$words.'}/u', $value, $matches);
 
-        if (! isset($matches[0]) || static::length($value) === static::length($matches[0])) {
-            return $value;
-        }
+		if (! isset($matches[0]) || static::length($value) === static::length($matches[0])) {
+			return $value;
+		}
 
-        return rtrim($matches[0]).$end;
-    }
+		return rtrim($matches[0]).$end;
+	}
 
-    public static function parseCallback($callback, $default = null) {
-        return static::contains($callback, '@') ? explode('@', $callback, 2) : [$callback, $default];
-    }
+	public static function parseCallback($callback, $default = null) {
+		return static::contains($callback, '@') ? explode('@', $callback, 2) : [$callback, $default];
+	}
 
-    public static function plural($value, $count = 2) {
-        return Pluralizer::plural($value, $count);
-    }
+	public static function plural($value, $count = 2) {
+		return Pluralizer::plural($value, $count);
+	}
 
-    public static function random($length = 16) {
-        $string = '';
+	public static function random($length = 16) {
+		$string = '';
 
-        while (($len = strlen($string)) < $length) {
-            $size = $length - $len;
-            $bytes = random_bytes($size);
-            $string .= substr(str_replace(['/', '+', '='], '', base64_encode($bytes)), 0, $size);
-        }
+		while (($len = strlen($string)) < $length) {
+			$size = $length - $len;
+			$bytes = random_bytes($size);
+			$string .= substr(str_replace(['/', '+', '='], '', base64_encode($bytes)), 0, $size);
+		}
 
-        return $string;
-    }
+		return $string;
+	}
 
-    public static function replaceArray($search, array $replace, $subject) {
-        foreach ($replace as $value) {
-            $subject = static::replaceFirst($search, $value, $subject);
-        }
+	public static function replaceArray($search, array $replace, $subject) {
+		foreach ($replace as $value) {
+			$subject = static::replaceFirst($search, $value, $subject);
+		}
 
-        return $subject;
-    }
+		return $subject;
+	}
 
-    public static function replaceFirst($search, $replace, $subject) {
-        if ($search == '') {
-            return $subject;
-        }
+	public static function replaceFirst($search, $replace, $subject) {
+		if ($search == '') {
+			return $subject;
+		}
 
-        $position = strpos($subject, $search);
+		$position = strpos($subject, $search);
 
-        if ($position !== false) {
-            return substr_replace($subject, $replace, $position, strlen($search));
-        }
+		if ($position !== false) {
+			return substr_replace($subject, $replace, $position, strlen($search));
+		}
 
-        return $subject;
-    }
+		return $subject;
+	}
 
-    public static function replaceLast($search, $replace, $subject) {
-        $position = strrpos($subject, $search);
+	public static function replaceLast($search, $replace, $subject) {
+		$position = strrpos($subject, $search);
 
-        if ($position !== false) {
-            return substr_replace($subject, $replace, $position, strlen($search));
-        }
+		if ($position !== false) {
+			return substr_replace($subject, $replace, $position, strlen($search));
+		}
 
-        return $subject;
-    }
+		return $subject;
+	}
 
-    public static function start($value, $prefix) {
-        $quoted = preg_quote($prefix, '/');
-        return $prefix.preg_replace('/^(?:'.$quoted.')+/u', '', $value);
-    }
+	public static function start($value, $prefix) {
+		$quoted = preg_quote($prefix, '/');
+		return $prefix.preg_replace('/^(?:'.$quoted.')+/u', '', $value);
+	}
 
-    public static function upper($value) {
-        return mb_strtoupper($value, 'UTF-8');
-    }
+	public static function upper($value) {
+		return mb_strtoupper($value, 'UTF-8');
+	}
 
-    public static function title($value) {
-        return mb_convert_case($value, MB_CASE_TITLE, 'UTF-8');
-    }
+	public static function title($value) {
+		return mb_convert_case($value, MB_CASE_TITLE, 'UTF-8');
+	}
 
-    public static function singular($value) {
-        return Pluralizer::singular($value);
-    }
+	public static function singular($value) {
+		return Pluralizer::singular($value);
+	}
 
-    public static function slug($title, $separator = '-', $language = 'en') {
-        $title = static::ascii($title, $language);
+	public static function slug($title, $separator = '-', $language = 'en') {
+		$title = static::ascii($title, $language);
 
-        $flip = $separator == '-' ? '_' : '-';
+		$flip = $separator == '-' ? '_' : '-';
 
-        $title = preg_replace('!['.preg_quote($flip).']+!u', $separator, $title);
-        $title = str_replace('@', $separator.'at'.$separator, $title);
-        $title = preg_replace('![^'.preg_quote($separator).'\pL\pN\s]+!u', '', mb_strtolower($title));
-        $title = preg_replace('!['.preg_quote($separator).'\s]+!u', $separator, $title);
+		$title = preg_replace('!['.preg_quote($flip).']+!u', $separator, $title);
+		$title = str_replace('@', $separator.'at'.$separator, $title);
+		$title = preg_replace('![^'.preg_quote($separator).'\pL\pN\s]+!u', '', mb_strtolower($title));
+		$title = preg_replace('!['.preg_quote($separator).'\s]+!u', $separator, $title);
 
-        return trim($title, $separator);
-    }
+		return trim($title, $separator);
+	}
 
-    public static function snake($value, $delimiter = '_') {
-        $key = $value;
+	public static function snake($value, $delimiter = '_') {
+		$key = $value;
 
-        if (isset(static::$snakeCache[$key][$delimiter])) {
-            return static::$snakeCache[$key][$delimiter];
-        }
+		if (isset(static::$snakeCache[$key][$delimiter])) {
+			return static::$snakeCache[$key][$delimiter];
+		}
 
-        if (! ctype_lower($value)) {
-            $value = preg_replace('/\s+/u', '', ucwords($value));
+		if (! ctype_lower($value)) {
+			$value = preg_replace('/\s+/u', '', ucwords($value));
 
-            $value = static::lower(preg_replace('/(.)(?=[A-Z])/u', '$1'.$delimiter, $value));
-        }
+			$value = static::lower(preg_replace('/(.)(?=[A-Z])/u', '$1'.$delimiter, $value));
+		}
 
-        return static::$snakeCache[$key][$delimiter] = $value;
-    }
+		return static::$snakeCache[$key][$delimiter] = $value;
+	}
 
-    public static function startsWith($haystack, $needles) {
-        foreach ((array) $needles as $needle) {
-            if ($needle !== '' && substr($haystack, 0, strlen($needle)) === (string) $needle) {
-                return true;
-            }
-        }
+	public static function startsWith($haystack, $needles) {
+		foreach ((array) $needles as $needle) {
+			if ($needle !== '' && substr($haystack, 0, strlen($needle)) === (string) $needle) {
+				return true;
+			}
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    public static function studly($value) {
-        $key = $value;
+	public static function studly($value) {
+		$key = $value;
 
-        if (isset(static::$studlyCache[$key])) {
-            return static::$studlyCache[$key];
-        }
+		if (isset(static::$studlyCache[$key])) {
+			return static::$studlyCache[$key];
+		}
 
-        $value = ucwords(str_replace(['-', '_'], ' ', $value));
+		$value = ucwords(str_replace(['-', '_'], ' ', $value));
 
-        return static::$studlyCache[$key] = str_replace(' ', '', $value);
-    }
+		return static::$studlyCache[$key] = str_replace(' ', '', $value);
+	}
 
-    public static function substr($string, $start, $length = null) {
-        return mb_substr($string, $start, $length, 'UTF-8');
-    }
+	public static function substr($string, $start, $length = null) {
+		return mb_substr($string, $start, $length, 'UTF-8');
+	}
 
-    public static function ucfirst($string) {
-        return static::upper(static::substr($string, 0, 1)).static::substr($string, 1);
-    }
+	public static function ucfirst($string) {
+		return static::upper(static::substr($string, 0, 1)).static::substr($string, 1);
+	}
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -97,7 +97,7 @@ 
     public static function words($value, $words = 100, $end = '...') {
         preg_match('/^\s*+(?:\S++\s*+){1,'.$words.'}/u', $value, $matches);
 
-        if (! isset($matches[0]) || static::length($value) === static::length($matches[0])) {
+        if (!isset($matches[0]) || static::length($value) === static::length($matches[0])) {
             return $value;
         }
 
@@ -193,7 +193,7 @@ 
             return static::$snakeCache[$key][$delimiter];
         }
 
-        if (! ctype_lower($value)) {
+        if (!ctype_lower($value)) {
             $value = preg_replace('/\s+/u', '', ucwords($value));
 
             $value = static::lower(preg_replace('/(.)(?=[A-Z])/u', '$1'.$delimiter, $value));

bootstrap/helpers.php

Spacing +28 added lines, -28 removed lines

@@ -1,27 +1,27 @@ 
 <?php
 
-function f3($get=null){$f3=Base::instance();return $get?$f3->get($get):$f3;}
+function f3($get = null) {$f3 = Base::instance(); return $get ? $f3->get($get) : $f3; }
 
-function base_path($inner = ''){return realpath(__DIR__.'/../').'/'.$inner;}
-function storage_path($inner = ''){return base_path('storage/').'/'.$inner;}
-function db_path($db = ''){return storage_path('db/').$db;}
-function lang_path($lang = ''){return base_path('resources/lang/').'/'.$lang;}
-function views_path(){return base_path('resources/views/');}
-function config_path($config = ''){return base_path('config/').'/'.$config;}
+function base_path($inner = '') {return realpath(__DIR__.'/../').'/'.$inner; }
+function storage_path($inner = '') {return base_path('storage/').'/'.$inner; }
+function db_path($db = '') {return storage_path('db/').$db; }
+function lang_path($lang = '') {return base_path('resources/lang/').'/'.$lang; }
+function views_path() {return base_path('resources/views/'); }
+function config_path($config = '') {return base_path('config/').'/'.$config; }
 
-function abort(){f3()->abort();}
-function status($code=404){f3()->error($code);}
-function reroute($where){f3()->reroute($where);}
-function is_api($path){if(is_string($path)) {return explode('/', $path)[1] === 'api';}return false;}
+function abort() {f3()->abort(); }
+function status($code = 404) {f3()->error($code); }
+function reroute($where) {f3()->reroute($where); }
+function is_api($path) {if (is_string($path)) {return explode('/', $path)[1] === 'api'; }return false; }
 
 function view($template, array $params = [], $mime = 'text/html') {
-	if(!empty($params)) {
+	if (!empty($params)) {
 		f3()->mset($params);
 	}
-	if(is_array($template)){
+	if (is_array($template)) {
 		$layout = $template[0];
 		$view = $template[1];
-	}else{
+	}else {
 		$layout = 'layouts/app.htm';
 		$view = $template;
 	}
@@ -31,13 +31,13 @@ 
 
 function template($template, array $params = [], $mime = 'text/html') {
 	$f3 = f3();
-	if(!empty($params)) {
+	if (!empty($params)) {
 		$f3->mset($params);
 	}
-	if(is_array($template)){
+	if (is_array($template)) {
 		$layout = $template[0];
 		$view = $template[1];
-	}else{
+	}else {
 		$layout = 'layouts/app.htm';
 		$view = $template;
 	}
@@ -46,23 +46,23 @@ 
 	echo Template::instance()->render($layout, $mime);
 }
 
-function str_contains($haystack,$needles){foreach((array)$needles as $needle){if($needle!=''&&mb_strpos($haystack,$needle)!==false){return true;}}return false;}
-function extension($file,$default='json'){return $file.'.'.(pathinfo($file,PATHINFO_EXTENSION)?:$default);}
-function flash($message, $type = 'success') {Flash::instance()->addMessage($message, $type);}
-function trans($key,$params=null){return f3()->format(f3()->get($key),($params?:''));}
+function str_contains($haystack, $needles) {foreach ((array) $needles as $needle) {if ($needle != '' && mb_strpos($haystack, $needle) !== false) {return true; }}return false; }
+function extension($file, $default = 'json') {return $file.'.'.(pathinfo($file, PATHINFO_EXTENSION) ?: $default); }
+function flash($message, $type = 'success') {Flash::instance()->addMessage($message, $type); }
+function trans($key, $params = null) {return f3()->format(f3()->get($key), ($params ?: '')); }
 function error($error) {
-	if(null === $error) {return;}
-	if(is_array($error)) {
-		foreach($error as $err) {
-			if(is_array($err)) {
-				foreach($err as $e) {
+	if (null === $error) {return; }
+	if (is_array($error)) {
+		foreach ($error as $err) {
+			if (is_array($err)) {
+				foreach ($err as $e) {
 					flash($e, 'danger');
 				}
-			}else{
+			}else {
 				flash($err, 'danger');
 			}
 		}
-	}else{
+	}else {
 		flash($error, 'danger');
 	}
 }
\ No newline at end of file

Braces +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
 	if(is_array($template)){
 		$layout = $template[0];
 		$view = $template[1];
-	}else{
+	} else{
 		$layout = 'layouts/app.htm';
 		$view = $template;
 	}
@@ -37,7 +37,7 @@ 
 	if(is_array($template)){
 		$layout = $template[0];
 		$view = $template[1];
-	}else{
+	} else{
 		$layout = 'layouts/app.htm';
 		$view = $template;
 	}
@@ -58,11 +58,11 @@ 
 				foreach($err as $e) {
 					flash($e, 'danger');
 				}
-			}else{
+			} else{
 				flash($err, 'danger');
 			}
 		}
-	}else{
+	} else{
 		flash($error, 'danger');
 	}
 }
\ No newline at end of file