Rozbo / puck

function.php

Braces +2 added lines, -4 removed lines

@@ -40,8 +40,7 @@ 
 
     if (isset($arr['status']) && $type == 2) {
         $ret=$arr;
-    }
-    else {
+    } else {
         $ret['status']=$type;
         $ret['data']=$arr;
     }
@@ -323,8 +322,7 @@ 
         if ($filters) {
             if (is_string($filters)) {
                 $filters=explode(',', $filters);
-            }
-            else if (is_array($filters)) {
+            } else if (is_array($filters)) {
                 foreach ($filters as $filter) {
                     $data=array_map_recursive($filter, $data); // 参数过滤
                 }

Doc Comments +1 added lines, -1 removed lines

@@ -462,7 +462,7 @@
      * 获取环境变量
      *
      * @param  string  $key
-     * @param  mixed   $default
+     * @param  string|false   $default
      * @return mixed
      */
     function env($key, $default = null)

core/Config.php

Doc Comments +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
     /**
      * Set a given configuration value.
      *
-     * @param  array|string  $key
+     * @param  string  $key
      * @param  mixed   $value
      * @return void
      */

core/Request.php

Doc Comments +6 added lines, -6 removed lines

@@ -170,7 +170,7 @@ 
      * @param array     $files
      * @param array     $server
      * @param string    $content
-     * @return \think\Request
+     * @return Request
      */
     public function create($uri, $method = 'GET', $params = [], $cookie = [], $files = [], $server = [], $content = null)
     {
@@ -612,7 +612,7 @@ 
     /**
      * 设置获取获取路由参数
      * @access public
-     * @param string|array  $name 变量名
+     * @param boolean  $name 变量名
      * @param mixed         $default 默认值
      * @param string|array  $filter 过滤方法
      * @return mixed
@@ -629,7 +629,7 @@ 
     /**
      * 设置获取获取GET参数
      * @access public
-     * @param string|array  $name 变量名
+     * @param boolean  $name 变量名
      * @param mixed         $default 默认值
      * @param string|array  $filter 过滤方法
      * @return mixed
@@ -783,9 +783,9 @@ 
     /**
      * 获取server参数
      * @access public
-     * @param string|array  $name 数据名称
+     * @param string  $name 数据名称
      * @param string        $default 默认值
-     * @param string|array  $filter 过滤方法
+     * @param string  $filter 过滤方法
      * @return mixed
      */
     public function server($name = '', $default = null, $filter = '')
@@ -1086,7 +1086,7 @@ 
      * @param string    $name 变量名
      * @param string    $type 变量类型
      * @param bool      $checkEmpty 是否检测空值
-     * @return mixed
+     * @return boolean
      */
     public function has($name, $type = 'param', $checkEmpty = false)
     {

core/tools/Arr.php

Doc Comments +1 added lines, -1 removed lines

@@ -260,7 +260,7 @@
      * Check if an item or items exist in an array using "dot" notation.
      *
      * @param  \ArrayAccess|array $array
-     * @param  string|array $keys
+     * @param  string $keys
      * @return bool
      */
     public static function has($array, $keys) {

core/Route.php

Braces +1 added lines, -2 removed lines

@@ -98,8 +98,7 @@
             }
         } catch (\ReflectionException $e) {
             return false;
-        }
-        catch (\InvalidArgumentException $e) {
+        } catch (\InvalidArgumentException $e) {
             return false;
         }
         return true;

core/helpers/Curl.php

Doc Comments +8 added lines, -8 removed lines

@@ -227,7 +227,7 @@ 
      * Progress
      *
      * @access public
-     * @param  $callback
+     * @param  \Closure $callback
      */
     public function progress($callback)
     {
@@ -263,7 +263,7 @@ 
      * Download Complete
      *
      * @access private
-     * @param  $fh
+     * @param  resource $fh
      */
     private function downloadComplete($fh)
     {
@@ -442,7 +442,7 @@ 
      * Get Info
      *
      * @access public
-     * @param  $opt
+     * @param  integer $opt
      *
      * @return mixed
      */
@@ -462,7 +462,7 @@ 
      * Get Opt
      *
      * @access public
-     * @param  $option
+     * @param  integer $option
      *
      * @return mixed
      */
@@ -1105,7 +1105,7 @@ 
      * Set Timeout
      *
      * @access public
-     * @param  $seconds
+     * @param  integer $seconds
      */
     public function setTimeout($seconds)
     {
@@ -1130,7 +1130,7 @@ 
      * Set User Agent
      *
      * @access public
-     * @param  $user_agent
+     * @param  string $user_agent
      */
     public function setUserAgent($user_agent)
     {
@@ -1173,7 +1173,7 @@ 
      * Using `curl -H "Host:" ...' is equivalent to $curl->removeHeader('Host');.
      *
      * @access public
-     * @param  $key
+     * @param  string $key
      */
     public function removeHeader($key)
     {
@@ -1360,7 +1360,7 @@ 
      * Parse Response Headers
      *
      * @access private
-     * @param  $raw_response_headers
+     * @param  string $raw_response_headers
      *
      * @return array
      */

core/Model.php

Doc Comments +8 added lines, -9 removed lines

@@ -76,7 +76,6 @@ 
     private $_with = Array();
 
     /**
-     * @param array $data Data to preload on object creation
      */
     public function __construct() {
         $this->db = app('db')->connect($this->dbConn);
@@ -207,7 +206,7 @@ 
     /**
      * Save or Update object
      *
-     * @return mixed insert id or false in case of failure
+     * @return boolean insert id or false in case of failure
      */
     public function save($data = null) {
         if ($this->isNew)
@@ -216,7 +215,7 @@ 
     }
 
     /**
-     * @return mixed insert id or false in case of failure
+     * @return boolean insert id or false in case of failure
      */
     public function insert() {
         if (!empty ($this->timestamps) && in_array("createdAt", $this->timestamps))
@@ -362,7 +361,7 @@ 
     /**
      * Delete method. Works only if object primaryKey is defined
      *
-     * @return boolean Indicates success. 0 or 1.
+     * @return null|boolean Indicates success. 0 or 1.
      */
     public function delete() {
         if (empty ($this->data[$this->primaryKey]))
@@ -522,7 +521,7 @@ 
      * @param string $joinType SQL join type: LEFT, RIGHT,  INNER, OUTER
      * @param string $primaryKey SQL join On Second primaryKey
      *
-     * @return dbObject
+     * @return Model
      */
     private function join($objectName, $key = null, $joinType = 'LEFT', $primaryKey = null) {
         $joinObj = new $objectName;
@@ -571,7 +570,7 @@ 
     /**
      * Helper function to create dbObject with Json return type
      *
-     * @return dbObject
+     * @return Model
      */
     private function JsonBuilder() {
         $this->returnType = 'Json';
@@ -585,7 +584,7 @@ 
     /**
      * Helper function to create dbObject with Array return type
      *
-     * @return dbObject
+     * @return Model
      */
     private function ArrayBuilder() {
         $this->returnType = 'Array';
@@ -596,7 +595,7 @@ 
      * Helper function to create dbObject with Object return type.
      * Added for consistency. Works same way as new $objname ()
      *
-     * @return dbObject
+     * @return Model
      */
     private function ObjectBuilder() {
         $this->returnType = 'Object';
@@ -651,7 +650,7 @@ 
      * @access public
      * @param string $objectName Object Name
      *
-     * @return dbObject
+     * @return null|Model
      */
     private function with($objectName) {
         if (!property_exists($this, 'relations') && !isset ($this->relations[$name]))

Braces +183 added lines, -125 removed lines

@@ -101,8 +101,9 @@ 
      */
     public static function table($tableName) {
         $tableName = preg_replace("/[^-a-z0-9_]+/i", '', $tableName);
-        if (!class_exists($tableName))
-            eval ("class $tableName extends dbObject {}");
+        if (!class_exists($tableName)) {
+                    eval ("class $tableName extends dbObject {}");
+        }
         return new $tableName ();
     }
 
@@ -119,23 +120,26 @@ 
     public static function __callStatic($method, $arg) {
         $obj = new static;
         $result = call_user_func_array(array($obj, $method), $arg);
-        if (method_exists($obj, $method))
-            return $result;
+        if (method_exists($obj, $method)) {
+                    return $result;
+        }
         return $obj;
     }
 
     public static function autoload($path = null) {
-        if ($path)
-            static::$modelPath = $path . "/";
-        else
-            static::$modelPath = __DIR__ . "/models/";
+        if ($path) {
+                    static::$modelPath = $path . "/";
+        } else {
+                    static::$modelPath = __DIR__ . "/models/";
+        }
         spl_autoload_register("dbObject::dbObjectAutoload");
     }
 
     private static function dbObjectAutoload($classname) {
         $filename = static::$modelPath . $classname . ".php";
-        if (file_exists($filename))
-            include($filename);
+        if (file_exists($filename)) {
+                    include($filename);
+        }
     }
 
     /**
@@ -146,11 +150,13 @@ 
      * @return mixed
      */
     public function __get($name) {
-        if (property_exists($this, 'hidden') && array_search($name, $this->hidden) !== false)
-            return null;
+        if (property_exists($this, 'hidden') && array_search($name, $this->hidden) !== false) {
+                    return null;
+        }
 
-        if (isset ($this->data[$name]) && $this->data[$name] instanceof dbObject)
-            return $this->data[$name];
+        if (isset ($this->data[$name]) && $this->data[$name] instanceof dbObject) {
+                    return $this->data[$name];
+        }
 
         if (property_exists($this, 'relations') && isset ($this->relations[$name])) {
             $relationType = strtolower($this->relations[$name][0]);
@@ -173,11 +179,13 @@ 
             }
         }
 
-        if (isset ($this->data[$name]))
-            return $this->data[$name];
+        if (isset ($this->data[$name])) {
+                    return $this->data[$name];
+        }
 
-        if (property_exists($this->db, $name))
-            return $this->db->$name;
+        if (property_exists($this->db, $name)) {
+                    return $this->db->$name;
+        }
     }
 
     /**
@@ -186,18 +194,21 @@ 
      * @return mixed
      */
     public function __set($name, $value) {
-        if (property_exists($this, 'hidden') && array_search($name, $this->hidden) !== false)
-            return;
+        if (property_exists($this, 'hidden') && array_search($name, $this->hidden) !== false) {
+                    return;
+        }
 
         $this->data[$name] = $value;
     }
 
     public function __isset($name) {
-        if (isset ($this->data[$name]))
-            return isset ($this->data[$name]);
+        if (isset ($this->data[$name])) {
+                    return isset ($this->data[$name]);
+        }
 
-        if (property_exists($this->db, $name))
-            return isset ($this->db->$name);
+        if (property_exists($this->db, $name)) {
+                    return isset ($this->db->$name);
+        }
     }
 
     public function __unset($name) {
@@ -210,8 +221,9 @@ 
      * @return mixed insert id or false in case of failure
      */
     public function save($data = null) {
-        if ($this->isNew)
-            return $this->insert();
+        if ($this->isNew) {
+                    return $this->insert();
+        }
         return $this->update($data);
     }
 
@@ -219,15 +231,18 @@ 
      * @return mixed insert id or false in case of failure
      */
     public function insert() {
-        if (!empty ($this->timestamps) && in_array("createdAt", $this->timestamps))
-            $this->createdAt = date("Y-m-d H:i:s");
+        if (!empty ($this->timestamps) && in_array("createdAt", $this->timestamps)) {
+                    $this->createdAt = date("Y-m-d H:i:s");
+        }
         $sqlData = $this->prepareData();
-        if (!$this->validate($sqlData))
-            return false;
+        if (!$this->validate($sqlData)) {
+                    return false;
+        }
 
         $id = $this->db->insert($this->dbTable, $sqlData);
-        if (!empty ($this->primaryKey) && empty ($this->data[$this->primaryKey]))
-            $this->data[$this->primaryKey] = $id;
+        if (!empty ($this->primaryKey) && empty ($this->data[$this->primaryKey])) {
+                    $this->data[$this->primaryKey] = $id;
+        }
         $this->isNew = false;
 
         return $id;
@@ -236,38 +251,44 @@ 
     private function prepareData() {
         $this->errors = Array();
         $sqlData = Array();
-        if (count($this->data) == 0)
-            return Array();
+        if (count($this->data) == 0) {
+                    return Array();
+        }
 
-        if (method_exists($this, "preLoad"))
-            $this->preLoad($this->data);
+        if (method_exists($this, "preLoad")) {
+                    $this->preLoad($this->data);
+        }
 
-        if (!$this->dbFields)
-            return $this->data;
+        if (!$this->dbFields) {
+                    return $this->data;
+        }
 
         foreach ($this->data as $key => &$value) {
             if ($value instanceof dbObject && $value->isNew == true) {
                 $id = $value->save();
-                if ($id)
-                    $value = $id;
-                else
-                    $this->errors = array_merge($this->errors, $value->errors);
+                if ($id) {
+                                    $value = $id;
+                } else {
+                                    $this->errors = array_merge($this->errors, $value->errors);
+                }
             }
 
-            if (!in_array($key, array_keys($this->dbFields)))
-                continue;
+            if (!in_array($key, array_keys($this->dbFields))) {
+                            continue;
+            }
 
             if (!is_array($value)) {
                 $sqlData[$key] = $value;
                 continue;
             }
 
-            if (isset ($this->jsonFields) && in_array($key, $this->jsonFields))
-                $sqlData[$key] = json_encode($value);
-            else if (isset ($this->arrayFields) && in_array($key, $this->arrayFields))
-                $sqlData[$key] = implode("|", $value);
-            else
-                $sqlData[$key] = $value;
+            if (isset ($this->jsonFields) && in_array($key, $this->jsonFields)) {
+                            $sqlData[$key] = json_encode($value);
+            } else if (isset ($this->arrayFields) && in_array($key, $this->arrayFields)) {
+                            $sqlData[$key] = implode("|", $value);
+            } else {
+                            $sqlData[$key] = $value;
+            }
         }
         return $sqlData;
     }
@@ -276,31 +297,37 @@ 
      * @param array $data
      */
     private function validate($data) {
-        if (!$this->dbFields)
-            return true;
+        if (!$this->dbFields) {
+                    return true;
+        }
 
         foreach ($this->dbFields as $key => $desc) {
             $type = null;
             $required = false;
-            if (isset ($data[$key]))
-                $value = $data[$key];
-            else
-                $value = null;
+            if (isset ($data[$key])) {
+                            $value = $data[$key];
+            } else {
+                            $value = null;
+            }
 
-            if (is_array($value))
-                continue;
+            if (is_array($value)) {
+                            continue;
+            }
 
-            if (isset ($desc[0]))
-                $type = $desc[0];
-            if (isset ($desc[1]) && ($desc[1] == 'required'))
-                $required = true;
+            if (isset ($desc[0])) {
+                            $type = $desc[0];
+            }
+            if (isset ($desc[1]) && ($desc[1] == 'required')) {
+                            $required = true;
+            }
 
             if ($required && strlen($value) == 0) {
                 $this->errors[] = Array($this->dbTable . "." . $key => "is required");
                 continue;
             }
-            if ($value == null)
-                continue;
+            if ($value == null) {
+                            continue;
+            }
 
             switch ($type) {
                 case "text";
@@ -322,8 +349,9 @@ 
                     $regexp = $type;
                     break;
             }
-            if (!$regexp)
-                continue;
+            if (!$regexp) {
+                            continue;
+            }
 
             if (!preg_match($regexp, $value)) {
                 $this->errors[] = Array($this->dbTable . "." . $key => "$type validation failed");
@@ -337,23 +365,28 @@ 
      * @param array $data Optional update data to apply to the object
      */
     public function update($data = null) {
-        if (empty ($this->dbFields))
-            return false;
+        if (empty ($this->dbFields)) {
+                    return false;
+        }
 
-        if (empty ($this->data[$this->primaryKey]))
-            return false;
+        if (empty ($this->data[$this->primaryKey])) {
+                    return false;
+        }
 
         if ($data) {
-            foreach ($data as $k => $v)
-                $this->$k = $v;
+            foreach ($data as $k => $v) {
+                            $this->$k = $v;
+            }
         }
 
-        if (!empty ($this->timestamps) && in_array("updatedAt", $this->timestamps))
-            $this->updatedAt = date("Y-m-d H:i:s");
+        if (!empty ($this->timestamps) && in_array("updatedAt", $this->timestamps)) {
+                    $this->updatedAt = date("Y-m-d H:i:s");
+        }
 
         $sqlData = $this->prepareData();
-        if (!$this->validate($sqlData))
-            return false;
+        if (!$this->validate($sqlData)) {
+                    return false;
+        }
 
         $this->db->where($this->primaryKey, $this->data[$this->primaryKey]);
         return $this->db->update($this->dbTable, $sqlData);
@@ -365,8 +398,9 @@ 
      * @return boolean Indicates success. 0 or 1.
      */
     public function delete() {
-        if (empty ($this->data[$this->primaryKey]))
-            return false;
+        if (empty ($this->data[$this->primaryKey])) {
+                    return false;
+        }
 
         $this->db->where($this->primaryKey, $this->data[$this->primaryKey]);
         return $this->db->delete($this->dbTable);
@@ -381,8 +415,9 @@ 
      * @return mixed
      */
     public function __call($method, $arg) {
-        if (method_exists($this, $method))
-            return call_user_func_array(array($this, $method), $arg);
+        if (method_exists($this, $method)) {
+                    return call_user_func_array(array($this, $method), $arg);
+        }
         $this->db->table($this->dbTable);
         return call_user_func_array(array($this->db, $method), $arg);;
     }
@@ -414,8 +449,9 @@ 
         $data = $this->data;
         $this->processAllWith($data);
         foreach ($data as &$d) {
-            if ($d instanceof dbObject)
-                $d = $d->data;
+            if ($d instanceof dbObject) {
+                            $d = $d->data;
+            }
         }
         return $data;
     }
@@ -426,8 +462,9 @@ 
      * @param array $data
      */
     private function processAllWith(&$data, $shouldReset = true) {
-        if (count($this->_with) == 0)
-            return;
+        if (count($this->_with) == 0) {
+                    return;
+        }
 
         foreach ($this->_with as $name => $opts) {
             $relationType = strtolower($opts[0]);
@@ -454,11 +491,13 @@ 
                     }
                 }
                 unset ($data[$table]);
-            } else
-                $data[$name] = $this->$name;
+            } else {
+                            $data[$name] = $this->$name;
+            }
+        }
+        if ($shouldReset) {
+                    $this->_with = Array();
         }
-        if ($shouldReset)
-            $this->_with = Array();
     }
 
     /**
@@ -475,8 +514,9 @@ 
         $objects = Array();
         $this->processHasOneWith();
         $results = $this->db->ArrayBuilder()->get($this->dbTable, $limit, $fields);
-        if ($this->db->count == 0)
-            return null;
+        if ($this->db->count == 0) {
+                    return null;
+        }
 
         foreach ($results as &$r) {
             $this->processArrays($r);
@@ -489,24 +529,28 @@ 
             }
         }
         $this->_with = Array();
-        if ($this->returnType == 'Object')
-            return $objects;
+        if ($this->returnType == 'Object') {
+                    return $objects;
+        }
 
-        if ($this->returnType == 'Json')
-            return json_encode($results);
+        if ($this->returnType == 'Json') {
+                    return json_encode($results);
+        }
 
         return $results;
     }
 
     private function processHasOneWith() {
-        if (count($this->_with) == 0)
-            return;
+        if (count($this->_with) == 0) {
+                    return;
+        }
         foreach ($this->_with as $name => $opts) {
             $relationType = strtolower($opts[0]);
             $modelName = $opts[1];
             $key = null;
-            if (isset ($opts[2]))
-                $key = $opts[2];
+            if (isset ($opts[2])) {
+                            $key = $opts[2];
+            }
             if ($relationType == 'hasone') {
                 $this->db->setQueryOption("MYSQLI_NESTJOIN");
                 $this->join($modelName, $key);
@@ -527,16 +571,19 @@ 
      */
     private function join($objectName, $key = null, $joinType = 'LEFT', $primaryKey = null) {
         $joinObj = new $objectName;
-        if (!$key)
-            $key = $objectName . "id";
+        if (!$key) {
+                    $key = $objectName . "id";
+        }
 
-        if (!$primaryKey)
-            $primaryKey = $this->db->getPrefix() . $joinObj->dbTable . "." . $joinObj->primaryKey;
+        if (!$primaryKey) {
+                    $primaryKey = $this->db->getPrefix() . $joinObj->dbTable . "." . $joinObj->primaryKey;
+        }
 
-        if (!strchr($key, '.'))
-            $joinStr = $this->db->getPrefix() . $this->dbTable . ".{$key} = " . $primaryKey;
-        else
-            $joinStr = $this->db->getPrefix() . "{$key} = " . $primaryKey;
+        if (!strchr($key, '.')) {
+                    $joinStr = $this->db->getPrefix() . $this->dbTable . ".{$key} = " . $primaryKey;
+        } else {
+                    $joinStr = $this->db->getPrefix() . "{$key} = " . $primaryKey;
+        }
 
         $this->db->join($joinObj->dbTable, $joinStr, $joinType);
         return $this;
@@ -547,13 +594,15 @@ 
      */
     private function processArrays(&$data) {
         if (isset ($this->jsonFields) && is_array($this->jsonFields)) {
-            foreach ($this->jsonFields as $key)
-                $data[$key] = json_decode($data[$key]);
+            foreach ($this->jsonFields as $key) {
+                            $data[$key] = json_decode($data[$key]);
+            }
         }
 
         if (isset ($this->arrayFields) && is_array($this->arrayFields)) {
-            foreach ($this->arrayFields as $key)
-                $data[$key] = explode("|", $data[$key]);
+            foreach ($this->arrayFields as $key) {
+                            $data[$key] = explode("|", $data[$key]);
+            }
         }
     }
 
@@ -564,8 +613,9 @@ 
      */
     protected function count() {
         $res = $this->db->ArrayBuilder()->getValue($this->dbTable, "count(*)");
-        if (!$res)
-            return 0;
+        if (!$res) {
+                    return 0;
+        }
         return $res;
     }
 
@@ -629,16 +679,19 @@ 
     protected function getOne($fields = null) {
         $this->processHasOneWith();
         $results = $this->db->ArrayBuilder()->getOne($this->dbTable, $fields);
-        if ($this->db->count == 0)
-            return null;
+        if ($this->db->count == 0) {
+                    return null;
+        }
 
         $this->processArrays($results);
         $this->data = $results;
         $this->processAllWith($results);
-        if ($this->returnType == 'Json')
-            return json_encode($results);
-        if ($this->returnType == 'Array')
-            return $results;
+        if ($this->returnType == 'Json') {
+                    return json_encode($results);
+        }
+        if ($this->returnType == 'Array') {
+                    return $results;
+        }
 
         $item = new static ($results);
         $item->isNew = false;
@@ -655,8 +708,9 @@ 
      * @return dbObject
      */
     private function with($objectName) {
-        if (!property_exists($this, 'relations') && !isset ($this->relations[$name]))
-            die ("No relation with name $objectName found");
+        if (!property_exists($this, 'relations') && !isset ($this->relations[$name])) {
+                    die ("No relation with name $objectName found");
+        }
 
         $this->_with[$objectName] = $this->relations[$objectName];
 
@@ -683,7 +737,9 @@ 
         $this->db->pageLimit = self::$pageLimit;
         $res = $this->db->paginate($this->dbTable, $page, $fields);
         self::$totalPages = $this->db->totalPages;
-        if ($this->db->count == 0) return null;
+        if ($this->db->count == 0) {
+            return null;
+        }
 
         foreach ($res as &$r) {
             $this->processArrays($r);
@@ -696,11 +752,13 @@ 
             }
         }
         $this->_with = Array();
-        if ($this->returnType == 'Object')
-            return $objects;
+        if ($this->returnType == 'Object') {
+                    return $objects;
+        }
 
-        if ($this->returnType == 'Json')
-            return json_encode($res);
+        if ($this->returnType == 'Json') {
+                    return json_encode($res);
+        }
 
         return $res;
     }

core/Mysql.php

Braces +27 added lines, -20 removed lines

@@ -268,8 +268,9 @@ 
      * @return void
      */
     public function disconnect() {
-        if (!$this->_mysqli)
-            return;
+        if (!$this->_mysqli) {
+                    return;
+        }
         $this->_mysqli->close();
         $this->_mysqli = null;
     }
@@ -556,8 +557,9 @@ 
 
         // if $meta is false yet sqlstate is true, there's no sql error but the query is
         // most likely an update/insert/delete which doesn't produce any results
-        if (!$meta && $stmt->sqlstate)
-            return array();
+        if (!$meta && $stmt->sqlstate) {
+                    return array();
+        }
 
         $row = array();
         while ($field = $meta->fetch_field()) {
@@ -743,16 +745,18 @@ 
      * Abstraction method that will build an JOIN part of the query
      */
     protected function _buildJoin() {
-        if (empty ($this->_join))
-            return;
+        if (empty ($this->_join)) {
+                    return;
+        }
 
         foreach ($this->_join as $data) {
             list ($joinType, $joinTable, $joinCondition) = $data;
 
-            if (is_object($joinTable))
-                $joinStr = $this->_buildPair("", $joinTable);
-            else
-                $joinStr = $joinTable;
+            if (is_object($joinTable)) {
+                            $joinStr = $this->_buildPair("", $joinTable);
+            } else {
+                            $joinStr = $joinTable;
+            }
 
             $this->_query .= " " . $joinType . " JOIN " . $joinStr . " on " . $joinCondition;
 
@@ -840,12 +844,13 @@ 
                 $this->_query .= $operator . $this->_buildPair("", $val);
                 break;
             default:
-                if (is_array($val))
-                    $this->_bindParams($val);
-                else if ($val === null)
-                    $this->_query .= $operator . " NULL";
-                else if ($val != 'DBNULL' || $val == '0')
-                    $this->_query .= $this->_buildPair($operator, $val);
+                if (is_array($val)) {
+                                    $this->_bindParams($val);
+                } else if ($val === null) {
+                                    $this->_query .= $operator . " NULL";
+                } else if ($val != 'DBNULL' || $val == '0') {
+                                    $this->_query .= $this->_buildPair($operator, $val);
+                }
         }
     }
 
@@ -862,8 +867,9 @@ 
         $isInsert = preg_match('/^[INSERT|REPLACE]/', $this->_query);
         $dataColumns = array_keys($tableData);
         if ($isInsert) {
-            if (isset ($dataColumns[0]))
-                $this->_query .= ' (`' . implode($dataColumns, '`, `') . '`) ';
+            if (isset ($dataColumns[0])) {
+                            $this->_query .= ' (`' . implode($dataColumns, '`, `') . '`) ';
+            }
             $this->_query .= ' VALUES (';
         } else {
             $this->_query .= " SET ";
@@ -2038,8 +2044,9 @@ 
             return false;
         }
 
-        foreach ($tables as $i => $value)
-            $tables[$i] = $this->prefix . $value;
+        foreach ($tables as $i => $value) {
+                    $tables[$i] = $this->prefix . $value;
+        }
         $this->where('table_schema', $this->db);
         $this->where('table_name', $tables, 'in');
         $this->get('information_schema.tables', $count);

Doc Comments +28 added lines, -29 removed lines

@@ -255,7 +255,7 @@ 
      *
      * @param string $subQueryAlias
      *
-     * @return MysqliDb
+     * @return Mysql
      */
     public static function subQuery($subQueryAlias = "") {
         return new self(array('host' => $subQueryAlias, 'isSubQuery' => true));
@@ -277,7 +277,7 @@ 
     /**
      * Helper function to create dbObject with JSON return type
      *
-     * @return MysqliDb
+     * @return Mysql
      */
     public function jsonBuilder() {
         $this->returnType = 'json';
@@ -287,7 +287,7 @@ 
     /**
      * Helper function to create dbObject with object return type.
      *
-     * @return MysqliDb
+     * @return Mysql
      */
     public function objectBuilder() {
         $this->returnType = 'object';
@@ -350,7 +350,7 @@ 
      * Method attempts to prepare the SQL query
      * and throws an error if there was a problem.
      *
-     * @return mysqli_stmt
+     * @return \mysqli_stmt
      */
     protected function _prepareQuery() {
         if (!$stmt = $this->mysqli()->prepare($this->_query)) {
@@ -539,7 +539,7 @@ 
      * This helper method takes care of prepared statements' "bind_result method
      * , when the number of variables to pass is unknown.
      *
-     * @param mysqli_stmt $stmt Equal to the prepared statement object.
+     * @param \mysqli_stmt $stmt Equal to the prepared statement object.
      *
      * @return array The results of the SQL fetch.
      */
@@ -702,7 +702,7 @@ 
      *                               or only $count
      * @param array $tableData Should contain an array of data for updating the database.
      *
-     * @return mysqli_stmt Returns the $stmt object.
+     * @return null|\mysqli_stmt Returns the $stmt object.
      */
     protected function _buildQuery($numRows = null, $tableData = null) {
         // $this->_buildJoinOld();
@@ -1209,9 +1209,8 @@ 
      * A convenient function that returns TRUE if exists at least an element that
      * satisfy the where condition specified calling the "where" method before this one.
      *
-     * @param string $tableName The name of the database table to work with.
      *
-     * @return array Contains the returned rows from the select query.
+     * @return boolean Contains the returned rows from the select query.
      */
     public function has() {
         $this->getOne($this->tableName, '1');
@@ -1311,7 +1310,7 @@ 
      * @param int|array $numRows Array to define SQL limit in format Array ($count, $offset)
      *                               or only $count
      *
-     * @return bool Indicates success. 0 or 1.
+     * @return null|boolean Indicates success. 0 or 1.
      */
     public function delete($numRows = null) {
         if ($this->isSubQuery) {
@@ -1342,7 +1341,7 @@ 
      * @param array $updateColumns Variable with values
      * @param string $lastInsertId Variable value
      *
-     * @return MysqliDb
+     * @return Mysql
      */
     public function onDuplicate($updateColumns, $lastInsertId = null) {
         $this->_lastInsertId = $lastInsertId;
@@ -1359,7 +1358,7 @@ 
      * @param mixed $whereValue The value of the database field.
      * @param string $operator Comparison operator. Default is =
      *
-     * @return MysqliDb
+     * @return Mysql
      */
     public function orWhere($whereProp, $whereValue = 'DBNULL', $operator = '=') {
         return $this->where($whereProp, $whereValue, $operator, 'OR');
@@ -1375,7 +1374,7 @@ 
      * @param string $operator Comparison operator. Default is =
      * @param string $cond Condition of where statement (OR, AND)
      *
-     * @return MysqliDb
+     * @return Mysql
      */
     public function where($whereProp, $whereValue = 'DBNULL', $operator = '=', $cond = 'AND') {
         // forkaround for an old operation api
@@ -1401,7 +1400,7 @@ 
      * @param mixed $havingValue The value of the database field.
      * @param string $operator Comparison operator. Default is =
      *
-     * @return MysqliDb
+     * @return Mysql
      */
     public function orHaving($havingProp, $havingValue = null, $operator = null) {
         return $this->having($havingProp, $havingValue, $operator, 'OR');
@@ -1416,7 +1415,7 @@ 
      * @param mixed $havingValue The value of the database field.
      * @param string $operator Comparison operator. Default is =
      *
-     * @return MysqliDb
+     * @return Mysql
      */
 
     public function having($havingProp, $havingValue = 'DBNULL', $operator = '=', $cond = 'AND') {
@@ -1444,7 +1443,7 @@ 
      * @param string $joinType 'LEFT', 'INNER' etc.
      *
      * @throws Exception
-     * @return MysqliDb
+     * @return Mysql
      */
     public function join($joinTable, $joinCondition, $joinType = '') {
         $allowedTypes = array('LEFT', 'RIGHT', 'OUTER', 'INNER', 'LEFT OUTER', 'RIGHT OUTER');
@@ -1529,7 +1528,7 @@ 
      * This method does not escape strings by default so make sure you'll never use it in production.
      *
      * @author Jonas Barascu
-     * @param [[Type]] $query [[Description]]
+     * @param string $query [[Description]]
      */
     private function queryUnprepared($query) {
         // Execute query
@@ -1603,11 +1602,11 @@ 
      * @uses $MySqliDb->orderBy('id', 'desc')->orderBy('name', 'desc');
      *
      * @param string $orderByField The name of the database field.
-     * @param string $orderByDirection Order direction.
+     * @param string $orderbyDirection Order direction.
      * @param array $customFields Fieldset for ORDER BY FIELD() ordering
      *
      * @throws Exception
-     * @return MysqliDb
+     * @return Mysql
      */
     public function orderBy($orderByField, $orderbyDirection = "DESC", $customFields = null) {
         $allowedDirection = Array("ASC", "DESC");
@@ -1643,7 +1642,7 @@ 
      *
      * @param string $groupByField The name of the database field.
      *
-     * @return MysqliDb
+     * @return Mysql
      */
     public function groupBy($groupByField) {
         $groupByField = preg_replace("/[^-a-z0-9\.\(\),_\*]+/i", '', $groupByField);
@@ -1659,7 +1658,7 @@ 
      * @param  string $method The table lock method. Can be READ or WRITE.
      *
      * @throws Exception
-     * @return MysqliDb
+     * @return Mysql
      */
     public function setLockMethod($method) {
         // Switch the uppercase string
@@ -1806,7 +1805,7 @@ 
      *
      * @param string $prefix Contains a tableprefix
      *
-     * @return MysqliDb
+     * @return Mysql
      */
     public function setPrefix($prefix = '') {
         $this->prefix = $prefix;
@@ -2016,7 +2015,7 @@ 
      * @param bool $enabled Enable execution time tracking
      * @param string $stripPrefix Prefix to strip from the path in exec log
      *
-     * @return MysqliDb
+     * @return Mysql
      */
     public function setTrace($enabled, $stripPrefix = null) {
         $this->traceEnabled = $enabled;
@@ -2053,7 +2052,7 @@ 
      *
      * @param string $idField field name to use for a mapped element key
      *
-     * @return MysqliDb
+     * @return Mysql
      */
     public function map($idField) {
         $this->_mapKey = $idField;
@@ -2069,7 +2068,7 @@ 
      * @param string $whereProp The name of the database field.
      * @param mixed $whereValue The value of the database field.
      *
-     * @return dbWrapper
+     * @return Mysql
      */
     public function joinOrWhere($whereJoin, $whereProp, $whereValue = 'DBNULL', $operator = '=', $cond = 'AND') {
         return $this->joinWhere($whereJoin, $whereProp, $whereValue, $operator, 'OR');
@@ -2084,7 +2083,7 @@ 
      * @param string $whereProp The name of the database field.
      * @param mixed $whereValue The value of the database field.
      *
-     * @return dbWrapper
+     * @return Mysql
      */
     public function joinWhere($whereJoin, $whereProp, $whereValue = 'DBNULL', $operator = '=', $cond = 'AND') {
         $this->_joinAnd[$whereJoin][] = Array($cond, $whereProp, $operator, $whereValue);
@@ -2160,7 +2159,7 @@ 
      * Helper function to create dbObject with array return type
      * Added for consistency as thats default output type
      *
-     * @return MysqliDb
+     * @return Mysql
      */
     public function arrayBuilder() {
         $this->returnType = 'array';
@@ -2241,7 +2240,7 @@ 
     /**
      * Function to enable SQL_CALC_FOUND_ROWS in the get queries
      *
-     * @return MysqliDb
+     * @return Mysql
      */
     public function withTotalCount() {
         $this->setQueryOption('SQL_CALC_FOUND_ROWS');
@@ -2253,10 +2252,10 @@ 
      *
      * @uses $MySqliDb->setQueryOption('name');
      *
-     * @param string|array $options The optons name of the query.
+     * @param string $options The optons name of the query.
      *
      * @throws Exception
-     * @return MysqliDb
+     * @return Mysql
      */
     public function setQueryOption($options) {
         $allowedOptions = Array('ALL', 'DISTINCT', 'DISTINCTROW', 'HIGH_PRIORITY', 'STRAIGHT_JOIN', 'SQL_SMALL_RESULT',

core/App.php

Braces +1 added lines, -2 removed lines

@@ -34,8 +34,7 @@
         try{
             $dotEnv = new Dotenv($this->basePath);
             $dotEnv->load();
-        }
-        catch (\Dotenv\Exception\InvalidPathException $e){
+        } catch (\Dotenv\Exception\InvalidPathException $e){
 
         }
         date_default_timezone_set(env('APP_TIMEZONE', 'Asia/Shanghai'));