caffeina-core / core

classes/CLI.php

Doc Comments +1 added lines, -1 removed lines

@@ -116,7 +116,7 @@
     /**
      * Dispatch the router
      * @param  string[] $args The arguments array.
-     * @return boolean  True if route was correctly dispatched.
+     * @return null|boolean  True if route was correctly dispatched.
      */
     public static function run($args=null){
       if($args) {

Indentation +43 added lines, -43 removed lines

@@ -102,15 +102,15 @@ 
      * @return array   The commands and their description.
      */
     public static function commands(){
-       $results = [];
-       foreach(static::$commands as $name => $cmd){
+        $results = [];
+        foreach(static::$commands as $name => $cmd){
           $results[] = [
             'name'        => $name,
             'params'      => preg_replace('/:(\w+)/','[$1]',implode(' ',$cmd[0])),
             'description' => $cmd[2],
           ];
-       }
-       return $results;
+        }
+        return $results;
     }
 
     /**
@@ -122,7 +122,7 @@ 
       if($args) {
         $_args = $args;
         static::$file = basename(isset($_SERVER['PHP_SELF'])?$_SERVER['PHP_SELF']:__FILE__);
-       } else {
+        } else {
         $_args = $_SERVER['argv'];
         static::$file = basename(array_shift($_args));
       }
@@ -143,7 +143,7 @@ 
           if ($segment[0]==':'){
             // Extract paramenter
             if (isset(static::$arguments[$_idx])){
-               $pars_vector[] = static::$arguments[$_idx];
+                $pars_vector[] = static::$arguments[$_idx];
             } else return static::triggerError("Command [".$command."] needs more parameters");
           } else {
             // Match command
@@ -159,15 +159,15 @@ 
       }
     }
 
-   /**
-    * Prints a message to the console with color formatting.
-    * @param  string $message The html-like encoded message
-    * @return void
-    */
-   public static function write($message){
+    /**
+     * Prints a message to the console with color formatting.
+     * @param  string $message The html-like encoded message
+     * @return void
+     */
+    public static function write($message){
       if( preg_match('~<[^>]+>~',$message)) {
-         // Use preg_replace_callback for fast regex matches navigation
-         echo strtr(preg_replace_callback('~^(.*)<([^>]+)>(.+)</\2>(.*)$~USm',function($m){
+          // Use preg_replace_callback for fast regex matches navigation
+          echo strtr(preg_replace_callback('~^(.*)<([^>]+)>(.+)</\2>(.*)$~USm',function($m){
             static::write($m[1]);
             $color = strtoupper(trim($m[2]));
             if( isset(static::$shell_colors[$color]) ) echo static::$shell_colors[$color];
@@ -177,37 +177,37 @@ 
             $back_color = array_pop(static::$color_stack) ?: static::$color_stack[]='NORMAL';
             if( isset(static::$shell_colors[$back_color]) ) echo static::$shell_colors[$back_color];
             static::write($m[4]);
-         },strtr($message,["\n"=>"&BR;"])),["&BR;"=>PHP_EOL]);
+          },strtr($message,["\n"=>"&BR;"])),["&BR;"=>PHP_EOL]);
       } else {
-         echo strtr($message,["&BR;"=>PHP_EOL]);
+          echo strtr($message,["&BR;"=>PHP_EOL]);
       }
-   }
+    }
    
-   /**
-    * Like CLI::write, but appends a newline at the end.
-    * @param  string $message The html-like encoded message
-    * @return void
-    */
-   public static function writeln($message){
-       static::write($message . PHP_EOL);
-   }
-
-   /**
-    * Set output ANSI color
-    * @param string $color The color name constant.
-    * @return void
-    */   
-   public static function color($color){
-       if ( isset(static::$shell_colors[$color]) ) echo static::$shell_colors[$color];
-   }
-
-   /**
-    * Edit a temporary block of text with $EDITOR (or nano as fallback)
-    * @param string $text The initial text of the document.
-    * @param string $filename The (fake) filename passed to the editor (for syntax highlighting hint).
-    * @return string The edited contents
-    */
-   public static function edit($text,$filename=''){
+    /**
+     * Like CLI::write, but appends a newline at the end.
+     * @param  string $message The html-like encoded message
+     * @return void
+     */
+    public static function writeln($message){
+        static::write($message . PHP_EOL);
+    }
+
+    /**
+     * Set output ANSI color
+     * @param string $color The color name constant.
+     * @return void
+     */   
+    public static function color($color){
+        if ( isset(static::$shell_colors[$color]) ) echo static::$shell_colors[$color];
+    }
+
+    /**
+     * Edit a temporary block of text with $EDITOR (or nano as fallback)
+     * @param string $text The initial text of the document.
+     * @param string $filename The (fake) filename passed to the editor (for syntax highlighting hint).
+     * @return string The edited contents
+     */
+    public static function edit($text,$filename=''){
       $EDITOR = getenv('EDITOR')?:'nano';
       $tmp = tempnam(sys_get_temp_dir(), "E-").strtr($filename,'/','_');
       file_put_contents($tmp, $text);
@@ -224,7 +224,7 @@ 
 // Standard Help Message
 CLI::help(function(){
   echo 'Usage: ', CLI::name(),' [commands]', PHP_EOL,
-       'Commands:',PHP_EOL;
+        'Commands:',PHP_EOL;
   foreach( CLI::commands() as $cmd ){
     echo "\t", $cmd['name'], ' ' ,$cmd['params'], PHP_EOL;    
     if($cmd['description'])

Spacing +60 added lines, -60 removed lines

@@ -21,18 +21,18 @@ 
     protected static $error        = null;
     
     protected static $shell_colors = [
-      'BLACK'     =>"\033[0;30m",      'DARKGRAY'     =>"\033[1;30m",
-      'BLUE'      =>"\033[0;34m",      'LIGHTBLUE'    =>"\033[1;34m",
-      'GREEN'     =>"\033[0;32m",      'LIGHTGREEN'   =>"\033[1;32m",
-      'CYAN'      =>"\033[0;36m",      'LIGHTCYAN'    =>"\033[1;36m",
-      'RED'       =>"\033[0;31m",      'LIGHTRED'     =>"\033[1;31m",
-      'PURPLE'    =>"\033[0;35m",      'LIGHTPURPLE'  =>"\033[1;35m",
-      'BROWN'     =>"\033[0;33m",      'YELLOW'       =>"\033[1;33m",
-      'LIGHTGRAY' =>"\033[0;37m",      'WHITE'        =>"\033[1;37m",
-      'NORMAL'    =>"\033[0;37m",      'B'            =>"\033[1m",
-      'ERROR'     =>"\033[1;31m",      'INFO'         =>"\033[0;36m",
-      'I'         =>"\033[0;30;104m",  'IB'           =>"\033[1;30;104m",
-      'U'         =>"\033[4m",         'D'            =>"\033[2m",
+      'BLACK'     =>"\033[0;30m", 'DARKGRAY'     =>"\033[1;30m",
+      'BLUE'      =>"\033[0;34m", 'LIGHTBLUE'    =>"\033[1;34m",
+      'GREEN'     =>"\033[0;32m", 'LIGHTGREEN'   =>"\033[1;32m",
+      'CYAN'      =>"\033[0;36m", 'LIGHTCYAN'    =>"\033[1;36m",
+      'RED'       =>"\033[0;31m", 'LIGHTRED'     =>"\033[1;31m",
+      'PURPLE'    =>"\033[0;35m", 'LIGHTPURPLE'  =>"\033[1;35m",
+      'BROWN'     =>"\033[0;33m", 'YELLOW'       =>"\033[1;33m",
+      'LIGHTGRAY' =>"\033[0;37m", 'WHITE'        =>"\033[1;37m",
+      'NORMAL'    =>"\033[0;37m", 'B'            =>"\033[1m",
+      'ERROR'     =>"\033[1;31m", 'INFO'         =>"\033[0;36m",
+      'I'         =>"\033[0;30;104m", 'IB'           =>"\033[1;30;104m",
+      'U'         =>"\033[4m", 'D'            =>"\033[2m",
     ];
     protected static $color_stack = ['NORMAL'];
     
@@ -42,16 +42,16 @@ 
      * @param  string   $command  The command route, use ":" before a parameter for extraction. 
      * @param  callable $callback The callback to be binded to the route.
      */
-    public static function on($command,callable $callback,$description=''){
-      $parts = preg_split('/\s+/',$command);
-      static::$commands[array_shift($parts)] = [$parts,$callback,$description];
+    public static function on($command, callable $callback, $description = '') {
+      $parts = preg_split('/\s+/', $command);
+      static::$commands[array_shift($parts)] = [$parts, $callback, $description];
     }
 
     /**
      * Bind a callback to the "help" route.
      * @param  callable $callback The callback to be binded to the route. If omitted triggers the callback.
      */
-    public static function help(callable $callback = null){
+    public static function help(callable $callback = null) {
         $callback
           ? is_callable($callback) && static::$help = $callback
           : static::$help && call_user_func(static::$help);
@@ -61,7 +61,7 @@ 
      * Bind a callback when an error occurs.
      * @param  callable $callback The callback to be binded to the route. If omitted triggers the callback.
      */
-    public static function error(callable $callback = null){
+    public static function error(callable $callback = null) {
         $callback
           ? is_callable($callback) && static::$error = $callback
           : static::$error && call_user_func(static::$error);
@@ -71,7 +71,7 @@ 
      * Returns the script name.
      * @return string
      */
-    public static function name(){
+    public static function name() {
         return static::$file;
     }
 
@@ -79,8 +79,8 @@ 
      * Triggers an error and exit
      * @param string $message 
      */
-    protected static function triggerError($message){
-        is_callable(static::$error) && call_user_func(static::$error,$message);
+    protected static function triggerError($message) {
+        is_callable(static::$error) && call_user_func(static::$error, $message);
         exit -1;
     }
 
@@ -90,8 +90,8 @@ 
      * @param mixed $default The default value if parameter is omitted. (if a callable it will be evaluated) 
      * @return mixed
      */
-    public static function input($key=null,$default=null){
-      return $key ? (isset(static::$options[$key]) ? static::$options[$key] : (is_callable($default)?call_user_func($default):$default)) : static::$options;
+    public static function input($key = null, $default = null) {
+      return $key ? (isset(static::$options[$key]) ? static::$options[$key] : (is_callable($default) ? call_user_func($default) : $default)) : static::$options;
     }
 
     /**
@@ -101,12 +101,12 @@ 
      *
      * @return array   The commands and their description.
      */
-    public static function commands(){
+    public static function commands() {
        $results = [];
-       foreach(static::$commands as $name => $cmd){
+       foreach (static::$commands as $name => $cmd) {
           $results[] = [
             'name'        => $name,
-            'params'      => preg_replace('/:(\w+)/','[$1]',implode(' ',$cmd[0])),
+            'params'      => preg_replace('/:(\w+)/', '[$1]', implode(' ', $cmd[0])),
             'description' => $cmd[2],
           ];
        }
@@ -118,40 +118,40 @@ 
      * @param  string[] $args The arguments array.
      * @return boolean  True if route was correctly dispatched.
      */
-    public static function run($args=null){
-      if($args) {
+    public static function run($args = null) {
+      if ($args) {
         $_args = $args;
-        static::$file = basename(isset($_SERVER['PHP_SELF'])?$_SERVER['PHP_SELF']:__FILE__);
+        static::$file = basename(isset($_SERVER['PHP_SELF']) ? $_SERVER['PHP_SELF'] : __FILE__);
        } else {
         $_args = $_SERVER['argv'];
         static::$file = basename(array_shift($_args));
       }
-      foreach($_args as $e) if(strpos($e,'-')===0) {
-        $h = explode('=',$e);
-        static::$options[ltrim(current($h),'-')] = isset($h[1])?$h[1]:true; 
+      foreach ($_args as $e) if (strpos($e, '-') === 0) {
+        $h = explode('=', $e);
+        static::$options[ltrim(current($h), '-')] = isset($h[1]) ? $h[1] : true; 
       } else {
         static::$arguments[] = $e;
       }
       
-      if(isset(static::$arguments[0])){
+      if (isset(static::$arguments[0])) {
         $command = array_shift(static::$arguments);
         if (empty(static::$commands[$command])) 
           return static::triggerError("Unknown command [".$command."].");
         $cmd = static::$commands[$command];
         $pars_vector = [];
         foreach ($cmd[0] as $_idx => $segment) {
-          if ($segment[0]==':'){
+          if ($segment[0] == ':') {
             // Extract paramenter
-            if (isset(static::$arguments[$_idx])){
+            if (isset(static::$arguments[$_idx])) {
                $pars_vector[] = static::$arguments[$_idx];
             } else return static::triggerError("Command [".$command."] needs more parameters");
           } else {
             // Match command
-            if (empty(static::$arguments[$_idx]) || $segment!=static::$arguments[$_idx]) 
+            if (empty(static::$arguments[$_idx]) || $segment != static::$arguments[$_idx]) 
               return static::triggerError("Command [".$command."] is incomplete.");
           }
         }
-        call_user_func_array($cmd[1],$pars_vector);
+        call_user_func_array($cmd[1], $pars_vector);
         return true;
       } else {
         static::help();
@@ -164,22 +164,22 @@ 
     * @param  string $message The html-like encoded message
     * @return void
     */
-   public static function write($message){
-      if( preg_match('~<[^>]+>~',$message)) {
+   public static function write($message) {
+      if (preg_match('~<[^>]+>~', $message)) {
          // Use preg_replace_callback for fast regex matches navigation
-         echo strtr(preg_replace_callback('~^(.*)<([^>]+)>(.+)</\2>(.*)$~USm',function($m){
+         echo strtr(preg_replace_callback('~^(.*)<([^>]+)>(.+)</\2>(.*)$~USm', function($m) {
             static::write($m[1]);
             $color = strtoupper(trim($m[2]));
-            if( isset(static::$shell_colors[$color]) ) echo static::$shell_colors[$color];
+            if (isset(static::$shell_colors[$color])) echo static::$shell_colors[$color];
             static::$color_stack[] = $color;
             static::write($m[3]);
             array_pop(static::$color_stack);
-            $back_color = array_pop(static::$color_stack) ?: static::$color_stack[]='NORMAL';
-            if( isset(static::$shell_colors[$back_color]) ) echo static::$shell_colors[$back_color];
+            $back_color = array_pop(static::$color_stack) ?: static::$color_stack[] = 'NORMAL';
+            if (isset(static::$shell_colors[$back_color])) echo static::$shell_colors[$back_color];
             static::write($m[4]);
-         },strtr($message,["\n"=>"&BR;"])),["&BR;"=>PHP_EOL]);
+         },strtr($message, ["\n"=>"&BR;"])), ["&BR;"=>PHP_EOL]);
       } else {
-         echo strtr($message,["&BR;"=>PHP_EOL]);
+         echo strtr($message, ["&BR;"=>PHP_EOL]);
       }
    }
    
@@ -188,8 +188,8 @@ 
     * @param  string $message The html-like encoded message
     * @return void
     */
-   public static function writeln($message){
-       static::write($message . PHP_EOL);
+   public static function writeln($message) {
+       static::write($message.PHP_EOL);
    }
 
    /**
@@ -197,8 +197,8 @@ 
     * @param string $color The color name constant.
     * @return void
     */   
-   public static function color($color){
-       if ( isset(static::$shell_colors[$color]) ) echo static::$shell_colors[$color];
+   public static function color($color) {
+       if (isset(static::$shell_colors[$color])) echo static::$shell_colors[$color];
    }
 
    /**
@@ -207,9 +207,9 @@ 
     * @param string $filename The (fake) filename passed to the editor (for syntax highlighting hint).
     * @return string The edited contents
     */
-   public static function edit($text,$filename=''){
-      $EDITOR = getenv('EDITOR')?:'nano';
-      $tmp = tempnam(sys_get_temp_dir(), "E-").strtr($filename,'/','_');
+   public static function edit($text, $filename = '') {
+      $EDITOR = getenv('EDITOR') ?: 'nano';
+      $tmp = tempnam(sys_get_temp_dir(), "E-").strtr($filename, '/', '_');
       file_put_contents($tmp, $text);
       passthru("$EDITOR $tmp");
       $result = file_get_contents($tmp);
@@ -222,17 +222,17 @@ 
 
 
 // Standard Help Message
-CLI::help(function(){
-  echo 'Usage: ', CLI::name(),' [commands]', PHP_EOL,
-       'Commands:',PHP_EOL;
-  foreach( CLI::commands() as $cmd ){
-    echo "\t", $cmd['name'], ' ' ,$cmd['params'], PHP_EOL;    
-    if($cmd['description'])
-      echo "\t\t- ", str_replace("\n","\n\t\t  ",$cmd['description']), PHP_EOL, PHP_EOL;    
+CLI::help(function() {
+  echo 'Usage: ', CLI::name(), ' [commands]', PHP_EOL,
+       'Commands:', PHP_EOL;
+  foreach (CLI::commands() as $cmd) {
+    echo "\t", $cmd['name'], ' ', $cmd['params'], PHP_EOL;    
+    if ($cmd['description'])
+      echo "\t\t- ", str_replace("\n", "\n\t\t  ", $cmd['description']), PHP_EOL, PHP_EOL;    
   }
 });
 
 // Standard Error Message
-CLI::error(function($message){
-  echo 'Error: ',$message,PHP_EOL;
+CLI::error(function($message) {
+  echo 'Error: ', $message, PHP_EOL;
 });

Braces +41 added lines, -30 removed lines

@@ -42,7 +42,7 @@ 
      * @param  string   $command  The command route, use ":" before a parameter for extraction. 
      * @param  callable $callback The callback to be binded to the route.
      */
-    public static function on($command,callable $callback,$description=''){
+    public static function on($command,callable $callback,$description='') {
       $parts = preg_split('/\s+/',$command);
       static::$commands[array_shift($parts)] = [$parts,$callback,$description];
     }
@@ -51,7 +51,7 @@ 
      * Bind a callback to the "help" route.
      * @param  callable $callback The callback to be binded to the route. If omitted triggers the callback.
      */
-    public static function help(callable $callback = null){
+    public static function help(callable $callback = null) {
         $callback
           ? is_callable($callback) && static::$help = $callback
           : static::$help && call_user_func(static::$help);
@@ -61,7 +61,7 @@ 
      * Bind a callback when an error occurs.
      * @param  callable $callback The callback to be binded to the route. If omitted triggers the callback.
      */
-    public static function error(callable $callback = null){
+    public static function error(callable $callback = null) {
         $callback
           ? is_callable($callback) && static::$error = $callback
           : static::$error && call_user_func(static::$error);
@@ -71,7 +71,7 @@ 
      * Returns the script name.
      * @return string
      */
-    public static function name(){
+    public static function name() {
         return static::$file;
     }
 
@@ -79,7 +79,7 @@ 
      * Triggers an error and exit
      * @param string $message 
      */
-    protected static function triggerError($message){
+    protected static function triggerError($message) {
         is_callable(static::$error) && call_user_func(static::$error,$message);
         exit -1;
     }
@@ -90,7 +90,7 @@ 
      * @param mixed $default The default value if parameter is omitted. (if a callable it will be evaluated) 
      * @return mixed
      */
-    public static function input($key=null,$default=null){
+    public static function input($key=null,$default=null) {
       return $key ? (isset(static::$options[$key]) ? static::$options[$key] : (is_callable($default)?call_user_func($default):$default)) : static::$options;
     }
 
@@ -101,9 +101,9 @@ 
      *
      * @return array   The commands and their description.
      */
-    public static function commands(){
+    public static function commands() {
        $results = [];
-       foreach(static::$commands as $name => $cmd){
+       foreach(static::$commands as $name => $cmd) {
           $results[] = [
             'name'        => $name,
             'params'      => preg_replace('/:(\w+)/','[$1]',implode(' ',$cmd[0])),
@@ -118,7 +118,7 @@ 
      * @param  string[] $args The arguments array.
      * @return boolean  True if route was correctly dispatched.
      */
-    public static function run($args=null){
+    public static function run($args=null) {
       if($args) {
         $_args = $args;
         static::$file = basename(isset($_SERVER['PHP_SELF'])?$_SERVER['PHP_SELF']:__FILE__);
@@ -133,22 +133,26 @@ 
         static::$arguments[] = $e;
       }
       
-      if(isset(static::$arguments[0])){
+      if(isset(static::$arguments[0])) {
         $command = array_shift(static::$arguments);
-        if (empty(static::$commands[$command])) 
-          return static::triggerError("Unknown command [".$command."].");
+        if (empty(static::$commands[$command])) {
+                  return static::triggerError("Unknown command [".$command."].");
+        }
         $cmd = static::$commands[$command];
         $pars_vector = [];
         foreach ($cmd[0] as $_idx => $segment) {
-          if ($segment[0]==':'){
+          if ($segment[0]==':') {
             // Extract paramenter
-            if (isset(static::$arguments[$_idx])){
+            if (isset(static::$arguments[$_idx])) {
                $pars_vector[] = static::$arguments[$_idx];
-            } else return static::triggerError("Command [".$command."] needs more parameters");
+            } else {
+              return static::triggerError("Command [".$command."] needs more parameters");
+            }
           } else {
             // Match command
-            if (empty(static::$arguments[$_idx]) || $segment!=static::$arguments[$_idx]) 
-              return static::triggerError("Command [".$command."] is incomplete.");
+            if (empty(static::$arguments[$_idx]) || $segment!=static::$arguments[$_idx]) {
+                          return static::triggerError("Command [".$command."] is incomplete.");
+            }
           }
         }
         call_user_func_array($cmd[1],$pars_vector);
@@ -164,18 +168,22 @@ 
     * @param  string $message The html-like encoded message
     * @return void
     */
-   public static function write($message){
+   public static function write($message) {
       if( preg_match('~<[^>]+>~',$message)) {
          // Use preg_replace_callback for fast regex matches navigation
-         echo strtr(preg_replace_callback('~^(.*)<([^>]+)>(.+)</\2>(.*)$~USm',function($m){
+         echo strtr(preg_replace_callback('~^(.*)<([^>]+)>(.+)</\2>(.*)$~USm',function($m) {
             static::write($m[1]);
             $color = strtoupper(trim($m[2]));
-            if( isset(static::$shell_colors[$color]) ) echo static::$shell_colors[$color];
+            if( isset(static::$shell_colors[$color]) ) {
+              echo static::$shell_colors[$color];
+            }
             static::$color_stack[] = $color;
             static::write($m[3]);
             array_pop(static::$color_stack);
             $back_color = array_pop(static::$color_stack) ?: static::$color_stack[]='NORMAL';
-            if( isset(static::$shell_colors[$back_color]) ) echo static::$shell_colors[$back_color];
+            if( isset(static::$shell_colors[$back_color]) ) {
+              echo static::$shell_colors[$back_color];
+            }
             static::write($m[4]);
          },strtr($message,["\n"=>"&BR;"])),["&BR;"=>PHP_EOL]);
       } else {
@@ -188,7 +196,7 @@ 
     * @param  string $message The html-like encoded message
     * @return void
     */
-   public static function writeln($message){
+   public static function writeln($message) {
        static::write($message . PHP_EOL);
    }
 
@@ -197,8 +205,10 @@ 
     * @param string $color The color name constant.
     * @return void
     */   
-   public static function color($color){
-       if ( isset(static::$shell_colors[$color]) ) echo static::$shell_colors[$color];
+   public static function color($color) {
+       if ( isset(static::$shell_colors[$color]) ) {
+         echo static::$shell_colors[$color];
+       }
    }
 
    /**
@@ -207,7 +217,7 @@ 
     * @param string $filename The (fake) filename passed to the editor (for syntax highlighting hint).
     * @return string The edited contents
     */
-   public static function edit($text,$filename=''){
+   public static function edit($text,$filename='') {
       $EDITOR = getenv('EDITOR')?:'nano';
       $tmp = tempnam(sys_get_temp_dir(), "E-").strtr($filename,'/','_');
       file_put_contents($tmp, $text);
@@ -222,17 +232,18 @@ 
 
 
 // Standard Help Message
-CLI::help(function(){
+CLI::help(function() {
   echo 'Usage: ', CLI::name(),' [commands]', PHP_EOL,
        'Commands:',PHP_EOL;
-  foreach( CLI::commands() as $cmd ){
+  foreach( CLI::commands() as $cmd ) {
     echo "\t", $cmd['name'], ' ' ,$cmd['params'], PHP_EOL;    
-    if($cmd['description'])
-      echo "\t\t- ", str_replace("\n","\n\t\t  ",$cmd['description']), PHP_EOL, PHP_EOL;    
+    if($cmd['description']) {
+          echo "\t\t- ", str_replace("\n","\n\t\t  ",$cmd['description']), PHP_EOL, PHP_EOL;
+    }
   }
 });
 
 // Standard Error Message
-CLI::error(function($message){
+CLI::error(function($message) {
   echo 'Error: ',$message,PHP_EOL;
 });

classes/Errors.php

Doc Comments +3 added lines

@@ -57,6 +57,9 @@
       return true;
     }
 
+    /**
+     * @param ErrorException $e
+     */
     public static function traceException($e){
       switch(self::$mode){
           case self::HTML :

Spacing +21 added lines, -21 removed lines

@@ -20,20 +20,20 @@ 
 
     static $mode = self::SILENT;
 
-    public static function capture($tracing_level=null){
-      if($tracing_level!==null) error_reporting($tracing_level);
+    public static function capture($tracing_level = null) {
+      if ($tracing_level !== null) error_reporting($tracing_level);
       set_error_handler(__CLASS__.'::traceError');
       set_exception_handler(__CLASS__.'::traceException');
     }
 
-    public static function mode($mode=null){
-      return $mode ? self::$mode=$mode : self::$mode;
+    public static function mode($mode = null) {
+      return $mode ? self::$mode = $mode : self::$mode;
     }
 
-    public static function traceError($errno,$errstr,$errfile=null,$errline=null){
+    public static function traceError($errno, $errstr, $errfile = null, $errline = null) {
       // This error code is not included in error_reporting
       if (!(error_reporting() & $errno)) return;
-      switch ( $errno ) {
+      switch ($errno) {
         case E_USER_ERROR:
             $type = 'Fatal';
         break;
@@ -51,16 +51,16 @@ 
         break;
       }
       $e = new \ErrorException($type.': '.$errstr, 0, $errno, $errfile, $errline);
-      $chk_specific = array_filter((array)Event::trigger('core.error.'.strtolower($type),$e));
-      $chk_general  = array_filter((array)Event::trigger('core.error',$e));
-      if (! ($chk_specific || $chk_general) ) static::traceException($e);
+      $chk_specific = array_filter((array) Event::trigger('core.error.'.strtolower($type), $e));
+      $chk_general  = array_filter((array) Event::trigger('core.error', $e));
+      if (!($chk_specific || $chk_general)) static::traceException($e);
       return true;
     }
 
-    public static function traceException($e){
-      switch(self::$mode){
+    public static function traceException($e) {
+      switch (self::$mode) {
           case self::HTML :
-              echo '<pre class="app error"><code>',$e->getMessage(),'</code></pre>',PHP_EOL;
+              echo '<pre class="app error"><code>', $e->getMessage(), '</code></pre>', PHP_EOL;
               break;
           case self::JSON :
               echo json_encode(['error' => $e->getMessage()]);
@@ -70,26 +70,26 @@ 
               break;
           case self::SIMPLE :
           default:
-              echo $e->getMessage(),PHP_EOL;
+              echo $e->getMessage(), PHP_EOL;
               break;
       }
       return true;
     }
 
-    public static function onFatal(callable $listener){
-      Event::on('core.error.fatal',$listener);
+    public static function onFatal(callable $listener) {
+      Event::on('core.error.fatal', $listener);
     }
 
-    public static function onWarning(callable $listener){
-      Event::on('core.error.warning',$listener);
+    public static function onWarning(callable $listener) {
+      Event::on('core.error.warning', $listener);
     }
 
-    public static function onNotice(callable $listener){
-      Event::on('core.error.notice',$listener);
+    public static function onNotice(callable $listener) {
+      Event::on('core.error.notice', $listener);
     }
 
-    public static function onAny(callable $listener){
-      Event::on('core.error',$listener);
+    public static function onAny(callable $listener) {
+      Event::on('core.error', $listener);
     }
 
 }

Braces +18 added lines, -12 removed lines

@@ -20,19 +20,23 @@ 
 
     static $mode = self::SILENT;
 
-    public static function capture($tracing_level=null){
-      if($tracing_level!==null) error_reporting($tracing_level);
+    public static function capture($tracing_level=null) {
+      if($tracing_level!==null) {
+        error_reporting($tracing_level);
+      }
       set_error_handler(__CLASS__.'::traceError');
       set_exception_handler(__CLASS__.'::traceException');
     }
 
-    public static function mode($mode=null){
+    public static function mode($mode=null) {
       return $mode ? self::$mode=$mode : self::$mode;
     }
 
-    public static function traceError($errno,$errstr,$errfile=null,$errline=null){
+    public static function traceError($errno,$errstr,$errfile=null,$errline=null) {
       // This error code is not included in error_reporting
-      if (!(error_reporting() & $errno)) return;
+      if (!(error_reporting() & $errno)) {
+        return;
+      }
       switch ( $errno ) {
         case E_USER_ERROR:
             $type = 'Fatal';
@@ -53,12 +57,14 @@ 
       $e = new \ErrorException($type.': '.$errstr, 0, $errno, $errfile, $errline);
       $chk_specific = array_filter((array)Event::trigger('core.error.'.strtolower($type),$e));
       $chk_general  = array_filter((array)Event::trigger('core.error',$e));
-      if (! ($chk_specific || $chk_general) ) static::traceException($e);
+      if (! ($chk_specific || $chk_general) ) {
+        static::traceException($e);
+      }
       return true;
     }
 
-    public static function traceException($e){
-      switch(self::$mode){
+    public static function traceException($e) {
+      switch(self::$mode) {
           case self::HTML :
               echo '<pre class="app error"><code>',$e->getMessage(),'</code></pre>',PHP_EOL;
               break;
@@ -76,19 +82,19 @@ 
       return true;
     }
 
-    public static function onFatal(callable $listener){
+    public static function onFatal(callable $listener) {
       Event::on('core.error.fatal',$listener);
     }
 
-    public static function onWarning(callable $listener){
+    public static function onWarning(callable $listener) {
       Event::on('core.error.warning',$listener);
     }
 
-    public static function onNotice(callable $listener){
+    public static function onNotice(callable $listener) {
       Event::on('core.error.notice',$listener);
     }
 
-    public static function onAny(callable $listener){
+    public static function onAny(callable $listener) {
       Event::on('core.error',$listener);
     }
 

classes/Route.php

Doc Comments +1 added lines, -2 removed lines

@@ -198,7 +198,6 @@ 
 
     /**
      * Bind a middleware callback to invoked before the route definition
-     * @param  callable $before The callback to be invoked ($this is binded to the route object).
      * @return Route
      */
     public function & before($callback){
@@ -318,7 +317,7 @@ 
      * @param  string  $pattern The URL schema with the named parameters
      * @param  string  $URL The URL to process, if omitted the current request URI will be used.
      * @param  boolean $cut If true don't limit the matching to the whole URL (used for group pattern extraction)
-     * @return array The extracted variables
+     * @return callable The extracted variables
      */
     protected static function extractVariablesFromURL($pattern,$URL=null,$cut=false){
         $URL     = $URL ?: Request::URI();

Indentation +1 added lines, -1 removed lines

@@ -140,7 +140,7 @@
       Event::trigger('core.route.end', $this);
 
       return [Filter::with('core.route.response', Response::body())];
-     }
+      }
 
     /**
      * Check if route match URL and HTTP Method and run if it is valid.

Spacing +63 added lines, -63 removed lines

@@ -38,12 +38,12 @@ 
      * @param string $method The HTTP method for which the route must respond.
      * @return Route
      */
-    public function __construct($URLPattern, $callback = null, $method='get'){
-      $prefix  = static::$prefix ? rtrim(implode('',static::$prefix),'/') : '';
-      $pattern = "/" . trim($URLPattern, "/");
+    public function __construct($URLPattern, $callback = null, $method = 'get') {
+      $prefix  = static::$prefix ? rtrim(implode('', static::$prefix), '/') : '';
+      $pattern = "/".trim($URLPattern, "/");
       // Adjust / optionality with dynamic patterns
       // Ex:  /test/(:a) ===> /test(/:a)
-      $this->URLPattern = str_replace('//','/',str_replace('/(','(/', rtrim("{$prefix}{$pattern}","/")));
+      $this->URLPattern = str_replace('//', '/', str_replace('/(', '(/', rtrim("{$prefix}{$pattern}", "/")));
 
       $this->dynamic    = $this->isDynamic($this->URLPattern);
       $this->pattern    = $this->dynamic ? $this->compilePatternAsRegex($this->URLPattern, $this->rules) : $this->URLPattern;
@@ -60,19 +60,19 @@ 
      * @param  string $method The HTTP Method to check against.
      * @return boolean
      */
-    public function match($URL,$method='get'){
+    public function match($URL, $method = 'get') {
       $method = strtolower($method);
 
       // * is an http method wildcard
       if (empty($this->methods[$method]) && empty($this->methods['*'])) return false;
-      $URL  = rtrim($URL,'/');
+      $URL  = rtrim($URL, '/');
       $args = [];
-      if ( $this->dynamic
-           ? preg_match($this->pattern,$URL,$args)
-           : $URL == rtrim($this->pattern,'/')
-      ){
-        foreach ( $args as $key => $value ) {
-          if ( false === is_string($key) ) unset($args[$key]);
+      if ($this->dynamic
+           ? preg_match($this->pattern, $URL, $args)
+           : $URL == rtrim($this->pattern, '/')
+      ) {
+        foreach ($args as $key => $value) {
+          if (false === is_string($key)) unset($args[$key]);
         }
         return $args;
       }
@@ -85,12 +85,12 @@ 
      * @param  string $method The HTTP Method requested.
      * @return array The callback response.
      */
-    public function run(array $args, $method='get'){
+    public function run(array $args, $method = 'get') {
       $method = strtolower($method);
-      $append_echoed_text = Options::get('core.route.append_echoed_text',true);
+      $append_echoed_text = Options::get('core.route.append_echoed_text', true);
 
       // Call direct befores
-      if ( $this->befores ) {
+      if ($this->befores) {
         // Reverse befores order
         foreach (array_reverse($this->befores) as $mw) {
           Event::trigger('core.route.before', $this, $mw);
@@ -98,7 +98,7 @@ 
           $mw_result  = call_user_func($mw);
           $raw_echoed = ob_get_clean();
           if ($append_echoed_text) Response::add($raw_echoed);
-          if ( false  === $mw_result ) {
+          if (false === $mw_result) {
             return [''];
           } else {
             Response::add($mw_result);
@@ -111,7 +111,7 @@ 
                   : $this->callback;
 
       if (is_callable($callback)) {
-        Response::type( Options::get('core.route.response_default_type', Response::TYPE_HTML) );
+        Response::type(Options::get('core.route.response_default_type', Response::TYPE_HTML));
 
         ob_start();
         $view_results = call_user_func_array($callback, $args);
@@ -122,14 +122,14 @@ 
       }
 
       // Apply afters
-      if ( $this->afters ) {
+      if ($this->afters) {
         foreach ($this->afters as $mw) {
           Event::trigger('core.route.after', $this, $mw);
           ob_start();
           $mw_result  = call_user_func($mw);
           $raw_echoed = ob_get_clean();
           if ($append_echoed_text) Response::add($raw_echoed);
-          if ( false  === $mw_result ) {
+          if (false === $mw_result) {
             return [''];
           } else {
             Response::add($mw_result);
@@ -148,8 +148,8 @@ 
      * @param  string $method The HTTP Method to check against.
      * @return array The callback response.
      */
-    public function runIfMatch($URL, $method='get'){
-      return ($args = $this->match($URL,$method)) ? $this->run($args,$method) : null;
+    public function runIfMatch($URL, $method = 'get') {
+      return ($args = $this->match($URL, $method)) ? $this->run($args, $method) : null;
     }
 
     /**
@@ -158,8 +158,8 @@ 
      * @param  $callback The callback to be invoked (with variables extracted from the route if present) when the route match the request URI.
      * @return Route
      */
-    public static function on($URLPattern, $callback = null){
-      return new Route($URLPattern,$callback);
+    public static function on($URLPattern, $callback = null) {
+      return new Route($URLPattern, $callback);
     }
 
     /**
@@ -168,8 +168,8 @@ 
      * @param  $callback The callback to be invoked (with variables extracted from the route if present) when the route match the request URI.
      * @return Route
      */
-    public static function get($URLPattern, $callback = null){
-      return (new Route($URLPattern,$callback))->via('get');
+    public static function get($URLPattern, $callback = null) {
+      return (new Route($URLPattern, $callback))->via('get');
     }
 
     /**
@@ -178,8 +178,8 @@ 
      * @param  $callback The callback to be invoked (with variables extracted from the route if present) when the route match the request URI.
      * @return Route
      */
-    public static function post($URLPattern, $callback = null){
-      return (new Route($URLPattern,$callback))->via('post');
+    public static function post($URLPattern, $callback = null) {
+      return (new Route($URLPattern, $callback))->via('post');
     }
 
     /**
@@ -188,8 +188,8 @@ 
      * @param  $callback The callback to be invoked (with variables extracted from the route if present) when the route match the request URI.
      * @return Route
      */
-    public static function any($URLPattern, $callback = null){
-      return (new Route($URLPattern,$callback))->via('*');
+    public static function any($URLPattern, $callback = null) {
+      return (new Route($URLPattern, $callback))->via('*');
     }
 
     /**
@@ -234,7 +234,7 @@ 
      */
     public function & via(){
       $this->methods = [];
-      foreach (func_get_args() as $method){
+      foreach (func_get_args() as $method) {
         $this->methods[strtolower($method)] = true;
       }
       return $this;
@@ -256,10 +256,10 @@ 
      * @return Route
      */
     public function & rules(array $rules){
-      foreach ((array)$rules as $varname => $rule){
+      foreach ((array) $rules as $varname => $rule) {
         $this->rules[$varname] = $rule;
       }
-      $this->pattern = $this->compilePatternAsRegex( $this->URLPattern, $this->rules );
+      $this->pattern = $this->compilePatternAsRegex($this->URLPattern, $this->rules);
       return $this;
     }
 
@@ -297,10 +297,10 @@ 
      * @param  string $pattern The URL schema.
      * @return string The compiled PREG RegEx.
      */
-    protected static function compilePatternAsRegex($pattern, $rules=[]){
-      return '#^'.preg_replace_callback('#:([a-zA-Z]\w*)#S',function($g) use (&$rules){
-        return '(?<' . $g[1] . '>' . (isset($rules[$g[1]])?$rules[$g[1]]:'[^/]+') .')';
-      },str_replace(['.',')','*'],['\.',')?','.+'],$pattern)).'$#';
+    protected static function compilePatternAsRegex($pattern, $rules = []) {
+      return '#^'.preg_replace_callback('#:([a-zA-Z]\w*)#S', function($g) use (&$rules){
+        return '(?<'.$g[1].'>'.(isset($rules[$g[1]]) ? $rules[$g[1]] : '[^/]+').')';
+      },str_replace(['.', ')', '*'], ['\.', ')?', '.+'], $pattern)).'$#';
     }
 
     /**
@@ -310,10 +310,10 @@ 
      * @param  boolean $cut If true don't limit the matching to the whole URL (used for group pattern extraction)
      * @return array The extracted variables
      */
-    protected static function extractVariablesFromURL($pattern, $URL=null, $cut=false){
+    protected static function extractVariablesFromURL($pattern, $URL = null, $cut = false) {
       $URL     = $URL ?: Request::URI();
-      $pattern = $cut ? str_replace('$#','',$pattern).'#' : $pattern;
-      if ( !preg_match($pattern,$URL,$args) ) return false;
+      $pattern = $cut ? str_replace('$#', '', $pattern).'#' : $pattern;
+      if (!preg_match($pattern, $URL, $args)) return false;
       foreach ($args as $key => $value) {
         if (false === is_string($key)) unset($args[$key]);
       }
@@ -325,8 +325,8 @@ 
      * @param  string  $pattern The URL schema.
      * @return boolean
      */
-    protected static function isDynamic($pattern){
-      return strlen($pattern) != strcspn($pattern,':(?[*+');
+    protected static function isDynamic($pattern) {
+      return strlen($pattern) != strcspn($pattern, ':(?[*+');
     }
 
     /**
@@ -334,8 +334,8 @@ 
      * @param Route $r
      * @return Route
      */
-    public static function add($r){
-      if ( isset(static::$group[0]) ) static::$group[0]->add($r);
+    public static function add($r) {
+      if (isset(static::$group[0])) static::$group[0]->add($r);
       return static::$routes[implode('', static::$prefix)][] = $r;
     }
 
@@ -344,10 +344,10 @@ 
      * @param  string $prefix The url prefix for the internal route definitions.
      * @param  string $callback This callback is invoked on $prefix match of the current request URI.
      */
-    public static function group($prefix, $callback=null){
+    public static function group($prefix, $callback = null) {
 
       // Skip definition if current request doesn't match group.
-      $prefix_complete = rtrim(implode('',static::$prefix),'/') . $prefix;
+      $prefix_complete = rtrim(implode('', static::$prefix), '/').$prefix;
 
       static::$prefix[] = $prefix;
       if (empty(static::$group)) static::$group = [];
@@ -361,7 +361,7 @@ 
           $vars = static::extractVariablesFromURL(static::compilePatternAsRegex($prefix_complete), null, true);
           // Errors in compile pattern or variable extraction, aborting.
           if (false === $vars) return false;
-          if ($callback) call_user_func_array($callback,$vars);
+          if ($callback) call_user_func_array($callback, $vars);
         break;
 
         // Static group
@@ -379,8 +379,8 @@ 
 
     }
 
-    public static function exitWithError($code,$message="Application Error"){
-      Response::error($code,$message);
+    public static function exitWithError($code, $message = "Application Error") {
+      Response::error($code, $message);
       Response::send();
       exit;
     }
@@ -390,27 +390,27 @@ 
      * @param  string $URL The URL to match onto.
      * @return boolean true if a route callback was executed.
      */
-    public static function dispatch($URL=null,$method=null){
+    public static function dispatch($URL = null, $method = null) {
         if (!$URL)     $URL     = Request::URI();
         if (!$method)  $method  = Request::method();
 
-        $__deferred_send = new Deferred(function(){
-          if (Options::get('core.response.autosend',true)){
+        $__deferred_send = new Deferred(function() {
+          if (Options::get('core.response.autosend', true)) {
             Response::send();
           }
         });
 
-        foreach ((array)static::$routes as $group => $routes){
+        foreach ((array) static::$routes as $group => $routes) {
             foreach ($routes as $route) {
-                if (is_a($route, 'Route') && false !== ($args = $route->match($URL,$method))){
-                    $route->run($args,$method);
+                if (is_a($route, 'Route') && false !== ($args = $route->match($URL, $method))) {
+                    $route->run($args, $method);
                     return true;
                 }
             }
         }
 
         Response::status(404, '404 Resource not found.');
-        foreach (array_filter(Event::trigger(404)) as $res){
+        foreach (array_filter(Event::trigger(404)) as $res) {
 
         }
         return false;
@@ -420,34 +420,34 @@ 
 class RouteGroup {
   protected $routes;
 
-  public function __construct(){
+  public function __construct() {
     $this->routes = new SplObjectStorage;
     return Route::add($this);
   }
 
-  public function has($r){
+  public function has($r) {
     return $this->routes->contains($r);
   }
 
-  public function add($r){
+  public function add($r) {
     $this->routes->attach($r);
     return $this;
   }
 
-  public function remove($r){
+  public function remove($r) {
     if ($this->routes->contains($r)) $this->routes->detach($r);
     return $this;
   }
 
-  public function before($callbacks){
-    foreach ($this->routes as $route){
+  public function before($callbacks) {
+    foreach ($this->routes as $route) {
       $route->before($callbacks);
     }
     return $this;
   }
 
-  public function after($callbacks){
-    foreach ($this->routes as $route){
+  public function after($callbacks) {
+    foreach ($this->routes as $route) {
       $route->after($callbacks);
     }
     return $this;

Braces +83 added lines, -49 removed lines

@@ -38,7 +38,7 @@ 
      * @param string $method The HTTP method for which the route must respond.
      * @return Route
      */
-    public function __construct($URLPattern, $callback = null, $method='get'){
+    public function __construct($URLPattern, $callback = null, $method='get') {
       $prefix  = static::$prefix ? rtrim(implode('',static::$prefix),'/') : '';
       $pattern = "/" . trim($URLPattern, "/");
       // Adjust / optionality with dynamic patterns
@@ -60,19 +60,23 @@ 
      * @param  string $method The HTTP Method to check against.
      * @return boolean
      */
-    public function match($URL,$method='get'){
+    public function match($URL,$method='get') {
       $method = strtolower($method);
 
       // * is an http method wildcard
-      if (empty($this->methods[$method]) && empty($this->methods['*'])) return false;
+      if (empty($this->methods[$method]) && empty($this->methods['*'])) {
+        return false;
+      }
       $URL  = rtrim($URL,'/');
       $args = [];
       if ( $this->dynamic
            ? preg_match($this->pattern,$URL,$args)
            : $URL == rtrim($this->pattern,'/')
-      ){
+      ) {
         foreach ( $args as $key => $value ) {
-          if ( false === is_string($key) ) unset($args[$key]);
+          if ( false === is_string($key) ) {
+            unset($args[$key]);
+          }
         }
         return $args;
       }
@@ -85,7 +89,7 @@ 
      * @param  string $method The HTTP Method requested.
      * @return array The callback response.
      */
-    public function run(array $args, $method='get'){
+    public function run(array $args, $method='get') {
       $method = strtolower($method);
       $append_echoed_text = Options::get('core.route.append_echoed_text',true);
 
@@ -97,7 +101,9 @@ 
           ob_start();
           $mw_result  = call_user_func($mw);
           $raw_echoed = ob_get_clean();
-          if ($append_echoed_text) Response::add($raw_echoed);
+          if ($append_echoed_text) {
+            Response::add($raw_echoed);
+          }
           if ( false  === $mw_result ) {
             return [''];
           } else {
@@ -117,7 +123,9 @@ 
         $view_results = call_user_func_array($callback, $args);
         $raw_echoed   = ob_get_clean();
 
-        if ($append_echoed_text) Response::add($raw_echoed);
+        if ($append_echoed_text) {
+          Response::add($raw_echoed);
+        }
         Response::add($view_results);
       }
 
@@ -128,7 +136,9 @@ 
           ob_start();
           $mw_result  = call_user_func($mw);
           $raw_echoed = ob_get_clean();
-          if ($append_echoed_text) Response::add($raw_echoed);
+          if ($append_echoed_text) {
+            Response::add($raw_echoed);
+          }
           if ( false  === $mw_result ) {
             return [''];
           } else {
@@ -148,7 +158,7 @@ 
      * @param  string $method The HTTP Method to check against.
      * @return array The callback response.
      */
-    public function runIfMatch($URL, $method='get'){
+    public function runIfMatch($URL, $method='get') {
       return ($args = $this->match($URL,$method)) ? $this->run($args,$method) : null;
     }
 
@@ -158,7 +168,7 @@ 
      * @param  $callback The callback to be invoked (with variables extracted from the route if present) when the route match the request URI.
      * @return Route
      */
-    public static function on($URLPattern, $callback = null){
+    public static function on($URLPattern, $callback = null) {
       return new Route($URLPattern,$callback);
     }
 
@@ -168,7 +178,7 @@ 
      * @param  $callback The callback to be invoked (with variables extracted from the route if present) when the route match the request URI.
      * @return Route
      */
-    public static function get($URLPattern, $callback = null){
+    public static function get($URLPattern, $callback = null) {
       return (new Route($URLPattern,$callback))->via('get');
     }
 
@@ -178,7 +188,7 @@ 
      * @param  $callback The callback to be invoked (with variables extracted from the route if present) when the route match the request URI.
      * @return Route
      */
-    public static function post($URLPattern, $callback = null){
+    public static function post($URLPattern, $callback = null) {
       return (new Route($URLPattern,$callback))->via('post');
     }
 
@@ -188,7 +198,7 @@ 
      * @param  $callback The callback to be invoked (with variables extracted from the route if present) when the route match the request URI.
      * @return Route
      */
-    public static function any($URLPattern, $callback = null){
+    public static function any($URLPattern, $callback = null) {
       return (new Route($URLPattern,$callback))->via('*');
     }
 
@@ -234,7 +244,7 @@ 
      */
     public function & via(){
       $this->methods = [];
-      foreach (func_get_args() as $method){
+      foreach (func_get_args() as $method) {
         $this->methods[strtolower($method)] = true;
       }
       return $this;
@@ -256,7 +266,7 @@ 
      * @return Route
      */
     public function & rules(array $rules){
-      foreach ((array)$rules as $varname => $rule){
+      foreach ((array)$rules as $varname => $rule) {
         $this->rules[$varname] = $rule;
       }
       $this->pattern = $this->compilePatternAsRegex( $this->URLPattern, $this->rules );
@@ -285,7 +295,9 @@ 
       $route->callback = [];
       foreach ($callbacks as $method => $callback) {
         $method = strtolower($method);
-        if (Request::method() !== $method) continue;
+        if (Request::method() !== $method) {
+          continue;
+        }
         $route->callback[$method] = $callback;
         $route->methods[$method]  = 1;
       }
@@ -297,8 +309,8 @@ 
      * @param  string $pattern The URL schema.
      * @return string The compiled PREG RegEx.
      */
-    protected static function compilePatternAsRegex($pattern, $rules=[]){
-      return '#^'.preg_replace_callback('#:([a-zA-Z]\w*)#S',function($g) use (&$rules){
+    protected static function compilePatternAsRegex($pattern, $rules=[]) {
+      return '#^'.preg_replace_callback('#:([a-zA-Z]\w*)#S',function($g) use (&$rules) {
         return '(?<' . $g[1] . '>' . (isset($rules[$g[1]])?$rules[$g[1]]:'[^/]+') .')';
       },str_replace(['.',')','*'],['\.',')?','.+'],$pattern)).'$#';
     }
@@ -310,12 +322,16 @@ 
      * @param  boolean $cut If true don't limit the matching to the whole URL (used for group pattern extraction)
      * @return array The extracted variables
      */
-    protected static function extractVariablesFromURL($pattern, $URL=null, $cut=false){
+    protected static function extractVariablesFromURL($pattern, $URL=null, $cut=false) {
       $URL     = $URL ?: Request::URI();
       $pattern = $cut ? str_replace('$#','',$pattern).'#' : $pattern;
-      if ( !preg_match($pattern,$URL,$args) ) return false;
+      if ( !preg_match($pattern,$URL,$args) ) {
+        return false;
+      }
       foreach ($args as $key => $value) {
-        if (false === is_string($key)) unset($args[$key]);
+        if (false === is_string($key)) {
+          unset($args[$key]);
+        }
       }
       return $args;
     }
@@ -325,7 +341,7 @@ 
      * @param  string  $pattern The URL schema.
      * @return boolean
      */
-    protected static function isDynamic($pattern){
+    protected static function isDynamic($pattern) {
       return strlen($pattern) != strcspn($pattern,':(?[*+');
     }
 
@@ -334,8 +350,10 @@ 
      * @param Route $r
      * @return Route
      */
-    public static function add($r){
-      if ( isset(static::$group[0]) ) static::$group[0]->add($r);
+    public static function add($r) {
+      if ( isset(static::$group[0]) ) {
+        static::$group[0]->add($r);
+      }
       return static::$routes[implode('', static::$prefix)][] = $r;
     }
 
@@ -344,13 +362,15 @@ 
      * @param  string $prefix The url prefix for the internal route definitions.
      * @param  string $callback This callback is invoked on $prefix match of the current request URI.
      */
-    public static function group($prefix, $callback=null){
+    public static function group($prefix, $callback=null) {
 
       // Skip definition if current request doesn't match group.
       $prefix_complete = rtrim(implode('',static::$prefix),'/') . $prefix;
 
       static::$prefix[] = $prefix;
-      if (empty(static::$group)) static::$group = [];
+      if (empty(static::$group)) {
+        static::$group = [];
+      }
       array_unshift(static::$group, new RouteGroup());
 
       switch (true) {
@@ -360,13 +380,19 @@ 
           // Capture vars
           $vars = static::extractVariablesFromURL(static::compilePatternAsRegex($prefix_complete), null, true);
           // Errors in compile pattern or variable extraction, aborting.
-          if (false === $vars) return false;
-          if ($callback) call_user_func_array($callback,$vars);
+          if (false === $vars) {
+            return false;
+          }
+          if ($callback) {
+            call_user_func_array($callback,$vars);
+          }
         break;
 
         // Static group
         case 0 === strpos(Request::URI(), $prefix_complete) :
-          if ($callback) call_user_func($callback);
+          if ($callback) {
+            call_user_func($callback);
+          }
         break;
 
       }
@@ -374,12 +400,14 @@ 
       $group = static::$group[0];
       array_shift(static::$group);
       array_pop(static::$prefix);
-      if (empty(static::$prefix)) static::$prefix = [''];
+      if (empty(static::$prefix)) {
+        static::$prefix = [''];
+      }
       return $group;
 
     }
 
-    public static function exitWithError($code,$message="Application Error"){
+    public static function exitWithError($code,$message="Application Error") {
       Response::error($code,$message);
       Response::send();
       exit;
@@ -390,19 +418,23 @@ 
      * @param  string $URL The URL to match onto.
      * @return boolean true if a route callback was executed.
      */
-    public static function dispatch($URL=null,$method=null){
-        if (!$URL)     $URL     = Request::URI();
-        if (!$method)  $method  = Request::method();
+    public static function dispatch($URL=null,$method=null) {
+        if (!$URL) {
+          $URL     = Request::URI();
+        }
+        if (!$method) {
+          $method  = Request::method();
+        }
 
-        $__deferred_send = new Deferred(function(){
-          if (Options::get('core.response.autosend',true)){
+        $__deferred_send = new Deferred(function() {
+          if (Options::get('core.response.autosend',true)) {
             Response::send();
           }
         });
 
-        foreach ((array)static::$routes as $group => $routes){
+        foreach ((array)static::$routes as $group => $routes) {
             foreach ($routes as $route) {
-                if (is_a($route, 'Route') && false !== ($args = $route->match($URL,$method))){
+                if (is_a($route, 'Route') && false !== ($args = $route->match($URL,$method))) {
                     $route->run($args,$method);
                     return true;
                 }
@@ -410,7 +442,7 @@ 
         }
 
         Response::status(404, '404 Resource not found.');
-        foreach (array_filter(Event::trigger(404)) as $res){
+        foreach (array_filter(Event::trigger(404)) as $res) {
 
         }
         return false;
@@ -420,34 +452,36 @@ 
 class RouteGroup {
   protected $routes;
 
-  public function __construct(){
+  public function __construct() {
     $this->routes = new SplObjectStorage;
     return Route::add($this);
   }
 
-  public function has($r){
+  public function has($r) {
     return $this->routes->contains($r);
   }
 
-  public function add($r){
+  public function add($r) {
     $this->routes->attach($r);
     return $this;
   }
 
-  public function remove($r){
-    if ($this->routes->contains($r)) $this->routes->detach($r);
+  public function remove($r) {
+    if ($this->routes->contains($r)) {
+      $this->routes->detach($r);
+    }
     return $this;
   }
 
-  public function before($callbacks){
-    foreach ($this->routes as $route){
+  public function before($callbacks) {
+    foreach ($this->routes as $route) {
       $route->before($callbacks);
     }
     return $this;
   }
 
-  public function after($callbacks){
-    foreach ($this->routes as $route){
+  public function after($callbacks) {
+    foreach ($this->routes as $route) {
       $route->after($callbacks);
     }
     return $this;

classes/View.php

Doc Comments +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
 
     /**
      * Load a Template Handler
-     * @param  class $handler The template handler class instance
+     * @param  View\Adapter $handler The template handler class instance
      */
     public static function using(View\Adapter &$handler){
       static::$handler = $handler;
@@ -69,7 +69,7 @@ 
 
     /**
      * Returns the handler instance
-     * @return mixed
+     * @return View\Adapter
      */
     public static function & handler(){
       return static::$handler;

Spacing +13 added lines, -13 removed lines

@@ -23,7 +23,7 @@ 
      * Construct a new view based on the passed template
      * @param  string $template The template path
      */
-    public function __construct($template){
+    public function __construct($template) {
       $this->options['template'] = $template;
     }
 
@@ -31,7 +31,7 @@ 
      * Load a Template Handler
      * @param  class $handler The template handler class instance
      */
-    public static function using(View\Adapter &$handler){
+    public static function using(View\Adapter & $handler) {
       static::$handler = $handler;
     }
 
@@ -41,7 +41,7 @@ 
      * @param  array $data     The key-value map of data to pass to the view
      * @return View
      */
-    public static function from($template,$data=null){
+    public static function from($template, $data = null) {
       $view = new self($template);
       return $data ? $view->with($data) : $view;
     }
@@ -51,9 +51,9 @@ 
      * @param  array $data     The key-value map of data to pass to the view
      * @return View
      */
-    public function with($data){
-      if ($data){
-        $tmp = array_merge($data, (isset($this->options['data'])?$this->options['data']:[]));
+    public function with($data) {
+      if ($data) {
+        $tmp = array_merge($data, (isset($this->options['data']) ? $this->options['data'] : []));
         $this->options['data'] = $tmp;
       }
       return $this;
@@ -63,8 +63,8 @@ 
      * Render view when casted to a string
      * @return string The rendered view
      */
-    public function __toString(){
-      return Filter::with('core.view',static::$handler->render($this->options['template'],$this->options['data']));
+    public function __toString() {
+      return Filter::with('core.view', static::$handler->render($this->options['template'], $this->options['data']));
     }
 
     /**
@@ -79,7 +79,7 @@ 
      * Check if a template exists
      * @return bool
      */
-    public static function exists($templatePath){
+    public static function exists($templatePath) {
       return static::$handler->exists($templatePath);
     }
 
@@ -87,15 +87,15 @@ 
     /**
      * Propagate the call to the handler
      */
-    public function __call($n,$p){
-      return call_user_func_array([static::$handler,$n],$p);
+    public function __call($n, $p) {
+      return call_user_func_array([static::$handler, $n], $p);
     }
 
     /**
      * Propagate the static call to the handler
      */
-    public static function __callStatic($n,$p){
-      return forward_static_call_array([static::$handler,$n],$p);
+    public static function __callStatic($n, $p) {
+      return forward_static_call_array([static::$handler, $n], $p);
     }
 
 

Braces +9 added lines, -9 removed lines

@@ -23,7 +23,7 @@ 
      * Construct a new view based on the passed template
      * @param  string $template The template path
      */
-    public function __construct($template){
+    public function __construct($template) {
       $this->options['template'] = $template;
     }
 
@@ -31,7 +31,7 @@ 
      * Load a Template Handler
      * @param  class $handler The template handler class instance
      */
-    public static function using(View\Adapter &$handler){
+    public static function using(View\Adapter &$handler) {
       static::$handler = $handler;
     }
 
@@ -41,7 +41,7 @@ 
      * @param  array $data     The key-value map of data to pass to the view
      * @return View
      */
-    public static function from($template,$data=null){
+    public static function from($template,$data=null) {
       $view = new self($template);
       return $data ? $view->with($data) : $view;
     }
@@ -51,8 +51,8 @@ 
      * @param  array $data     The key-value map of data to pass to the view
      * @return View
      */
-    public function with($data){
-      if ($data){
+    public function with($data) {
+      if ($data) {
         $tmp = array_merge($data, (isset($this->options['data'])?$this->options['data']:[]));
         $this->options['data'] = $tmp;
       }
@@ -63,7 +63,7 @@ 
      * Render view when casted to a string
      * @return string The rendered view
      */
-    public function __toString(){
+    public function __toString() {
       return Filter::with('core.view',static::$handler->render($this->options['template'],$this->options['data']));
     }
 
@@ -79,7 +79,7 @@ 
      * Check if a template exists
      * @return bool
      */
-    public static function exists($templatePath){
+    public static function exists($templatePath) {
       return static::$handler->exists($templatePath);
     }
 
@@ -87,14 +87,14 @@ 
     /**
      * Propagate the call to the handler
      */
-    public function __call($n,$p){
+    public function __call($n,$p) {
       return call_user_func_array([static::$handler,$n],$p);
     }
 
     /**
      * Propagate the static call to the handler
      */
-    public static function __callStatic($n,$p){
+    public static function __callStatic($n,$p) {
       return forward_static_call_array([static::$handler,$n],$p);
     }
 

classes/SQL.php

Doc Comments +5 added lines

@@ -101,6 +101,11 @@
             $queries           = [],
             $last_exec_success = true;
 
+  /**
+   * @param string $dsn
+   * @param string $username
+   * @param string $password
+   */
   public function __construct($dsn, $username=null, $password=null, $options=[]){
     $this->connection = [
       'dsn'        => $dsn,

Indentation +4 added lines, -4 removed lines

@@ -14,7 +14,7 @@ 
 class SQL {
   use Module;
   protected static $connections = [],
-                   $current     = 'default';
+                    $current     = 'default';
 
   /**
    * Register a new datasource
@@ -208,7 +208,7 @@ 
     }
   }
 
- public function run($script){
+  public function run($script){
     if(!$this->connection()) return false;
 
     $sql_path = Options::get('database.sql.path',APP_DIR.'/sql');
@@ -223,8 +223,8 @@ 
   }
 
   public function all($query, $params=[], callable $looper = null){
-   if(!$this->connection()) return false;
-   return $this->each($query,$params,$looper);
+    if(!$this->connection()) return false;
+    return $this->each($query,$params,$looper);
   }
 
   public function delete($table, $pks=null, $pk='id', $inclusive=true){

Spacing +73 added lines, -73 removed lines

@@ -25,7 +25,7 @@ 
    * @param  array  $options  Options to pass to the PDO constructor
    * @return SQLConnection    The datasource resource
    */
-  public static function register($name, $dsn, $username=null, $password=null, $options=[]){
+  public static function register($name, $dsn, $username = null, $password = null, $options = []) {
     return self::$connections[$name] = new SQLConnection($dsn, $username, $password, $options);
   }
 
@@ -37,7 +37,7 @@ 
    * @param  array  $options  Options to pass to the PDO constructor
    * @return SQLConnection    The datasource resource
    */
-  public static function connect($dsn, $username=null, $password=null, $options=[]){
+  public static function connect($dsn, $username = null, $password = null, $options = []) {
     return self::register('default', $dsn, $username, $password, $options);
   }
 
@@ -46,8 +46,8 @@ 
    * @param  string $name The datasource name
    * @return bool       `true` if correctly changed
    */
-  public static function defaultTo($name){
-    if (isset(self::$connections[$name])){
+  public static function defaultTo($name) {
+    if (isset(self::$connections[$name])) {
       self::$current = $name;
       return true;
     } else return false;
@@ -58,11 +58,11 @@ 
    * @param  string $name The datasource name, omit for close all of them
    * @return bool       `true` if one or more datasource where closed
    */
-  public static function close($name=null){
+  public static function close($name = null) {
     if ($name === null) {
       foreach (self::$connections as $conn) $conn->close();
       return true;
-    } else if (isset(self::$connections[$name])){
+    } else if (isset(self::$connections[$name])) {
       self::$connections[$name]->close();
       return true;
     } else return false;
@@ -73,7 +73,7 @@ 
    * @param  strinf $name The datasource name
    * @return SQLConnect   The datasource connection
    */
-  public static function using($name){
+  public static function using($name) {
     if (empty(self::$connections[$name])) throw new \Exception("[SQL] Unknown connection named '$name'.");
     return self::$connections[$name];
   }
@@ -84,9 +84,9 @@ 
    * @param  array $args    The method arguments
    * @return mixed          The method return value
    */
-  public static function __callStatic($method, $args){
+  public static function __callStatic($method, $args) {
     if (empty(self::$connections[self::$current])) throw new \Exception("[SQL] No default connection defined.");
-    return call_user_func_array([self::$connections[self::$current],$method],$args);
+    return call_user_func_array([self::$connections[self::$current], $method], $args);
   }
 
 }
@@ -101,7 +101,7 @@ 
             $queries           = [],
             $last_exec_success = true;
 
-  public function __construct($dsn, $username=null, $password=null, $options=[]){
+  public function __construct($dsn, $username = null, $password = null, $options = []) {
     $this->connection = [
       'dsn'        => $dsn,
       'pdo'        => null,
@@ -111,20 +111,20 @@ 
         PDO::ATTR_ERRMODE              => PDO::ERRMODE_EXCEPTION,
         PDO::ATTR_DEFAULT_FETCH_MODE   => PDO::FETCH_ASSOC,
         PDO::ATTR_EMULATE_PREPARES     => true,
-      ],$options),
+      ], $options),
     ];
     // "The auto-commit mode cannot be changed for this driver" SQLite workaround
-    if (strpos($dsn,'sqlite:') === 0) {
+    if (strpos($dsn, 'sqlite:') === 0) {
       $this->connection['options'] = $options;
     }
   }
 
-  public function close(){
+  public function close() {
     $this->connection['pdo'] = null;
   }
 
-  public function connection(){
-    if(empty($this->connection['pdo'])) {
+  public function connection() {
+    if (empty($this->connection['pdo'])) {
       try {
         $this->connection['pdo'] = new PDO(
             $this->connection['dsn'],
@@ -133,26 +133,26 @@ 
             $this->connection['options']
 
         );
-        Event::trigger('core.sql.connect',$this);
-      } catch(Exception $e) {
+        Event::trigger('core.sql.connect', $this);
+      } catch (Exception $e) {
         $this->connection['pdo'] = null;
       }
     }
     return $this->connection['pdo'];
   }
 
-  public function prepare($query){
-    if(!$this->connection()) return false;
+  public function prepare($query) {
+    if (!$this->connection()) return false;
     return isset($this->queries[$query]) ? $this->queries[$query] : ($this->queries[$query] = $this->connection()->prepare($query));
   }
 
-  public function exec($query, $params=[]){
-    if(!$this->connection()) return false;
+  public function exec($query, $params = []) {
+    if (!$this->connection()) return false;
 
-    if (false==is_array($params)) $params = (array)$params;
-    $query = Filter::with('core.sql.query',$query);
-    if($statement = $this->prepare($query)){
-      Event::trigger('core.sql.query',$query,$params,(bool)$statement);
+    if (false == is_array($params)) $params = (array) $params;
+    $query = Filter::with('core.sql.query', $query);
+    if ($statement = $this->prepare($query)) {
+      Event::trigger('core.sql.query', $query, $params, (bool) $statement);
 
       foreach ($params as $key => $val) {
         $type = PDO::PARAM_STR;
@@ -164,10 +164,10 @@ 
           $type = PDO::PARAM_INT;
         }
         // bindValue need a 1-based numeric parameter
-        $statement->bindValue(is_numeric($key)?$key+1:':'.$key, $val, $type);
+        $statement->bindValue(is_numeric($key) ? $key + 1 : ':'.$key, $val, $type);
       }
     } else {
-      Event::trigger('core.sql.error',$query,$params);
+      Event::trigger('core.sql.error', $query, $params);
       return false;
     }
 
@@ -175,18 +175,18 @@ 
     return $statement;
   }
 
-  public function value($query, $params=[], $column=0){
-    if(!$this->connection()) return false;
+  public function value($query, $params = [], $column = 0) {
+    if (!$this->connection()) return false;
 
-    $res = $this->exec($query,$params);
+    $res = $this->exec($query, $params);
     return $res ? $res->fetchColumn($column) : null;
   }
 
-  public function column($query, $params=[], $column=0){
-    if(!$this->connection()) return false;
+  public function column($query, $params = [], $column = 0) {
+    if (!$this->connection()) return false;
 
     $results = [];
-    $res     = $this->exec($query,$params);
+    $res     = $this->exec($query, $params);
 
     if (is_string($column))
       while ($x = $res->fetch(PDO::FETCH_OBJ)) $results[] = $x->$column;
@@ -196,25 +196,25 @@ 
     return $results;
   }
 
-  public function each($query, $params=[], callable $looper = null){
-    if(!$this->connection()) return false;
+  public function each($query, $params = [], callable $looper = null) {
+    if (!$this->connection()) return false;
 
     // ($query,$looper) shorthand
-    if ($looper===null && is_callable($params)) {$looper = $params; $params = [];}
-    if( $res = $this->exec($query,$params) ){
-      if(is_callable($looper))
+    if ($looper === null && is_callable($params)) {$looper = $params;$params = [];}
+    if ($res = $this->exec($query, $params)) {
+      if (is_callable($looper))
         while ($row = $res->fetchObject()) $looper($row);
       else
         return $res->fetchAll(PDO::FETCH_CLASS);
     }
   }
 
-  public function single($query, $params=[], callable $handler = null){
-    if(!$this->connection()) return false;
+  public function single($query, $params = [], callable $handler = null) {
+    if (!$this->connection()) return false;
 
     // ($query,$handler) shorthand
-    if ($handler===null && is_callable($params)) {$handler = $params; $params = [];}
-    if( $res = $this->exec($query,$params) ){
+    if ($handler === null && is_callable($params)) {$handler = $params;$params = [];}
+    if ($res = $this->exec($query, $params)) {
         if (is_callable($handler))
           $handler($res->fetchObject());
         else
@@ -222,76 +222,76 @@ 
     }
   }
 
- public function run($script){
-    if(!$this->connection()) return false;
+ public function run($script) {
+    if (!$this->connection()) return false;
 
-    $sql_path = Options::get('database.sql.path',APP_DIR.'/sql');
-    $sql_sep  = Options::get('database.sql.separator',';');
-    if (is_file($f = "$sql_path/$script.sql")){
+    $sql_path = Options::get('database.sql.path', APP_DIR.'/sql');
+    $sql_sep  = Options::get('database.sql.separator', ';');
+    if (is_file($f = "$sql_path/$script.sql")) {
         $result = true;
-        foreach(explode($sql_sep,file_get_contents($f)) as $statement) {
+        foreach (explode($sql_sep, file_get_contents($f)) as $statement) {
             $result = $this->exec($statement);
         }
         return $result;
     } else return false;
   }
 
-  public function all($query, $params=[], callable $looper = null){
-   if(!$this->connection()) return false;
-   return $this->each($query,$params,$looper);
+  public function all($query, $params = [], callable $looper = null) {
+   if (!$this->connection()) return false;
+   return $this->each($query, $params, $looper);
   }
 
-  public function delete($table, $pks=null, $pk='id', $inclusive=true){
-    if(!$this->connection()) return false;
+  public function delete($table, $pks = null, $pk = 'id', $inclusive = true) {
+    if (!$this->connection()) return false;
 
-    if (null===$pks) {
+    if (null === $pks) {
       return $this->exec("DELETE FROM `$table`");
     } else {
-      return $this->exec("DELETE FROM `$table` WHERE `$pk` ".($inclusive ? "" : "NOT " )."IN (" . implode( ',', array_fill_keys( (array)$pks, '?' ) ) . ")",(array)$pks);
+      return $this->exec("DELETE FROM `$table` WHERE `$pk` ".($inclusive ? "" : "NOT ")."IN (".implode(',', array_fill_keys((array) $pks, '?')).")", (array) $pks);
     }
   }
 
-  public function insert($table, $data){
-    if(!$this->connection()) return false;
+  public function insert($table, $data) {
+    if (!$this->connection()) return false;
 
-    if (false==is_array($data)) $data = (array)$data;
+    if (false == is_array($data)) $data = (array) $data;
     $k = array_keys($data);
     asort($k);
     $pk = $k;
-    array_walk($pk,function(&$e){ $e = ':'.$e;});
-    $q = "INSERT INTO `$table` (`".implode('`,`',$k)."`) VALUES (".implode(',',$pk).")";
-    $this->exec($q,$data);
+    array_walk($pk, function(&$e) { $e = ':'.$e;});
+    $q = "INSERT INTO `$table` (`".implode('`,`', $k)."`) VALUES (".implode(',', $pk).")";
+    $this->exec($q, $data);
     return $this->last_exec_success ? $this->connection()->lastInsertId() : false;
   }
 
-  public function updateWhere($table, $data, $where, $pk='id'){
-    if(!$this->connection()) return false;
+  public function updateWhere($table, $data, $where, $pk = 'id') {
+    if (!$this->connection()) return false;
 
-    if (false==is_array($data)) $data = (array)$data;
+    if (false == is_array($data)) $data = (array) $data;
     if (empty($data)) return false;
     $k = array_keys($data);
     asort($k);
 
     // Remove primary key from SET
-    array_walk($k,function(&$e) use ($pk) {
-      $e = ($e==$pk) ? null : "`$e`=:$e";
+    array_walk($k, function(&$e) use ($pk) {
+      $e = ($e == $pk) ? null : "`$e`=:$e";
     });
 
-    $q = "UPDATE `$table` SET ".implode(', ',array_filter($k))." WHERE $where";
-    $this->exec($q,$data);
+    $q = "UPDATE `$table` SET ".implode(', ', array_filter($k))." WHERE $where";
+    $this->exec($q, $data);
     return $this->last_exec_success;
   }
 
-  public function update($table, $data, $pk='id', $extra_where=''){
+  public function update($table, $data, $pk = 'id', $extra_where = '') {
     return $this->updateWhere($table, $data, "`$pk`=:$pk $extra_where", $pk);
   }
 
-  public function insertOrUpdate($table, $data=[], $pk='id', $extra_where=''){
-    if(!$this->connection()) return false;
+  public function insertOrUpdate($table, $data = [], $pk = 'id', $extra_where = '') {
+    if (!$this->connection()) return false;
 
-    if (false==is_array($data)) $data = (array)$data;
+    if (false == is_array($data)) $data = (array) $data;
     if (empty($data[$pk])) return $this->insert($table, $data);
-    if( (string) $this->value("SELECT `$pk` FROM `$table` WHERE `$pk`=? LIMIT 1", [$data[$pk]]) === (string) $data[$pk] ){
+    if ((string) $this->value("SELECT `$pk` FROM `$table` WHERE `$pk`=? LIMIT 1", [$data[$pk]]) === (string) $data[$pk]) {
         return $this->update($table, $data, $pk, $extra_where);
     } else {
         return $this->insert($table, $data);

Braces +113 added lines, -64 removed lines

@@ -25,7 +25,7 @@ 
    * @param  array  $options  Options to pass to the PDO constructor
    * @return SQLConnection    The datasource resource
    */
-  public static function register($name, $dsn, $username=null, $password=null, $options=[]){
+  public static function register($name, $dsn, $username=null, $password=null, $options=[]) {
     return self::$connections[$name] = new SQLConnection($dsn, $username, $password, $options);
   }
 
@@ -37,7 +37,7 @@ 
    * @param  array  $options  Options to pass to the PDO constructor
    * @return SQLConnection    The datasource resource
    */
-  public static function connect($dsn, $username=null, $password=null, $options=[]){
+  public static function connect($dsn, $username=null, $password=null, $options=[]) {
     return self::register('default', $dsn, $username, $password, $options);
   }
 
@@ -46,11 +46,13 @@ 
    * @param  string $name The datasource name
    * @return bool       `true` if correctly changed
    */
-  public static function defaultTo($name){
-    if (isset(self::$connections[$name])){
+  public static function defaultTo($name) {
+    if (isset(self::$connections[$name])) {
       self::$current = $name;
       return true;
-    } else return false;
+    } else {
+      return false;
+    }
   }
 
   /**
@@ -58,14 +60,16 @@ 
    * @param  string $name The datasource name, omit for close all of them
    * @return bool       `true` if one or more datasource where closed
    */
-  public static function close($name=null){
+  public static function close($name=null) {
     if ($name === null) {
       foreach (self::$connections as $conn) $conn->close();
       return true;
-    } else if (isset(self::$connections[$name])){
+    } else if (isset(self::$connections[$name])) {
       self::$connections[$name]->close();
       return true;
-    } else return false;
+    } else {
+      return false;
+    }
   }
 
   /**
@@ -73,8 +77,10 @@ 
    * @param  strinf $name The datasource name
    * @return SQLConnect   The datasource connection
    */
-  public static function using($name){
-    if (empty(self::$connections[$name])) throw new \Exception("[SQL] Unknown connection named '$name'.");
+  public static function using($name) {
+    if (empty(self::$connections[$name])) {
+      throw new \Exception("[SQL] Unknown connection named '$name'.");
+    }
     return self::$connections[$name];
   }
 
@@ -84,8 +90,10 @@ 
    * @param  array $args    The method arguments
    * @return mixed          The method return value
    */
-  public static function __callStatic($method, $args){
-    if (empty(self::$connections[self::$current])) throw new \Exception("[SQL] No default connection defined.");
+  public static function __callStatic($method, $args) {
+    if (empty(self::$connections[self::$current])) {
+      throw new \Exception("[SQL] No default connection defined.");
+    }
     return call_user_func_array([self::$connections[self::$current],$method],$args);
   }
 
@@ -101,7 +109,7 @@ 
             $queries           = [],
             $last_exec_success = true;
 
-  public function __construct($dsn, $username=null, $password=null, $options=[]){
+  public function __construct($dsn, $username=null, $password=null, $options=[]) {
     $this->connection = [
       'dsn'        => $dsn,
       'pdo'        => null,
@@ -119,11 +127,11 @@ 
     }
   }
 
-  public function close(){
+  public function close() {
     $this->connection['pdo'] = null;
   }
 
-  public function connection(){
+  public function connection() {
     if(empty($this->connection['pdo'])) {
       try {
         $this->connection['pdo'] = new PDO(
@@ -141,17 +149,23 @@ 
     return $this->connection['pdo'];
   }
 
-  public function prepare($query){
-    if(!$this->connection()) return false;
+  public function prepare($query) {
+    if(!$this->connection()) {
+      return false;
+    }
     return isset($this->queries[$query]) ? $this->queries[$query] : ($this->queries[$query] = $this->connection()->prepare($query));
   }
 
-  public function exec($query, $params=[]){
-    if(!$this->connection()) return false;
+  public function exec($query, $params=[]) {
+    if(!$this->connection()) {
+      return false;
+    }
 
-    if (false==is_array($params)) $params = (array)$params;
+    if (false==is_array($params)) {
+      $params = (array)$params;
+    }
     $query = Filter::with('core.sql.query',$query);
-    if($statement = $this->prepare($query)){
+    if($statement = $this->prepare($query)) {
       Event::trigger('core.sql.query',$query,$params,(bool)$statement);
 
       foreach ($params as $key => $val) {
@@ -175,74 +189,93 @@ 
     return $statement;
   }
 
-  public function value($query, $params=[], $column=0){
-    if(!$this->connection()) return false;
+  public function value($query, $params=[], $column=0) {
+    if(!$this->connection()) {
+      return false;
+    }
 
     $res = $this->exec($query,$params);
     return $res ? $res->fetchColumn($column) : null;
   }
 
-  public function column($query, $params=[], $column=0){
-    if(!$this->connection()) return false;
+  public function column($query, $params=[], $column=0) {
+    if(!$this->connection()) {
+      return false;
+    }
 
     $results = [];
     $res     = $this->exec($query,$params);
 
-    if (is_string($column))
-      while ($x = $res->fetch(PDO::FETCH_OBJ)) $results[] = $x->$column;
-    else
-      while ($x = $res->fetchColumn($column)) $results[] = $x;
+    if (is_string($column)) {
+          while ($x = $res->fetch(PDO::FETCH_OBJ)) $results[] = $x->$column;
+    } else {
+          while ($x = $res->fetchColumn($column)) $results[] = $x;
+    }
 
     return $results;
   }
 
-  public function each($query, $params=[], callable $looper = null){
-    if(!$this->connection()) return false;
+  public function each($query, $params=[], callable $looper = null) {
+    if(!$this->connection()) {
+      return false;
+    }
 
     // ($query,$looper) shorthand
     if ($looper===null && is_callable($params)) {$looper = $params; $params = [];}
-    if( $res = $this->exec($query,$params) ){
-      if(is_callable($looper))
-        while ($row = $res->fetchObject()) $looper($row);
-      else
-        return $res->fetchAll(PDO::FETCH_CLASS);
+    if( $res = $this->exec($query,$params) ) {
+      if(is_callable($looper)) {
+              while ($row = $res->fetchObject()) $looper($row);
+      } else {
+              return $res->fetchAll(PDO::FETCH_CLASS);
+      }
     }
   }
 
-  public function single($query, $params=[], callable $handler = null){
-    if(!$this->connection()) return false;
+  public function single($query, $params=[], callable $handler = null) {
+    if(!$this->connection()) {
+      return false;
+    }
 
     // ($query,$handler) shorthand
     if ($handler===null && is_callable($params)) {$handler = $params; $params = [];}
-    if( $res = $this->exec($query,$params) ){
-        if (is_callable($handler))
-          $handler($res->fetchObject());
-        else
-          return $res->fetchObject();
+    if( $res = $this->exec($query,$params) ) {
+        if (is_callable($handler)) {
+                  $handler($res->fetchObject());
+        } else {
+                  return $res->fetchObject();
+        }
     }
   }
 
- public function run($script){
-    if(!$this->connection()) return false;
+ public function run($script) {
+    if(!$this->connection()) {
+      return false;
+    }
 
     $sql_path = Options::get('database.sql.path',APP_DIR.'/sql');
     $sql_sep  = Options::get('database.sql.separator',';');
-    if (is_file($f = "$sql_path/$script.sql")){
+    if (is_file($f = "$sql_path/$script.sql")) {
         $result = true;
         foreach(explode($sql_sep,file_get_contents($f)) as $statement) {
             $result = $this->exec($statement);
         }
         return $result;
-    } else return false;
+    } else {
+      return false;
+    }
   }
 
-  public function all($query, $params=[], callable $looper = null){
-   if(!$this->connection()) return false;
+  public function all($query, $params=[], callable $looper = null) {
+   if(!$this->connection()) {
+     return false;
+   }
    return $this->each($query,$params,$looper);
   }
 
-  public function delete($table, $pks=null, $pk='id', $inclusive=true){
-    if(!$this->connection()) return false;
+  public function delete($table, $pks=null, $pk='id', $inclusive=true) {
+    if(!$this->connection()) {
+      return false;
+    }
 
     if (null===$pks) {
       return $this->exec("DELETE FROM `$table`");
@@ -251,10 +284,14 @@ 
     }
   }
 
-  public function insert($table, $data){
-    if(!$this->connection()) return false;
+  public function insert($table, $data) {
+    if(!$this->connection()) {
+      return false;
+    }
 
-    if (false==is_array($data)) $data = (array)$data;
+    if (false==is_array($data)) {
+      $data = (array)$data;
+    }
     $k = array_keys($data);
     asort($k);
     $pk = $k;
@@ -264,11 +301,17 @@ 
     return $this->last_exec_success ? $this->connection()->lastInsertId() : false;
   }
 
-  public function updateWhere($table, $data, $where, $pk='id'){
-    if(!$this->connection()) return false;
+  public function updateWhere($table, $data, $where, $pk='id') {
+    if(!$this->connection()) {
+      return false;
+    }
 
-    if (false==is_array($data)) $data = (array)$data;
-    if (empty($data)) return false;
+    if (false==is_array($data)) {
+      $data = (array)$data;
+    }
+    if (empty($data)) {
+      return false;
+    }
     $k = array_keys($data);
     asort($k);
 
@@ -282,16 +325,22 @@ 
     return $this->last_exec_success;
   }
 
-  public function update($table, $data, $pk='id', $extra_where=''){
+  public function update($table, $data, $pk='id', $extra_where='') {
     return $this->updateWhere($table, $data, "`$pk`=:$pk $extra_where", $pk);
   }
 
-  public function insertOrUpdate($table, $data=[], $pk='id', $extra_where=''){
-    if(!$this->connection()) return false;
+  public function insertOrUpdate($table, $data=[], $pk='id', $extra_where='') {
+    if(!$this->connection()) {
+      return false;
+    }
 
-    if (false==is_array($data)) $data = (array)$data;
-    if (empty($data[$pk])) return $this->insert($table, $data);
-    if( (string) $this->value("SELECT `$pk` FROM `$table` WHERE `$pk`=? LIMIT 1", [$data[$pk]]) === (string) $data[$pk] ){
+    if (false==is_array($data)) {
+      $data = (array)$data;
+    }
+    if (empty($data[$pk])) {
+      return $this->insert($table, $data);
+    }
+    if( (string) $this->value("SELECT `$pk` FROM `$table` WHERE `$pk`=? LIMIT 1", [$data[$pk]]) === (string) $data[$pk] ) {
         return $this->update($table, $data, $pk, $extra_where);
     } else {
         return $this->insert($table, $data);

classes/Response.php

Doc Comments +7 added lines, -6 removed lines

@@ -89,7 +89,7 @@ 
 
     /**
      * Check if an response output buffering is active.
-     * @return boolean
+     * @return boolean|null
      */
     public static function isBuffering(){
         return static::$buffer;
@@ -113,7 +113,6 @@ 
 
     /**
      * Append a text to the buffer.
-     * @param  mixed $payload Text to append to the response buffer
      */
     public static function text(){
         static::type(static::TYPE_TEXT);
@@ -122,7 +121,6 @@ 
 
     /**
      * Append an XML string to the buffer.
-     * @param  mixed $payload Data to append to the response buffer
      */
     public static function xml(){
         static::type(static::TYPE_XML);
@@ -131,7 +129,6 @@ 
 
     /**
      * Append a SVG string to the buffer.
-     * @param  mixed $payload Data to append to the response buffer
      */
     public static function svg(){
         static::type(static::TYPE_SVG);
@@ -140,7 +137,6 @@ 
 
     /**
      * Append an HTML string to the buffer.
-     * @param  mixed $payload Data to append to the response buffer
      */
     public static function html(){
         static::type(static::TYPE_HTML);
@@ -149,16 +145,21 @@ 
 
     /**
      * Append a raw string to the buffer.
-     * @param  mixed $payload Data to append to the response buffer
      */
     public static function add(){
         static::$payload[] = implode('',func_get_args());
     }
 
+    /**
+     * @param integer $code
+     */
     public static function status($code,$message=''){
         static::header('Status',$message?:$code,$code);
     }
 
+    /**
+     * @param string $name
+     */
     public static function header($name,$value,$code=null){
         static::$headers[$name] = [$value,$code];
     }

Indentation +10 added lines, -10 removed lines

@@ -23,13 +23,13 @@ 
           TYPE_BIN                = 'application/octet-stream';
 
     protected static $payload     = [],
-                     $status      = 200,
-                     $charset     = "utf-8",
-                     $headers     = ['Content-Type' => ['text/html; charset=utf-8']],
-                     $buffer      = null,
-                     $force_dl    = false,
-                     $link        = null,
-                     $sent        = false;
+                      $status      = 200,
+                      $charset     = "utf-8",
+                      $headers     = ['Content-Type' => ['text/html; charset=utf-8']],
+                      $buffer      = null,
+                      $force_dl    = false,
+                      $link        = null,
+                      $sent        = false;
 
 
     public static function charset($charset){
@@ -187,12 +187,12 @@ 
       if ($setBody) static::$payload = [$setBody];
       return Filter::with('core.response.body',
                 is_array(static::$payload) ? implode('',static::$payload) : static::$payload
-             );
+              );
     }
 
     public static function headers($setHeaders=null){
-       if ($setHeaders) static::$headers = $setHeaders;
-       return static::$headers;
+        if ($setHeaders) static::$headers = $setHeaders;
+        return static::$headers;
     }
 
     /**

Spacing +43 added lines, -43 removed lines

@@ -32,12 +32,12 @@ 
                      $sent        = false;
 
 
-    public static function charset($charset){
+    public static function charset($charset) {
         static::$charset = $charset;
     }
 
-    public static function type($mime){
-        static::header('Content-Type',$mime . (static::$charset ? '; charset='.static::$charset : ''));
+    public static function type($mime) {
+        static::header('Content-Type', $mime.(static::$charset ? '; charset='.static::$charset : ''));
     }
 
     /**
@@ -45,39 +45,39 @@ 
      * @param  string/bool $filename Pass a falsy value to disable download or pass a filename for exporting content
      * @return [type]        [description]
      */
-    public static function download($filename){
+    public static function download($filename) {
         static::$force_dl = $filename;
     }
 
     /**
      * Start capturing output
      */
-    public static function start(){
+    public static function start() {
         static::$buffer = ob_start();
     }
 
     /**
      * Enable CORS HTTP headers.
      */
-    public static function enableCORS(){
+    public static function enableCORS() {
 
         // Allow from any origin
-        if ($origin = filter_input(INPUT_SERVER,'HTTP_ORIGIN')) {
+        if ($origin = filter_input(INPUT_SERVER, 'HTTP_ORIGIN')) {
           static::header('Access-Control-Allow-Origin', $origin);
           static::header('Access-Control-Allow-Credentials', 'true');
           static::header('Access-Control-Max-Age', 86400);
         }
 
         // Access-Control headers are received during OPTIONS requests
-        if (filter_input(INPUT_SERVER,'REQUEST_METHOD') == 'OPTIONS') {
+        if (filter_input(INPUT_SERVER, 'REQUEST_METHOD') == 'OPTIONS') {
             static::clean();
 
-            if (filter_input(INPUT_SERVER,'HTTP_ACCESS_CONTROL_REQUEST_METHOD')) {
+            if (filter_input(INPUT_SERVER, 'HTTP_ACCESS_CONTROL_REQUEST_METHOD')) {
               static::header('Access-Control-Allow-Methods',
                 'GET, POST, PUT, DELETE, OPTIONS, HEAD, CONNECT, PATCH, TRACE');
             }
-            if ($req_h = filter_input(INPUT_SERVER,'HTTP_ACCESS_CONTROL_REQUEST_HEADERS')) {
-              static::header('Access-Control-Allow-Headers',$req_h);
+            if ($req_h = filter_input(INPUT_SERVER, 'HTTP_ACCESS_CONTROL_REQUEST_HEADERS')) {
+              static::header('Access-Control-Allow-Headers', $req_h);
             }
 
             static::send();
@@ -93,8 +93,8 @@ 
      * Finish the output buffer capturing.
      * @return string The captured buffer
      */
-    public static function end(){
-        if (static::$buffer){
+    public static function end() {
+        if (static::$buffer) {
             static::$payload[] = ob_get_contents();
             ob_end_clean();
             static::$buffer = null;
@@ -106,14 +106,14 @@ 
      * Check if an response output buffering is active.
      * @return boolean
      */
-    public static function isBuffering(){
+    public static function isBuffering() {
         return static::$buffer;
     }
 
     /**
      * Clear the response body
      */
-    public static function clean(){
+    public static function clean() {
         static::$payload = [];
     }
 
@@ -121,45 +121,45 @@ 
      * Append a JSON object to the buffer.
      * @param  mixed $payload Data to append to the response buffer
      */
-    public static function json($payload){
+    public static function json($payload) {
         static::type(static::TYPE_JSON);
-        static::$payload[] = json_encode($payload, Options::get('core.response.json_flags',JSON_NUMERIC_CHECK));
+        static::$payload[] = json_encode($payload, Options::get('core.response.json_flags', JSON_NUMERIC_CHECK));
     }
 
     /**
      * Append a text to the buffer.
      * @param  mixed $payload Text to append to the response buffer
      */
-    public static function text(){
+    public static function text() {
         static::type(static::TYPE_TEXT);
-        static::$payload[] = implode('',func_get_args());
+        static::$payload[] = implode('', func_get_args());
     }
 
     /**
      * Append an XML string to the buffer.
      * @param  mixed $payload Data to append to the response buffer
      */
-    public static function xml(){
+    public static function xml() {
         static::type(static::TYPE_XML);
-        static::$payload[] = implode('',func_get_args());
+        static::$payload[] = implode('', func_get_args());
     }
 
     /**
      * Append a SVG string to the buffer.
      * @param  mixed $payload Data to append to the response buffer
      */
-    public static function svg(){
+    public static function svg() {
         static::type(static::TYPE_SVG);
-        static::$payload[] = implode('',func_get_args());
+        static::$payload[] = implode('', func_get_args());
     }
 
     /**
      * Append an HTML string to the buffer.
      * @param  mixed $payload Data to append to the response buffer
      */
-    public static function html(){
+    public static function html() {
         static::type(static::TYPE_HTML);
-        static::$payload[] = implode('',func_get_args());
+        static::$payload[] = implode('', func_get_args());
     }
 
     /**
@@ -172,8 +172,8 @@ 
      *
      * @param  mixed $payload Data to append to the response buffer
      */
-    public static function add(){
-      foreach(func_get_args() as $data){
+    public static function add() {
+      foreach (func_get_args() as $data) {
         switch (true) {
           case is_callable($data) :
             return static::add($data());
@@ -187,27 +187,27 @@ 
       }
     }
 
-    public static function status($code,$message=''){
-        static::header('Status',$message?:$code,$code);
+    public static function status($code, $message = '') {
+        static::header('Status', $message ?: $code, $code);
     }
 
-    public static function header($name,$value,$code=null){
-        static::$headers[$name] = [$value,$code];
+    public static function header($name, $value, $code = null) {
+        static::$headers[$name] = [$value, $code];
     }
 
-    public static function error($code=500,$message='Application Error'){
-        Event::trigger('core.response.error',$code,$message);
-        static::status($code,$message);
+    public static function error($code = 500, $message = 'Application Error') {
+        Event::trigger('core.response.error', $code, $message);
+        static::status($code, $message);
     }
 
-    public static function body($setBody=null){
+    public static function body($setBody = null) {
       if ($setBody) static::$payload = [$setBody];
       return Filter::with('core.response.body',
-                is_array(static::$payload) ? implode('',static::$payload) : static::$payload
+                is_array(static::$payload) ? implode('', static::$payload) : static::$payload
              );
     }
 
-    public static function headers($setHeaders=null){
+    public static function headers($setHeaders = null) {
        if ($setHeaders) static::$headers = $setHeaders;
        return static::$headers;
     }
@@ -219,7 +219,7 @@ 
      *
      * @return array Headers and body of the response
      */
-    public static function save(){
+    public static function save() {
         return [
           'head' => static::$headers,
           'body' => static::body(),
@@ -233,13 +233,13 @@ 
      *
      * @param  array $data head/body saved state
      */
-    public static function load($data){
-      $data = (object)$data;
+    public static function load($data) {
+      $data = (object) $data;
       if (isset($data->head)) static::headers($data->head);
       if (isset($data->body)) static::body($data->body);
     }
 
-    public static function send($force = false){
+    public static function send($force = false) {
       if (!static::$sent || $force) {
         static::$sent = true;
         Event::trigger('core.response.send');
@@ -252,8 +252,8 @@ 
                 $code  = null;
             }
 
-            if ($value == 'Status'){
-              if (function_exists('http_response_code')){
+            if ($value == 'Status') {
+              if (function_exists('http_response_code')) {
                 http_response_code($code);
               } else {
                 header("Status: $code", true, $code);

Braces +44 added lines, -32 removed lines

@@ -32,11 +32,11 @@ 
                      $sent        = false;
 
 
-    public static function charset($charset){
+    public static function charset($charset) {
         static::$charset = $charset;
     }
 
-    public static function type($mime){
+    public static function type($mime) {
         static::header('Content-Type',$mime . (static::$charset ? '; charset='.static::$charset : ''));
     }
 
@@ -45,21 +45,21 @@ 
      * @param  string/bool $filename Pass a falsy value to disable download or pass a filename for exporting content
      * @return [type]        [description]
      */
-    public static function download($filename){
+    public static function download($filename) {
         static::$force_dl = $filename;
     }
 
     /**
      * Start capturing output
      */
-    public static function start(){
+    public static function start() {
         static::$buffer = ob_start();
     }
 
     /**
      * Enable CORS HTTP headers.
      */
-    public static function enableCORS(){
+    public static function enableCORS() {
 
         // Allow from any origin
         if ($origin = filter_input(INPUT_SERVER,'HTTP_ORIGIN')) {
@@ -93,8 +93,8 @@ 
      * Finish the output buffer capturing.
      * @return string The captured buffer
      */
-    public static function end(){
-        if (static::$buffer){
+    public static function end() {
+        if (static::$buffer) {
             static::$payload[] = ob_get_contents();
             ob_end_clean();
             static::$buffer = null;
@@ -106,14 +106,14 @@ 
      * Check if an response output buffering is active.
      * @return boolean
      */
-    public static function isBuffering(){
+    public static function isBuffering() {
         return static::$buffer;
     }
 
     /**
      * Clear the response body
      */
-    public static function clean(){
+    public static function clean() {
         static::$payload = [];
     }
 
@@ -121,7 +121,7 @@ 
      * Append a JSON object to the buffer.
      * @param  mixed $payload Data to append to the response buffer
      */
-    public static function json($payload){
+    public static function json($payload) {
         static::type(static::TYPE_JSON);
         static::$payload[] = json_encode($payload, Options::get('core.response.json_flags',JSON_NUMERIC_CHECK));
     }
@@ -130,7 +130,7 @@ 
      * Append a text to the buffer.
      * @param  mixed $payload Text to append to the response buffer
      */
-    public static function text(){
+    public static function text() {
         static::type(static::TYPE_TEXT);
         static::$payload[] = implode('',func_get_args());
     }
@@ -139,7 +139,7 @@ 
      * Append an XML string to the buffer.
      * @param  mixed $payload Data to append to the response buffer
      */
-    public static function xml(){
+    public static function xml() {
         static::type(static::TYPE_XML);
         static::$payload[] = implode('',func_get_args());
     }
@@ -148,7 +148,7 @@ 
      * Append a SVG string to the buffer.
      * @param  mixed $payload Data to append to the response buffer
      */
-    public static function svg(){
+    public static function svg() {
         static::type(static::TYPE_SVG);
         static::$payload[] = implode('',func_get_args());
     }
@@ -157,7 +157,7 @@ 
      * Append an HTML string to the buffer.
      * @param  mixed $payload Data to append to the response buffer
      */
-    public static function html(){
+    public static function html() {
         static::type(static::TYPE_HTML);
         static::$payload[] = implode('',func_get_args());
     }
@@ -172,8 +172,8 @@ 
      *
      * @param  mixed $payload Data to append to the response buffer
      */
-    public static function add(){
-      foreach(func_get_args() as $data){
+    public static function add() {
+      foreach(func_get_args() as $data) {
         switch (true) {
           case is_callable($data) :
             return static::add($data());
@@ -187,28 +187,32 @@ 
       }
     }
 
-    public static function status($code,$message=''){
+    public static function status($code,$message='') {
         static::header('Status',$message?:$code,$code);
     }
 
-    public static function header($name,$value,$code=null){
+    public static function header($name,$value,$code=null) {
         static::$headers[$name] = [$value,$code];
     }
 
-    public static function error($code=500,$message='Application Error'){
+    public static function error($code=500,$message='Application Error') {
         Event::trigger('core.response.error',$code,$message);
         static::status($code,$message);
     }
 
-    public static function body($setBody=null){
-      if ($setBody) static::$payload = [$setBody];
+    public static function body($setBody=null) {
+      if ($setBody) {
+        static::$payload = [$setBody];
+      }
       return Filter::with('core.response.body',
                 is_array(static::$payload) ? implode('',static::$payload) : static::$payload
              );
     }
 
-    public static function headers($setHeaders=null){
-       if ($setHeaders) static::$headers = $setHeaders;
+    public static function headers($setHeaders=null) {
+       if ($setHeaders) {
+         static::$headers = $setHeaders;
+       }
        return static::$headers;
     }
 
@@ -219,7 +223,7 @@ 
      *
      * @return array Headers and body of the response
      */
-    public static function save(){
+    public static function save() {
         return [
           'head' => static::$headers,
           'body' => static::body(),
@@ -233,27 +237,33 @@ 
      *
      * @param  array $data head/body saved state
      */
-    public static function load($data){
+    public static function load($data) {
       $data = (object)$data;
-      if (isset($data->head)) static::headers($data->head);
-      if (isset($data->body)) static::body($data->body);
+      if (isset($data->head)) {
+        static::headers($data->head);
+      }
+      if (isset($data->body)) {
+        static::body($data->body);
+      }
     }
 
-    public static function send($force = false){
+    public static function send($force = false) {
       if (!static::$sent || $force) {
         static::$sent = true;
         Event::trigger('core.response.send');
-        if (false === headers_sent()) foreach (static::$headers as $name => $value_code) {
+        if (false === headers_sent()) {
+          foreach (static::$headers as $name => $value_code) {
 
             if (is_array($value_code)) {
                 list($value, $code) = (count($value_code) > 1) ? $value_code : [current($value_code), 200];
+        }
             } else {
                 $value = $value_code;
                 $code  = null;
             }
 
-            if ($value == 'Status'){
-              if (function_exists('http_response_code')){
+            if ($value == 'Status') {
+              if (function_exists('http_response_code')) {
                 http_response_code($code);
               } else {
                 header("Status: $code", true, $code);
@@ -265,7 +275,9 @@ 
                 : header("$name: $value", true);
             }
         }
-        if (static::$force_dl) header('Content-Disposition: attachment; filename="'.static::$force_dl.'"');
+        if (static::$force_dl) {
+          header('Content-Disposition: attachment; filename="'.static::$force_dl.'"');
+        }
         echo static::body();
       }
     }

classes/Session.php

Doc Comments +3 added lines, -4 removed lines

@@ -32,7 +32,6 @@ 
 	 *
 	 * @access public
 	 * @static
-	 * @param string $key The session name
 	 * @return string The session value
 	 */
 	static public function name($name=null){
@@ -62,7 +61,7 @@ 
 	 *
 	 * @access public
 	 * @static
-	 * @param mixed $key The variable name
+	 * @param string $key The variable name
 	 * @param mixed $value The variable value
 	 * @return void
 	 */
@@ -80,7 +79,7 @@ 
 	 *
 	 * @access public
 	 * @static
-	 * @param mixed $key The variable name
+	 * @param string $key The variable name
 	 * @return void
 	 */
 	static public function delete($key){
@@ -107,7 +106,7 @@ 
 	 *
 	 * @access public
 	 * @static
-	 * @return void
+	 * @return boolean
 	 */
 	static public function active(){
 		return session_status() == PHP_SESSION_ACTIVE;

Spacing +18 added lines, -18 removed lines

@@ -20,7 +20,7 @@ 
 	 * @static
 	 * @return void
 	 */
-	static public function start($name=null){
+	static public function start($name = null) {
 		if (isset($_SESSION)) return;
 		static::name($name);
 		session_cache_limiter('must-revalidate');
@@ -35,7 +35,7 @@ 
 	 * @param string $key The session name
 	 * @return string The session value
 	 */
-	static public function name($name=null){
+	static public function name($name = null) {
 		return $name ? session_name($name) : session_name();
 	}
 
@@ -47,13 +47,13 @@ 
 	 * @param mixed $key The variable name
 	 * @return mixed The variable value
 	 */
-	static public function get($key,$default=null){
+	static public function get($key, $default = null) {
                 if (($active = static::active()) && isset($_SESSION[$key])) {
 			return $_SESSION[$key];
                 } else if ($active) {
-                	return $_SESSION[$key] = (is_callable($default)?call_user_func($default):$default);
+                	return $_SESSION[$key] = (is_callable($default) ? call_user_func($default) : $default);
                 } else {
-                 	return (is_callable($default)?call_user_func($default):$default);
+                 	return (is_callable($default) ? call_user_func($default) : $default);
                 }
 	}
 
@@ -66,10 +66,10 @@ 
 	 * @param mixed $value The variable value
 	 * @return void
 	 */
-	static public function set($key,$value=null){
+	static public function set($key, $value = null) {
 		static::start();
-		if($value==null && is_array($key)){
-			foreach($key as $k=>$v) $_SESSION[$k]=$v;
+		if ($value == null && is_array($key)) {
+			foreach ($key as $k=>$v) $_SESSION[$k] = $v;
 		} else {
 			$_SESSION[$key] = $value;
 		}
@@ -83,7 +83,7 @@ 
 	 * @param mixed $key The variable name
 	 * @return void
 	 */
-	static public function delete($key){
+	static public function delete($key) {
 		static::start();
 		unset($_SESSION[$key]);
 	}
@@ -96,7 +96,7 @@ 
 	 * @static
 	 * @return void
 	 */
-	static public function clear(){
+	static public function clear() {
 		static::start();
 		session_unset();
 		session_destroy();
@@ -109,7 +109,7 @@ 
 	 * @static
 	 * @return void
 	 */
-	static public function active(){
+	static public function active() {
 		return session_status() == PHP_SESSION_ACTIVE;
 	}
 
@@ -121,7 +121,7 @@ 
 	 * @param mixed $key The variable name
 	 * @return bool
 	 */
-	static public function exists($key){
+	static public function exists($key) {
 		static::start();
 		return isset($_SESSION[$key]);
 	}
@@ -130,7 +130,7 @@ 
 	 * Return a read-only accessor to session variables for in-view use.
 	 * @return SessionReadOnly
 	 */
-	static public function readOnly(){
+	static public function readOnly() {
 		return new SessionReadOnly;
 	}
 
@@ -151,14 +151,14 @@ 
 	 * @param mixed $key The variable name
 	 * @return mixed The variable value
 	 */
-	public function get($key){
+	public function get($key) {
 		return Session::get($key);
 	}
-	public function __get($key){
+	public function __get($key) {
 		return Session::get($key);
 	}
 
-	public function name(){
+	public function name() {
 		return Session::name();
 	}
 
@@ -169,10 +169,10 @@ 
 	 * @param mixed $key The variable name
 	 * @return bool
 	 */
-	public function exists($key){
+	public function exists($key) {
 		return Session::exists($key);
 	}
-	public function __isset($key){
+	public function __isset($key) {
 		return Session::exists($key);
 	}
 

Braces +18 added lines, -16 removed lines

@@ -20,8 +20,10 @@ 
 	 * @static
 	 * @return void
 	 */
-	static public function start($name=null){
-		if (isset($_SESSION)) return;
+	static public function start($name=null) {
+		if (isset($_SESSION)) {
+		  return;
+		}
 		static::name($name);
 		session_cache_limiter('must-revalidate');
 		@session_start();
@@ -35,7 +37,7 @@ 
 	 * @param string $key The session name
 	 * @return string The session value
 	 */
-	static public function name($name=null){
+	static public function name($name=null) {
 		return $name ? session_name($name) : session_name();
 	}
 
@@ -47,7 +49,7 @@ 
 	 * @param mixed $key The variable name
 	 * @return mixed The variable value
 	 */
-	static public function get($key,$default=null){
+	static public function get($key,$default=null) {
                 if (($active = static::active()) && isset($_SESSION[$key])) {
 			return $_SESSION[$key];
                 } else if ($active) {
@@ -66,9 +68,9 @@ 
 	 * @param mixed $value The variable value
 	 * @return void
 	 */
-	static public function set($key,$value=null){
+	static public function set($key,$value=null) {
 		static::start();
-		if($value==null && is_array($key)){
+		if($value==null && is_array($key)) {
 			foreach($key as $k=>$v) $_SESSION[$k]=$v;
 		} else {
 			$_SESSION[$key] = $value;
@@ -83,7 +85,7 @@ 
 	 * @param mixed $key The variable name
 	 * @return void
 	 */
-	static public function delete($key){
+	static public function delete($key) {
 		static::start();
 		unset($_SESSION[$key]);
 	}
@@ -96,7 +98,7 @@ 
 	 * @static
 	 * @return void
 	 */
-	static public function clear(){
+	static public function clear() {
 		static::start();
 		session_unset();
 		session_destroy();
@@ -109,7 +111,7 @@ 
 	 * @static
 	 * @return void
 	 */
-	static public function active(){
+	static public function active() {
 		return session_status() == PHP_SESSION_ACTIVE;
 	}
 
@@ -121,7 +123,7 @@ 
 	 * @param mixed $key The variable name
 	 * @return bool
 	 */
-	static public function exists($key){
+	static public function exists($key) {
 		static::start();
 		return isset($_SESSION[$key]);
 	}
@@ -130,7 +132,7 @@ 
 	 * Return a read-only accessor to session variables for in-view use.
 	 * @return SessionReadOnly
 	 */
-	static public function readOnly(){
+	static public function readOnly() {
 		return new SessionReadOnly;
 	}
 
@@ -151,14 +153,14 @@ 
 	 * @param mixed $key The variable name
 	 * @return mixed The variable value
 	 */
-	public function get($key){
+	public function get($key) {
 		return Session::get($key);
 	}
-	public function __get($key){
+	public function __get($key) {
 		return Session::get($key);
 	}
 
-	public function name(){
+	public function name() {
 		return Session::name();
 	}
 
@@ -169,10 +171,10 @@ 
 	 * @param mixed $key The variable name
 	 * @return bool
 	 */
-	public function exists($key){
+	public function exists($key) {
 		return Session::exists($key);
 	}
-	public function __isset($key){
+	public function __isset($key) {
 		return Session::exists($key);
 	}
 

Indentation +147 added lines, -147 removed lines

@@ -13,128 +13,128 @@ 
 class Session {
     use Module;
 
-	/**
-	 * Start session handler
-	 *
-	 * @access public
-	 * @static
-	 * @return void
-	 */
-	static public function start($name=null){
-		if (isset($_SESSION)) return;
-		static::name($name);
+  /**
+   * Start session handler
+   *
+   * @access public
+   * @static
+   * @return void
+   */
+  static public function start($name=null){
+    if (isset($_SESSION)) return;
+    static::name($name);
     // Obfuscate IDs
     ini_set('session.hash_function', 'whirlpool');
-		session_cache_limiter('must-revalidate');
-		@session_start();
-	}
-
-	/**
-	 * Get/Set Session name
-	 *
-	 * @access public
-	 * @static
-	 * @param string $key The session name
-	 * @return string The session value
-	 */
-	static public function name($name=null){
-		return $name ? session_name($name) : session_name();
-	}
-
-	/**
-	 * Get a session variable reference
-	 *
-	 * @access public
-	 * @static
-	 * @param mixed $key The variable name
-	 * @return mixed The variable value
-	 */
-	static public function get($key,$default=null){
+    session_cache_limiter('must-revalidate');
+    @session_start();
+  }
+
+  /**
+   * Get/Set Session name
+   *
+   * @access public
+   * @static
+   * @param string $key The session name
+   * @return string The session value
+   */
+  static public function name($name=null){
+    return $name ? session_name($name) : session_name();
+  }
+
+  /**
+   * Get a session variable reference
+   *
+   * @access public
+   * @static
+   * @param mixed $key The variable name
+   * @return mixed The variable value
+   */
+  static public function get($key,$default=null){
                 if (($active = static::active()) && isset($_SESSION[$key])) {
-			return $_SESSION[$key];
+      return $_SESSION[$key];
                 } else if ($active) {
-                	return $_SESSION[$key] = (is_callable($default)?call_user_func($default):$default);
+                  return $_SESSION[$key] = (is_callable($default)?call_user_func($default):$default);
                 } else {
-                 	return (is_callable($default)?call_user_func($default):$default);
+                    return (is_callable($default)?call_user_func($default):$default);
                 }
-	}
-
-	/**
-	 * Set a session variable
-	 *
-	 * @access public
-	 * @static
-	 * @param mixed $key The variable name
-	 * @param mixed $value The variable value
-	 * @return void
-	 */
-	static public function set($key,$value=null){
-		static::start();
-		if($value==null && is_array($key)){
-			foreach($key as $k=>$v) $_SESSION[$k]=$v;
-		} else {
-			$_SESSION[$key] = $value;
-		}
-	}
-
-	/**
-	 * Delete a session variable
-	 *
-	 * @access public
-	 * @static
-	 * @param mixed $key The variable name
-	 * @return void
-	 */
-	static public function delete($key){
-		static::start();
-		unset($_SESSION[$key]);
-	}
-
-
-	/**
-	 * Delete all session variables
-	 *
-	 * @access public
-	 * @static
-	 * @return void
-	 */
-	static public function clear(){
-		static::start();
-		session_unset();
-		session_destroy();
-	}
-
-	/**
-	 * Check if session is active
-	 *
-	 * @access public
-	 * @static
-	 * @return void
-	 */
-	static public function active(){
-		return session_status() == PHP_SESSION_ACTIVE;
-	}
-
-	/**
-	 * Check if a session variable exists
-	 *
-	 * @access public
-	 * @static
-	 * @param mixed $key The variable name
-	 * @return bool
-	 */
-	static public function exists($key){
-		static::start();
-		return isset($_SESSION[$key]);
-	}
-
-	/**
-	 * Return a read-only accessor to session variables for in-view use.
-	 * @return SessionReadOnly
-	 */
-	static public function readOnly(){
-		return new SessionReadOnly;
-	}
+  }
+
+  /**
+   * Set a session variable
+   *
+   * @access public
+   * @static
+   * @param mixed $key The variable name
+   * @param mixed $value The variable value
+   * @return void
+   */
+  static public function set($key,$value=null){
+    static::start();
+    if($value==null && is_array($key)){
+      foreach($key as $k=>$v) $_SESSION[$k]=$v;
+    } else {
+      $_SESSION[$key] = $value;
+    }
+  }
+
+  /**
+   * Delete a session variable
+   *
+   * @access public
+   * @static
+   * @param mixed $key The variable name
+   * @return void
+   */
+  static public function delete($key){
+    static::start();
+    unset($_SESSION[$key]);
+  }
+
+
+  /**
+   * Delete all session variables
+   *
+   * @access public
+   * @static
+   * @return void
+   */
+  static public function clear(){
+    static::start();
+    session_unset();
+    session_destroy();
+  }
+
+  /**
+   * Check if session is active
+   *
+   * @access public
+   * @static
+   * @return void
+   */
+  static public function active(){
+    return session_status() == PHP_SESSION_ACTIVE;
+  }
+
+  /**
+   * Check if a session variable exists
+   *
+   * @access public
+   * @static
+   * @param mixed $key The variable name
+   * @return bool
+   */
+  static public function exists($key){
+    static::start();
+    return isset($_SESSION[$key]);
+  }
+
+  /**
+   * Return a read-only accessor to session variables for in-view use.
+   * @return SessionReadOnly
+   */
+  static public function readOnly(){
+    return new SessionReadOnly;
+  }
 
 }  /* End of class */
 
@@ -146,36 +146,36 @@ 
 
 class SessionReadOnly {
 
-	/**
-	 * Get a session variable reference
-	 *
-	 * @access public
-	 * @param mixed $key The variable name
-	 * @return mixed The variable value
-	 */
-	public function get($key){
-		return Session::get($key);
-	}
-	public function __get($key){
-		return Session::get($key);
-	}
-
-	public function name(){
-		return Session::name();
-	}
-
-	/**
-	 * Check if a session variable exists
-	 *
-	 * @access public
-	 * @param mixed $key The variable name
-	 * @return bool
-	 */
-	public function exists($key){
-		return Session::exists($key);
-	}
-	public function __isset($key){
-		return Session::exists($key);
-	}
+  /**
+   * Get a session variable reference
+   *
+   * @access public
+   * @param mixed $key The variable name
+   * @return mixed The variable value
+   */
+  public function get($key){
+    return Session::get($key);
+  }
+  public function __get($key){
+    return Session::get($key);
+  }
+
+  public function name(){
+    return Session::name();
+  }
+
+  /**
+   * Check if a session variable exists
+   *
+   * @access public
+   * @param mixed $key The variable name
+   * @return bool
+   */
+  public function exists($key){
+    return Session::exists($key);
+  }
+  public function __isset($key){
+    return Session::exists($key);
+  }
 
 }  /* End of class */

classes/Email/Envelope.php

Doc Comments +3 added lines

@@ -96,6 +96,9 @@
     return $this->replyTo;
   }
 
+  /**
+   * @return string
+   */
   public function subject($value=null){
     if ($value!==null && $value) {
       $this->compiled_head = null;

Indentation +11 added lines, -11 removed lines

@@ -15,17 +15,17 @@
 class Envelope {
 
   protected  $uid,
-             $to,
-             $from,
-             $cc,
-             $bcc,
-             $replyTo,
-             $subject,
-             $message,
-             $contentType = 'text/html; charset="utf-8"',
-             $attachments,
-             $compiled_head,
-             $compiled_body;
+              $to,
+              $from,
+              $cc,
+              $bcc,
+              $replyTo,
+              $subject,
+              $message,
+              $contentType = 'text/html; charset="utf-8"',
+              $attachments,
+              $compiled_head,
+              $compiled_body;
 
   public function __construct($email=null){
     if ($email) {

Spacing +59 added lines, -59 removed lines

@@ -27,126 +27,126 @@ 
              $compiled_head,
              $compiled_body;
 
-  public function __construct($email=null){
+  public function __construct($email = null) {
     if ($email) {
-      $email = (object)$email;
-      if(isset($email->to))           $this->to($email->to);
-      if(isset($email->from))         $this->from($email->from);
-      if(isset($email->cc))           $this->cc($email->cc);
-      if(isset($email->bcc))          $this->bcc($email->bcc);
-      if(isset($email->replyTo))      $this->replyTo($email->replyTo);
-      if(isset($email->subject))      $this->subject($email->subject);
-      if(isset($email->message))      $this->message($email->message);
-      if(isset($email->attachments))  $this->attach($email->attachments);
+      $email = (object) $email;
+      if (isset($email->to))           $this->to($email->to);
+      if (isset($email->from))         $this->from($email->from);
+      if (isset($email->cc))           $this->cc($email->cc);
+      if (isset($email->bcc))          $this->bcc($email->bcc);
+      if (isset($email->replyTo))      $this->replyTo($email->replyTo);
+      if (isset($email->subject))      $this->subject($email->subject);
+      if (isset($email->message))      $this->message($email->message);
+      if (isset($email->attachments))  $this->attach($email->attachments);
     }
-    $this->uid  = '_CORE_'.md5(uniqid(time()));
+    $this->uid = '_CORE_'.md5(uniqid(time()));
 
   }
 
-  protected function add_emails(&$pool, $emails, $append=true){
+  protected function add_emails(&$pool, $emails, $append = true) {
     $this->compiled_head = null;
-    foreach ((array)$emails as $values) {
-      foreach(preg_split('/\s*,\s*/',$values) as $value) {
-        if(strpos($value,'<')!==false){
-          $value   = str_replace('>','',$value);
-          $parts   = explode('<',$value,2);
+    foreach ((array) $emails as $values) {
+      foreach (preg_split('/\s*,\s*/', $values) as $value) {
+        if (strpos($value, '<') !== false) {
+          $value   = str_replace('>', '', $value);
+          $parts   = explode('<', $value, 2);
           $name    = trim(current($parts));
           $email   = trim(end($parts));
           $address = "$name <{$email}>";
         } else {
           $address = $value;
         }
-        if ($append) $pool[] = $address; else $pool = $address;
+        if ($append) $pool[] = $address;else $pool = $address;
       }
     }
   }
 
-  public function from($value=null){
-    if ($value!==null && $value) {
+  public function from($value = null) {
+    if ($value !== null && $value) {
       $this->add_emails($this->from, $value, false);
-    } else if ($value===false) $this->from = '';
+    } else if ($value === false) $this->from = '';
     return $this->from;
   }
 
-  public function to($value=null){
-    if ($value!==null && $value) {
+  public function to($value = null) {
+    if ($value !== null && $value) {
       $this->add_emails($this->to, $value);
-    } else if ($value===false) $this->to = [];
+    } else if ($value === false) $this->to = [];
     return $this->to;
   }
 
-  public function cc($value=null){
-    if ($value!==null && $value) {
+  public function cc($value = null) {
+    if ($value !== null && $value) {
       $this->add_emails($this->cc, $value);
-    } else if ($value===false) $this->cc = [];
+    } else if ($value === false) $this->cc = [];
     return $this->cc;
   }
 
-  public function bcc($value=null){
-    if ($value!==null && $value) {
+  public function bcc($value = null) {
+    if ($value !== null && $value) {
       $this->add_emails($this->bcc, $value);
-    } else if ($value===false) $this->bcc = [];
+    } else if ($value === false) $this->bcc = [];
     return $this->bcc;
   }
 
-  public function replyTo($value=null){
-    if ($value!==null && $value) {
+  public function replyTo($value = null) {
+    if ($value !== null && $value) {
       $this->add_emails($this->replyTo, $value, false);
-    } else if ($value===false) $this->replyTo = '';
+    } else if ($value === false) $this->replyTo = '';
     return $this->replyTo;
   }
 
-  public function subject($value=null){
-    if ($value!==null && $value) {
+  public function subject($value = null) {
+    if ($value !== null && $value) {
       $this->compiled_head = null;
       $this->subject = $value;
-    } else if ($value===false) $this->subject = '';
+    } else if ($value === false) $this->subject = '';
     return $this->subject;
   }
 
-  public function contentType($value=null){
-    if ($value!==null && $value) {
+  public function contentType($value = null) {
+    if ($value !== null && $value) {
       $this->compiled_body = null;
       $this->contentType = $value;
-    } else if ($value===false) $this->contentType = '';
+    } else if ($value === false) $this->contentType = '';
     return $this->contentType;
   }
 
-  public function message($value=null){
-    if ($value!==null && $value) {
+  public function message($value = null) {
+    if ($value !== null && $value) {
       $this->compiled_body = null;
       $this->message = $value;
-    } else if ($value===false) $this->message = '';
+    } else if ($value === false) $this->message = '';
     return $this->message;
   }
 
-  public function attach($file){
+  public function attach($file) {
     $this->compiled_body = null;
     if (isset($file->content) || isset($file['content'])) {
       $this->attachments[] = $file;
-    } else foreach ((array)$file as $curfile) {
+    } else foreach ((array) $file as $curfile) {
       $this->attachments[] = $curfile;
     }
   }
 
-  public function head($recompile = false){
-    if ($recompile || (null === $this->compiled_head)){
+  public function head($recompile = false) {
+    if ($recompile || (null === $this->compiled_head)) {
       $head   = [];
       $head[] = "Subject: {$this->subject}";
-      if($this->from)                        $head[] = "From: {$this->from}";
-      if(is_array($this->to)  && !empty($this->to))  $head[] = "To: "  . implode(', ',$this->to);
-      if(is_array($this->cc)  && !empty($this->cc))  $head[] = "Cc: "  . implode(', ',$this->cc);
-      if(is_array($this->bcc) && !empty($this->bcc)) $head[] = "Bcc: " . implode(', ',$this->bcc);
-      if($this->replyTo)                     $head[] = "Reply-To: {$this->replyTo}";
+      if ($this->from)                        $head[] = "From: {$this->from}";
+      if (is_array($this->to) && !empty($this->to))  $head[] = "To: ".implode(', ', $this->to);
+      if (is_array($this->cc) && !empty($this->cc))  $head[] = "Cc: ".implode(', ', $this->cc);
+      if (is_array($this->bcc) && !empty($this->bcc)) $head[] = "Bcc: ".implode(', ', $this->bcc);
+      if ($this->replyTo)                     $head[] = "Reply-To: {$this->replyTo}";
       $head[] = 'MIME-Version: 1.0';
       $head[] = "Content-Type: multipart/mixed; boundary=\"{$this->uid}\"";
       $this->compiled_head = implode("\r\n", $head);
     }
-    return \Filter::with( 'core.email.source.head', $this->compiled_head);
+    return \Filter::with('core.email.source.head', $this->compiled_head);
   }
 
-  public function body($recompile = false){
-    if ($recompile || (null === $this->compiled_body)){
+  public function body($recompile = false) {
+    if ($recompile || (null === $this->compiled_body)) {
       $body[] = "--{$this->uid}";
       $body[] = "Content-Type: {$this->contentType}";
       $body[] = "Content-Transfer-Encoding: quoted-printable";
@@ -154,13 +154,13 @@ 
       $body[] = quoted_printable_encode($this->message);
       $body[] = '';
 
-      if (!empty($this->attachments)) foreach ((array)$this->attachments as $file) {
+      if (!empty($this->attachments)) foreach ((array) $this->attachments as $file) {
 
         if (is_string($file)) {
           $name = basename($file);
           $data = file_get_contents($file);
         } else {
-          $name = isset($file['name'])    ? $file['name']    : 'untitled';
+          $name = isset($file['name']) ? $file['name'] : 'untitled';
           $data = isset($file['content']) ? $file['content'] : '';
         }
 
@@ -177,11 +177,11 @@ 
 
       $this->compiled_body = implode("\r\n", $body);
     }
-    return \Filter::with( 'core.email.source.body', $this->compiled_body);
+    return \Filter::with('core.email.source.body', $this->compiled_body);
   }
 
-  public function build(){
-    return \Filter::with( 'core.email.source', $this->head() . "\r\n" . $this->body() );
+  public function build() {
+    return \Filter::with('core.email.source', $this->head()."\r\n".$this->body());
   }
 
 }

Braces +94 added lines, -42 removed lines

@@ -27,27 +27,43 @@ 
              $compiled_head,
              $compiled_body;
 
-  public function __construct($email=null){
+  public function __construct($email=null) {
     if ($email) {
       $email = (object)$email;
-      if(isset($email->to))           $this->to($email->to);
-      if(isset($email->from))         $this->from($email->from);
-      if(isset($email->cc))           $this->cc($email->cc);
-      if(isset($email->bcc))          $this->bcc($email->bcc);
-      if(isset($email->replyTo))      $this->replyTo($email->replyTo);
-      if(isset($email->subject))      $this->subject($email->subject);
-      if(isset($email->message))      $this->message($email->message);
-      if(isset($email->attachments))  $this->attach($email->attachments);
+      if(isset($email->to)) {
+        $this->to($email->to);
+      }
+      if(isset($email->from)) {
+        $this->from($email->from);
+      }
+      if(isset($email->cc)) {
+        $this->cc($email->cc);
+      }
+      if(isset($email->bcc)) {
+        $this->bcc($email->bcc);
+      }
+      if(isset($email->replyTo)) {
+        $this->replyTo($email->replyTo);
+      }
+      if(isset($email->subject)) {
+        $this->subject($email->subject);
+      }
+      if(isset($email->message)) {
+        $this->message($email->message);
+      }
+      if(isset($email->attachments)) {
+        $this->attach($email->attachments);
+      }
     }
     $this->uid  = '_CORE_'.md5(uniqid(time()));
 
   }
 
-  protected function add_emails(&$pool, $emails, $append=true){
+  protected function add_emails(&$pool, $emails, $append=true) {
     $this->compiled_head = null;
     foreach ((array)$emails as $values) {
       foreach(preg_split('/\s*,\s*/',$values) as $value) {
-        if(strpos($value,'<')!==false){
+        if(strpos($value,'<')!==false) {
           $value   = str_replace('>','',$value);
           $parts   = explode('<',$value,2);
           $name    = trim(current($parts));
@@ -56,89 +72,123 @@ 
         } else {
           $address = $value;
         }
-        if ($append) $pool[] = $address; else $pool = $address;
+        if ($append) {
+          $pool[] = $address;
+        } else {
+          $pool = $address;
+        }
       }
     }
   }
 
-  public function from($value=null){
+  public function from($value=null) {
     if ($value!==null && $value) {
       $this->add_emails($this->from, $value, false);
-    } else if ($value===false) $this->from = '';
+    } else if ($value===false) {
+      $this->from = '';
+    }
     return $this->from;
   }
 
-  public function to($value=null){
+  public function to($value=null) {
     if ($value!==null && $value) {
       $this->add_emails($this->to, $value);
-    } else if ($value===false) $this->to = [];
+    } else if ($value===false) {
+      $this->to = [];
+    }
     return $this->to;
   }
 
-  public function cc($value=null){
+  public function cc($value=null) {
     if ($value!==null && $value) {
       $this->add_emails($this->cc, $value);
-    } else if ($value===false) $this->cc = [];
+    } else if ($value===false) {
+      $this->cc = [];
+    }
     return $this->cc;
   }
 
-  public function bcc($value=null){
+  public function bcc($value=null) {
     if ($value!==null && $value) {
       $this->add_emails($this->bcc, $value);
-    } else if ($value===false) $this->bcc = [];
+    } else if ($value===false) {
+      $this->bcc = [];
+    }
     return $this->bcc;
   }
 
-  public function replyTo($value=null){
+  public function replyTo($value=null) {
     if ($value!==null && $value) {
       $this->add_emails($this->replyTo, $value, false);
-    } else if ($value===false) $this->replyTo = '';
+    } else if ($value===false) {
+      $this->replyTo = '';
+    }
     return $this->replyTo;
   }
 
-  public function subject($value=null){
+  public function subject($value=null) {
     if ($value!==null && $value) {
       $this->compiled_head = null;
       $this->subject = $value;
-    } else if ($value===false) $this->subject = '';
+    } else if ($value===false) {
+      $this->subject = '';
+    }
     return $this->subject;
   }
 
-  public function contentType($value=null){
+  public function contentType($value=null) {
     if ($value!==null && $value) {
-      if (empty($this->attachments)) $this->compiled_head = null;
+      if (empty($this->attachments)) {
+        $this->compiled_head = null;
+      }
       $this->compiled_body = null;
       $this->contentType = $value;
-    } else if ($value===false) $this->contentType = '';
+    } else if ($value===false) {
+      $this->contentType = '';
+    }
     return $this->contentType;
   }
 
-  public function message($value=null){
+  public function message($value=null) {
     if ($value!==null && $value) {
       $this->compiled_body = null;
       $this->message = $value;
-    } else if ($value===false) $this->message = '';
+    } else if ($value===false) {
+      $this->message = '';
+    }
     return $this->message;
   }
 
-  public function attach($file){
+  public function attach($file) {
     $this->compiled_body = null;
     if (isset($file->content) || isset($file['content'])) {
       $this->attachments[] = $file;
-    } else foreach ((array)$file as $curfile) {
+    } else {
+      foreach ((array)$file as $curfile) {
       $this->attachments[] = $curfile;
     }
+    }
   }
 
-  public function head($recompile = false){
-    if ($recompile || (null === $this->compiled_head)){
+  public function head($recompile = false) {
+    if ($recompile || (null === $this->compiled_head)) {
       $head   = [];
       $head[] = "Subject: {$this->subject}";
-      if($this->from)                        $head[] = "From: {$this->from}";
-      if(is_array($this->to)  && !empty($this->to))  $head[] = "To: "  . implode(', ',$this->to);
-      if(is_array($this->cc)  && !empty($this->cc))  $head[] = "Cc: "  . implode(', ',$this->cc);
-      if(is_array($this->bcc) && !empty($this->bcc)) $head[] = "Bcc: " . implode(', ',$this->bcc);
-      if($this->replyTo)                     $head[] = "Reply-To: {$this->replyTo}";
+      if($this->from) {
+        $head[] = "From: {$this->from}";
+      }
+      if(is_array($this->to)  && !empty($this->to)) {
+        $head[] = "To: "  . implode(', ',$this->to);
+      }
+      if(is_array($this->cc)  && !empty($this->cc)) {
+        $head[] = "Cc: "  . implode(', ',$this->cc);
+      }
+      if(is_array($this->bcc) && !empty($this->bcc)) {
+        $head[] = "Bcc: " . implode(', ',$this->bcc);
+      }
+      if($this->replyTo) {
+        $head[] = "Reply-To: {$this->replyTo}";
+      }
       $head[] = 'MIME-Version: 1.0';
       if (!empty($this->attachments)) {
         $head[] = "Content-Type: multipart/mixed; boundary=\"{$this->uid}\"";
@@ -151,8 +201,8 @@ 
     return \Filter::with( 'core.email.source.head', $this->compiled_head);
   }
 
-  public function body($recompile = false){
-    if ($recompile || (null === $this->compiled_body)){
+  public function body($recompile = false) {
+    if ($recompile || (null === $this->compiled_body)) {
       if (!empty($this->attachments)) {
         $body[] = "--{$this->uid}";
         $body[] = "Content-Type: {$this->contentType}";
@@ -162,10 +212,12 @@ 
       $body[] = quoted_printable_encode($this->message);
       $body[] = '';
 
-      if (!empty($this->attachments)) foreach ((array)$this->attachments as $file) {
+      if (!empty($this->attachments)) {
+        foreach ((array)$this->attachments as $file) {
 
         if (is_string($file)) {
           $name = basename($file);
+      }
           $data = file_get_contents($file);
         } else {
           $name = isset($file['name'])    ? $file['name']    : 'untitled';
@@ -187,7 +239,7 @@ 
     return \Filter::with( 'core.email.source.body', $this->compiled_body);
   }
 
-  public function build(){
+  public function build() {
     return \Filter::with( 'core.email.source', $this->head() . "\r\n" . $this->body() );
   }
 

classes/HTTP.php

Doc Comments +3 added lines

@@ -18,6 +18,9 @@
   protected static $headers     = [];
   protected static $last_info   = null;
 
+  /**
+   * @param string $method
+   */
   protected static function request($method, $url, $data=[], array $headers=[], $data_as_json=false, $username=null, $password = null){
     $http_method = strtoupper($method);
     $ch = curl_init($url);

Indentation +3 added lines, -3 removed lines

@@ -14,9 +14,9 @@
   use Module;
 
   protected static $UA          = "Mozilla/4.0 (compatible; Core::HTTP; Windows NT 6.1)",
-                   $json_data   = false,
-                   $headers     = [],
-                   $last_info   = null;
+                    $json_data   = false,
+                    $headers     = [],
+                    $last_info   = null;
 
   protected static function request($method, $url, $data=[], array $headers=[], $data_as_json=false, $username=null, $password = null){
     $http_method = strtoupper($method);

Spacing +30 added lines, -30 removed lines

@@ -18,7 +18,7 @@ 
                    $headers     = [],
                    $last_info   = null;
 
-  protected static function request($method, $url, $data=[], array $headers=[], $data_as_json=false, $username=null, $password = null){
+  protected static function request($method, $url, $data = [], array $headers = [], $data_as_json = false, $username = null, $password = null) {
     $http_method = strtoupper($method);
     $ch  = curl_init($url);
     $opt = [
@@ -33,26 +33,26 @@ 
       CURLOPT_ENCODING        => '',
     ];
 
-    if($username && $password) {
+    if ($username && $password) {
       $opt[CURLOPT_USERPWD] = "$username:$password";
     }
 
-    $headers = array_merge($headers,static::$headers);
+    $headers = array_merge($headers, static::$headers);
 
-    if($http_method == 'GET'){
-        if($data && is_array($data)){
+    if ($http_method == 'GET') {
+        if ($data && is_array($data)) {
           $tmp                       = [];
           $queried_url               = $url;
-          foreach($data as $key=>$val) $tmp[] = $key.'='.$val;
-          $queried_url               .= (strpos($queried_url,'?') === false) ? '?' : '&';
-          $queried_url               .= implode('&',$tmp);
+          foreach ($data as $key=>$val) $tmp[] = $key.'='.$val;
+          $queried_url               .= (strpos($queried_url, '?') === false) ? '?' : '&';
+          $queried_url               .= implode('&', $tmp);
           $opt[CURLOPT_URL]          = $queried_url;
           $opt[CURLOPT_HTTPGET]      = true;
           unset($opt[CURLOPT_CUSTOMREQUEST]);
         }
     } else {
         $opt[CURLOPT_CUSTOMREQUEST]  = $http_method;
-        if($data_as_json or is_object($data)){
+        if ($data_as_json or is_object($data)) {
           $headers['Content-Type']   = 'application/json';
           $opt[CURLOPT_POSTFIELDS]   = json_encode($data);
         } else {
@@ -60,59 +60,59 @@ 
         }
     }
 
-    curl_setopt_array($ch,$opt);
+    curl_setopt_array($ch, $opt);
     $_harr = [];
-    foreach($headers as $key=>$val)  $_harr[] = $key.': '.$val;
+    foreach ($headers as $key=>$val)  $_harr[] = $key.': '.$val;
     curl_setopt($ch, CURLOPT_HTTPHEADER, $_harr);
     $result = curl_exec($ch);
     $contentType = strtolower(curl_getinfo($ch, CURLINFO_CONTENT_TYPE));
     static::$last_info = curl_getinfo($ch);
-    if(false !== strpos($contentType,'json')) $result = json_decode($result);
+    if (false !== strpos($contentType, 'json')) $result = json_decode($result);
     curl_close($ch);
     return $result;
   }
 
-  public static function useJSON($value=null){
-    return $value===null ? static::$json_data : static::$json_data = $value;
+  public static function useJSON($value = null) {
+    return $value === null ? static::$json_data : static::$json_data = $value;
   }
 
-  public static function addHeader($name,$value){
+  public static function addHeader($name, $value) {
     static::$headers[$name] = $value;
   }
 
-  public static function removeHeader($name){
+  public static function removeHeader($name) {
     unset(static::$headers[$name]);
   }
 
-  public static function headers($name=null){
+  public static function headers($name = null) {
     // null === $name ?? static::$headers ?? static::$headers[$name]
     return null === $name
            ? static::$headers
-           : ( isset(static::$headers[$name]) ? static::$headers[$name] : '' );
+           : (isset(static::$headers[$name]) ? static::$headers[$name] : '');
   }
 
-  public static function userAgent($value=null){
-    return $value===null ? static::$UA : static::$UA = $value;
+  public static function userAgent($value = null) {
+    return $value === null ? static::$UA : static::$UA = $value;
   }
 
-  public static function get($url, $data=null, array $headers=[], $username = null, $password = null){
-    return static::request('get',$url,$data,$headers,false,$username,$password);
+  public static function get($url, $data = null, array $headers = [], $username = null, $password = null) {
+    return static::request('get', $url, $data, $headers, false, $username, $password);
   }
 
-  public static function post($url, $data=null, array $headers=[], $username = null, $password = null){
-    return static::request('post',$url,$data,$headers,static::$json_data,$username,$password);
+  public static function post($url, $data = null, array $headers = [], $username = null, $password = null) {
+    return static::request('post', $url, $data, $headers, static::$json_data, $username, $password);
   }
 
-  public static function put($url, $data=null, array $headers=[], $username = null, $password = null){
-    return static::request('put',$url,$data,$headers,static::$json_data,$username,$password);
+  public static function put($url, $data = null, array $headers = [], $username = null, $password = null) {
+    return static::request('put', $url, $data, $headers, static::$json_data, $username, $password);
   }
 
-  public static function delete($url, $data=null, array $headers=[], $username = null, $password = null){
-    return static::request('delete',$url,$data,$headers,static::$json_data,$username,$password);
+  public static function delete($url, $data = null, array $headers = [], $username = null, $password = null) {
+    return static::request('delete', $url, $data, $headers, static::$json_data, $username, $password);
   }
 
-  public static function info($url = null){
-    if ($url){
+  public static function info($url = null) {
+    if ($url) {
       curl_setopt_array($ch = curl_init($url), [
         CURLOPT_SSL_VERIFYHOST  => false,
         CURLOPT_CONNECTTIMEOUT  => 10,

Braces +18 added lines, -16 removed lines

@@ -18,7 +18,7 @@ 
                    $headers     = [],
                    $last_info   = null;
 
-  protected static function request($method, $url, $data=[], array $headers=[], $data_as_json=false, $username=null, $password = null){
+  protected static function request($method, $url, $data=[], array $headers=[], $data_as_json=false, $username=null, $password = null) {
     $http_method = strtoupper($method);
     $ch  = curl_init($url);
     $opt = [
@@ -39,8 +39,8 @@ 
 
     $headers = array_merge($headers,static::$headers);
 
-    if($http_method == 'GET'){
-        if($data && is_array($data)){
+    if($http_method == 'GET') {
+        if($data && is_array($data)) {
           $tmp                       = [];
           $queried_url               = $url;
           foreach($data as $key=>$val) $tmp[] = $key.'='.$val;
@@ -52,7 +52,7 @@ 
         }
     } else {
         $opt[CURLOPT_CUSTOMREQUEST]  = $http_method;
-        if($data_as_json or is_object($data)){
+        if($data_as_json or is_object($data)) {
           $headers['Content-Type']   = 'application/json';
           $opt[CURLOPT_POSTFIELDS]   = json_encode($data);
         } else {
@@ -67,52 +67,54 @@ 
     $result = curl_exec($ch);
     $contentType = strtolower(curl_getinfo($ch, CURLINFO_CONTENT_TYPE));
     static::$last_info = curl_getinfo($ch);
-    if(false !== strpos($contentType,'json')) $result = json_decode($result);
+    if(false !== strpos($contentType,'json')) {
+      $result = json_decode($result);
+    }
     curl_close($ch);
     return $result;
   }
 
-  public static function useJSON($value=null){
+  public static function useJSON($value=null) {
     return $value===null ? static::$json_data : static::$json_data = $value;
   }
 
-  public static function addHeader($name,$value){
+  public static function addHeader($name,$value) {
     static::$headers[$name] = $value;
   }
 
-  public static function removeHeader($name){
+  public static function removeHeader($name) {
     unset(static::$headers[$name]);
   }
 
-  public static function headers($name=null){
+  public static function headers($name=null) {
     // null === $name ?? static::$headers ?? static::$headers[$name]
     return null === $name
            ? static::$headers
            : ( isset(static::$headers[$name]) ? static::$headers[$name] : '' );
   }
 
-  public static function userAgent($value=null){
+  public static function userAgent($value=null) {
     return $value===null ? static::$UA : static::$UA = $value;
   }
 
-  public static function get($url, $data=null, array $headers=[], $username = null, $password = null){
+  public static function get($url, $data=null, array $headers=[], $username = null, $password = null) {
     return static::request('get',$url,$data,$headers,false,$username,$password);
   }
 
-  public static function post($url, $data=null, array $headers=[], $username = null, $password = null){
+  public static function post($url, $data=null, array $headers=[], $username = null, $password = null) {
     return static::request('post',$url,$data,$headers,static::$json_data,$username,$password);
   }
 
-  public static function put($url, $data=null, array $headers=[], $username = null, $password = null){
+  public static function put($url, $data=null, array $headers=[], $username = null, $password = null) {
     return static::request('put',$url,$data,$headers,static::$json_data,$username,$password);
   }
 
-  public static function delete($url, $data=null, array $headers=[], $username = null, $password = null){
+  public static function delete($url, $data=null, array $headers=[], $username = null, $password = null) {
     return static::request('delete',$url,$data,$headers,static::$json_data,$username,$password);
   }
 
-  public static function info($url = null){
-    if ($url){
+  public static function info($url = null) {
+    if ($url) {
       curl_setopt_array($ch = curl_init($url), [
         CURLOPT_SSL_VERIFYHOST  => false,
         CURLOPT_CONNECTTIMEOUT  => 10,