caffeina-core / core

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);

Spacing +31 added lines, -31 removed lines

@@ -18,7 +18,7 @@ 
   protected static $headers     = [];
   protected static $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) {
-      $opt[CURLOPT_USERPWD]   =  "$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;
           unset($opt[CURLOPT_CUSTOMREQUEST]);
           $opt[CURLOPT_HTTPGET]      = true;
         } 
     } 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 {
@@ -61,56 +61,56 @@ 
     }
 
 
-    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 static::$json_data = ($value===null?static::$json_data:$value);
+  public static function useJSON($value = null) {
+    return static::$json_data = ($value === null ? 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){
-    return null===$name?static::$headers:(isset(static::$headers[$name])?static::$headers[$name]:'');
+  public static function headers($name = null) {
+    return null === $name ? static::$headers : (isset(static::$headers[$name]) ? static::$headers[$name] : '');
   }
 
-  public static function userAgent($value=null){
-    return static::$UA = ($value===null?static::$UA:$value);
+  public static function userAgent($value = null) {
+    return static::$UA = ($value === null ? 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) {
       $ch = curl_init($url);
       curl_setopt_array($ch, [
         CURLOPT_SSL_VERIFYHOST  => false,

Braces +18 added lines, -16 removed lines

@@ -18,7 +18,7 @@ 
   protected static $headers     = [];
   protected static $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 {
@@ -68,49 +68,51 @@ 
     $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 static::$json_data = ($value===null?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) {
     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 static::$UA = ($value===null?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) {
       $ch = curl_init($url);
       curl_setopt_array($ch, [
         CURLOPT_SSL_VERIFYHOST  => false,

classes/Request.php

Indentation +5 added lines, -5 removed lines

@@ -14,7 +14,7 @@ 
   use Module;
 
   protected static $body,
-                   $accepts;
+                    $accepts;
 
   /**
    * Handle Content Negotiation requests
@@ -206,7 +206,7 @@ 
    * @return string
    */
   public static function method(){
-   return Filter::with('core.request.method',strtolower(filter_input(INPUT_SERVER,'REQUEST_METHOD')?:'get'));
+    return Filter::with('core.request.method',strtolower(filter_input(INPUT_SERVER,'REQUEST_METHOD')?:'get'));
   }
 
   /**
@@ -215,7 +215,7 @@ 
    * @return string
    */
   public static function IP(){
-   return Filter::with('core.request.IP',strtolower(filter_input(INPUT_SERVER,'REMOTE_ADDR')?:''));
+    return Filter::with('core.request.IP',strtolower(filter_input(INPUT_SERVER,'REMOTE_ADDR')?:''));
   }
 
   /**
@@ -224,7 +224,7 @@ 
    * @return string
    */
   public static function UA(){
-   return Filter::with('core.request.UA',strtolower(filter_input(INPUT_SERVER,'HTTP_USER_AGENT')?:''));
+    return Filter::with('core.request.UA',strtolower(filter_input(INPUT_SERVER,'HTTP_USER_AGENT')?:''));
   }
 
 
@@ -243,7 +243,7 @@ 
       if ($json) {
         static::$body = json_decode(file_get_contents("php://input"));
       } else {
-       if (empty($_POST)) {
+        if (empty($_POST)) {
           static::$body = file_get_contents("php://input");
         } else {
           static::$body = (object)$_POST;

Spacing +51 added lines, -53 removed lines

@@ -24,16 +24,16 @@ 
    *
    * @return Object The preferred content if $choices is empty else return best match
    */
-  public static function accept($key='type',$choices=''){
+  public static function accept($key = 'type', $choices = '') {
     if (null === static::$accepts) static::$accepts = [
-      'type'     => new Negotiation(isset($_SERVER['HTTP_ACCEPT'])          ? $_SERVER['HTTP_ACCEPT']          : ''),
+      'type'     => new Negotiation(isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : ''),
       'language' => new Negotiation(isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : ''),
       'encoding' => new Negotiation(isset($_SERVER['HTTP_ACCEPT_ENCODING']) ? $_SERVER['HTTP_ACCEPT_ENCODING'] : ''),
-      'charset'  => new Negotiation(isset($_SERVER['HTTP_ACCEPT_CHARSET'])  ? $_SERVER['HTTP_ACCEPT_CHARSET']  : ''),
+      'charset'  => new Negotiation(isset($_SERVER['HTTP_ACCEPT_CHARSET']) ? $_SERVER['HTTP_ACCEPT_CHARSET'] : ''),
     ];
     return empty(static::$accepts[$key])
       ? false
-      : ( empty($choices)
+      : (empty($choices)
            ? static::$accepts[$key]->preferred()
            : static::$accepts[$key]->best($choices)
       );
@@ -47,8 +47,8 @@ 
    *
    * @return Object The returned value or $default.
    */
-  public static function input($key=null,$default=null){
-    return $key ? (isset($_REQUEST[$key]) ? new Object($_REQUEST[$key]) : (is_callable($default)?call_user_func($default):$default))  : new Object($_REQUEST[$key]);
+  public static function input($key = null, $default = null) {
+    return $key ? (isset($_REQUEST[$key]) ? new Object($_REQUEST[$key]) : (is_callable($default) ? call_user_func($default) : $default)) : new Object($_REQUEST[$key]);
   }
 
   /**
@@ -59,8 +59,8 @@ 
    *
    * @return Object The returned value or $default.
    */
-  public static function env($key=null,$default=null){
-    return $key ? (filter_input(INPUT_ENV,$key) ?: (is_callable($default)?call_user_func($default):$default))  : $_ENV;
+  public static function env($key = null, $default = null) {
+    return $key ? (filter_input(INPUT_ENV, $key) ?: (is_callable($default) ? call_user_func($default) : $default)) : $_ENV;
   }
 
   /**
@@ -71,8 +71,8 @@ 
    *
    * @return Object The returned value or $default.
    */
-  public static function server($key=null,$default=null){
-    return $key ? (filter_input(INPUT_SERVER,$key) ?: (is_callable($default)?call_user_func($default):$default))  : $_SERVER;
+  public static function server($key = null, $default = null) {
+    return $key ? (filter_input(INPUT_SERVER, $key) ?: (is_callable($default) ? call_user_func($default) : $default)) : $_SERVER;
   }
 
   /**
@@ -83,8 +83,8 @@ 
    *
    * @return Object The returned value or $default.
    */
-  public static function post($key=null,$default=null){
-    return $key ? (filter_input(INPUT_POST,$key) ?: (is_callable($default)?call_user_func($default):$default))  : $_POST;
+  public static function post($key = null, $default = null) {
+    return $key ? (filter_input(INPUT_POST, $key) ?: (is_callable($default) ? call_user_func($default) : $default)) : $_POST;
   }
 
   /**
@@ -95,8 +95,8 @@ 
    *
    * @return Object The returned value or $default.
    */
-  public static function get($key=null,$default=null){
-    return $key ? (filter_input(INPUT_GET,$key) ?: (is_callable($default)?call_user_func($default):$default))  : $_GET;
+  public static function get($key = null, $default = null) {
+    return $key ? (filter_input(INPUT_GET, $key) ?: (is_callable($default) ? call_user_func($default) : $default)) : $_GET;
   }
 
   /**
@@ -107,8 +107,8 @@ 
    *
    * @return Object The returned value or $default.
    */
-  public static function files($key=null,$default=null){
-    return $key ? (isset($_FILES[$key]) ? $_FILES[$key] : (is_callable($default)?call_user_func($default):$default))  : $_FILES;
+  public static function files($key = null, $default = null) {
+    return $key ? (isset($_FILES[$key]) ? $_FILES[$key] : (is_callable($default) ? call_user_func($default) : $default)) : $_FILES;
   }
 
   /**
@@ -119,8 +119,8 @@ 
    *
    * @return Object The returned value or $default.
    */
-  public static function cookie($key=null,$default=null){
-    return $key ? (filter_input(INPUT_COOKIE,$key) ?: (is_callable($default)?call_user_func($default):$default))  : $_COOKIE;
+  public static function cookie($key = null, $default = null) {
+    return $key ? (filter_input(INPUT_COOKIE, $key) ?: (is_callable($default) ? call_user_func($default) : $default)) : $_COOKIE;
   }
 
   /**
@@ -128,12 +128,11 @@ 
    *
    * @return string
    */
-  public static function host($protocol=true){
-    $host = filter_input(INPUT_SERVER,'HOSTNAME') ?: (
-          filter_input(INPUT_SERVER,'SERVER_NAME') ?:
-          filter_input(INPUT_SERVER,'HTTP_HOST')
+  public static function host($protocol = true) {
+    $host = filter_input(INPUT_SERVER, 'HOSTNAME') ?: (
+          filter_input(INPUT_SERVER, 'SERVER_NAME') ?: filter_input(INPUT_SERVER, 'HTTP_HOST')
     );
-    return ($protocol ? 'http' . (filter_input(INPUT_SERVER,'HTTPS')?'s':'') . '://' : '') . Filter::with('core.request.host',$host);
+    return ($protocol ? 'http'.(filter_input(INPUT_SERVER, 'HTTPS') ? 's' : '').'://' : '').Filter::with('core.request.host', $host);
   }
 
   /**
@@ -141,8 +140,8 @@ 
    *
    * @return string
    */
-  public static function URL(){
-    return static::host(true) . static::URI(false);
+  public static function URL() {
+    return static::host(true).static::URI(false);
   }
 
   /**
@@ -153,9 +152,9 @@ 
    *
    * @return Object The returned value or null.
    */
-  public static function header($key=null,$default=null){
-    $key = 'HTTP_'.strtr(strtoupper($key),'-','_');
-    return $key ? (filter_input(INPUT_SERVER,$key) ?: (is_callable($default)?call_user_func($default):$default)) : $_SERVER;
+  public static function header($key = null, $default = null) {
+    $key = 'HTTP_'.strtr(strtoupper($key), '-', '_');
+    return $key ? (filter_input(INPUT_SERVER, $key) ?: (is_callable($default) ? call_user_func($default) : $default)) : $_SERVER;
   }
 
   /**
@@ -165,25 +164,24 @@ 
    *
    * @return string
    */
-  public static function URI($relative=true){
+  public static function URI($relative = true) {
     // On some web server configurations PHP_SELF is not populated.
-    $self = filter_input(INPUT_SERVER,'SCRIPT_NAME') ?: filter_input(INPUT_SERVER,'PHP_SELF');
+    $self = filter_input(INPUT_SERVER, 'SCRIPT_NAME') ?: filter_input(INPUT_SERVER, 'PHP_SELF');
     // Search REQUEST_URI in $_SERVER
-    $serv_uri = filter_input(INPUT_SERVER,'PATH_INFO') ?: (
-          filter_input(INPUT_SERVER,'ORIG_PATH_INFO') ?:
-          filter_input(INPUT_SERVER,'REQUEST_URI')
+    $serv_uri = filter_input(INPUT_SERVER, 'PATH_INFO') ?: (
+          filter_input(INPUT_SERVER, 'ORIG_PATH_INFO') ?: filter_input(INPUT_SERVER, 'REQUEST_URI')
     );
-    $uri = strtok($serv_uri,'?');
+    $uri = strtok($serv_uri, '?');
     $uri = ($uri == $self) ? '/' : $uri;
 
     // Add a filter here, for URL rewriting
-    $uri = Filter::with('core.request.URI',$uri);
+    $uri = Filter::with('core.request.URI', $uri);
 
-    $uri = rtrim($uri,'/');
+    $uri = rtrim($uri, '/');
 
-    if ($relative){
-      $base = rtrim(dirname($self),'/');
-      $uri = str_replace($base,'',$uri);
+    if ($relative) {
+      $base = rtrim(dirname($self), '/');
+      $uri = str_replace($base, '', $uri);
     }
 
     return $uri ?: '/';
@@ -194,9 +192,9 @@ 
    *
    * @return string
    */
-  public static function baseURI(){
+  public static function baseURI() {
     // On some web server configurations PHP_SELF is not populated.
-    $uri = dirname(filter_input(INPUT_SERVER,'SCRIPT_NAME') ?: filter_input(INPUT_SERVER,'PHP_SELF'));
+    $uri = dirname(filter_input(INPUT_SERVER, 'SCRIPT_NAME') ?: filter_input(INPUT_SERVER, 'PHP_SELF'));
     return $uri ?: '/';
   }
 
@@ -205,8 +203,8 @@ 
    *
    * @return string
    */
-  public static function method(){
-   return Filter::with('core.request.method',strtolower(filter_input(INPUT_SERVER,'REQUEST_METHOD')?:'get'));
+  public static function method() {
+   return Filter::with('core.request.method', strtolower(filter_input(INPUT_SERVER, 'REQUEST_METHOD') ?: 'get'));
   }
 
   /**
@@ -214,8 +212,8 @@ 
    *
    * @return string
    */
-  public static function IP(){
-   return Filter::with('core.request.IP',strtolower(filter_input(INPUT_SERVER,'REMOTE_ADDR')?:''));
+  public static function IP() {
+   return Filter::with('core.request.IP', strtolower(filter_input(INPUT_SERVER, 'REMOTE_ADDR') ?: ''));
   }
 
   /**
@@ -223,8 +221,8 @@ 
    *
    * @return string
    */
-  public static function UA(){
-   return Filter::with('core.request.UA',strtolower(filter_input(INPUT_SERVER,'HTTP_USER_AGENT')?:''));
+  public static function UA() {
+   return Filter::with('core.request.UA', strtolower(filter_input(INPUT_SERVER, 'HTTP_USER_AGENT') ?: ''));
   }
 
 
@@ -236,21 +234,21 @@ 
    *
    * @return mixed The request body data
    */
-  public static function data($key=null,$default=null){
-    if (null===static::$body){
-      $json = (false !== stripos(filter_input(INPUT_SERVER,'HTTP_CONTENT_TYPE'),'json'))
-           || (false !== stripos(filter_input(INPUT_SERVER,'CONTENT_TYPE'),'json'));
+  public static function data($key = null, $default = null) {
+    if (null === static::$body) {
+      $json = (false !== stripos(filter_input(INPUT_SERVER, 'HTTP_CONTENT_TYPE'), 'json'))
+           || (false !== stripos(filter_input(INPUT_SERVER, 'CONTENT_TYPE'), 'json'));
       if ($json) {
         static::$body = json_decode(file_get_contents("php://input"));
       } else {
        if (empty($_POST)) {
           static::$body = file_get_contents("php://input");
         } else {
-          static::$body = (object)$_POST;
+          static::$body = (object) $_POST;
         }
       }
     }
-    return $key ? (isset(static::$body->$key) ? static::$body->$key : (is_callable($default)?call_user_func($default):$default))  : static::$body;
+    return $key ? (isset(static::$body->$key) ? static::$body->$key : (is_callable($default) ? call_user_func($default) : $default)) : static::$body;
   }
 
 }

Braces +22 added lines, -20 removed lines

@@ -24,13 +24,15 @@ 
    *
    * @return Object The preferred content if $choices is empty else return best match
    */
-  public static function accept($key='type',$choices=''){
-    if (null === static::$accepts) static::$accepts = [
+  public static function accept($key='type',$choices='') {
+    if (null === static::$accepts) {
+      static::$accepts = [
       'type'     => new Negotiation(isset($_SERVER['HTTP_ACCEPT'])          ? $_SERVER['HTTP_ACCEPT']          : ''),
       'language' => new Negotiation(isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : ''),
       'encoding' => new Negotiation(isset($_SERVER['HTTP_ACCEPT_ENCODING']) ? $_SERVER['HTTP_ACCEPT_ENCODING'] : ''),
       'charset'  => new Negotiation(isset($_SERVER['HTTP_ACCEPT_CHARSET'])  ? $_SERVER['HTTP_ACCEPT_CHARSET']  : ''),
     ];
+    }
     return empty(static::$accepts[$key])
       ? false
       : ( empty($choices)
@@ -47,7 +49,7 @@ 
    *
    * @return Object The returned value or $default.
    */
-  public static function input($key=null,$default=null){
+  public static function input($key=null,$default=null) {
     return $key ? (isset($_REQUEST[$key]) ? new Object($_REQUEST[$key]) : (is_callable($default)?call_user_func($default):$default))  : new Object($_REQUEST[$key]);
   }
 
@@ -59,7 +61,7 @@ 
    *
    * @return Object The returned value or $default.
    */
-  public static function env($key=null,$default=null){
+  public static function env($key=null,$default=null) {
     return $key ? (filter_input(INPUT_ENV,$key) ?: (is_callable($default)?call_user_func($default):$default))  : $_ENV;
   }
 
@@ -71,7 +73,7 @@ 
    *
    * @return Object The returned value or $default.
    */
-  public static function server($key=null,$default=null){
+  public static function server($key=null,$default=null) {
     return $key ? (filter_input(INPUT_SERVER,$key) ?: (is_callable($default)?call_user_func($default):$default))  : $_SERVER;
   }
 
@@ -83,7 +85,7 @@ 
    *
    * @return Object The returned value or $default.
    */
-  public static function post($key=null,$default=null){
+  public static function post($key=null,$default=null) {
     return $key ? (filter_input(INPUT_POST,$key) ?: (is_callable($default)?call_user_func($default):$default))  : $_POST;
   }
 
@@ -95,7 +97,7 @@ 
    *
    * @return Object The returned value or $default.
    */
-  public static function get($key=null,$default=null){
+  public static function get($key=null,$default=null) {
     return $key ? (filter_input(INPUT_GET,$key) ?: (is_callable($default)?call_user_func($default):$default))  : $_GET;
   }
 
@@ -107,7 +109,7 @@ 
    *
    * @return Object The returned value or $default.
    */
-  public static function files($key=null,$default=null){
+  public static function files($key=null,$default=null) {
     return $key ? (isset($_FILES[$key]) ? $_FILES[$key] : (is_callable($default)?call_user_func($default):$default))  : $_FILES;
   }
 
@@ -119,7 +121,7 @@ 
    *
    * @return Object The returned value or $default.
    */
-  public static function cookie($key=null,$default=null){
+  public static function cookie($key=null,$default=null) {
     return $key ? (filter_input(INPUT_COOKIE,$key) ?: (is_callable($default)?call_user_func($default):$default))  : $_COOKIE;
   }
 
@@ -128,7 +130,7 @@ 
    *
    * @return string
    */
-  public static function host($protocol=true){
+  public static function host($protocol=true) {
     $host = filter_input(INPUT_SERVER,'HOSTNAME') ?: (
           filter_input(INPUT_SERVER,'SERVER_NAME') ?:
           filter_input(INPUT_SERVER,'HTTP_HOST')
@@ -141,7 +143,7 @@ 
    *
    * @return string
    */
-  public static function URL(){
+  public static function URL() {
     return static::host(true) . static::URI(false);
   }
 
@@ -153,7 +155,7 @@ 
    *
    * @return Object The returned value or null.
    */
-  public static function header($key=null,$default=null){
+  public static function header($key=null,$default=null) {
     $key = 'HTTP_'.strtr(strtoupper($key),'-','_');
     return $key ? (filter_input(INPUT_SERVER,$key) ?: (is_callable($default)?call_user_func($default):$default)) : $_SERVER;
   }
@@ -165,7 +167,7 @@ 
    *
    * @return string
    */
-  public static function URI($relative=true){
+  public static function URI($relative=true) {
     // On some web server configurations PHP_SELF is not populated.
     $self = filter_input(INPUT_SERVER,'SCRIPT_NAME') ?: filter_input(INPUT_SERVER,'PHP_SELF');
     // Search REQUEST_URI in $_SERVER
@@ -181,7 +183,7 @@ 
 
     $uri = rtrim($uri,'/');
 
-    if ($relative){
+    if ($relative) {
       $base = rtrim(dirname($self),'/');
       $uri = str_replace($base,'',$uri);
     }
@@ -194,7 +196,7 @@ 
    *
    * @return string
    */
-  public static function baseURI(){
+  public static function baseURI() {
     // On some web server configurations PHP_SELF is not populated.
     $uri = dirname(filter_input(INPUT_SERVER,'SCRIPT_NAME') ?: filter_input(INPUT_SERVER,'PHP_SELF'));
     return $uri ?: '/';
@@ -205,7 +207,7 @@ 
    *
    * @return string
    */
-  public static function method(){
+  public static function method() {
    return Filter::with('core.request.method',strtolower(filter_input(INPUT_SERVER,'REQUEST_METHOD')?:'get'));
   }
 
@@ -214,7 +216,7 @@ 
    *
    * @return string
    */
-  public static function IP(){
+  public static function IP() {
    return Filter::with('core.request.IP',strtolower(filter_input(INPUT_SERVER,'REMOTE_ADDR')?:''));
   }
 
@@ -223,7 +225,7 @@ 
    *
    * @return string
    */
-  public static function UA(){
+  public static function UA() {
    return Filter::with('core.request.UA',strtolower(filter_input(INPUT_SERVER,'HTTP_USER_AGENT')?:''));
   }
 
@@ -236,8 +238,8 @@ 
    *
    * @return mixed The request body data
    */
-  public static function data($key=null,$default=null){
-    if (null===static::$body){
+  public static function data($key=null,$default=null) {
+    if (null===static::$body) {
       $json = (false !== stripos(filter_input(INPUT_SERVER,'HTTP_CONTENT_TYPE'),'json'))
            || (false !== stripos(filter_input(INPUT_SERVER,'CONTENT_TYPE'),'json'));
       if ($json) {

classes/Dictionary.php

Spacing +10 added lines, -10 removed lines

@@ -27,51 +27,51 @@
         return static::$fields->all();
     }
 
-    public static function get($key, $default=null){
+    public static function get($key, $default = null) {
         if (!static::$fields) static::$fields = new Map();
         return static::$fields->get($key, $default);
     }
 
-    public static function set($key, $value=null){
+    public static function set($key, $value = null) {
         if (!static::$fields) static::$fields = new Map();
         return static::$fields->set($key, $value);
     }
 
-    public static function delete($key, $compact=true){
+    public static function delete($key, $compact = true) {
         if (!static::$fields) static::$fields = new Map();
         static::$fields->delete($key, $compact);
     }
 
-    public static function exists($key){
+    public static function exists($key) {
         if (!static::$fields) static::$fields = new Map();
         return static::$fields->exists($key);
     }
 
-    public static function clear(){
+    public static function clear() {
         if (!static::$fields) static::$fields = new Map();
         static::$fields->clear();
     }
 
-    public static function load($fields){
+    public static function load($fields) {
         if (!static::$fields) static::$fields = new Map();
         static::$fields->load($fields);
     }
 
-    public static function merge(array $array, $merge_back=false){
+    public static function merge(array $array, $merge_back = false) {
         if (!static::$fields) static::$fields = new Map();
         static::$fields->merge($array, $merge_back);
     }
 
-    protected static function compact(){
+    protected static function compact() {
         if (!static::$fields) static::$fields = new Map();
         static::$fields->compact();
     }
 
-    protected static function & find($path, $create=false, callable $operation=null) {
+    protected static function & find($path, $create = false, callable $operation = null) {
         return static::$fields->find($path, $create, $operation);
     }
 
-    public function jsonSerialize(){
+    public function jsonSerialize() {
       if (!static::$fields) static::$fields = new Map();
       return static::$fields->jsonSerialize();
     }

Braces +39 added lines, -19 removed lines

@@ -23,47 +23,65 @@ 
     protected static $fields = null;
 
     public static function & all(){
-        if (!static::$fields) static::$fields = new Map();
+        if (!static::$fields) {
+          static::$fields = new Map();
+        }
         return static::$fields->all();
     }
 
-    public static function get($key, $default=null){
-        if (!static::$fields) static::$fields = new Map();
+    public static function get($key, $default=null) {
+        if (!static::$fields) {
+          static::$fields = new Map();
+        }
         return static::$fields->get($key, $default);
     }
 
-    public static function set($key, $value=null){
-        if (!static::$fields) static::$fields = new Map();
+    public static function set($key, $value=null) {
+        if (!static::$fields) {
+          static::$fields = new Map();
+        }
         return static::$fields->set($key, $value);
     }
 
-    public static function delete($key, $compact=true){
-        if (!static::$fields) static::$fields = new Map();
+    public static function delete($key, $compact=true) {
+        if (!static::$fields) {
+          static::$fields = new Map();
+        }
         static::$fields->delete($key, $compact);
     }
 
-    public static function exists($key){
-        if (!static::$fields) static::$fields = new Map();
+    public static function exists($key) {
+        if (!static::$fields) {
+          static::$fields = new Map();
+        }
         return static::$fields->exists($key);
     }
 
-    public static function clear(){
-        if (!static::$fields) static::$fields = new Map();
+    public static function clear() {
+        if (!static::$fields) {
+          static::$fields = new Map();
+        }
         static::$fields->clear();
     }
 
-    public static function load($fields){
-        if (!static::$fields) static::$fields = new Map();
+    public static function load($fields) {
+        if (!static::$fields) {
+          static::$fields = new Map();
+        }
         static::$fields->load($fields);
     }
 
-    public static function merge(array $array, $merge_back=false){
-        if (!static::$fields) static::$fields = new Map();
+    public static function merge(array $array, $merge_back=false) {
+        if (!static::$fields) {
+          static::$fields = new Map();
+        }
         static::$fields->merge($array, $merge_back);
     }
 
-    protected static function compact(){
-        if (!static::$fields) static::$fields = new Map();
+    protected static function compact() {
+        if (!static::$fields) {
+          static::$fields = new Map();
+        }
         static::$fields->compact();
     }
 
@@ -71,8 +89,10 @@ 
         return static::$fields->find($path, $create, $operation);
     }
 
-    public function jsonSerialize(){
-      if (!static::$fields) static::$fields = new Map();
+    public function jsonSerialize() {
+      if (!static::$fields) {
+        static::$fields = new Map();
+      }
       return static::$fields->jsonSerialize();
     }
 

classes/Email.php

Indentation +2 added lines, -2 removed lines

@@ -14,8 +14,8 @@
   use Module;
 
   protected static $driver,
-                   $options,
-                   $driver_name;
+                    $options,
+                    $driver_name;
 
   public static function using($driver, $options = null){
     $class = 'Email\\'.ucfirst(strtolower($driver));

Spacing +5 added lines, -5 removed lines

@@ -17,17 +17,17 @@ 
                    $options,
                    $driver_name;
 
-  public static function using($driver, $options = null){
+  public static function using($driver, $options = null) {
     $class = 'Email\\'.ucfirst(strtolower($driver));
-    if ( ! class_exists($class) ) throw new Exception("[core.email] : $driver driver not found.");
+    if (!class_exists($class)) throw new Exception("[core.email] : $driver driver not found.");
     static::$driver_name = $driver;
     static::$options     = $options;
     static::$driver      = new $class;
     static::$driver->onInit($options);
   }
 
-  public static function create($mail=[]){
-    if (is_a($mail, 'Email\\Envelope')){
+  public static function create($mail = []) {
+    if (is_a($mail, 'Email\\Envelope')) {
       return $mail;
     } else {
       return new Email\Envelope(array_merge([
@@ -43,7 +43,7 @@ 
     }
   }
 
-  public static function send($mail){
+  public static function send($mail) {
     return static::$driver->onSend(static::create($mail));
   }
 

Braces +7 added lines, -5 removed lines

@@ -17,17 +17,19 @@ 
                    $options,
                    $driver_name;
 
-  public static function using($driver, $options = null){
+  public static function using($driver, $options = null) {
     $class = 'Email\\'.ucfirst(strtolower($driver));
-    if ( ! class_exists($class) ) throw new Exception("[core.email] : $driver driver not found.");
+    if ( ! class_exists($class) ) {
+      throw new Exception("[core.email] : $driver driver not found.");
+    }
     static::$driver_name = $driver;
     static::$options     = $options;
     static::$driver      = new $class;
     static::$driver->onInit($options);
   }
 
-  public static function create($mail=[]){
-    if (is_a($mail, 'Email\\Envelope')){
+  public static function create($mail=[]) {
+    if (is_a($mail, 'Email\\Envelope')) {
       return $mail;
     } else {
       return new Email\Envelope(array_merge([
@@ -43,7 +45,7 @@ 
     }
   }
 
-  public static function send($mail){
+  public static function send($mail) {
     return static::$driver->onSend(static::create($mail));
   }
 

classes/Module.php

Spacing +9 added lines, -9 removed lines

@@ -13,7 +13,7 @@ 
 trait Module {
     static protected $__classMethods = array();
     
-    public function __call($name, $args){
+    public function __call($name, $args) {
         if (isset(static::$__classMethods[$name]) && static::$__classMethods[$name] instanceof \Closure) {
             return call_user_func_array(static::$__classMethods[$name]->bindTo($this, $this), $args);
         }
@@ -25,19 +25,19 @@ 
         throw new \BadMethodCallException;
     }
     
-    public static function __prototypeAdd($name, \Closure $method){
+    public static function __prototypeAdd($name, \Closure $method) {
         static::$__classMethods[$name] = $method;
     }
 
-    public static function __prototypeGet($name){
-        return isset(static::$__classMethods[$name])?static::$__classMethods[$name]:null;
+    public static function __prototypeGet($name) {
+        return isset(static::$__classMethods[$name]) ? static::$__classMethods[$name] : null;
     }
     
-    public static function __prototypeRemove($name){
+    public static function __prototypeRemove($name) {
         unset(static::$__classMethods[$name]);
     }
     
-    public static function __callStatic($name, $args){
+    public static function __callStatic($name, $args) {
         if (isset(static::$__classMethods[$name]) && static::$__classMethods[$name] instanceof \Closure) {
             return forward_static_call_array(static::$__classMethods[$name], $args);
         }
@@ -49,10 +49,10 @@ 
         throw new \BadMethodCallException;
     }
     
-    public static function extend($methodMap=[]){
+    public static function extend($methodMap = []) {
         if ($methodMap) foreach ($methodMap as $name => $method) {
-            if($method && $method instanceof \Closure) {
-                static::__prototypeAdd($name,$method);
+            if ($method && $method instanceof \Closure) {
+                static::__prototypeAdd($name, $method);
             } else throw new \BadMethodCallException;
         }
     }

Braces +12 added lines, -8 removed lines

@@ -13,7 +13,7 @@ 
 trait Module {
     static protected $__classMethods = array();
     
-    public function __call($name, $args){
+    public function __call($name, $args) {
         if (isset(static::$__classMethods[$name]) && static::$__classMethods[$name] instanceof \Closure) {
             return call_user_func_array(static::$__classMethods[$name]->bindTo($this, $this), $args);
         }
@@ -25,19 +25,19 @@ 
         throw new \BadMethodCallException;
     }
     
-    public static function __prototypeAdd($name, \Closure $method){
+    public static function __prototypeAdd($name, \Closure $method) {
         static::$__classMethods[$name] = $method;
     }
 
-    public static function __prototypeGet($name){
+    public static function __prototypeGet($name) {
         return isset(static::$__classMethods[$name])?static::$__classMethods[$name]:null;
     }
     
-    public static function __prototypeRemove($name){
+    public static function __prototypeRemove($name) {
         unset(static::$__classMethods[$name]);
     }
     
-    public static function __callStatic($name, $args){
+    public static function __callStatic($name, $args) {
         if (isset(static::$__classMethods[$name]) && static::$__classMethods[$name] instanceof \Closure) {
             return forward_static_call_array(static::$__classMethods[$name], $args);
         }
@@ -49,11 +49,15 @@ 
         throw new \BadMethodCallException;
     }
     
-    public static function extend($methodMap=[]){
-        if ($methodMap) foreach ($methodMap as $name => $method) {
+    public static function extend($methodMap=[]) {
+        if ($methodMap) {
+          foreach ($methodMap as $name => $method) {
             if($method && $method instanceof \Closure) {
                 static::__prototypeAdd($name,$method);
-            } else throw new \BadMethodCallException;
+        }
+            } else {
+              throw new \BadMethodCallException;
+            }
         }
     }
 }

classes/Work.php

Indentation +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
   }
 
   public static function send($id,$passValue) {
-     isset(self::$workers[$id]) && self::$workers[$id]->pass($passValue);
+      isset(self::$workers[$id]) && self::$workers[$id]->pass($passValue);
   }
 
   public static function run(){
@@ -43,7 +43,7 @@ 
       $task = self::$pool->dequeue();
       $task->run();
       if ($task->complete()) {
-         unset(self::$workers[$task->id()]);
+          unset(self::$workers[$task->id()]);
       } else {
           self::$pool->enqueue($task);
       }

Spacing +7 added lines, -7 removed lines

@@ -21,9 +21,9 @@ 
   protected static $workers;
   protected static $lastID = 0;
 
-  public static function add($id,$job=null){
-    self::$pool or ( self::$pool = new \SplQueue() );
-    if(is_callable($id) && $job===null){
+  public static function add($id, $job = null) {
+    self::$pool or (self::$pool = new \SplQueue());
+    if (is_callable($id) && $job === null) {
       $job = $id;
       $id = ++self::$lastID;
     }
@@ -33,12 +33,12 @@ 
     return $task;
   }
 
-  public static function send($id,$passValue) {
+  public static function send($id, $passValue) {
      isset(self::$workers[$id]) && self::$workers[$id]->pass($passValue);
   }
 
-  public static function run(){
-    self::$pool or ( self::$pool = new \SplQueue() );
+  public static function run() {
+    self::$pool or (self::$pool = new \SplQueue());
     while (!self::$pool->isEmpty()) {
       $task = self::$pool->dequeue();
       $task->run();
@@ -84,7 +84,7 @@ 
     }
 
     public function complete() {
-        return ! $this->coroutine->valid();
+        return !$this->coroutine->valid();
     }
 
 }

Braces +3 added lines, -3 removed lines

@@ -21,9 +21,9 @@ 
   protected static $workers;
   protected static $lastID = 0;
 
-  public static function add($id,$job=null){
+  public static function add($id,$job=null) {
     self::$pool or ( self::$pool = new \SplQueue() );
-    if(is_callable($id) && $job===null){
+    if(is_callable($id) && $job===null) {
       $job = $id;
       $id = ++self::$lastID;
     }
@@ -37,7 +37,7 @@ 
      isset(self::$workers[$id]) && self::$workers[$id]->pass($passValue);
   }
 
-  public static function run(){
+  public static function run() {
     self::$pool or ( self::$pool = new \SplQueue() );
     while (!self::$pool->isEmpty()) {
       $task = self::$pool->dequeue();

classes/Hash.php

Indentation +2 added lines, -2 removed lines

@@ -112,14 +112,14 @@
         ++$i;
         $k1  = (((($k1 & 0xffff) * 0xcc9e2d51)
              + ((((($k1 >= 0 ? $k1 >> 16 : (($k1 & 0x7fffffff) >> 16) | 0x8000)) * 0xcc9e2d51) & 0xffff) << 16)))
-             & 0xffffffff;
+              & 0xffffffff;
         $k1  = $k1 << 15 | ($k1 >= 0 ? $k1 >> 17 : (($k1 & 0x7fffffff) >> 17) | 0x4000);
         $k1  = (((($k1 & 0xffff) * 0x1b873593) + ((((($k1 >= 0 ? $k1 >> 16 : (($k1 & 0x7fffffff) >> 16) | 0x8000))
              * 0x1b873593) & 0xffff) << 16))) & 0xffffffff;
         $h1 ^= $k1;
         $h1  = $h1 << 13 | ($h1 >= 0 ? $h1 >> 19 : (($h1 & 0x7fffffff) >> 19) | 0x1000);
         $h1b = (((($h1 & 0xffff) * 5) + ((((($h1 >= 0 ? $h1 >> 16 : (($h1 & 0x7fffffff) >> 16) | 0x8000)) * 5)
-             & 0xffff) << 16))) & 0xffffffff;
+              & 0xffff) << 16))) & 0xffffffff;
         $h1  = ((($h1b & 0xffff) + 0x6b64) + ((((($h1b >= 0 ? $h1b >> 16 : (($h1b & 0x7fffffff) >> 16) | 0x8000))
              + 0xe654) & 0xffff) << 16));
       }

Spacing +25 added lines, -25 removed lines

@@ -20,8 +20,8 @@ 
      * @param  integer $method  The hashing method, default is "md5"
      * @return string          The hash string
      */
-    public static function make($payload,$method='md5'){
-      return hash($method,serialize($payload));
+    public static function make($payload, $method = 'md5') {
+      return hash($method, serialize($payload));
     }
 
     /**
@@ -31,8 +31,8 @@ 
      * @param  integer $method The hashing method
      * @return bool            Returns `true` if payload matches hash
      */
-    public static function verify($payload,$hash,$method='md5'){
-      return static::make($payload,$method) == $hash;
+    public static function verify($payload, $hash, $method = 'md5') {
+      return static::make($payload, $method) == $hash;
     }
 
     /**
@@ -42,7 +42,7 @@ 
      *
      * @return array   Array containing the list of supported hashing algorithms.
      */
-    public static function methods(){
+    public static function methods() {
       return hash_algos();
     }
 
@@ -56,8 +56,8 @@ 
      *
      * @return bool
      */
-    public static function can($algo){
-      return in_array($algo,hash_algos());
+    public static function can($algo) {
+      return in_array($algo, hash_algos());
     }
 
     /**
@@ -65,29 +65,29 @@ 
      *
      * See [hash-algos](http://php.net/manual/it/function.hash-algos.php) for a list of algorithms
      */
-    public static function __callStatic($method,$params){
-      return self::make(current($params),$method);
+    public static function __callStatic($method, $params) {
+      return self::make(current($params), $method);
     }
 
-    public static function uuid($type=4, $namespace='', $name=''){
-      switch($type){
-        case 3: if(preg_match('/^\{?[0-9a-f]{8}\-?[0-9a-f]{4}\-?[0-9a-f]{4}\-?'.
+    public static function uuid($type = 4, $namespace = '', $name = '') {
+      switch ($type) {
+        case 3: if (preg_match('/^\{?[0-9a-f]{8}\-?[0-9a-f]{4}\-?[0-9a-f]{4}\-?'.
         '[0-9a-f]{4}\-?[0-9a-f]{12}\}?$/Si', $namespace) !== 1) return false;
-        $nhex = str_replace(array('-','{','}'), '', $namespace);
-        $nstr = ''; for($i = 0; $i < strlen($nhex); $i+=2)
-        $nstr .= chr(hexdec($nhex[$i].$nhex[$i+1]));
-        $hash = md5($nstr . $name);
+        $nhex = str_replace(array('-', '{', '}'), '', $namespace);
+        $nstr = '';for ($i = 0;$i < strlen($nhex);$i += 2)
+        $nstr .= chr(hexdec($nhex[$i].$nhex[$i + 1]));
+        $hash = md5($nstr.$name);
         return sprintf('%08s-%04s-%04x-%04x-%12s',
         substr($hash, 0, 8), substr($hash, 8, 4),
         (hexdec(substr($hash, 12, 4)) & 0x0fff) | 0x3000,
         (hexdec(substr($hash, 16, 4)) & 0x3fff) | 0x8000,
         substr($hash, 20, 12));
-        case 5: if(preg_match('/^\{?[0-9a-f]{8}\-?[0-9a-f]{4}\-?[0-9a-f]{4}\-?'.
+        case 5: if (preg_match('/^\{?[0-9a-f]{8}\-?[0-9a-f]{4}\-?[0-9a-f]{4}\-?'.
         '[0-9a-f]{4}\-?[0-9a-f]{12}\}?$/Si', $namespace) !== 1) return false;
-        $nhex = str_replace(array('-','{','}'), '', $namespace);
-        $nstr = ''; for($i = 0; $i < strlen($nhex); $i+=2)
-        $nstr .= chr(hexdec($nhex[$i].$nhex[$i+1]));
-        $hash = sha1($nstr . $name);
+        $nhex = str_replace(array('-', '{', '}'), '', $namespace);
+        $nstr = '';for ($i = 0;$i < strlen($nhex);$i += 2)
+        $nstr .= chr(hexdec($nhex[$i].$nhex[$i + 1]));
+        $hash = sha1($nstr.$name);
         return sprintf('%08s-%04s-%04x-%04x-%12s',
         substr($hash, 0, 8), substr($hash, 8, 4),
         (hexdec(substr($hash, 12, 4)) & 0x0fff) | 0x5000,
@@ -100,11 +100,11 @@ 
       }
     }
 
-    public static function murmurhash3_int($key, $seed=0){
+    public static function murmurhash3_int($key, $seed = 0) {
       $key  = (string) $key;
       $klen = strlen($key);
       $h1   = $seed;
-      for ($i=0,$bytes=$klen-($remainder=$klen&3) ; $i<$bytes ; ) {
+      for ($i = 0, $bytes = $klen - ($remainder = $klen & 3);$i < $bytes;) {
         $k1 = ((ord($key[$i]) & 0xff))
           | ((ord($key[++$i]) & 0xff) << 8)
           | ((ord($key[++$i]) & 0xff) << 16)
@@ -146,8 +146,8 @@ 
       return $h1;
     }
 
-    public static function murmurhash3($key, $seed=0){
-      return base_convert(static::murmurhash3_int($key, $seed),10,32);
+    public static function murmurhash3($key, $seed = 0) {
+      return base_convert(static::murmurhash3_int($key, $seed), 10, 32);
     }
 
 }

Braces +15 added lines, -11 removed lines

@@ -20,7 +20,7 @@ 
      * @param  integer $method  The hashing method, default is "md5"
      * @return string          The hash string
      */
-    public static function make($payload,$method='md5'){
+    public static function make($payload,$method='md5') {
       return hash($method,serialize($payload));
     }
 
@@ -31,7 +31,7 @@ 
      * @param  integer $method The hashing method
      * @return bool            Returns `true` if payload matches hash
      */
-    public static function verify($payload,$hash,$method='md5'){
+    public static function verify($payload,$hash,$method='md5') {
       return static::make($payload,$method) == $hash;
     }
 
@@ -42,7 +42,7 @@ 
      *
      * @return array   Array containing the list of supported hashing algorithms.
      */
-    public static function methods(){
+    public static function methods() {
       return hash_algos();
     }
 
@@ -56,7 +56,7 @@ 
      *
      * @return bool
      */
-    public static function can($algo){
+    public static function can($algo) {
       return in_array($algo,hash_algos());
     }
 
@@ -65,14 +65,16 @@ 
      *
      * See [hash-algos](http://php.net/manual/it/function.hash-algos.php) for a list of algorithms
      */
-    public static function __callStatic($method,$params){
+    public static function __callStatic($method,$params) {
       return self::make(current($params),$method);
     }
 
-    public static function uuid($type=4, $namespace='', $name=''){
-      switch($type){
+    public static function uuid($type=4, $namespace='', $name='') {
+      switch($type) {
         case 3: if(preg_match('/^\{?[0-9a-f]{8}\-?[0-9a-f]{4}\-?[0-9a-f]{4}\-?'.
-        '[0-9a-f]{4}\-?[0-9a-f]{12}\}?$/Si', $namespace) !== 1) return false;
+        '[0-9a-f]{4}\-?[0-9a-f]{12}\}?$/Si', $namespace) !== 1) {
+          return false;
+        }
         $nhex = str_replace(array('-','{','}'), '', $namespace);
         $nstr = ''; for($i = 0; $i < strlen($nhex); $i+=2)
         $nstr .= chr(hexdec($nhex[$i].$nhex[$i+1]));
@@ -83,7 +85,9 @@ 
         (hexdec(substr($hash, 16, 4)) & 0x3fff) | 0x8000,
         substr($hash, 20, 12));
         case 5: if(preg_match('/^\{?[0-9a-f]{8}\-?[0-9a-f]{4}\-?[0-9a-f]{4}\-?'.
-        '[0-9a-f]{4}\-?[0-9a-f]{12}\}?$/Si', $namespace) !== 1) return false;
+        '[0-9a-f]{4}\-?[0-9a-f]{12}\}?$/Si', $namespace) !== 1) {
+          return false;
+        }
         $nhex = str_replace(array('-','{','}'), '', $namespace);
         $nstr = ''; for($i = 0; $i < strlen($nhex); $i+=2)
         $nstr .= chr(hexdec($nhex[$i].$nhex[$i+1]));
@@ -100,7 +104,7 @@ 
       }
     }
 
-    public static function murmurhash3_int($key, $seed=0){
+    public static function murmurhash3_int($key, $seed=0) {
       $key  = (string) $key;
       $klen = strlen($key);
       $h1   = $seed;
@@ -146,7 +150,7 @@ 
       return $h1;
     }
 
-    public static function murmurhash3($key, $seed=0){
+    public static function murmurhash3($key, $seed=0) {
       return base_convert(static::murmurhash3_int($key, $seed),10,32);
     }
 

classes/Cache/Files.php

Spacing +25 added lines, -25 removed lines

@@ -15,23 +15,23 @@ 
 class Files implements Adapter {
     protected $options;
 
-    public static function valid(){
+    public static function valid() {
         return true;
     }
 
-    public function __construct($options=[]){
-        $this->options = (object) array_merge($options,[
+    public function __construct($options = []) {
+        $this->options = (object) array_merge($options, [
             'cache_dir' => sys_get_temp_dir().'/core_file_cache',
         ]);
-        $this->options->cache_dir = rtrim($this->options->cache_dir,'/');
-        if(false===is_dir($this->options->cache_dir)) mkdir($this->options->cache_dir,0777,true);
+        $this->options->cache_dir = rtrim($this->options->cache_dir, '/');
+        if (false === is_dir($this->options->cache_dir)) mkdir($this->options->cache_dir, 0777, true);
         $this->options->cache_dir .= '/';
     }
 
-    public function get($key){
+    public function get($key) {
         $cache_file_name = $this->options->cache_dir.$key.'.cache.php';
-        if(is_file($cache_file_name) && $data = @unserialize(file_get_contents($cache_file_name))){
-            if($data[0] && (time() > $data[0])) {
+        if (is_file($cache_file_name) && $data = @unserialize(file_get_contents($cache_file_name))) {
+            if ($data[0] && (time() > $data[0])) {
                 unlink($cache_file_name);
                 return null;
             }
@@ -41,39 +41,39 @@ 
         }
     }
 
-    public function set($key,$value,$expire=0){
+    public function set($key, $value, $expire = 0) {
         $cache_file_name = $this->options->cache_dir.$key.'.cache.php';
-        file_put_contents($cache_file_name,serialize([$expire?time()+$expire:0,$value]));
+        file_put_contents($cache_file_name, serialize([$expire ? time() + $expire : 0, $value]));
     }
 
-    public function delete($key){
+    public function delete($key) {
         $cache_file_name = $this->options->cache_dir.$key.'.cache.php';
-      if(is_file($cache_file_name)) unlink($cache_file_name);
+      if (is_file($cache_file_name)) unlink($cache_file_name);
     }
 
-    public function exists($key){
+    public function exists($key) {
         $cache_file_name = $this->options->cache_dir.$key.'.cache.php';
-        if(false === is_file($cache_file_name)) return false;
-        $peek = file_get_contents($cache_file_name,false,null,-1,32);
-        $expire = explode('{i:0;i:',$peek,2);
-        $expire = explode(';',end($expire),2);
+        if (false === is_file($cache_file_name)) return false;
+        $peek = file_get_contents($cache_file_name, false, null, -1, 32);
+        $expire = explode('{i:0;i:', $peek, 2);
+        $expire = explode(';', end($expire), 2);
         $expire = current($expire);
-        if($expire && $expire < time()){
+        if ($expire && $expire < time()) {
             unlink($cache_file_name);
             return false;
         } else return true;
     }
 
-    public function flush(){
-        exec('rm -f ' . $this->options->cache_dir . '*.cache.php');
+    public function flush() {
+        exec('rm -f '.$this->options->cache_dir.'*.cache.php');
     }
 
-    public function inc($key,$value=1){
-        if(null === ($current = $this->get($key))) $current = $value; else $current += $value;
-        $this->set($key,$current);
+    public function inc($key, $value = 1) {
+        if (null === ($current = $this->get($key))) $current = $value;else $current += $value;
+        $this->set($key, $current);
     }
 
-    public function dec($key,$value=1){
-        $this->inc($key,-abs($value));
+    public function dec($key, $value = 1) {
+        $this->inc($key, -abs($value));
     }
 }

Braces +28 added lines, -16 removed lines

@@ -15,22 +15,24 @@ 
 class Files implements Adapter {
     protected $options;
 
-    public static function valid(){
+    public static function valid() {
         return true;
     }
 
-    public function __construct($options=[]){
+    public function __construct($options=[]) {
         $this->options = (object) array_merge($options,[
             'cache_dir' => sys_get_temp_dir().'/core_file_cache',
         ]);
         $this->options->cache_dir = rtrim($this->options->cache_dir,'/');
-        if(false===is_dir($this->options->cache_dir)) mkdir($this->options->cache_dir,0777,true);
+        if(false===is_dir($this->options->cache_dir)) {
+          mkdir($this->options->cache_dir,0777,true);
+        }
         $this->options->cache_dir .= '/';
     }
 
-    public function get($key){
+    public function get($key) {
         $cache_file_name = $this->options->cache_dir.$key.'.cache.php';
-        if(is_file($cache_file_name) && $data = @unserialize(file_get_contents($cache_file_name))){
+        if(is_file($cache_file_name) && $data = @unserialize(file_get_contents($cache_file_name))) {
             if($data[0] && (time() > $data[0])) {
                 unlink($cache_file_name);
                 return null;
@@ -41,39 +43,49 @@ 
         }
     }
 
-    public function set($key,$value,$expire=0){
+    public function set($key,$value,$expire=0) {
         $cache_file_name = $this->options->cache_dir.$key.'.cache.php';
         file_put_contents($cache_file_name,serialize([$expire?time()+$expire:0,$value]));
     }
 
-    public function delete($key){
+    public function delete($key) {
         $cache_file_name = $this->options->cache_dir.$key.'.cache.php';
-      if(is_file($cache_file_name)) unlink($cache_file_name);
+      if(is_file($cache_file_name)) {
+        unlink($cache_file_name);
+      }
     }
 
-    public function exists($key){
+    public function exists($key) {
         $cache_file_name = $this->options->cache_dir.$key.'.cache.php';
-        if(false === is_file($cache_file_name)) return false;
+        if(false === is_file($cache_file_name)) {
+          return false;
+        }
         $peek = file_get_contents($cache_file_name,false,null,-1,32);
         $expire = explode('{i:0;i:',$peek,2);
         $expire = explode(';',end($expire),2);
         $expire = current($expire);
-        if($expire && $expire < time()){
+        if($expire && $expire < time()) {
             unlink($cache_file_name);
             return false;
-        } else return true;
+        } else {
+          return true;
+        }
     }
 
-    public function flush(){
+    public function flush() {
         exec('rm -f ' . $this->options->cache_dir . '*.cache.php');
     }
 
-    public function inc($key,$value=1){
-        if(null === ($current = $this->get($key))) $current = $value; else $current += $value;
+    public function inc($key,$value=1) {
+        if(null === ($current = $this->get($key))) {
+          $current = $value;
+        } else {
+          $current += $value;
+        }
         $this->set($key,$current);
     }
 
-    public function dec($key,$value=1){
+    public function dec($key,$value=1) {
         $this->inc($key,-abs($value));
     }
 }

classes/Cache/Adapter.php

Spacing +4 added lines, -4 removed lines

@@ -12,15 +12,15 @@
 
 namespace Cache;
 
-interface Adapter  {
+interface Adapter {
   public function get($key);
-  public function set($key,$value,$expire=0);
+  public function set($key, $value, $expire = 0);
   public function delete($key);
   public function exists($key);
   public function flush();
 
-  public function inc($key,$value=1);
-  public function dec($key,$value=1);
+  public function inc($key, $value = 1);
+  public function dec($key, $value = 1);
 
   public static function valid();
 }
\ No newline at end of file

Braces +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 namespace Cache;
 
-interface Adapter  {
+interface Adapter {
   public function get($key);
   public function set($key,$value,$expire=0);
   public function delete($key);