AnuTiger / F3

helpers/Controller.php

Indentation +8 added lines, -8 removed lines

@@ -2,14 +2,14 @@
 
 abstract class Controller
 {
-    protected $viewPath;
+	protected $viewPath;
 
-    protected function view()
-    {
-    }
+	protected function view()
+	{
+	}
 
-    protected function template($template)
-    {
-        template($this->viewPath.$template);
-    }
+	protected function template($template)
+	{
+		template($this->viewPath.$template);
+	}
 }

helpers/Model.php

Indentation +26 added lines, -26 removed lines

@@ -2,35 +2,35 @@
 
 abstract class Model extends Cortex
 {
-    protected $app;
-    protected $db = 'DB';
-    protected $fieldConf = array(
-        'created_at' => array(
-            'type' => Schema::DT_TIMESTAMP,
-            'default' => Schema::DF_CURRENT_TIMESTAMP
-            ),
-        'updated_at' => array(
-            'type' => Schema::DT_TIMESTAMP,
-            'default' => '0-0-0 0:0:0'
-            ),
-        'deleted_at' => array(
-            'type' => Schema::DT_TIMESTAMP,
-            'default' => '0-0-0 0:0:0'
-            )
-        );
+	protected $app;
+	protected $db = 'DB';
+	protected $fieldConf = array(
+		'created_at' => array(
+			'type' => Schema::DT_TIMESTAMP,
+			'default' => Schema::DF_CURRENT_TIMESTAMP
+			),
+		'updated_at' => array(
+			'type' => Schema::DT_TIMESTAMP,
+			'default' => '0-0-0 0:0:0'
+			),
+		'deleted_at' => array(
+			'type' => Schema::DT_TIMESTAMP,
+			'default' => '0-0-0 0:0:0'
+			)
+		);
 
-    public function __construct()
-    {
-        if (property_exists($this, 'fields')) {
-            $this->fieldConf = array_merge($this->fields, $this->fieldConf);
-        }
+	public function __construct()
+	{
+		if (property_exists($this, 'fields')) {
+			$this->fieldConf = array_merge($this->fields, $this->fieldConf);
+		}
 
-        parent::__construct();
-        $this->app = f3();
-        //$this->beforesave($this->validate(get_called_class()));
-    }
+		parent::__construct();
+		$this->app = f3();
+		//$this->beforesave($this->validate(get_called_class()));
+	}
 
-    /*private function validate($caller, $parent) {
+	/*private function validate($caller, $parent) {
         $valid = true;
         foreach($this->getFieldConfiguration() as $field => $conf) {
             if(isset($conf['type']) && !isset($conf['relType'])){

helpers/Route.php

Indentation +84 added lines, -84 removed lines

@@ -2,88 +2,88 @@
 
 class Route extends Prefab
 {
-    private $app;
-
-    public function __construct()
-    {
-        if ($this->app == null) {
-            $this->app = f3();
-        }
-    }
-
-    public function uri()
-    {
-        return $this->app['URI'];
-    }
-
-    public function type()
-    {
-        return $this->app['VERB'];
-    }
-
-    public function has($route)
-    {
-        if (str_contains($route, '/')) {
-            return array_key_exists($route, $this->getRoutes());
-        }
-
-        return $this->getNamedRoute($route);
-    }
-
-    public function current()
-    {
-        return $this->app['PATH'];
-    }
-
-    public function is($route)
-    {
-        return Str::contains($this->current(), $route);
-    }
-
-    public function currentRouteName()
-    {
-        return $this->getRoutes()[$this->current()][0][$this->type()][3];
-    }
-
-    public function getRouteName($route)
-    {
-        $response = null;
-        foreach ($this->getNamedRoutes() as $name => $url) {
-            if ($url == $route) {
-                $response[] = $name;
-            }
-        }
-        return $response;
-        //return array_search($this->getNamedRoutes(), $route);
-    }
-
-    public function getNamedRoute($route)
-    {
-        return array_key_exists($route, $this->getNamedRoutes());
-    }
-
-    public function getNamedRoutes()
-    {
-        return $this->app['ALIASES'];
-    }
-
-    public function getRoutes()
-    {
-        return $this->app['ROUTES'];
-    }
-
-    public function hasParameter($parameter)
-    {
-        return (bool) $this->parameter($parameter);
-    }
-
-    public function parameters()
-    {
-        return $this->app[$this->type()];
-    }
-
-    public function parameter($parameter)
-    {
-        return $this->app[$this->type().'.'.$parameter];
-    }
+	private $app;
+
+	public function __construct()
+	{
+		if ($this->app == null) {
+			$this->app = f3();
+		}
+	}
+
+	public function uri()
+	{
+		return $this->app['URI'];
+	}
+
+	public function type()
+	{
+		return $this->app['VERB'];
+	}
+
+	public function has($route)
+	{
+		if (str_contains($route, '/')) {
+			return array_key_exists($route, $this->getRoutes());
+		}
+
+		return $this->getNamedRoute($route);
+	}
+
+	public function current()
+	{
+		return $this->app['PATH'];
+	}
+
+	public function is($route)
+	{
+		return Str::contains($this->current(), $route);
+	}
+
+	public function currentRouteName()
+	{
+		return $this->getRoutes()[$this->current()][0][$this->type()][3];
+	}
+
+	public function getRouteName($route)
+	{
+		$response = null;
+		foreach ($this->getNamedRoutes() as $name => $url) {
+			if ($url == $route) {
+				$response[] = $name;
+			}
+		}
+		return $response;
+		//return array_search($this->getNamedRoutes(), $route);
+	}
+
+	public function getNamedRoute($route)
+	{
+		return array_key_exists($route, $this->getNamedRoutes());
+	}
+
+	public function getNamedRoutes()
+	{
+		return $this->app['ALIASES'];
+	}
+
+	public function getRoutes()
+	{
+		return $this->app['ROUTES'];
+	}
+
+	public function hasParameter($parameter)
+	{
+		return (bool) $this->parameter($parameter);
+	}
+
+	public function parameters()
+	{
+		return $this->app[$this->type()];
+	}
+
+	public function parameter($parameter)
+	{
+		return $this->app[$this->type().'.'.$parameter];
+	}
 }

helpers/Captcha.php

Indentation +116 added lines, -116 removed lines

@@ -2,123 +2,123 @@
 
 class Captcha extends Prefab
 {
-    protected $name;
-    protected $code;
-    protected $pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
-
-    public function __construct($name = 'captcha-string')
-    {
-        $this->name = $name;
-    }
-
-    public function text($length = 4, $mock = null)
-    {
-        $this->setSession($code = $this->_generate($length));
-        return $code;
-    }
-
-    public function img($length = 4, $class = 'captcha-img')
-    {
-        return '<img src="'.$this->text($length).'" class="'.$class.'" />';
-    }
-
-    public function source($length = 4, $mock = null)
-    {
-    }
-
-    public function input($class = 'captcha-input')
-    {
-        return '<input type="text" class="'.$class.'" name="'.$this->name.'" />';
-    }
-
-    /*
+	protected $name;
+	protected $code;
+	protected $pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+
+	public function __construct($name = 'captcha-string')
+	{
+		$this->name = $name;
+	}
+
+	public function text($length = 4, $mock = null)
+	{
+		$this->setSession($code = $this->_generate($length));
+		return $code;
+	}
+
+	public function img($length = 4, $class = 'captcha-img')
+	{
+		return '<img src="'.$this->text($length).'" class="'.$class.'" />';
+	}
+
+	public function source($length = 4, $mock = null)
+	{
+	}
+
+	public function input($class = 'captcha-input')
+	{
+		return '<input type="text" class="'.$class.'" name="'.$this->name.'" />';
+	}
+
+	/*
     * Captcha::instance()->render(4)
     * 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)) {
-            $func = null;
-            $length = null;
-            $imgClass = null;
-            $inputClass = null;
-            foreach ($param as $key => $val) {
-                if ('type' == $key) {
-                    $func = $key;
-                }
-                if ('length' == $key) {
-                    $length = $key;
-                }
-                if ('class' == $key && is_array($key)) {
-                    if (array_key_exists('img', $key)) {
-                        $imgClass = $key['img'];
-                    } elseif (array_key_exists('input', $key)) {
-                        $inputClass = $key['input'];
-                    }
-                } else {
-                    $imgClass = $inputClass = $key;
-                }
-            }
-            if (method_exists($this, $func)) {
-                $response = $this->$key($length, $imgClass).$this->input($inputClass);
-            } else {
-                throw new Exception("Error Processing Captcha Method", 1);
-            }
-        } elseif (is_numeric($param)) {
-            $response = $this->img($param).$this->input();
-        } else {
-            throw new Exception("Error Processing Captcha Parameters", 1);
-        }
-
-        return '<form method="post" action="'.$url.'">'.$response.'</form>';
-    }
-
-    public function name($name)
-    {
-        $this->name = $name;
-        return $this;
-    }
-
-    public function verify($code)
-    {
-        $this->startSession();
-
-        $n = $this->name;
-
-        $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 ($valid && isset($_SESSION[$n])) {
-            unset($_SESSION[$n]);
-        }
-
-        return $valid;
-    }
-
-    private function startSession()
-    {
-        session_id() || session_start();
-    }
-
-    private function setSession($string)
-    {
-        $this->startSession();
-        $_SESSION[$this->name] = crypt(strtolower($string), $this->salt());
-    }
-
-    private function _generate($length)
-    {
-        return $this->code = substr(str_shuffle(str_repeat($this->pool, 5)), 0, $length);
-    }
-
-    private static function salt()
-    {
-        return md5(__FILE__.filemtime(__FILE__));
-    }
+	public function render($param, $url)
+	{
+		if (is_array($param)) {
+			$func = null;
+			$length = null;
+			$imgClass = null;
+			$inputClass = null;
+			foreach ($param as $key => $val) {
+				if ('type' == $key) {
+					$func = $key;
+				}
+				if ('length' == $key) {
+					$length = $key;
+				}
+				if ('class' == $key && is_array($key)) {
+					if (array_key_exists('img', $key)) {
+						$imgClass = $key['img'];
+					} elseif (array_key_exists('input', $key)) {
+						$inputClass = $key['input'];
+					}
+				} else {
+					$imgClass = $inputClass = $key;
+				}
+			}
+			if (method_exists($this, $func)) {
+				$response = $this->$key($length, $imgClass).$this->input($inputClass);
+			} else {
+				throw new Exception("Error Processing Captcha Method", 1);
+			}
+		} elseif (is_numeric($param)) {
+			$response = $this->img($param).$this->input();
+		} else {
+			throw new Exception("Error Processing Captcha Parameters", 1);
+		}
+
+		return '<form method="post" action="'.$url.'">'.$response.'</form>';
+	}
+
+	public function name($name)
+	{
+		$this->name = $name;
+		return $this;
+	}
+
+	public function verify($code)
+	{
+		$this->startSession();
+
+		$n = $this->name;
+
+		$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 ($valid && isset($_SESSION[$n])) {
+			unset($_SESSION[$n]);
+		}
+
+		return $valid;
+	}
+
+	private function startSession()
+	{
+		session_id() || session_start();
+	}
+
+	private function setSession($string)
+	{
+		$this->startSession();
+		$_SESSION[$this->name] = crypt(strtolower($string), $this->salt());
+	}
+
+	private function _generate($length)
+	{
+		return $this->code = substr(str_shuffle(str_repeat($this->pool, 5)), 0, $length);
+	}
+
+	private static function salt()
+	{
+		return md5(__FILE__.filemtime(__FILE__));
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -55,18 +55,18 @@
                     } elseif (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);
             }
         } elseif (is_numeric($param)) {
             $response = $this->img($param).$this->input();
-        } else {
+        }else {
             throw new Exception("Error Processing Captcha Parameters", 1);
         }
 

resources/lang/en.php

Indentation +84 added lines, -84 removed lines

@@ -1,90 +1,90 @@
 <?php
 
 return [
-    'site' => [
-        'title' => 'F3!',
-        'description' => 'description...',
-        'keywords' => 'f3, fatfree, fatfreeframework, anutig3r',
-        'author' => [
-            'name' => 'Anu Tig3r',
-            'email' => 'anutig3r@gmail.com'
-        ]
-    ],
+	'site' => [
+		'title' => 'F3!',
+		'description' => 'description...',
+		'keywords' => 'f3, fatfree, fatfreeframework, anutig3r',
+		'author' => [
+			'name' => 'Anu Tig3r',
+			'email' => 'anutig3r@gmail.com'
+		]
+	],
 
-    'error' => [
-        'validations' => [
-            'accepted' => 'The {0} must be accepted.',
-            'active_url' => 'The {0} is not a valid URL.',
-            'after' => 'The {0} must be a date after {1}.',
-            'after_or_equal' => 'The {0} must be a date after or equal to {1}.',
-            'alpha' => 'The {0} may only contain letters.',
-            'alpha_dash' => 'The {0} may only contain letters, numbers, and dashes.',
-            'alpha_num' => 'The {0} may only contain letters and numbers.',
-            'array' => 'The {0} must be an array.',
-            'before' => 'The {0} must be a date before {1}.',
-            'before_or_equal' => 'The {0} must be a date before or equal to {1}.',
-            'between' => [
-                'numeric' => 'The {0} must be between {1} and {2}.',
-                'file' => 'The {0} must be between {1} and {2} kilobytes.',
-                'string' => 'The {0} must be between {1} and {2} characters.',
-                'array' => 'The {0} must have between {1} and {2} items.',
-            ],
-            'boolean' => 'The {0} field must be true or false.',
-            'confirmed' => 'The {0} confirmation does not match.',
-            'date' => 'The {0} is not a valid date.',
-            'date_format' => 'The {0} does not match the format {1}.',
-            'digits' => 'The {0} must be :digits digits.',
-            'digits_between' => 'The {0} must be between {1} and {1} digits.',
-            'email' => 'The {0} must be a valid email address.',
-            'exists' => 'The selected {0} is invalid.',
-            'file' => 'The {0} must be a file.',
-            'filled' => 'The {0} field must have a value.',
-            'image' => 'The {0} must be an image.',
-            'in' => 'The selected {0} is invalid.',
-            'in_array' => 'The {0} field does not exist in {1}.',
-            'integer' => 'The {0} must be an integer.',
-            'ip' => 'The {0} must be a valid IP address.',
-            'ipv4' => 'The {0} must be a valid IPv4 address.',
-            'ipv6' => 'The {0} must be a valid IPv6 address.',
-            'json' => 'The {0} must be a valid JSON string.',
-            'max' => [
-                'numeric' => 'The {0} may not be greater than {1}.',
-                'file' => 'The {0} may not be greater than {1} kilobytes.',
-                'string' => 'The {0} may not be greater than {1} characters.',
-                'array' => 'The {0} may not have more than {1} items.',
-            ],
-            'mimes' => 'The {0} must be a file of {1} {2}.',
-            'mimetypes' => 'The {0} must be a file of {1} {2}.',
-            'min' => [
-                'numeric' => 'The {0} must be at least {1}.',
-                'file' => 'The {0} must be at least {1} kilobytes.',
-                'string' => 'The {0} must be at least {1} characters.',
-                'array' => 'The {0} must have at least {1} items.',
-            ],
-            'not_in' => 'The selected {0} is invalid.',
-            '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.',
-            'size' => [
-                'numeric' => 'The {0} must be {1}.',
-                'file' => 'The {0} must be {1} kilobytes.',
-                'string' => 'The {0} must be {1} characters.',
-                'array' => 'The {0} must contain {1} items.',
-            ],
-            'string' => 'The {0} must be a string.',
-            'timezone' => 'The {0} must be a valid zone.',
-            'unique' => 'The {0} has already been taken.',
-            'uploaded' => 'The {0} failed to upload.',
-            'url' => 'The {0} format is invalid.',
-        ],
-        'auth' => [
-            'not_registered' => '{0} is not registered with us!',
-            'password' => 'Password is not geniune for {0}',
-        ]
-    ],
+	'error' => [
+		'validations' => [
+			'accepted' => 'The {0} must be accepted.',
+			'active_url' => 'The {0} is not a valid URL.',
+			'after' => 'The {0} must be a date after {1}.',
+			'after_or_equal' => 'The {0} must be a date after or equal to {1}.',
+			'alpha' => 'The {0} may only contain letters.',
+			'alpha_dash' => 'The {0} may only contain letters, numbers, and dashes.',
+			'alpha_num' => 'The {0} may only contain letters and numbers.',
+			'array' => 'The {0} must be an array.',
+			'before' => 'The {0} must be a date before {1}.',
+			'before_or_equal' => 'The {0} must be a date before or equal to {1}.',
+			'between' => [
+				'numeric' => 'The {0} must be between {1} and {2}.',
+				'file' => 'The {0} must be between {1} and {2} kilobytes.',
+				'string' => 'The {0} must be between {1} and {2} characters.',
+				'array' => 'The {0} must have between {1} and {2} items.',
+			],
+			'boolean' => 'The {0} field must be true or false.',
+			'confirmed' => 'The {0} confirmation does not match.',
+			'date' => 'The {0} is not a valid date.',
+			'date_format' => 'The {0} does not match the format {1}.',
+			'digits' => 'The {0} must be :digits digits.',
+			'digits_between' => 'The {0} must be between {1} and {1} digits.',
+			'email' => 'The {0} must be a valid email address.',
+			'exists' => 'The selected {0} is invalid.',
+			'file' => 'The {0} must be a file.',
+			'filled' => 'The {0} field must have a value.',
+			'image' => 'The {0} must be an image.',
+			'in' => 'The selected {0} is invalid.',
+			'in_array' => 'The {0} field does not exist in {1}.',
+			'integer' => 'The {0} must be an integer.',
+			'ip' => 'The {0} must be a valid IP address.',
+			'ipv4' => 'The {0} must be a valid IPv4 address.',
+			'ipv6' => 'The {0} must be a valid IPv6 address.',
+			'json' => 'The {0} must be a valid JSON string.',
+			'max' => [
+				'numeric' => 'The {0} may not be greater than {1}.',
+				'file' => 'The {0} may not be greater than {1} kilobytes.',
+				'string' => 'The {0} may not be greater than {1} characters.',
+				'array' => 'The {0} may not have more than {1} items.',
+			],
+			'mimes' => 'The {0} must be a file of {1} {2}.',
+			'mimetypes' => 'The {0} must be a file of {1} {2}.',
+			'min' => [
+				'numeric' => 'The {0} must be at least {1}.',
+				'file' => 'The {0} must be at least {1} kilobytes.',
+				'string' => 'The {0} must be at least {1} characters.',
+				'array' => 'The {0} must have at least {1} items.',
+			],
+			'not_in' => 'The selected {0} is invalid.',
+			'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.',
+			'size' => [
+				'numeric' => 'The {0} must be {1}.',
+				'file' => 'The {0} must be {1} kilobytes.',
+				'string' => 'The {0} must be {1} characters.',
+				'array' => 'The {0} must contain {1} items.',
+			],
+			'string' => 'The {0} must be a string.',
+			'timezone' => 'The {0} must be a valid zone.',
+			'unique' => 'The {0} has already been taken.',
+			'uploaded' => 'The {0} failed to upload.',
+			'url' => 'The {0} format is invalid.',
+		],
+		'auth' => [
+			'not_registered' => '{0} is not registered with us!',
+			'password' => 'Password is not geniune for {0}',
+		]
+	],
 
-    'messenger' => [
-        'new' => '{0, plural, zero {No new message}, one {One new message}, other {You have # new messages}}'
-    ]
+	'messenger' => [
+		'new' => '{0, plural, zero {No new message}, one {One new message}, other {You have # new messages}}'
+	]
 ];

app.php

Indentation +167 added lines, -167 removed lines

@@ -2,171 +2,171 @@
 
 class app extends Prefab
 {
-    public $db;
-    public $app;
-    public $session;
-    public $authenticatedUser;
-
-    public function __construct()
-    {
-        $this->app = $this->app ?: Base::instance();
-    }
-
-    public static 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 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 config($key = null)
-    {
-        return $this->app->get($key ?: 'CONFIG');
-    }
-
-    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();
-        $this->registerErrorHandler();
-        $this->initialized(true);
-        $this->app->run();
-    }
-
-    public function loadRoutes($file = null)
-    {
-        $this->_load('routes', $file);
-    }
-
-    public function loadConfig($file = null)
-    {
-        $this->_load('config', $file);
-    }
-
-    private function _load($path, $file = null)
-    {
-        if ($file) {
-            $this->app->config(base_path("{path}/{$file}"));
-        } else {
-            foreach (glob(base_path("{$path}/*.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);
-        } elseif ($type == 'sql') {
-            $this->db = new DB\SQL($this->app->DB, $this->app->DB_USER, $this->app->DB_PSWD);
-        } elseif ($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);
-            } elseif ($this->app->CSRF) {
-                $this->session = new Session(null, 'CSRF');
-            } else {
-                if ($type == 'jig' || $type == 'mongo' || $type == 'sql') {
-                    $session = str_ireplace('/', '', 'DB\/'.$this->_getDBType($type).'\Session');
-                    $this->session = new $session($this->app->DB);
-                } else {
-                    $this->session = new Session();
-                }
-            }
-            $this->app->set('SESSION', $this->session);
-        }
-    }
-
-    public function configureCSRF($type)
-    {
-        $session = str_ireplace('/', '', 'DB\/'.$this->_getDBType($type).'\Session');
-        $this->session = new $session($this->app->DB, 'sessions', null, 'CSRF');
-    }
-
-    private function _getDBType($type)
-    {
-        if ($type == 'jig' || $type == 'mongo') {
-            return ucfirst($type);
-        } elseif ($type == 'sql') {
-            return strtoupper($type);
-        }
-    }
-
-    public function configureAssets()
-    {
-        $assets = Assets::instance();
-        $this->app->set('ASSETS.onFileNotFound', function ($file) {
-            echo 'file not found: '.$file;
-        });
-    }
-
-    public function registerErrorHandler()
-    {
-        if ($this->app->DEV) {
-            Falsum\Run::handler($this->app->DEBUG != 3);
-        } else {
-            $this->app->set('ONERROR', 'App\Core\Controllers\ErrorController->init');
-        }
-    }
+	public $db;
+	public $app;
+	public $session;
+	public $authenticatedUser;
+
+	public function __construct()
+	{
+		$this->app = $this->app ?: Base::instance();
+	}
+
+	public static 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 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 config($key = null)
+	{
+		return $this->app->get($key ?: 'CONFIG');
+	}
+
+	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();
+		$this->registerErrorHandler();
+		$this->initialized(true);
+		$this->app->run();
+	}
+
+	public function loadRoutes($file = null)
+	{
+		$this->_load('routes', $file);
+	}
+
+	public function loadConfig($file = null)
+	{
+		$this->_load('config', $file);
+	}
+
+	private function _load($path, $file = null)
+	{
+		if ($file) {
+			$this->app->config(base_path("{path}/{$file}"));
+		} else {
+			foreach (glob(base_path("{$path}/*.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);
+		} elseif ($type == 'sql') {
+			$this->db = new DB\SQL($this->app->DB, $this->app->DB_USER, $this->app->DB_PSWD);
+		} elseif ($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);
+			} elseif ($this->app->CSRF) {
+				$this->session = new Session(null, 'CSRF');
+			} else {
+				if ($type == 'jig' || $type == 'mongo' || $type == 'sql') {
+					$session = str_ireplace('/', '', 'DB\/'.$this->_getDBType($type).'\Session');
+					$this->session = new $session($this->app->DB);
+				} else {
+					$this->session = new Session();
+				}
+			}
+			$this->app->set('SESSION', $this->session);
+		}
+	}
+
+	public function configureCSRF($type)
+	{
+		$session = str_ireplace('/', '', 'DB\/'.$this->_getDBType($type).'\Session');
+		$this->session = new $session($this->app->DB, 'sessions', null, 'CSRF');
+	}
+
+	private function _getDBType($type)
+	{
+		if ($type == 'jig' || $type == 'mongo') {
+			return ucfirst($type);
+		} elseif ($type == 'sql') {
+			return strtoupper($type);
+		}
+	}
+
+	public function configureAssets()
+	{
+		$assets = Assets::instance();
+		$this->app->set('ASSETS.onFileNotFound', function ($file) {
+			echo 'file not found: '.$file;
+		});
+	}
+
+	public function registerErrorHandler()
+	{
+		if ($this->app->DEV) {
+			Falsum\Run::handler($this->app->DEBUG != 3);
+		} else {
+			$this->app->set('ONERROR', 'App\Core\Controllers\ErrorController->init');
+		}
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -16,7 +16,7 @@ 
     {
         if (Registry::exists('APP')) {
             $app = Registry::get('APP');
-        } else {
+        }else {
             $app = new self;
             Registry::set('APP', $app);
         }
@@ -81,7 +81,7 @@ 
     {
         if ($file) {
             $this->app->config(base_path("{path}/{$file}"));
-        } else {
+        }else {
             foreach (glob(base_path("{$path}/*.ini")) as $file) {
                 $this->app->config($file);
             }
@@ -126,11 +126,11 @@ 
                 $this->configureCSRF($type);
             } elseif ($this->app->CSRF) {
                 $this->session = new Session(null, 'CSRF');
-            } else {
+            }else {
                 if ($type == 'jig' || $type == 'mongo' || $type == 'sql') {
                     $session = str_ireplace('/', '', 'DB\/'.$this->_getDBType($type).'\Session');
                     $this->session = new $session($this->app->DB);
-                } else {
+                }else {
                     $this->session = new Session();
                 }
             }
@@ -156,7 +156,7 @@ 
     public function configureAssets()
     {
         $assets = Assets::instance();
-        $this->app->set('ASSETS.onFileNotFound', function ($file) {
+        $this->app->set('ASSETS.onFileNotFound', function($file) {
             echo 'file not found: '.$file;
         });
     }
@@ -165,7 +165,7 @@ 
     {
         if ($this->app->DEV) {
             Falsum\Run::handler($this->app->DEBUG != 3);
-        } else {
+        }else {
             $this->app->set('ONERROR', 'App\Core\Controllers\ErrorController->init');
         }
     }

bootstrap/helpers.php

Indentation +54 added lines, -54 removed lines

@@ -2,110 +2,110 @@
 
 function f3($get = null)
 {
-    $f3 = Base::instance();
-    return $get ? $f3->get($get) : $f3;
+	$f3 = Base::instance();
+	return $get ? $f3->get($get) : $f3;
 }
 
 function base_path($inner = '')
 {
-    return realpath(__DIR__.'/../').'/'.$inner;
+	return realpath(__DIR__.'/../').'/'.$inner;
 }
 function storage_path($inner = '')
 {
-    return base_path('storage/').'/'.$inner;
+	return base_path('storage/').'/'.$inner;
 }
 function db_path($db = '')
 {
-    return storage_path('db/').$db;
+	return storage_path('db/').$db;
 }
 function lang_path($lang = '')
 {
-    return base_path('resources/lang/').'/'.$lang;
+	return base_path('resources/lang/').'/'.$lang;
 }
 function views_path()
 {
-    return base_path('resources/views/');
+	return base_path('resources/views/');
 }
 function config_path($config = '')
 {
-    return base_path('config/').'/'.$config;
+	return base_path('config/').'/'.$config;
 }
 
 function abort()
 {
-    f3()->abort();
+	f3()->abort();
 }
 function status($code = 404)
 {
-    f3()->error($code);
+	f3()->error($code);
 }
 function reroute($where)
 {
-    f3()->reroute($where);
+	f3()->reroute($where);
 }
 function is_api($path)
 {
-    if (is_string($path)) {
-        return explode('/', $path)[1] === 'api';
-    }
-    return false;
+	if (is_string($path)) {
+		return explode('/', $path)[1] === 'api';
+	}
+	return false;
 }
 
 function template($template, array $params = [], $mime = 'text/html')
 {
-    $f3 = f3();
-    if (!empty($params)) {
-        $f3->mset($params);
-    }
-    if (is_array($template)) {
-        $layout = $template[0];
-        $view = $template[1];
-    } else {
-        $layout = 'layouts/app.htm';
-        $view = $template;
-    }
-    $f3->set('user', App::instance()->user());
-    $f3->set('content', extension($view, 'htm'));
-    echo Template::instance()->render($layout, $mime);
+	$f3 = f3();
+	if (!empty($params)) {
+		$f3->mset($params);
+	}
+	if (is_array($template)) {
+		$layout = $template[0];
+		$view = $template[1];
+	} else {
+		$layout = 'layouts/app.htm';
+		$view = $template;
+	}
+	$f3->set('user', App::instance()->user());
+	$f3->set('content', extension($view, 'htm'));
+	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;
+	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);
+	return $file.'.'.(pathinfo($file, PATHINFO_EXTENSION) ?: $default);
 }
 function flash($message, $type = 'success')
 {
-    Flash::instance()->addMessage($message, $type);
+	Flash::instance()->addMessage($message, $type);
 }
 function trans($key, $params = null)
 {
-    return f3()->format(f3()->get($key), ($params ?: ''));
+	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) {
-                    flash($e, 'danger');
-                }
-            } else {
-                flash($err, 'danger');
-            }
-        }
-    } else {
-        flash($error, 'danger');
-    }
+	if (null === $error) {
+		return;
+	}
+	if (is_array($error)) {
+		foreach ($error as $err) {
+			if (is_array($err)) {
+				foreach ($err as $e) {
+					flash($e, 'danger');
+				}
+			} else {
+				flash($err, 'danger');
+			}
+		}
+	} else {
+		flash($error, 'danger');
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -60,7 +60,7 @@ 
     if (is_array($template)) {
         $layout = $template[0];
         $view = $template[1];
-    } else {
+    }else {
         $layout = 'layouts/app.htm';
         $view = $template;
     }
@@ -101,11 +101,11 @@ 
                 foreach ($err as $e) {
                     flash($e, 'danger');
                 }
-            } else {
+            }else {
                 flash($err, 'danger');
             }
         }
-    } else {
+    }else {
         flash($error, 'danger');
     }
 }

helpers/Str.php

Indentation +247 added lines, -247 removed lines

@@ -2,262 +2,262 @@
 
 class Str extends Prefab
 {
-    protected static $snakeCache = [];
-    protected static $camelCache = [];
-    protected static $studlyCache = [];
+	protected static $snakeCache = [];
+	protected static $camelCache = [];
+	protected static $studlyCache = [];
     
-    public static function after($subject, $search)
-    {
-        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 camel($value)
-    {
-        if (isset(static::$camelCache[$value])) {
-            return static::$camelCache[$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;
-            }
-        }
-
-        return false;
-    }
-
-    public static function endsWith($haystack, $needles)
-    {
-        foreach ((array) $needles as $needle) {
-            if (substr($haystack, -strlen($needle)) === (string) $needle) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public static function finish($value, $cap)
-    {
-        $quoted = preg_quote($cap, '/');
-
-        return preg_replace('/(?:'.$quoted.')+$/u', '', $value).$cap;
-    }
-
-    public static function is($pattern, $value)
-    {
-        $patterns = is_array($pattern) ? $pattern : (array) $pattern;
-
-        if (empty($patterns)) {
-            return false;
-        }
-
-        foreach ($patterns as $pattern) {
-            if ($pattern == $value) {
-                return true;
-            }
-
-            $pattern = preg_quote($pattern, '#');
-            $pattern = str_replace('\*', '.*', $pattern);
-
-            if (preg_match('#^'.$pattern.'\z#u', $value) === 1) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public static function kebab($value)
-    {
-        return static::snake($value, '-');
-    }
-
-    public static function length($value, $encoding = null)
-    {
-        if ($encoding) {
-            return mb_strlen($value, $encoding);
-        }
-
-        return mb_strlen($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;
-    }
-
-    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);
-
-        if (!isset($matches[0]) || static::length($value) === static::length($matches[0])) {
-            return $value;
-        }
-
-        return rtrim($matches[0]).$end;
-    }
-
-    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 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);
-        }
-
-        return $string;
-    }
-
-    public static function replaceArray($search, array $replace, $subject)
-    {
-        foreach ($replace as $value) {
-            $subject = static::replaceFirst($search, $value, $subject);
-        }
-
-        return $subject;
-    }
-
-    public static function replaceFirst($search, $replace, $subject)
-    {
-        if ($search == '') {
-            return $subject;
-        }
-
-        $position = strpos($subject, $search);
-
-        if ($position !== false) {
-            return substr_replace($subject, $replace, $position, strlen($search));
-        }
-
-        return $subject;
-    }
-
-    public static function replaceLast($search, $replace, $subject)
-    {
-        $position = strrpos($subject, $search);
-
-        if ($position !== false) {
-            return substr_replace($subject, $replace, $position, strlen($search));
-        }
-
-        return $subject;
-    }
-
-    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 title($value)
-    {
-        return mb_convert_case($value, MB_CASE_TITLE, 'UTF-8');
-    }
-
-    public static function singular($value)
-    {
-        return Pluralizer::singular($value);
-    }
-
-    public static function slug($title, $separator = '-', $language = 'en')
-    {
-        $title = static::ascii($title, $language);
-
-        $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);
-
-        return trim($title, $separator);
-    }
+	public static function after($subject, $search)
+	{
+		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 camel($value)
+	{
+		if (isset(static::$camelCache[$value])) {
+			return static::$camelCache[$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;
+			}
+		}
+
+		return false;
+	}
+
+	public static function endsWith($haystack, $needles)
+	{
+		foreach ((array) $needles as $needle) {
+			if (substr($haystack, -strlen($needle)) === (string) $needle) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	public static function finish($value, $cap)
+	{
+		$quoted = preg_quote($cap, '/');
+
+		return preg_replace('/(?:'.$quoted.')+$/u', '', $value).$cap;
+	}
+
+	public static function is($pattern, $value)
+	{
+		$patterns = is_array($pattern) ? $pattern : (array) $pattern;
+
+		if (empty($patterns)) {
+			return false;
+		}
+
+		foreach ($patterns as $pattern) {
+			if ($pattern == $value) {
+				return true;
+			}
+
+			$pattern = preg_quote($pattern, '#');
+			$pattern = str_replace('\*', '.*', $pattern);
+
+			if (preg_match('#^'.$pattern.'\z#u', $value) === 1) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	public static function kebab($value)
+	{
+		return static::snake($value, '-');
+	}
+
+	public static function length($value, $encoding = null)
+	{
+		if ($encoding) {
+			return mb_strlen($value, $encoding);
+		}
+
+		return mb_strlen($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;
+	}
+
+	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);
+
+		if (!isset($matches[0]) || static::length($value) === static::length($matches[0])) {
+			return $value;
+		}
+
+		return rtrim($matches[0]).$end;
+	}
+
+	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 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);
+		}
+
+		return $string;
+	}
+
+	public static function replaceArray($search, array $replace, $subject)
+	{
+		foreach ($replace as $value) {
+			$subject = static::replaceFirst($search, $value, $subject);
+		}
+
+		return $subject;
+	}
+
+	public static function replaceFirst($search, $replace, $subject)
+	{
+		if ($search == '') {
+			return $subject;
+		}
+
+		$position = strpos($subject, $search);
+
+		if ($position !== false) {
+			return substr_replace($subject, $replace, $position, strlen($search));
+		}
+
+		return $subject;
+	}
+
+	public static function replaceLast($search, $replace, $subject)
+	{
+		$position = strrpos($subject, $search);
+
+		if ($position !== false) {
+			return substr_replace($subject, $replace, $position, strlen($search));
+		}
+
+		return $subject;
+	}
+
+	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 title($value)
+	{
+		return mb_convert_case($value, MB_CASE_TITLE, 'UTF-8');
+	}
+
+	public static function singular($value)
+	{
+		return Pluralizer::singular($value);
+	}
+
+	public static function slug($title, $separator = '-', $language = 'en')
+	{
+		$title = static::ascii($title, $language);
+
+		$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);
+
+		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 (!ctype_lower($value)) {
-            $value = preg_replace('/\s+/u', '', ucwords($value));
-
-            $value = static::lower(preg_replace('/(.)(?=[A-Z])/u', '$1'.$delimiter, $value));
-        }
-
-        return static::$snakeCache[$key][$delimiter] = $value;
-    }
+		if (isset(static::$snakeCache[$key][$delimiter])) {
+			return static::$snakeCache[$key][$delimiter];
+		}
+
+		if (!ctype_lower($value)) {
+			$value = preg_replace('/\s+/u', '', ucwords($value));
+
+			$value = static::lower(preg_replace('/(.)(?=[A-Z])/u', '$1'.$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);
+	}
 }