caffeina-core / core

classes/Event.php

Spacing +11 added lines, -11 removed lines

@@ -15,40 +15,40 @@
 
     protected static $_listeners = [];
 
-    public static function on($name,callable $listener){
+    public static function on($name, callable $listener) {
         static::$_listeners[$name][] = $listener;
     }
 
-    public static function single($name,callable $listener){
+    public static function single($name, callable $listener) {
         static::$_listeners[$name] = [$listener];
     }
 
-    public static function off($name,callable $listener = null){
-        if($listener === null) {
+    public static function off($name, callable $listener = null) {
+        if ($listener === null) {
             unset(static::$_listeners[$name]);
         } else {
-            if ($idx = array_search($listener,static::$_listeners[$name],true))
+            if ($idx = array_search($listener, static::$_listeners[$name], true))
                 unset(static::$_listeners[$name][$idx]);
         }
     }
 
-    public static function alias($source,$alias){
-        static::$_listeners[$alias] =& static::$_listeners[$source];
+    public static function alias($source, $alias) {
+        static::$_listeners[$alias] = & static::$_listeners[$source];
     }
 
-    public static function trigger($name){
-        if (false === empty(static::$_listeners[$name])){
+    public static function trigger($name) {
+        if (false === empty(static::$_listeners[$name])) {
             $args = func_get_args();
             array_shift($args);
             $results = [];
             foreach (static::$_listeners[$name] as $listener) {
-                $results[] = call_user_func_array($listener,$args);
+                $results[] = call_user_func_array($listener, $args);
             }
             return $results;
         };
     }
 
-    public static function triggerOnce($name){
+    public static function triggerOnce($name) {
         $res = static::trigger($name);
         unset(static::$_listeners[$name]);
         return $res;

Braces +10 added lines, -9 removed lines

@@ -15,29 +15,30 @@ 
 
     protected static $_listeners = [];
 
-    public static function on($name,callable $listener){
+    public static function on($name,callable $listener) {
         static::$_listeners[$name][] = $listener;
     }
 
-    public static function single($name,callable $listener){
+    public static function single($name,callable $listener) {
         static::$_listeners[$name] = [$listener];
     }
 
-    public static function off($name,callable $listener = null){
+    public static function off($name,callable $listener = null) {
         if($listener === null) {
             unset(static::$_listeners[$name]);
         } else {
-            if ($idx = array_search($listener,static::$_listeners[$name],true))
-                unset(static::$_listeners[$name][$idx]);
+            if ($idx = array_search($listener,static::$_listeners[$name],true)) {
+                            unset(static::$_listeners[$name][$idx]);
+            }
         }
     }
 
-    public static function alias($source,$alias){
+    public static function alias($source,$alias) {
         static::$_listeners[$alias] =& static::$_listeners[$source];
     }
 
-    public static function trigger($name){
-        if (false === empty(static::$_listeners[$name])){
+    public static function trigger($name) {
+        if (false === empty(static::$_listeners[$name])) {
             $args = func_get_args();
             array_shift($args);
             $results = [];
@@ -48,7 +49,7 @@ 
         };
     }
 
-    public static function triggerOnce($name){
+    public static function triggerOnce($name) {
         $res = static::trigger($name);
         unset(static::$_listeners[$name]);
         return $res;

classes/Negotiation.php

Spacing +16 added lines, -16 removed lines

@@ -13,15 +13,15 @@ 
 class Negotiation {
   protected $list;
 
-  public static function parse($query){
+  public static function parse($query) {
     $list = new \SplPriorityQueue();
     array_map(function($e) use ($list) {
-      preg_match_all('(([^;]+)(?=\s*;\s*(\w+)\s*=\s*([^;]+))*)',$e,$p);
-      $params = array_map('trim',array_merge(
-        [ 'type' => current($p[0]) ], array_combine($p[2], $p[3]))
+      preg_match_all('(([^;]+)(?=\s*;\s*(\w+)\s*=\s*([^;]+))*)', $e, $p);
+      $params = array_map('trim', array_merge(
+        ['type' => current($p[0])], array_combine($p[2], $p[3]))
       );
       unset($params['']);
-      $params['q'] = isset($params['q']) ? 1.0*$params['q'] : $params['q'] = 1.0;
+      $params['q'] = isset($params['q']) ? 1.0 * $params['q'] : $params['q'] = 1.0;
       $list->insert($params, $params['q']);
     },preg_split('(\s*,\s*)', $query));
     return array_values(iterator_to_array($list));
@@ -35,26 +35,26 @@ 
     $this->list = self::parse(trim($query));
   }
 
-  public function preferred(){
+  public function preferred() {
     return self::encodeParsedValue(current($this->list));
   }
 
-  protected static function encodeParsedValue($parsed){
-    unset($parsed['q']);     // Hide quality key from output
-    $type = $parsed['type']; // Extract type
+  protected static function encodeParsedValue($parsed) {
+    unset($parsed['q']);// Hide quality key from output
+    $type = $parsed['type'];// Extract type
     unset($parsed['type']);
-    return implode(';', array_merge([$type], array_map(function($k,$v){
+    return implode(';', array_merge([$type], array_map(function($k, $v) {
       return "$k=$v";
     }, array_keys($parsed), $parsed)));
   }
 
-  public function best($choices){
-    $_choices  = self::parse(trim($choices));
-    foreach ($this->list as $accept){
-      foreach ($_choices as $choice){
+  public function best($choices) {
+    $_choices = self::parse(trim($choices));
+    foreach ($this->list as $accept) {
+      foreach ($_choices as $choice) {
         if (preg_match('('.strtr($accept["type"],
-          [ '.' => '\.', '+' => '\+', '*' => '.+' ]
-        ).')', $choice["type"])){
+          ['.' => '\.', '+' => '\+', '*' => '.+']
+        ).')', $choice["type"])) {
           return self::encodeParsedValue($choice);
         }
       }

Braces +8 added lines, -8 removed lines

@@ -13,7 +13,7 @@ 
 class Negotiation {
   protected $list;
 
-  public static function parse($query){
+  public static function parse($query) {
     $list = new \SplPriorityQueue();
     array_map(function($e) use ($list) {
       preg_match_all('(([^;]+)(?=\s*;\s*(\w+)\s*=\s*([^;]+))*)',$e,$p);
@@ -35,26 +35,26 @@ 
     $this->list = self::parse(trim($query));
   }
 
-  public function preferred(){
+  public function preferred() {
     return self::encodeParsedValue(current($this->list));
   }
 
-  protected static function encodeParsedValue($parsed){
+  protected static function encodeParsedValue($parsed) {
     unset($parsed['q']);     // Hide quality key from output
     $type = $parsed['type']; // Extract type
     unset($parsed['type']);
-    return implode(';', array_merge([$type], array_map(function($k,$v){
+    return implode(';', array_merge([$type], array_map(function($k,$v) {
       return "$k=$v";
     }, array_keys($parsed), $parsed)));
   }
 
-  public function best($choices){
+  public function best($choices) {
     $_choices  = self::parse(trim($choices));
-    foreach ($this->list as $accept){
-      foreach ($_choices as $choice){
+    foreach ($this->list as $accept) {
+      foreach ($_choices as $choice) {
         if (preg_match('('.strtr($accept["type"],
           [ '.' => '\.', '+' => '\+', '*' => '.+' ]
-        ).')', $choice["type"])){
+        ).')', $choice["type"])) {
           return self::encodeParsedValue($choice);
         }
       }

classes/Password.php

Indentation +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
  * @copyright Caffeina srl - 2015 - http://caffeina.it
  */
 
- class Password {
+  class Password {
     use Module;
 
     /**

Spacing +9 added lines, -9 removed lines

@@ -18,12 +18,12 @@ 
      * @param string $password
      * @return string
      */
-    public static function make($password){
+    public static function make($password) {
         // Pre PHP 5.5 support
         if (!defined('PASSWORD_DEFAULT')) {
-            return '$5h$'.hash('sha1',$password);
+            return '$5h$'.hash('sha1', $password);
         } else {
-            return password_hash($password,PASSWORD_BCRYPT,['cost' => 12]);
+            return password_hash($password, PASSWORD_BCRYPT, ['cost' => 12]);
         }
     }
 
@@ -33,12 +33,12 @@ 
      * @param  string $hash     The hash to match against
      * @return bool             Returns `true` if hash match password
      */
-    public static function verify($password, $hash){
+    public static function verify($password, $hash) {
         // Pre PHP 5.5 support
-        if (!defined('PASSWORD_DEFAULT') || substr($hash,0,4)=='$5h$') {
-            return '$5h$'.hash('sha1',$password) == $hash;
+        if (!defined('PASSWORD_DEFAULT') || substr($hash, 0, 4) == '$5h$') {
+            return '$5h$'.hash('sha1', $password) == $hash;
         } else {
-            return password_verify($password,$hash);
+            return password_verify($password, $hash);
         }
     }
 
@@ -49,7 +49,7 @@ 
      * @param  string $b Second string to compare
      * @return boll      Returns `true` if strings are the same
      */
-    public static function compare($a, $b){
+    public static function compare($a, $b) {
       return hash_equals($a, $b);
     }
 
@@ -58,7 +58,7 @@ 
 
 // Polyfill hash_equals (PHP < 5.6.0)
 // http://php.net/manual/en/function.hash-equals.php
-if(!function_exists('hash_equals')) {
+if (!function_exists('hash_equals')) {
   function hash_equals($a, $b) {
     return substr_count("$a" ^ "$b", "\0") * 2 === strlen("$a$b");
   }

Braces +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
      * @param string $password
      * @return string
      */
-    public static function make($password){
+    public static function make($password) {
         // Pre PHP 5.5 support
         if (!defined('PASSWORD_DEFAULT')) {
             return '$5h$'.hash('sha1',$password);
@@ -33,7 +33,7 @@ 
      * @param  string $hash     The hash to match against
      * @return bool             Returns `true` if hash match password
      */
-    public static function verify($password, $hash){
+    public static function verify($password, $hash) {
         // Pre PHP 5.5 support
         if (!defined('PASSWORD_DEFAULT') || substr($hash,0,4)=='$5h$') {
             return '$5h$'.hash('sha1',$password) == $hash;
@@ -49,7 +49,7 @@ 
      * @param  string $b Second string to compare
      * @return boll      Returns `true` if strings are the same
      */
-    public static function compare($a, $b){
+    public static function compare($a, $b) {
       return hash_equals($a, $b);
     }
 

classes/ZIP.php

Indentation +2 added lines, -2 removed lines

@@ -14,8 +14,8 @@
   use Module;
 
   public $file,
-         $name,
-         $zip;
+          $name,
+          $zip;
 
   public static function create($name=''){
     return new ZIP($name);

Spacing +19 added lines, -19 removed lines

@@ -17,42 +17,42 @@ 
          $name,
          $zip;
 
-  public static function create($name=''){
+  public static function create($name = '') {
     return new ZIP($name);
   }
 
-  public function __construct($name=''){
-    $this->name = preg_replace('/\.zip$/','',($name?:tempnam(sys_get_temp_dir(), 'ZExp').'-archive'));
-    $this->file = $this->name . '.zip';
-    if (!preg_match('~^/|\./|\.\./~',$this->file)) $this->file = './'.$this->file;
+  public function __construct($name = '') {
+    $this->name = preg_replace('/\.zip$/', '', ($name ?: tempnam(sys_get_temp_dir(), 'ZExp').'-archive'));
+    $this->file = $this->name.'.zip';
+    if (!preg_match('~^/|\./|\.\./~', $this->file)) $this->file = './'.$this->file;
     $this->zip  = new \ZipArchive;
-    if ( true !== ($e = $this->zip->open($this->file,
+    if (true !== ($e = $this->zip->open($this->file,
       \ZipArchive::CREATE || \ZipArchive::OVERWRITE
     ))) {
       throw new Exception("Error opening temp ZIP file [".($this->file)."] Code $e", 1);
     }
   }
 
-  public function __destruct(){
+  public function __destruct() {
     $this->close();
   }
 
-  public function path(){
+  public function path() {
     return $this->file;
   }
 
-  public function write($filename, $data){
+  public function write($filename, $data) {
     $this->zip->addFromString($filename, $data);
     return $this;
   }
 
-  public function close(){
-    if($this->zip) @$this->zip->close();
+  public function close() {
+    if ($this->zip) @$this->zip->close();
     return $this;
   }
 
-  public function addDirectory($folder, $root=null) {
-    $folder = rtrim($folder,'/');
+  public function addDirectory($folder, $root = null) {
+    $folder = rtrim($folder, '/');
     if (null === $root) {
       $root   = dirname($folder);
       $folder = basename($folder);
@@ -60,25 +60,25 @@ 
     $this->zip->addEmptyDir($folder);
     foreach (glob("$root/$folder/*") as $item) {
       if (is_dir($item)) {
-          $this->addDirectory(str_replace($root,'',$item),$root);
-      } else if (is_file($item))  {
-          $this->zip->addFile($item, str_replace($root,'',$item));
+          $this->addDirectory(str_replace($root, '', $item), $root);
+      } else if (is_file($item)) {
+          $this->zip->addFile($item, str_replace($root, '', $item));
       }
     }
 
     return $this;
   }
 
-  public function download(){
+  public function download() {
     @$this->zip->close();
     header('Content-Type: application/zip');
-    header('Content-Disposition: attachment;filename="'.$this->name.'"',true);
+    header('Content-Disposition: attachment;filename="'.$this->name.'"', true);
     header('Content-Transfer-Encoding: binary');
     header('Expires: 0');
     header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
     header('Pragma: public');
     header('Content-Length: '.filesize($this->file));
-    while(ob_get_level()) ob_end_clean();
+    while (ob_get_level()) ob_end_clean();
     readfile($this->file);
     exit;
   }

Braces +14 added lines, -10 removed lines

@@ -17,14 +17,16 @@ 
          $name,
          $zip;
 
-  public static function create($name=''){
+  public static function create($name='') {
     return new ZIP($name);
   }
 
-  public function __construct($name=''){
+  public function __construct($name='') {
     $this->name = preg_replace('/\.zip$/','',($name?:tempnam(sys_get_temp_dir(), 'ZExp').'-archive'));
     $this->file = $this->name . '.zip';
-    if (!preg_match('~^/|\./|\.\./~',$this->file)) $this->file = './'.$this->file;
+    if (!preg_match('~^/|\./|\.\./~',$this->file)) {
+      $this->file = './'.$this->file;
+    }
     $this->zip  = new \ZipArchive;
     if ( true !== ($e = $this->zip->open($this->file,
       \ZipArchive::CREATE || \ZipArchive::OVERWRITE
@@ -33,21 +35,23 @@ 
     }
   }
 
-  public function __destruct(){
+  public function __destruct() {
     $this->close();
   }
 
-  public function path(){
+  public function path() {
     return $this->file;
   }
 
-  public function write($filename, $data){
+  public function write($filename, $data) {
     $this->zip->addFromString($filename, $data);
     return $this;
   }
 
-  public function close(){
-    if($this->zip) @$this->zip->close();
+  public function close() {
+    if($this->zip) {
+      @$this->zip->close();
+    }
     return $this;
   }
 
@@ -61,7 +65,7 @@ 
     foreach (glob("$root/$folder/*") as $item) {
       if (is_dir($item)) {
           $this->addDirectory(str_replace($root,'',$item),$root);
-      } else if (is_file($item))  {
+      } else if (is_file($item)) {
           $this->zip->addFile($item, str_replace($root,'',$item));
       }
     }
@@ -69,7 +73,7 @@ 
     return $this;
   }
 
-  public function download(){
+  public function download() {
     @$this->zip->close();
     header('Content-Type: application/zip');
     header('Content-Disposition: attachment;filename="'.$this->name.'"',true);

classes/Object.php

Indentation +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
                     }
                 }
             }
-           parent::__construct($data, static::ARRAY_AS_PROPS);
+            parent::__construct($data, static::ARRAY_AS_PROPS);
         } else {
             throw new InvalidArgumentException(
                 'Argument must be a string containing valid JSON, an array or an stdClass.'

Braces +16 added lines, -13 removed lines

@@ -21,12 +21,12 @@ 
      * @param mixed  $input The object/array/json_encoded object to wrap
      * @param boolean $deep  Wrap also deep branches as Objects
      */
-    public function __construct($input=[], $deep=true){
+    public function __construct($input=[], $deep=true) {
         $data = is_string($input) ? json_decode($input,true) : (array)$input;
-        if (is_array($data)){
+        if (is_array($data)) {
             if ($deep) {
                 foreach ($data as $key => &$value) {
-                    if (is_array($value) || is_a($value,'stdClass')){
+                    if (is_array($value) || is_a($value,'stdClass')) {
                         $value = new self($value);
                     }
                 }
@@ -42,17 +42,18 @@ 
     /**
      * ArrayObject::offsetSet
      */
-    public function offsetSet($key, $value){
-        if ( is_array($value) )
-          parent::offsetSet($key, new static($value));
-        else
-          parent::offsetSet($key, $value);
+    public function offsetSet($key, $value) {
+        if ( is_array($value) ) {
+                  parent::offsetSet($key, new static($value));
+        } else {
+                  parent::offsetSet($key, $value);
+        }
     }
 
     /**
      * ArrayObject::offsetGet
      */
-    public function offsetGet($key){
+    public function offsetGet($key) {
         $raw = parent::offsetGet($key);
         return is_callable($raw) ? call_user_func($raw) : $raw;
     }
@@ -60,10 +61,12 @@ 
     /**
      * Emulate object methods
      */
-    public function __call($method, $args){
+    public function __call($method, $args) {
         $raw = parent::offsetGet($method);
         if (is_callable($raw)) {
-            if ($raw instanceof \Closure) $raw->bindTo($this);
+            if ($raw instanceof \Closure) {
+              $raw->bindTo($this);
+            }
             return call_user_func_array($raw, $args);
         }
     }
@@ -72,7 +75,7 @@ 
      * If casted as a string, return a JSON rappresentation of the wrapped payload
      * @return string
      */
-    public function __toString(){
+    public function __toString() {
         return json_encode($this,JSON_NUMERIC_CHECK);
     }
 
@@ -103,7 +106,7 @@ 
       return $frag ? '' : $ptr;
     }
 
-    public static function create($class, $args = null){
+    public static function create($class, $args = null) {
         return is_array($args) ? (new ReflectionClass($class))->newInstanceArgs($args) : new $class;
     }
 

Spacing +15 added lines, -15 removed lines

@@ -21,12 +21,12 @@ 
      * @param mixed  $input The object/array/json_encoded object to wrap
      * @param boolean $deep  Wrap also deep branches as Objects
      */
-    public function __construct($input=[], $deep=true){
-        $data = is_string($input) ? json_decode($input,true) : (array)$input;
-        if (is_array($data)){
+    public function __construct($input = [], $deep = true) {
+        $data = is_string($input) ? json_decode($input, true) : (array) $input;
+        if (is_array($data)) {
             if ($deep) {
                 foreach ($data as $key => &$value) {
-                    if (is_array($value) || is_a($value,'stdClass')){
+                    if (is_array($value) || is_a($value, 'stdClass')) {
                         $value = new self($value);
                     }
                 }
@@ -42,8 +42,8 @@ 
     /**
      * ArrayObject::offsetSet
      */
-    public function offsetSet($key, $value){
-        if ( is_array($value) )
+    public function offsetSet($key, $value) {
+        if (is_array($value))
           parent::offsetSet($key, new static($value));
         else
           parent::offsetSet($key, $value);
@@ -52,7 +52,7 @@ 
     /**
      * ArrayObject::offsetGet
      */
-    public function offsetGet($key){
+    public function offsetGet($key) {
         $raw = parent::offsetGet($key);
         return is_callable($raw) ? call_user_func($raw) : $raw;
     }
@@ -60,7 +60,7 @@ 
     /**
      * Emulate object methods
      */
-    public function __call($method, $args){
+    public function __call($method, $args) {
         $raw = parent::offsetGet($method);
         if (is_callable($raw)) {
             if ($raw instanceof \Closure) $raw->bindTo($this);
@@ -72,8 +72,8 @@ 
      * If casted as a string, return a JSON rappresentation of the wrapped payload
      * @return string
      */
-    public function __toString(){
-        return json_encode($this,JSON_NUMERIC_CHECK);
+    public function __toString() {
+        return json_encode($this, JSON_NUMERIC_CHECK);
     }
 
     /**
@@ -84,22 +84,22 @@ 
      */
 
     public static function fetch($path, $root) {
-      $_ = (array)$root;
-      if (strpos($path,'.') === false) {
+      $_ = (array) $root;
+      if (strpos($path, '.') === false) {
         return isset($_[$path]) ? $_[$path] : null;
       } else {
-        list($frag,$rest) = explode('.', $path, 2);
+        list($frag, $rest) = explode('.', $path, 2);
         if ($rest) {
           return isset($_[$frag]) ? self::fetch($rest, $_[$frag]) : null;
         } elseif ($frag) {
-          return (array)$_[$frag];
+          return (array) $_[$frag];
         } else {
           return null;
         }
       }
     }
 
-    public static function create($class, $args = null){
+    public static function create($class, $args = null) {
         return is_array($args) ? (new ReflectionClass($class))->newInstanceArgs($args) : new $class;
     }
 

classes/Message.php

Spacing +22 added lines, -22 removed lines

@@ -15,41 +15,41 @@ 
   protected static $loaded = false;
   protected static $fields = [];
 
-  protected static function init(){
-    if(false===static::$loaded){
-      static::load(Session::get('core.messages',[]));
+  protected static function init() {
+    if (false === static::$loaded) {
+      static::load(Session::get('core.messages', []));
       static::$loaded = true;
     }
   }
 
-  public static function & get($key,$default=null){
+  public static function & get($key, $default = null){
     static::init();
-    $value = parent::get($key,'');
-    parent::delete($key,'');
-    Session::set('core.messages',parent::all());
+    $value = parent::get($key, '');
+    parent::delete($key, '');
+    Session::set('core.messages', parent::all());
     return $value;
   }
 
-  public static function set($key,$data=null){
+  public static function set($key, $data = null) {
     static::init();
-    parent::set($key,$data);
-    return Session::set('core.messages',parent::all());
+    parent::set($key, $data);
+    return Session::set('core.messages', parent::all());
   }
 
-  public static function add($key,$data=null){
+  public static function add($key, $data = null) {
     static::init();
-    $d = parent::get($key,[]);
+    $d = parent::get($key, []);
     $d[] = $data;
-    parent::set($key,$d);
-    return Session::set('core.messages',parent::all());
+    parent::set($key, $d);
+    return Session::set('core.messages', parent::all());
   }
 
-  public static function & all($key=null){
+  public static function & all($key = null){
     static::init();
-    if($key){
-      $all = parent::get($key,[]);
+    if ($key) {
+      $all = parent::get($key, []);
       parent::delete($key);
-      Session::set('core.messages',parent::all());
+      Session::set('core.messages', parent::all());
     } else {
       $all = parent::all();
       static::clear();
@@ -57,7 +57,7 @@ 
     return $all;
   }
 
-  public static function clear(){
+  public static function clear() {
     static::init();
     parent::clear();
     Session::delete('core.messages');
@@ -68,7 +68,7 @@ 
    * Return a read-only accessor to messages variables for in-view use.
    * @return MessageReadOnly
    */
-  public static function readOnly(){
+  public static function readOnly() {
     return new MessageReadOnly();
   }
 
@@ -81,11 +81,11 @@ 
 
 class MessageReadOnly {
 
-  public function __get($key){
+  public function __get($key) {
     return Message::get($key);
   }
 
-  public function __isset($key){
+  public function __isset($key) {
     return true;
   }
 

Braces +9 added lines, -9 removed lines

@@ -15,8 +15,8 @@ 
   protected static $loaded = false;
   protected static $fields = [];
 
-  protected static function init(){
-    if(false===static::$loaded){
+  protected static function init() {
+    if(false===static::$loaded) {
       static::load(Session::get('core.messages',[]));
       static::$loaded = true;
     }
@@ -30,13 +30,13 @@ 
     return $value;
   }
 
-  public static function set($key,$data=null){
+  public static function set($key,$data=null) {
     static::init();
     parent::set($key,$data);
     return Session::set('core.messages',parent::all());
   }
 
-  public static function add($key,$data=null){
+  public static function add($key,$data=null) {
     static::init();
     $d = parent::get($key,[]);
     $d[] = $data;
@@ -46,7 +46,7 @@ 
 
   public static function & all($key=null){
     static::init();
-    if($key){
+    if($key) {
       $all = parent::get($key,[]);
       parent::delete($key);
       Session::set('core.messages',parent::all());
@@ -57,7 +57,7 @@ 
     return $all;
   }
 
-  public static function clear(){
+  public static function clear() {
     static::init();
     parent::clear();
     Session::delete('core.messages');
@@ -68,7 +68,7 @@ 
    * Return a read-only accessor to messages variables for in-view use.
    * @return MessageReadOnly
    */
-  public static function readOnly(){
+  public static function readOnly() {
     return new MessageReadOnly();
   }
 
@@ -81,11 +81,11 @@ 
 
 class MessageReadOnly {
 
-  public function __get($key){
+  public function __get($key) {
     return Message::get($key);
   }
 
-  public function __isset($key){
+  public function __isset($key) {
     return true;
   }
 

classes/CSV.php

Spacing +37 added lines, -37 removed lines

@@ -27,54 +27,54 @@ 
             $format       = self::STANDARD,
             $savedheaders = false;
 
-  public static function open($file, $format=self::AUTO){
-    return new static($file,self::READ,$format);
+  public static function open($file, $format = self::AUTO) {
+    return new static($file, self::READ, $format);
   }
 
-  public static function create($file, $format=self::STANDARD){
-    return new static($file,self::WRITE, $format);
+  public static function create($file, $format = self::STANDARD) {
+    return new static($file, self::WRITE, $format);
   }
 
-  public static function fromSQL($sql, $format=self::AUTO){
+  public static function fromSQL($sql, $format = self::AUTO) {
     $csv = static::create(tempnam(sys_get_temp_dir(), 'CSVx'), $format);
-    SQL::each($sql,function($row) use (&$csv){
+    SQL::each($sql, function($row) use (&$csv){
       $csv->write($row);
     });
     return $csv;
   }
 
-  public static function fromTable($table, $format=self::AUTO){
+  public static function fromTable($table, $format = self::AUTO) {
     $csv = static::create(tempnam(sys_get_temp_dir(), 'CSVx'), $format);
-    foreach($table as $row){
+    foreach ($table as $row) {
       $csv->write($row);
     }
     return $csv;
   }
 
-  public function __construct($file, $mode=self::READ, $format=self::AUTO){
+  public function __construct($file, $mode = self::READ, $format = self::AUTO) {
     $this->mode = $mode;
-    $this->file = new \SplFileObject($file,'c+');
+    $this->file = new \SplFileObject($file, 'c+');
     if (!$this->file->valid()) throw new Exception("Error opening CSV file [$file]", 1);
     $this->file->setFlags(
-      \SplFileObject::READ_CSV |     // set file reading mode to csv
-      \SplFileObject::SKIP_EMPTY |   // ignore empty lines
+      \SplFileObject::READ_CSV | // set file reading mode to csv
+      \SplFileObject::SKIP_EMPTY | // ignore empty lines
       \SplFileObject::DROP_NEW_LINE  // drop new line from last column in record
     );
-    $this->format = ($format==self::AUTO ? $this->guessSeparator() : $format);
-    $this->file->setCsvControl($this->format,'"',"\\");
+    $this->format = ($format == self::AUTO ? $this->guessSeparator() : $format);
+    $this->file->setCsvControl($this->format, '"', "\\");
   }
 
-  private function guessSeparator($checkLines = 2){
+  private function guessSeparator($checkLines = 2) {
     if ($this->mode == self::WRITE) return self::STANDARD;
-    $delimiters = [",","\t",";"];
+    $delimiters = [",", "\t", ";"];
     $results = [];
     $this->file->rewind();
     while ($checkLines--) {
         $line = $this->file->fgets();
-        foreach ($delimiters as $delimiter){
+        foreach ($delimiters as $delimiter) {
             $fields = preg_split('/['.$delimiter.']/', $line);
-            if(count($fields) > 1){
-                if(empty($results[$delimiter])){
+            if (count($fields) > 1) {
+                if (empty($results[$delimiter])) {
                   $results[$delimiter] = 1;
                 } else {
                   $results[$delimiter]++;
@@ -87,9 +87,9 @@ 
     return $results[0];
   }
 
-  public function write($row){
+  public function write($row) {
     if ($this->mode != self::WRITE) return;
-    $row = (array)$row;
+    $row = (array) $row;
     if (false === $this->savedheaders) {
       $this->schema(array_keys($row));
     }
@@ -100,11 +100,11 @@ 
     $this->file->fputcsv($row_t);
   }
 
-  public function read(){
+  public function read() {
     if ($this->mode != self::READ) return;
-    foreach($this->file as $row){
-      if ($row){
-        if(!$this->headers) {
+    foreach ($this->file as $row) {
+      if ($row) {
+        if (!$this->headers) {
           $this->headers = $row;
           continue;
         }
@@ -114,18 +114,18 @@ 
     return;
   }
 
-  public function each(callable $looper = null){
+  public function each(callable $looper = null) {
     if ($looper) {
-      foreach($this->read() as $row) $looper($row);
+      foreach ($this->read() as $row) $looper($row);
       return $this;
     } else {
       $results = [];
-      foreach($this->read() as $row) $results[] = $row;
+      foreach ($this->read() as $row) $results[] = $row;
       return $results;
     }
   }
 
-  public function convert($filename, $format=self::STANDARD){
+  public function convert($filename, $format = self::STANDARD) {
     if ($this->mode != self::READ) return;
     if ($format == self::AUTO) $format = self::STANDARD;
     $csv = CSV::create($filename, CSV::EXCEL);
@@ -135,18 +135,18 @@ 
     return $csv;
   }
 
-  public function flush(){
+  public function flush() {
     if ($this->mode == self::WRITE) {
       $this->file->fflush();
     }
   }
 
-  public function schema($schema=null){
-    if($schema){
-      $this->headers = array_values((array)$schema);
+  public function schema($schema = null) {
+    if ($schema) {
+      $this->headers = array_values((array) $schema);
       if ($this->mode == self::WRITE) {
         $this->savedheaders = true;
-        $this->template = array_combine($this->headers, array_pad([],count($this->headers),''));
+        $this->template = array_combine($this->headers, array_pad([], count($this->headers), ''));
         $this->file->fputcsv($this->headers);
       }
       return $this;
@@ -155,13 +155,13 @@ 
     }
   }
 
-  public function asString(){
+  public function asString() {
     $this->flush();
     return file_get_contents($this->file->getPathname());
   }
 
-  public function __toString(){
-    try { return $this->asString(); } catch(\Exception $e) { return ''; }
+  public function __toString() {
+    try { return $this->asString();} catch (\Exception $e) { return '';}
   }
 
 }

Braces +43 added lines, -29 removed lines

@@ -27,34 +27,36 @@ 
             $format       = self::STANDARD,
             $savedheaders = false;
 
-  public static function open($file, $format=self::AUTO){
+  public static function open($file, $format=self::AUTO) {
     return new static($file,self::READ,$format);
   }
 
-  public static function create($file, $format=self::STANDARD){
+  public static function create($file, $format=self::STANDARD) {
     return new static($file,self::WRITE, $format);
   }
 
-  public static function fromSQL($sql, $format=self::AUTO){
+  public static function fromSQL($sql, $format=self::AUTO) {
     $csv = static::create(tempnam(sys_get_temp_dir(), 'CSVx'), $format);
-    SQL::each($sql,function($row) use (&$csv){
+    SQL::each($sql,function($row) use (&$csv) {
       $csv->write($row);
     });
     return $csv;
   }
 
-  public static function fromTable($table, $format=self::AUTO){
+  public static function fromTable($table, $format=self::AUTO) {
     $csv = static::create(tempnam(sys_get_temp_dir(), 'CSVx'), $format);
-    foreach($table as $row){
+    foreach($table as $row) {
       $csv->write($row);
     }
     return $csv;
   }
 
-  public function __construct($file, $mode=self::READ, $format=self::AUTO){
+  public function __construct($file, $mode=self::READ, $format=self::AUTO) {
     $this->mode = $mode;
     $this->file = new \SplFileObject($file,'c+');
-    if (!$this->file->valid()) throw new Exception("Error opening CSV file [$file]", 1);
+    if (!$this->file->valid()) {
+      throw new Exception("Error opening CSV file [$file]", 1);
+    }
     $this->file->setFlags(
       \SplFileObject::READ_CSV |     // set file reading mode to csv
       \SplFileObject::SKIP_EMPTY |   // ignore empty lines
@@ -64,17 +66,19 @@ 
     $this->file->setCsvControl($this->format,'"',"\\");
   }
 
-  private function guessSeparator($checkLines = 2){
-    if ($this->mode == self::WRITE) return self::STANDARD;
+  private function guessSeparator($checkLines = 2) {
+    if ($this->mode == self::WRITE) {
+      return self::STANDARD;
+    }
     $delimiters = [",","\t",";"];
     $results = [];
     $this->file->rewind();
     while ($checkLines--) {
         $line = $this->file->fgets();
-        foreach ($delimiters as $delimiter){
+        foreach ($delimiters as $delimiter) {
             $fields = preg_split('/['.$delimiter.']/', $line);
-            if(count($fields) > 1){
-                if(empty($results[$delimiter])){
+            if(count($fields) > 1) {
+                if(empty($results[$delimiter])) {
                   $results[$delimiter] = 1;
                 } else {
                   $results[$delimiter]++;
@@ -87,23 +91,29 @@ 
     return $results[0];
   }
 
-  public function write($row){
-    if ($this->mode != self::WRITE) return;
+  public function write($row) {
+    if ($this->mode != self::WRITE) {
+      return;
+    }
     $row = (array)$row;
     if (false === $this->savedheaders) {
       $this->schema(array_keys($row));
     }
     $row_t = $this->template;
     foreach ($this->headers as $key) {
-      if (isset($row[$key])) $row_t[$key] = $row[$key];
+      if (isset($row[$key])) {
+        $row_t[$key] = $row[$key];
+      }
     }
     $this->file->fputcsv($row_t);
   }
 
-  public function read(){
-    if ($this->mode != self::READ) return;
-    foreach($this->file as $row){
-      if ($row){
+  public function read() {
+    if ($this->mode != self::READ) {
+      return;
+    }
+    foreach($this->file as $row) {
+      if ($row) {
         if(!$this->headers) {
           $this->headers = $row;
           continue;
@@ -114,7 +124,7 @@ 
     return;
   }
 
-  public function each(callable $looper = null){
+  public function each(callable $looper = null) {
     if ($looper) {
       foreach($this->read() as $row) $looper($row);
       return $this;
@@ -125,9 +135,13 @@ 
     }
   }
 
-  public function convert($filename, $format=self::STANDARD){
-    if ($this->mode != self::READ) return;
-    if ($format == self::AUTO) $format = self::STANDARD;
+  public function convert($filename, $format=self::STANDARD) {
+    if ($this->mode != self::READ) {
+      return;
+    }
+    if ($format == self::AUTO) {
+      $format = self::STANDARD;
+    }
     $csv = CSV::create($filename, CSV::EXCEL);
     $this->each(function($row) use ($csv) {
       $csv->write($row);
@@ -135,14 +149,14 @@ 
     return $csv;
   }
 
-  public function flush(){
+  public function flush() {
     if ($this->mode == self::WRITE) {
       $this->file->fflush();
     }
   }
 
-  public function schema($schema=null){
-    if($schema){
+  public function schema($schema=null) {
+    if($schema) {
       $this->headers = array_values((array)$schema);
       if ($this->mode == self::WRITE) {
         $this->savedheaders = true;
@@ -155,12 +169,12 @@ 
     }
   }
 
-  public function asString(){
+  public function asString() {
     $this->flush();
     return file_get_contents($this->file->getPathname());
   }
 
-  public function __toString(){
+  public function __toString() {
     try { return $this->asString(); } catch(\Exception $e) { return ''; }
   }
 

classes/Options.php

Indentation +44 added lines, -44 removed lines

@@ -13,52 +13,52 @@
 class Options extends Dictionary {
   protected static $fields = [];
 
-	/**
-	 * Load a PHP configuration file (script must return array)
-	 * @param  string $filepath The path of the PHP config file
-	 * @param  string $prefix_path You can insert/update the loaded array to a specific key path, if omitted it will be merged with the whole dictionary
-	 */
-	public static function loadPHP($filepath,$prefix_path=null){
-		ob_start();
-		$results = include($filepath);
-		ob_end_clean();
-		if($results) static::loadArray($results,$prefix_path);
-	}
+  /**
+   * Load a PHP configuration file (script must return array)
+   * @param  string $filepath The path of the PHP config file
+   * @param  string $prefix_path You can insert/update the loaded array to a specific key path, if omitted it will be merged with the whole dictionary
+   */
+  public static function loadPHP($filepath,$prefix_path=null){
+    ob_start();
+    $results = include($filepath);
+    ob_end_clean();
+    if($results) static::loadArray($results,$prefix_path);
+  }
 
-	/**
-	 * Load an INI configuration file
-	 * @param  string $filepath The path of the INI config file
-	 * @param  string $prefix_path You can insert/update the loaded array to a specific key path, if omitted it will be merged with the whole dictionary
-	 */
-	public static function loadINI($filepath,$prefix_path=null){
-		$results = parse_ini_file($filepath,true);
-		if($results) static::loadArray($results,$prefix_path);
-	}
+  /**
+   * Load an INI configuration file
+   * @param  string $filepath The path of the INI config file
+   * @param  string $prefix_path You can insert/update the loaded array to a specific key path, if omitted it will be merged with the whole dictionary
+   */
+  public static function loadINI($filepath,$prefix_path=null){
+    $results = parse_ini_file($filepath,true);
+    if($results) static::loadArray($results,$prefix_path);
+  }
 
-	/**
-	 * Load a JSON configuration file
-	 * @param  string $filepath The path of the JSON config file
-	 * @param  string $prefix_path You can insert/update the loaded array to a specific key path, if omitted it will be merged with the whole dictionary
-	 */
-	public static function loadJSON($filepath,$prefix_path=null){
-		$data = file_get_contents($filepath);
-		$results = $data?json_decode($data,true):[];
-		if($results) static::loadArray($results,$prefix_path);
-	}
+  /**
+   * Load a JSON configuration file
+   * @param  string $filepath The path of the JSON config file
+   * @param  string $prefix_path You can insert/update the loaded array to a specific key path, if omitted it will be merged with the whole dictionary
+   */
+  public static function loadJSON($filepath,$prefix_path=null){
+    $data = file_get_contents($filepath);
+    $results = $data?json_decode($data,true):[];
+    if($results) static::loadArray($results,$prefix_path);
+  }
 
-	/**
-	 * Load an array to the configuration
-	 * @param  array $array The array to load
-	 * @param  string $prefix_path You can insert/update the loaded array to a specific key path, if omitted it will be merged with the whole dictionary
-	 */
-	public static function loadArray(array $array,$prefix_path=null){
-		if (is_array($array)) {
-			if ($prefix_path){
-				static::set($prefix_path,$array);
-			} else {
-				static::merge($array);
-			}
-		}
-	}
+  /**
+   * Load an array to the configuration
+   * @param  array $array The array to load
+   * @param  string $prefix_path You can insert/update the loaded array to a specific key path, if omitted it will be merged with the whole dictionary
+   */
+  public static function loadArray(array $array,$prefix_path=null){
+    if (is_array($array)) {
+      if ($prefix_path){
+        static::set($prefix_path,$array);
+      } else {
+        static::merge($array);
+      }
+    }
+  }
 
 }

Spacing +19 added lines, -19 removed lines

@@ -18,11 +18,11 @@ 
 	 * @param  string $filepath The path of the PHP config file
 	 * @param  string $prefix_path You can insert/update the loaded array to a specific key path, if omitted it will be merged with the whole dictionary
 	 */
-	public static function loadPHP($filepath,$prefix_path=null){
+	public static function loadPHP($filepath, $prefix_path = null) {
 		ob_start();
 		$results = include($filepath);
 		ob_end_clean();
-		if($results) static::loadArray($results,$prefix_path);
+		if ($results) static::loadArray($results, $prefix_path);
 	}
 
 	/**
@@ -30,9 +30,9 @@ 
 	 * @param  string $filepath The path of the INI config file
 	 * @param  string $prefix_path You can insert/update the loaded array to a specific key path, if omitted it will be merged with the whole dictionary
 	 */
-	public static function loadINI($filepath,$prefix_path=null){
-		$results = parse_ini_file($filepath,true);
-		if($results) static::loadArray($results,$prefix_path);
+	public static function loadINI($filepath, $prefix_path = null) {
+		$results = parse_ini_file($filepath, true);
+		if ($results) static::loadArray($results, $prefix_path);
 	}
 
 	/**
@@ -40,10 +40,10 @@ 
 	 * @param  string $filepath The path of the JSON config file
 	 * @param  string $prefix_path You can insert/update the loaded array to a specific key path, if omitted it will be merged with the whole dictionary
 	 */
-	public static function loadJSON($filepath,$prefix_path=null){
+	public static function loadJSON($filepath, $prefix_path = null) {
 		$data = file_get_contents($filepath);
-		$results = $data?json_decode($data,true):[];
-		if($results) static::loadArray($results,$prefix_path);
+		$results = $data ? json_decode($data, true) : [];
+		if ($results) static::loadArray($results, $prefix_path);
 	}
 
 	/**
@@ -51,10 +51,10 @@ 
 	 * @param  array $array The array to load
 	 * @param  string $prefix_path You can insert/update the loaded array to a specific key path, if omitted it will be merged with the whole dictionary
 	 */
-	public static function loadArray(array $array,$prefix_path=null){
+	public static function loadArray(array $array, $prefix_path = null) {
 		if (is_array($array)) {
-			if ($prefix_path){
-				static::set($prefix_path,$array);
+			if ($prefix_path) {
+				static::set($prefix_path, $array);
 			} else {
 				static::merge($array);
 			}
@@ -67,22 +67,22 @@ 
    * @param  string $envname The filename for the ENV file (Default to `.env`)
    * @param  string $prefix_path You can insert/update the loaded array to a specific key path, if omitted it will be merged with the whole dictionary
    */
-  public static function loadENV($dir,$envname='.env',$prefix_path=null){
-    $dir = rtrim($dir,'/');
+  public static function loadENV($dir, $envname = '.env', $prefix_path = null) {
+    $dir = rtrim($dir, '/');
     $results = [];
-    foreach(file("$dir/$envname", FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES) as $line){
+    foreach (file("$dir/$envname", FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES) as $line) {
       $line = trim($line);
-      if ($line[0]=='#' || strpos($line,'=')===false) continue;
-      list($key,$value) = explode('=',$line,2);
+      if ($line[0] == '#' || strpos($line, '=') === false) continue;
+      list($key, $value) = explode('=', $line, 2);
       $key   = trim(str_replace(['export ', "'", '"'], '', $key));
-      $value = stripslashes(trim($value,'"'));
-      $results[$key] = preg_replace_callback('/\${([a-zA-Z0-9_]+)}/',function($m) use (&$results){
+      $value = stripslashes(trim($value, '"'));
+      $results[$key] = preg_replace_callback('/\${([a-zA-Z0-9_]+)}/', function($m) use (&$results){
         return isset($results[$m[1]]) ? $results[$m[1]] : '';
       },$value);
       putenv("$key={$results[$key]}");
       $_ENV[$key] = $results[$key];
     }
-    if($results) static::loadArray($results,$prefix_path);
+    if ($results) static::loadArray($results, $prefix_path);
   }
 
 }

Braces +23 added lines, -13 removed lines

@@ -18,11 +18,13 @@ 
 	 * @param  string $filepath The path of the PHP config file
 	 * @param  string $prefix_path You can insert/update the loaded array to a specific key path, if omitted it will be merged with the whole dictionary
 	 */
-	public static function loadPHP($filepath,$prefix_path=null){
+	public static function loadPHP($filepath,$prefix_path=null) {
 		ob_start();
 		$results = include($filepath);
 		ob_end_clean();
-		if($results) static::loadArray($results,$prefix_path);
+		if($results) {
+		  static::loadArray($results,$prefix_path);
+		}
 	}
 
 	/**
@@ -30,9 +32,11 @@ 
 	 * @param  string $filepath The path of the INI config file
 	 * @param  string $prefix_path You can insert/update the loaded array to a specific key path, if omitted it will be merged with the whole dictionary
 	 */
-	public static function loadINI($filepath,$prefix_path=null){
+	public static function loadINI($filepath,$prefix_path=null) {
 		$results = parse_ini_file($filepath,true);
-		if($results) static::loadArray($results,$prefix_path);
+		if($results) {
+		  static::loadArray($results,$prefix_path);
+		}
 	}
 
 	/**
@@ -40,10 +44,12 @@ 
 	 * @param  string $filepath The path of the JSON config file
 	 * @param  string $prefix_path You can insert/update the loaded array to a specific key path, if omitted it will be merged with the whole dictionary
 	 */
-	public static function loadJSON($filepath,$prefix_path=null){
+	public static function loadJSON($filepath,$prefix_path=null) {
 		$data = file_get_contents($filepath);
 		$results = $data?json_decode($data,true):[];
-		if($results) static::loadArray($results,$prefix_path);
+		if($results) {
+		  static::loadArray($results,$prefix_path);
+		}
 	}
 
 	/**
@@ -51,9 +57,9 @@ 
 	 * @param  array $array The array to load
 	 * @param  string $prefix_path You can insert/update the loaded array to a specific key path, if omitted it will be merged with the whole dictionary
 	 */
-	public static function loadArray(array $array,$prefix_path=null){
+	public static function loadArray(array $array,$prefix_path=null) {
 		if (is_array($array)) {
-			if ($prefix_path){
+			if ($prefix_path) {
 				static::set($prefix_path,$array);
 			} else {
 				static::merge($array);
@@ -67,22 +73,26 @@ 
    * @param  string $envname The filename for the ENV file (Default to `.env`)
    * @param  string $prefix_path You can insert/update the loaded array to a specific key path, if omitted it will be merged with the whole dictionary
    */
-  public static function loadENV($dir,$envname='.env',$prefix_path=null){
+  public static function loadENV($dir,$envname='.env',$prefix_path=null) {
     $dir = rtrim($dir,'/');
     $results = [];
-    foreach(file("$dir/$envname", FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES) as $line){
+    foreach(file("$dir/$envname", FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES) as $line) {
       $line = trim($line);
-      if ($line[0]=='#' || strpos($line,'=')===false) continue;
+      if ($line[0]=='#' || strpos($line,'=')===false) {
+        continue;
+      }
       list($key,$value) = explode('=',$line,2);
       $key   = trim(str_replace(['export ', "'", '"'], '', $key));
       $value = stripslashes(trim($value,'"'));
-      $results[$key] = preg_replace_callback('/\${([a-zA-Z0-9_]+)}/',function($m) use (&$results){
+      $results[$key] = preg_replace_callback('/\${([a-zA-Z0-9_]+)}/',function($m) use (&$results) {
         return isset($results[$m[1]]) ? $results[$m[1]] : '';
       },$value);
       putenv("$key={$results[$key]}");
       $_ENV[$key] = $results[$key];
     }
-    if($results) static::loadArray($results,$prefix_path);
+    if($results) {
+      static::loadArray($results,$prefix_path);
+    }
   }
 
 }

classes/File.php

Indentation +2 added lines, -2 removed lines

@@ -22,11 +22,11 @@
     }
 
     public static function unmount($alias) {
-       unset(static::$mount_points[$alias]);
+        unset(static::$mount_points[$alias]);
     }
 
     public static function mounts() {
-       return array_keys(static::$mount_points);
+        return array_keys(static::$mount_points);
     }
 
     public static function __callStatic($name, $params) {

Spacing +11 added lines, -11 removed lines

@@ -31,22 +31,22 @@ 
 
     public static function __callStatic($name, $params) {
         $uri = array_shift($params);
-        if ($file_location = static::locate($uri)){
+        if ($file_location = static::locate($uri)) {
             list($mount, $path) = $file_location;
             array_unshift($params, static::resolvePath($path));
             if (empty(static::$mount_points[$mount])) return false;
-            return call_user_func_array([static::$mount_points[$mount],$name],$params);
+            return call_user_func_array([static::$mount_points[$mount], $name], $params);
         } else return false;
     }
 
     public static function locate($path) {
-        if (strpos($path,'://')!==false) {
-            list($mount, $filepath) = explode('://',$path,2);
+        if (strpos($path, '://') !== false) {
+            list($mount, $filepath) = explode('://', $path, 2);
             $filepath = static::resolvePath($filepath);
             return isset(static::$mount_points[$mount]) ? [$mount, $filepath] : false;
         } else {
             $path = static::resolvePath($path);
-            foreach(static::$mount_points as $mount => $fs){
+            foreach (static::$mount_points as $mount => $fs) {
                 if ($fs->exists($path)) return [$mount, $path];
             }
             return false;
@@ -65,13 +65,13 @@ 
                 $absolutes[] = $part;
             }
         }
-        return trim(implode('/', $absolutes),'/');
+        return trim(implode('/', $absolutes), '/');
     }
 
-    public static function search($pattern, $recursive=true){
+    public static function search($pattern, $recursive = true) {
         $results = [];
         foreach (static::$mount_points as $mount => $fs) {
-            foreach($fs->search($pattern, $recursive) as $path) {
+            foreach ($fs->search($pattern, $recursive) as $path) {
                 $results[] = $mount.'://'.$path;
             }
         }
@@ -79,7 +79,7 @@ 
     }
 
 
-    public static function move($old,$new) {
+    public static function move($old, $new) {
         $src  = static::locate($old);
         $dest = static::locate($new);
         if ($src && $dest) {
@@ -87,9 +87,9 @@ 
             $_dfs = static::$mount_points[$dest[0]];
             if ($src[0] == $dest[0]) {
                 // Same filesystem
-                return $_sfs->move($src[1],$dest[1]);
+                return $_sfs->move($src[1], $dest[1]);
             } else {
-                return $_dfs->write($dest[1],$_sfs->read($src[1])) && $_sfs->delete($src[1]);
+                return $_dfs->write($dest[1], $_sfs->read($src[1])) && $_sfs->delete($src[1]);
             }
         } else return false;
     }

Braces +21 added lines, -9 removed lines

@@ -17,7 +17,9 @@ 
 
     public static function mount($alias, $driver, $options = null) {
         $driver_class = '\\FileSystem\\'.ucfirst(strtolower($driver));
-        if (!class_exists($driver_class)) throw new \Exception('Filesystem adapter '.$driver.' not found.');
+        if (!class_exists($driver_class)) {
+          throw new \Exception('Filesystem adapter '.$driver.' not found.');
+        }
         static::$mount_points[$alias] = new $driver_class($options);
     }
 
@@ -31,12 +33,16 @@ 
 
     public static function __callStatic($name, $params) {
         $uri = array_shift($params);
-        if ($file_location = static::locate($uri)){
+        if ($file_location = static::locate($uri)) {
             list($mount, $path) = $file_location;
             array_unshift($params, static::resolvePath($path));
-            if (empty(static::$mount_points[$mount])) return false;
+            if (empty(static::$mount_points[$mount])) {
+              return false;
+            }
             return call_user_func_array([static::$mount_points[$mount],$name],$params);
-        } else return false;
+        } else {
+          return false;
+        }
     }
 
     public static function locate($path) {
@@ -46,8 +52,10 @@ 
             return isset(static::$mount_points[$mount]) ? [$mount, $filepath] : false;
         } else {
             $path = static::resolvePath($path);
-            foreach(static::$mount_points as $mount => $fs){
-                if ($fs->exists($path)) return [$mount, $path];
+            foreach(static::$mount_points as $mount => $fs) {
+                if ($fs->exists($path)) {
+                  return [$mount, $path];
+                }
             }
             return false;
         }
@@ -58,7 +66,9 @@ 
         $parts = array_filter(explode('/', $path), 'strlen');
         $absolutes = [];
         foreach ($parts as $part) {
-            if ('.' == $part) continue;
+            if ('.' == $part) {
+              continue;
+            }
             if ('..' == $part) {
                 array_pop($absolutes);
             } else {
@@ -68,7 +78,7 @@ 
         return trim(implode('/', $absolutes),'/');
     }
 
-    public static function search($pattern, $recursive=true){
+    public static function search($pattern, $recursive=true) {
         $results = [];
         foreach (static::$mount_points as $mount => $fs) {
             foreach($fs->search($pattern, $recursive) as $path) {
@@ -91,7 +101,9 @@ 
             } else {
                 return $_dfs->write($dest[1],$_sfs->read($src[1])) && $_sfs->delete($src[1]);
             }
-        } else return false;
+        } else {
+          return false;
+        }
     }