Rozbo / puck

core/tools/Str.php

Spacing +46 added lines, -46 removed lines

@@ -12,19 +12,19 @@ 
      *
      * @var array
      */
-    protected static $snakeCache = [];
+    protected static $snakeCache=[];
     /**
      * The cache of camel-cased words.
      *
      * @var array
      */
-    protected static $camelCache = [];
+    protected static $camelCache=[];
     /**
      * The cache of studly-cased words.
      *
      * @var array
      */
-    protected static $studlyCache = [];
+    protected static $studlyCache=[];
 
     /**
      * 判断一个字符串是否以给定字符串开始
@@ -71,7 +71,7 @@ 
             return static::$camelCache[$value];
         }
 
-        return static::$camelCache[$value] = lcfirst(static::studly($value));
+        return static::$camelCache[$value]=lcfirst(static::studly($value));
     }
 
     /**
@@ -81,15 +81,15 @@ 
      * @return string
      */
     public static function studly($value) {
-        $key = $value;
+        $key=$value;
 
         if (isset(static::$studlyCache[$key])) {
             return static::$studlyCache[$key];
         }
 
-        $value = ucwords(str_replace(['-', '_'], ' ', $value));
+        $value=ucwords(str_replace(['-', '_'], ' ', $value));
 
-        return static::$studlyCache[$key] = str_replace(' ', '', $value);
+        return static::$studlyCache[$key]=str_replace(' ', '', $value);
     }
 
     /**
@@ -100,9 +100,9 @@ 
      * @return string
      */
     public static function finish($value, $cap) {
-        $quoted = preg_quote($cap, '/');
+        $quoted=preg_quote($cap, '/');
 
-        return preg_replace('/(?:' . $quoted . ')+$/u', '', $value) . $cap;
+        return preg_replace('/(?:'.$quoted.')+$/u', '', $value).$cap;
     }
 
     /**
@@ -117,14 +117,14 @@ 
             return true;
         }
 
-        $pattern = preg_quote($pattern, '#');
+        $pattern=preg_quote($pattern, '#');
 
         // Asterisks are translated into zero-or-more regular expression wildcards
         // to make it convenient to check if the strings starts with the given
         // pattern such as "library/*", making any string check convenient.
-        $pattern = str_replace('\*', '.*', $pattern);
+        $pattern=str_replace('\*', '.*', $pattern);
 
-        return (bool)preg_match('#^' . $pattern . '\z#u', $value);
+        return (bool) preg_match('#^'.$pattern.'\z#u', $value);
     }
 
     /**
@@ -144,20 +144,20 @@ 
      * @param  string $delimiter
      * @return string
      */
-    public static function snake($value, $delimiter = '_') {
-        $key = $value;
+    public static function snake($value, $delimiter='_') {
+        $key=$value;
 
         if (isset(static::$snakeCache[$key][$delimiter])) {
             return static::$snakeCache[$key][$delimiter];
         }
 
         if (!ctype_lower($value)) {
-            $value = preg_replace('/\s+/u', '', $value);
+            $value=preg_replace('/\s+/u', '', $value);
 
-            $value = static::lower(preg_replace('/(.)(?=[A-Z])/u', '$1' . $delimiter, $value));
+            $value=static::lower(preg_replace('/(.)(?=[A-Z])/u', '$1'.$delimiter, $value));
         }
 
-        return static::$snakeCache[$key][$delimiter] = $value;
+        return static::$snakeCache[$key][$delimiter]=$value;
     }
 
     /**
@@ -178,12 +178,12 @@ 
      * @param  string $end
      * @return string
      */
-    public static function limit($value, $limit = 100, $end = '...') {
+    public static function limit($value, $limit=100, $end='...') {
         if (mb_strwidth($value, 'UTF-8') <= $limit) {
             return $value;
         }
 
-        return rtrim(mb_strimwidth($value, 0, $limit, '', 'UTF-8')) . $end;
+        return rtrim(mb_strimwidth($value, 0, $limit, '', 'UTF-8')).$end;
     }
 
     /**
@@ -194,14 +194,14 @@ 
      * @param  string $end
      * @return string
      */
-    public static function words($value, $words = 100, $end = '...') {
-        preg_match('/^\s*+(?:\S++\s*+){1,' . $words . '}/u', $value, $matches);
+    public static function words($value, $words=100, $end='...') {
+        preg_match('/^\s*+(?:\S++\s*+){1,'.$words.'}/u', $value, $matches);
 
         if (!isset($matches[0]) || static::length($value) === static::length($matches[0])) {
             return $value;
         }
 
-        return rtrim($matches[0]) . $end;
+        return rtrim($matches[0]).$end;
     }
 
     /**
@@ -221,7 +221,7 @@ 
      * @param  string|null $default
      * @return array
      */
-    public static function parseCallback($callback, $default = null) {
+    public static function parseCallback($callback, $default=null) {
         return static::contains($callback, '@') ? explode('@', $callback, 2) : [$callback, $default];
     }
 
@@ -233,7 +233,7 @@ 
      * @return bool
      */
     public static function contains($haystack, $needles) {
-        foreach ((array)$needles as $needle) {
+        foreach ((array) $needles as $needle) {
             if ($needle != '' && mb_strpos($haystack, $needle) !== false) {
                 return true;
             }
@@ -248,7 +248,7 @@ 
      * @param  int $count
      * @return string
      */
-    public static function plural($value, $count = 2) {
+    public static function plural($value, $count=2) {
         return Pluralizer::plural($value, $count);
     }
 
@@ -262,12 +262,12 @@ 
      * @param  int $length
      * @return string
      */
-    public static function quickRandom($length = 16) {
+    public static function quickRandom($length=16) {
         if (PHP_MAJOR_VERSION > 5) {
             return static::random($length);
         }
 
-        $pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+        $pool='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
 
         return substr(str_shuffle(str_repeat($pool, $length)), 0, $length);
     }
@@ -278,15 +278,15 @@ 
      * @param  int $length
      * @return string
      */
-    public static function random($length = 16) {
-        $string = '';
+    public static function random($length=16) {
+        $string='';
 
-        while (($len = strlen($string)) < $length) {
-            $size = $length - $len;
+        while (($len=strlen($string)) < $length) {
+            $size=$length - $len;
 
-            $bytes = random_bytes($size);
+            $bytes=random_bytes($size);
 
-            $string .= substr(str_replace(['/', '+', '='], '', base64_encode($bytes)), 0, $size);
+            $string.=substr(str_replace(['/', '+', '='], '', base64_encode($bytes)), 0, $size);
         }
 
         return $string;
@@ -302,7 +302,7 @@ 
      */
     public static function replaceArray($search, array $replace, $subject) {
         foreach ($replace as $value) {
-            $subject = static::replaceFirst($search, $value, $subject);
+            $subject=static::replaceFirst($search, $value, $subject);
         }
 
         return $subject;
@@ -317,7 +317,7 @@ 
      * @return string
      */
     public static function replaceFirst($search, $replace, $subject) {
-        $position = strpos($subject, $search);
+        $position=strpos($subject, $search);
 
         if ($position !== false) {
             return substr_replace($subject, $replace, $position, strlen($search));
@@ -335,7 +335,7 @@ 
      * @return string
      */
     public static function replaceLast($search, $replace, $subject) {
-        $position = strrpos($subject, $search);
+        $position=strrpos($subject, $search);
 
         if ($position !== false) {
             return substr_replace($subject, $replace, $position, strlen($search));
@@ -371,19 +371,19 @@ 
      * @param  string $separator
      * @return string
      */
-    public static function slug($title, $separator = '-') {
-        $title = static::ascii($title);
+    public static function slug($title, $separator='-') {
+        $title=static::ascii($title);
 
         // Convert all dashes/underscores into separator
-        $flip = $separator == '-' ? '_' : '-';
+        $flip=$separator == '-' ? '_' : '-';
 
-        $title = preg_replace('![' . preg_quote($flip) . ']+!u', $separator, $title);
+        $title=preg_replace('!['.preg_quote($flip).']+!u', $separator, $title);
 
         // Remove all characters that are not the separator, letters, numbers, or whitespace.
-        $title = preg_replace('![^' . preg_quote($separator) . '\pL\pN\s]+!u', '', mb_strtolower($title));
+        $title=preg_replace('![^'.preg_quote($separator).'\pL\pN\s]+!u', '', mb_strtolower($title));
 
         // Replace all separator characters and whitespace by a single separator
-        $title = preg_replace('![' . preg_quote($separator) . '\s]+!u', $separator, $title);
+        $title=preg_replace('!['.preg_quote($separator).'\s]+!u', $separator, $title);
 
         return trim($title, $separator);
     }
@@ -396,7 +396,7 @@ 
      */
     public static function ascii($value) {
         foreach (static::charsArray() as $key => $val) {
-            $value = str_replace($val, $key, $value);
+            $value=str_replace($val, $key, $value);
         }
 
         return preg_replace('/[^\x20-\x7E]/u', '', $value);
@@ -418,7 +418,7 @@ 
             return $charsArray;
         }
 
-        return $charsArray = [
+        return $charsArray=[
             '0' => ['°', '₀', '۰'],
             '1' => ['¹', '₁', '۱'],
             '2' => ['²', '₂', '۲'],
@@ -542,7 +542,7 @@ 
      * @return string
      */
     public static function ucfirst($string) {
-        return static::upper(static::substr($string, 0, 1)) . static::substr($string, 1);
+        return static::upper(static::substr($string, 0, 1)).static::substr($string, 1);
     }
 
     /**
@@ -563,7 +563,7 @@ 
      * @param  int|null $length
      * @return string
      */
-    public static function substr($string, $start, $length = null) {
+    public static function substr($string, $start, $length=null) {
         return mb_substr($string, $start, $length, 'UTF-8');
     }
 }
\ No newline at end of file

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

Spacing +127 added lines, -127 removed lines

@@ -9,13 +9,13 @@ 
      *
      * @var int
      */
-    public static $pageLimit = 20;
+    public static $pageLimit=20;
     /**
      * Variable that holds total pages count of last paginate() query
      *
      * @var int
      */
-    public static $totalPages = 0;
+    public static $totalPages=0;
     /**
      * Models path
      *
@@ -33,33 +33,33 @@ 
      *
      * @var boolean
      */
-    public $isNew = true;
+    public $isNew=true;
     /**
      * Return type: 'Array' to return results as array, 'Object' as object
      * 'Json' as json string
      *
      * @var string
      */
-    public $returnType = 'Object';
+    public $returnType='Object';
     /**
      * An array that holds insert/update/select errors
      *
      * @var array
      */
-    public $errors = null;
+    public $errors=null;
     /**
      * Primary key for an object. 'id' is a default value.
      *
      * @var stating
      */
-    protected $primaryKey = 'id';
+    protected $primaryKey='id';
     /**
      * Table name for an object. Class name will be used by default
      *
      * @var stating
      */
     protected $dbTable;
-    protected $dbConn = null;
+    protected $dbConn=null;
     protected $prefix;
     /**
      * Working instance of MysqliDb created earlier
@@ -73,24 +73,24 @@ 
      *
      * @var string
      */
-    private $_with = Array();
+    private $_with=Array();
 
     /**
      * @param array $data Data to preload on object creation
      */
     public function __construct() {
-        $this->db = app('db')->connect($this->dbConn);
+        $this->db=app('db')->connect($this->dbConn);
         if ($this->prefix) {
-            $this->db = $this->db->setPrefix($this->prefix);
+            $this->db=$this->db->setPrefix($this->prefix);
         }
         if (!$this->dbTable) {
-            $classFull = get_class($this);
-            $classArray = explode("\\", $classFull);
-            $classSelf = array_pop($classArray);
-            $classSelf = Str::snake($classSelf);
-            $this->dbTable = $classSelf;
+            $classFull=get_class($this);
+            $classArray=explode("\\", $classFull);
+            $classSelf=array_pop($classArray);
+            $classSelf=Str::snake($classSelf);
+            $this->dbTable=$classSelf;
         }
-        $this->db = $this->db->table($this->dbTable);
+        $this->db=$this->db->table($this->dbTable);
     }
 
     /**
@@ -100,10 +100,10 @@ 
      * @return dbObject
      */
     public static function table($tableName) {
-        $tableName = preg_replace("/[^-a-z0-9_]+/i", '', $tableName);
+        $tableName=preg_replace("/[^-a-z0-9_]+/i", '', $tableName);
         if (!class_exists($tableName))
             eval ("class $tableName extends dbObject {}");
-        return new $tableName ();
+        return new $tableName();
     }
 
     /**
@@ -117,23 +117,23 @@ 
      * @return mixed
      */
     public static function __callStatic($method, $arg) {
-        $obj = new static;
-        $result = call_user_func_array(array($obj, $method), $arg);
+        $obj=new static;
+        $result=call_user_func_array(array($obj, $method), $arg);
         if (method_exists($obj, $method))
             return $result;
         return $obj;
     }
 
-    public static function autoload($path = null) {
+    public static function autoload($path=null) {
         if ($path)
-            static::$modelPath = $path . "/";
+            static::$modelPath=$path."/";
         else
-            static::$modelPath = __DIR__ . "/models/";
+            static::$modelPath=__DIR__."/models/";
         spl_autoload_register("dbObject::dbObjectAutoload");
     }
 
     private static function dbObjectAutoload($classname) {
-        $filename = static::$modelPath . $classname . ".php";
+        $filename=static::$modelPath.$classname.".php";
         if (file_exists($filename))
             include($filename);
     }
@@ -153,20 +153,20 @@ 
             return $this->data[$name];
 
         if (property_exists($this, 'relations') && isset ($this->relations[$name])) {
-            $relationType = strtolower($this->relations[$name][0]);
-            $modelName = $this->relations[$name][1];
+            $relationType=strtolower($this->relations[$name][0]);
+            $modelName=$this->relations[$name][1];
             switch ($relationType) {
                 case 'hasone':
-                    $key = isset ($this->relations[$name][2]) ? $this->relations[$name][2] : $name;
-                    $obj = new $modelName;
-                    $obj->returnType = $this->returnType;
-                    return $this->data[$name] = $obj->byId($this->data[$key]);
+                    $key=isset ($this->relations[$name][2]) ? $this->relations[$name][2] : $name;
+                    $obj=new $modelName;
+                    $obj->returnType=$this->returnType;
+                    return $this->data[$name]=$obj->byId($this->data[$key]);
                     break;
                 case 'hasmany':
-                    $key = $this->relations[$name][2];
-                    $obj = new $modelName;
-                    $obj->returnType = $this->returnType;
-                    return $this->data[$name] = $obj->where($key, $this->data[$this->primaryKey])->get();
+                    $key=$this->relations[$name][2];
+                    $obj=new $modelName;
+                    $obj->returnType=$this->returnType;
+                    return $this->data[$name]=$obj->where($key, $this->data[$this->primaryKey])->get();
                     break;
                 default:
                     break;
@@ -189,7 +189,7 @@ 
         if (property_exists($this, 'hidden') && array_search($name, $this->hidden) !== false)
             return;
 
-        $this->data[$name] = $value;
+        $this->data[$name]=$value;
     }
 
     public function __isset($name) {
@@ -209,7 +209,7 @@ 
      *
      * @return mixed insert id or false in case of failure
      */
-    public function save($data = null) {
+    public function save($data=null) {
         if ($this->isNew)
             return $this->insert();
         return $this->update($data);
@@ -220,22 +220,22 @@ 
      */
     public function insert() {
         if (!empty ($this->timestamps) && in_array("createdAt", $this->timestamps))
-            $this->createdAt = date("Y-m-d H:i:s");
-        $sqlData = $this->prepareData();
+            $this->createdAt=date("Y-m-d H:i:s");
+        $sqlData=$this->prepareData();
         if (!$this->validate($sqlData))
             return false;
 
-        $id = $this->db->insert($this->dbTable, $sqlData);
+        $id=$this->db->insert($this->dbTable, $sqlData);
         if (!empty ($this->primaryKey) && empty ($this->data[$this->primaryKey]))
-            $this->data[$this->primaryKey] = $id;
-        $this->isNew = false;
+            $this->data[$this->primaryKey]=$id;
+        $this->isNew=false;
 
         return $id;
     }
 
     private function prepareData() {
-        $this->errors = Array();
-        $sqlData = Array();
+        $this->errors=Array();
+        $sqlData=Array();
         if (count($this->data) == 0)
             return Array();
 
@@ -247,27 +247,27 @@ 
 
         foreach ($this->data as $key => &$value) {
             if ($value instanceof dbObject && $value->isNew == true) {
-                $id = $value->save();
+                $id=$value->save();
                 if ($id)
-                    $value = $id;
+                    $value=$id;
                 else
-                    $this->errors = array_merge($this->errors, $value->errors);
+                    $this->errors=array_merge($this->errors, $value->errors);
             }
 
             if (!in_array($key, array_keys($this->dbFields)))
                 continue;
 
             if (!is_array($value)) {
-                $sqlData[$key] = $value;
+                $sqlData[$key]=$value;
                 continue;
             }
 
             if (isset ($this->jsonFields) && in_array($key, $this->jsonFields))
-                $sqlData[$key] = json_encode($value);
+                $sqlData[$key]=json_encode($value);
             else if (isset ($this->arrayFields) && in_array($key, $this->arrayFields))
-                $sqlData[$key] = implode("|", $value);
+                $sqlData[$key]=implode("|", $value);
             else
-                $sqlData[$key] = $value;
+                $sqlData[$key]=$value;
         }
         return $sqlData;
     }
@@ -280,23 +280,23 @@ 
             return true;
 
         foreach ($this->dbFields as $key => $desc) {
-            $type = null;
-            $required = false;
+            $type=null;
+            $required=false;
             if (isset ($data[$key]))
-                $value = $data[$key];
+                $value=$data[$key];
             else
-                $value = null;
+                $value=null;
 
             if (is_array($value))
                 continue;
 
             if (isset ($desc[0]))
-                $type = $desc[0];
+                $type=$desc[0];
             if (isset ($desc[1]) && ($desc[1] == 'required'))
-                $required = true;
+                $required=true;
 
             if ($required && strlen($value) == 0) {
-                $this->errors[] = Array($this->dbTable . "." . $key => "is required");
+                $this->errors[]=Array($this->dbTable.".".$key => "is required");
                 continue;
             }
             if ($value == null)
@@ -304,29 +304,29 @@ 
 
             switch ($type) {
                 case "text";
-                    $regexp = null;
+                    $regexp=null;
                     break;
                 case "int":
-                    $regexp = "/^[0-9]*$/";
+                    $regexp="/^[0-9]*$/";
                     break;
                 case "double":
-                    $regexp = "/^[0-9\.]*$/";
+                    $regexp="/^[0-9\.]*$/";
                     break;
                 case "bool":
-                    $regexp = '/^[yes|no|0|1|true|false]$/i';
+                    $regexp='/^[yes|no|0|1|true|false]$/i';
                     break;
                 case "datetime":
-                    $regexp = "/^[0-9a-zA-Z -:]*$/";
+                    $regexp="/^[0-9a-zA-Z -:]*$/";
                     break;
                 default:
-                    $regexp = $type;
+                    $regexp=$type;
                     break;
             }
             if (!$regexp)
                 continue;
 
             if (!preg_match($regexp, $value)) {
-                $this->errors[] = Array($this->dbTable . "." . $key => "$type validation failed");
+                $this->errors[]=Array($this->dbTable.".".$key => "$type validation failed");
                 continue;
             }
         }
@@ -336,7 +336,7 @@ 
     /**
      * @param array $data Optional update data to apply to the object
      */
-    public function update($data = null) {
+    public function update($data=null) {
         if (empty ($this->dbFields))
             return false;
 
@@ -345,13 +345,13 @@ 
 
         if ($data) {
             foreach ($data as $k => $v)
-                $this->$k = $v;
+                $this->$k=$v;
         }
 
         if (!empty ($this->timestamps) && in_array("updatedAt", $this->timestamps))
-            $this->updatedAt = date("Y-m-d H:i:s");
+            $this->updatedAt=date("Y-m-d H:i:s");
 
-        $sqlData = $this->prepareData();
+        $sqlData=$this->prepareData();
         if (!$this->validate($sqlData))
             return false;
 
@@ -384,7 +384,7 @@ 
         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);;
+        return call_user_func_array(array($this->db, $method), $arg); ;
     }
 
     /**
@@ -411,11 +411,11 @@ 
      * @return array Converted data
      */
     public function toArray() {
-        $data = $this->data;
+        $data=$this->data;
         $this->processAllWith($data);
         foreach ($data as &$d) {
             if ($d instanceof dbObject)
-                $d = $d->data;
+                $d=$d->data;
         }
         return $data;
     }
@@ -425,40 +425,40 @@ 
      *
      * @param array $data
      */
-    private function processAllWith(&$data, $shouldReset = true) {
+    private function processAllWith(&$data, $shouldReset=true) {
         if (count($this->_with) == 0)
             return;
 
         foreach ($this->_with as $name => $opts) {
-            $relationType = strtolower($opts[0]);
-            $modelName = $opts[1];
+            $relationType=strtolower($opts[0]);
+            $modelName=$opts[1];
             if ($relationType == 'hasone') {
-                $obj = new $modelName;
-                $table = $obj->dbTable;
-                $primaryKey = $obj->primaryKey;
+                $obj=new $modelName;
+                $table=$obj->dbTable;
+                $primaryKey=$obj->primaryKey;
 
                 if (!isset ($data[$table])) {
-                    $data[$name] = $this->$name;
+                    $data[$name]=$this->$name;
                     continue;
                 }
                 if ($data[$table][$primaryKey] === null) {
-                    $data[$name] = null;
+                    $data[$name]=null;
                 } else {
                     if ($this->returnType == 'Object') {
-                        $item = new $modelName ($data[$table]);
-                        $item->returnType = $this->returnType;
-                        $item->isNew = false;
-                        $data[$name] = $item;
+                        $item=new $modelName($data[$table]);
+                        $item->returnType=$this->returnType;
+                        $item->isNew=false;
+                        $data[$name]=$item;
                     } else {
-                        $data[$name] = $data[$table];
+                        $data[$name]=$data[$table];
                     }
                 }
                 unset ($data[$table]);
             } else
-                $data[$name] = $this->$name;
+                $data[$name]=$this->$name;
         }
         if ($shouldReset)
-            $this->_with = Array();
+            $this->_with=Array();
     }
 
     /**
@@ -471,24 +471,24 @@ 
      *
      * @return array Array of dbObjects
      */
-    protected function get($limit = null, $fields = null) {
-        $objects = Array();
+    protected function get($limit=null, $fields=null) {
+        $objects=Array();
         $this->processHasOneWith();
-        $results = $this->db->ArrayBuilder()->get($this->dbTable, $limit, $fields);
+        $results=$this->db->ArrayBuilder()->get($this->dbTable, $limit, $fields);
         if ($this->db->count == 0)
             return null;
 
         foreach ($results as &$r) {
             $this->processArrays($r);
-            $this->data = $r;
+            $this->data=$r;
             $this->processAllWith($r, false);
             if ($this->returnType == 'Object') {
-                $item = new static ($r);
-                $item->isNew = false;
-                $objects[] = $item;
+                $item=new static ($r);
+                $item->isNew=false;
+                $objects[]=$item;
             }
         }
-        $this->_with = Array();
+        $this->_with=Array();
         if ($this->returnType == 'Object')
             return $objects;
 
@@ -502,11 +502,11 @@ 
         if (count($this->_with) == 0)
             return;
         foreach ($this->_with as $name => $opts) {
-            $relationType = strtolower($opts[0]);
-            $modelName = $opts[1];
-            $key = null;
+            $relationType=strtolower($opts[0]);
+            $modelName=$opts[1];
+            $key=null;
             if (isset ($opts[2]))
-                $key = $opts[2];
+                $key=$opts[2];
             if ($relationType == 'hasone') {
                 $this->db->setQueryOption("MYSQLI_NESTJOIN");
                 $this->join($modelName, $key);
@@ -525,18 +525,18 @@ 
      *
      * @return dbObject
      */
-    private function join($objectName, $key = null, $joinType = 'LEFT', $primaryKey = null) {
-        $joinObj = new $objectName;
+    private function join($objectName, $key=null, $joinType='LEFT', $primaryKey=null) {
+        $joinObj=new $objectName;
         if (!$key)
-            $key = $objectName . "id";
+            $key=$objectName."id";
 
         if (!$primaryKey)
-            $primaryKey = $this->db->getPrefix() . $joinObj->dbTable . "." . $joinObj->primaryKey;
+            $primaryKey=$this->db->getPrefix().$joinObj->dbTable.".".$joinObj->primaryKey;
 
         if (!strchr($key, '.'))
-            $joinStr = $this->db->getPrefix() . $this->dbTable . ".{$key} = " . $primaryKey;
+            $joinStr=$this->db->getPrefix().$this->dbTable.".{$key} = ".$primaryKey;
         else
-            $joinStr = $this->db->getPrefix() . "{$key} = " . $primaryKey;
+            $joinStr=$this->db->getPrefix()."{$key} = ".$primaryKey;
 
         $this->db->join($joinObj->dbTable, $joinStr, $joinType);
         return $this;
@@ -548,12 +548,12 @@ 
     private function processArrays(&$data) {
         if (isset ($this->jsonFields) && is_array($this->jsonFields)) {
             foreach ($this->jsonFields as $key)
-                $data[$key] = json_decode($data[$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]);
+                $data[$key]=explode("|", $data[$key]);
         }
     }
 
@@ -563,7 +563,7 @@ 
      * @return int
      */
     protected function count() {
-        $res = $this->db->ArrayBuilder()->getValue($this->dbTable, "count(*)");
+        $res=$this->db->ArrayBuilder()->getValue($this->dbTable, "count(*)");
         if (!$res)
             return 0;
         return $res;
@@ -575,7 +575,7 @@ 
      * @return dbObject
      */
     private function JsonBuilder() {
-        $this->returnType = 'Json';
+        $this->returnType='Json';
         return $this;
     }
 
@@ -589,7 +589,7 @@ 
      * @return dbObject
      */
     private function ArrayBuilder() {
-        $this->returnType = 'Array';
+        $this->returnType='Array';
         return $this;
     }
 
@@ -600,7 +600,7 @@ 
      * @return dbObject
      */
     private function ObjectBuilder() {
-        $this->returnType = 'Object';
+        $this->returnType='Object';
         return $this;
     }
 
@@ -613,8 +613,8 @@ 
      *
      * @return dbObject|array
      */
-    private function byId($id, $fields = null) {
-        $this->db->where($this->db->getPrefix() . $this->dbTable . '.' . $this->primaryKey, $id);
+    private function byId($id, $fields=null) {
+        $this->db->where($this->db->getPrefix().$this->dbTable.'.'.$this->primaryKey, $id);
         return $this->getOne($fields);
     }
 
@@ -626,22 +626,22 @@ 
      *
      * @return dbObject
      */
-    protected function getOne($fields = null) {
+    protected function getOne($fields=null) {
         $this->processHasOneWith();
-        $results = $this->db->ArrayBuilder()->getOne($this->dbTable, $fields);
+        $results=$this->db->ArrayBuilder()->getOne($this->dbTable, $fields);
         if ($this->db->count == 0)
             return null;
 
         $this->processArrays($results);
-        $this->data = $results;
+        $this->data=$results;
         $this->processAllWith($results);
         if ($this->returnType == 'Json')
             return json_encode($results);
         if ($this->returnType == 'Array')
             return $results;
 
-        $item = new static ($results);
-        $item->isNew = false;
+        $item=new static ($results);
+        $item->isNew=false;
 
         return $item;
     }
@@ -658,7 +658,7 @@ 
         if (!property_exists($this, 'relations') && !isset ($this->relations[$name]))
             die ("No relation with name $objectName found");
 
-        $this->_with[$objectName] = $this->relations[$objectName];
+        $this->_with[$objectName]=$this->relations[$objectName];
 
         return $this;
     }
@@ -679,23 +679,23 @@ 
      * @param array|string $fields Array or coma separated list of fields to fetch
      * @return array
      */
-    private function paginate($page, $fields = null) {
-        $this->db->pageLimit = self::$pageLimit;
-        $res = $this->db->paginate($this->dbTable, $page, $fields);
-        self::$totalPages = $this->db->totalPages;
+    private function paginate($page, $fields=null) {
+        $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;
 
         foreach ($res as &$r) {
             $this->processArrays($r);
-            $this->data = $r;
+            $this->data=$r;
             $this->processAllWith($r, false);
             if ($this->returnType == 'Object') {
-                $item = new static ($r);
-                $item->isNew = false;
-                $objects[] = $item;
+                $item=new static ($r);
+                $item->isNew=false;
+                $objects[]=$item;
             }
         }
-        $this->_with = Array();
+        $this->_with=Array();
         if ($this->returnType == 'Object')
             return $objects;
 

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/Db.php

Spacing +12 added lines, -12 removed lines

@@ -9,38 +9,38 @@ 
     protected $db;
     protected $field;
     protected $table;
-    protected $limitCount = null;
+    protected $limitCount=null;
 
     private $connPool;
 
-    public function connect($conn = null) {
+    public function connect($conn=null) {
         if ($conn === null) {
-            $conn = 'db.main';
+            $conn='db.main';
         }
-        $dbConf = [];
+        $dbConf=[];
         if (is_string($conn)) {
-            $dbConf = app('config')->get($conn);
+            $dbConf=app('config')->get($conn);
         } elseif (is_array($conn)) {
-            $dbConf = $conn;
+            $dbConf=$conn;
         } else {
             throw new \InvalidArgumentException("数据库配置必须为字符串或者数组");
         }
         if (is_null($dbConf)) {
             throw new \InvalidArgumentException("数据库配置异常！");
         }
-        $confMd5 = md5(serialize($dbConf));
+        $confMd5=md5(serialize($dbConf));
         if (!isset($this->connPool[$confMd5])) {
-            $obj = new Mysql($dbConf);
-            $this->connPool[$confMd5] = $obj;
+            $obj=new Mysql($dbConf);
+            $this->connPool[$confMd5]=$obj;
         }
         return $this->connPool[$confMd5];
     }
 
 
     public function __call($method, $arg) {
-        $ret = $this;
+        $ret=$this;
         if (method_exists($this->db, $method)) {
-            $ret = call_user_func_array(array($this->db, $method), $arg);
+            $ret=call_user_func_array(array($this->db, $method), $arg);
         }
         return $ret == $this->db ? $this : $ret;
     }
@@ -49,6 +49,6 @@ 
         if (property_exists($this->db, $name)) {
             return $this->db->$name;
         }
-        throw new MemberAccessException('model Property ' . $name . ' not exists');
+        throw new MemberAccessException('model Property '.$name.' not exists');
     }
 }
\ No newline at end of file

core/Mysql.php

Spacing +381 added lines, -381 removed lines

@@ -23,32 +23,32 @@ 
      * Variable which holds an amount of returned rows during get/getOne/select queries
      * @var string
      */
-    public $count = 0;
+    public $count=0;
     /**
      * Variable which holds an amount of returned rows during get/getOne/select queries with withTotalCount()
      * @var string
      */
-    public $totalCount = 0;
+    public $totalCount=0;
     /**
      * Return type: 'array' to return results as array, 'object' as object
      * 'json' as json string
      * @var string
      */
-    public $returnType = 'array';
-    public $trace = array();
+    public $returnType='array';
+    public $trace=array();
     /**
      * Per page limit for pagination
      *
      * @var int
      */
 
-    public $pageLimit = 20;
+    public $pageLimit=20;
     /**
      * Variable that holds total pages count of last paginate() query
      *
      * @var int
      */
-    public $totalPages = 0;
+    public $totalPages=0;
     /**
      * MySQLi instance
      * @var mysqli
@@ -68,53 +68,53 @@ 
      * The SQL query options required after SELECT, INSERT, UPDATE or DELETE
      * @var string
      */
-    protected $_queryOptions = array();
+    protected $_queryOptions=array();
     /**
      * An array that holds where joins
      * @var array
      */
-    protected $_join = array();
+    protected $_join=array();
     /**
      * An array that holds where conditions
      * @var array
      */
-    protected $_where = array();
+    protected $_where=array();
     /**
      * An array that holds where join ands
      *
      * @var array
      */
-    protected $_joinAnd = array();
+    protected $_joinAnd=array();
     /**
      * An array that holds having conditions
      * @var array
      */
-    protected $_having = array();
+    protected $_having=array();
     /**
      * Dynamic type list for order by condition value
      * @var array
      */
-    protected $_orderBy = array(); // Create the empty 0 index
+    protected $_orderBy=array(); // Create the empty 0 index
     /**
      * Dynamic type list for group by condition value
      * @var array
      */
-    protected $_groupBy = array();
+    protected $_groupBy=array();
     /**
      * Dynamic type list for tempromary locking tables.
      * @var array
      */
-    protected $_tableLocks = array();
+    protected $_tableLocks=array();
     /**
      * Variable which holds the current table lock method.
      * @var string
      */
-    protected $_tableLockMethod = "READ";
+    protected $_tableLockMethod="READ";
     /**
      * Dynamic array that holds a combination of where condition/table data value types and parameter references
      * @var array
      */
-    protected $_bindParams = array('');
+    protected $_bindParams=array('');
     /**
      * Variable which holds last statement error
      * @var string
@@ -139,39 +139,39 @@ 
      * Is Subquery object
      * @var bool
      */
-    protected $isSubQuery = false;
+    protected $isSubQuery=false;
     /**
      * Name of the auto increment column
      * @var int
      */
-    protected $_lastInsertId = null;
+    protected $_lastInsertId=null;
     /**
      * Column names for update when using onDuplicate method
      * @var array
      */
-    protected $_updateColumns = null;
+    protected $_updateColumns=null;
     /**
      * Should join() results be nested by table
      * @var bool
      */
-    protected $_nestJoin = false;
+    protected $_nestJoin=false;
     /**
      * FOR UPDATE flag
      * @var bool
      */
-    protected $_forUpdate = false;
+    protected $_forUpdate=false;
 
     /**
      * LOCK IN SHARE MODE flag
      * @var bool
      */
-    protected $_lockInShareMode = false;
+    protected $_lockInShareMode=false;
 
     /**
      * Key field for Map()'ed result array
      * @var string
      */
-    protected $_mapKey = null;
+    protected $_mapKey=null;
 
     /**
      * Variables for query execution tracing
@@ -183,7 +183,7 @@ 
      * Table prefix
      * @var string
      */
-    private $prefix = '';
+    private $prefix='';
     /**
      * 字段列表
      * @var string
@@ -193,7 +193,7 @@ 
      * 含有表前缀的表名
      * @var string
      */
-    private $tableName = '';
+    private $tableName='';
 
     /**
      * @param string $host
@@ -203,30 +203,30 @@ 
      * @param int $port
      * @param string $charset
      */
-    public function __construct($host = null, $username = null, $password = null, $db = null, $port = null, $charset = 'utf8') {
-        $isSubQuery = false;
+    public function __construct($host=null, $username=null, $password=null, $db=null, $port=null, $charset='utf8') {
+        $isSubQuery=false;
 
         // if params were passed as array
         if (is_array($host)) {
             foreach ($host as $key => $val) {
-                $$key = $val;
+                $$key=$val;
             }
         }
         // if host were set as mysqli socket
         if (is_object($host)) {
-            $this->_mysqli = $host;
+            $this->_mysqli=$host;
         } else {
-            $this->host = $host;
+            $this->host=$host;
         }
 
-        $this->_username = $username;
-        $this->_password = $password;
-        $this->db = $db;
-        $this->port = $port;
-        $this->charset = $charset;
+        $this->_username=$username;
+        $this->_password=$password;
+        $this->db=$db;
+        $this->port=$port;
+        $this->charset=$charset;
 
         if ($isSubQuery) {
-            $this->isSubQuery = true;
+            $this->isSubQuery=true;
             return;
         }
 
@@ -234,7 +234,7 @@ 
             $this->setPrefix($prefix);
         }
 
-        self::$_instance = $this;
+        self::$_instance=$this;
     }
 
     /**
@@ -257,7 +257,7 @@ 
      *
      * @return MysqliDb
      */
-    public static function subQuery($subQueryAlias = "") {
+    public static function subQuery($subQueryAlias="") {
         return new self(array('host' => $subQueryAlias, 'isSubQuery' => true));
     }
 
@@ -271,7 +271,7 @@ 
         if (!$this->_mysqli)
             return;
         $this->_mysqli->close();
-        $this->_mysqli = null;
+        $this->_mysqli=null;
     }
 
     /**
@@ -280,7 +280,7 @@ 
      * @return MysqliDb
      */
     public function jsonBuilder() {
-        $this->returnType = 'json';
+        $this->returnType='json';
         return $this;
     }
 
@@ -290,7 +290,7 @@ 
      * @return MysqliDb
      */
     public function objectBuilder() {
-        $this->returnType = 'object';
+        $this->returnType='object';
         return $this;
     }
 
@@ -304,8 +304,8 @@ 
      *
      * @return array|null Contains the returned row from the query.
      */
-    public function rawQueryOne($query, $bindParams = null) {
-        $res = $this->rawQuery($query, $bindParams);
+    public function rawQueryOne($query, $bindParams=null) {
+        $res=$this->rawQuery($query, $bindParams);
         if (is_array($res) && isset($res[0])) {
             return $res[0];
         }
@@ -321,14 +321,14 @@ 
      *
      * @return array Contains the returned rows from the query.
      */
-    public function rawQuery($query, $bindParams = null) {
-        $params = array(''); // Create the empty 0 index
-        $this->_query = $query;
-        $stmt = $this->_prepareQuery();
+    public function rawQuery($query, $bindParams=null) {
+        $params=array(''); // Create the empty 0 index
+        $this->_query=$query;
+        $stmt=$this->_prepareQuery();
 
         if (is_array($bindParams) === true) {
             foreach ($bindParams as $prop => $val) {
-                $params[0] .= $this->_determineType($val);
+                $params[0].=$this->_determineType($val);
                 array_push($params, $bindParams[$prop]);
             }
 
@@ -336,11 +336,11 @@ 
         }
 
         $stmt->execute();
-        $this->count = $stmt->affected_rows;
-        $this->_stmtError = $stmt->error;
-        $this->_stmtErrno = $stmt->errno;
-        $this->_lastQuery = $this->replacePlaceHolders($this->_query, $params);
-        $res = $this->_dynamicBindResults($stmt);
+        $this->count=$stmt->affected_rows;
+        $this->_stmtError=$stmt->error;
+        $this->_stmtErrno=$stmt->errno;
+        $this->_lastQuery=$this->replacePlaceHolders($this->_query, $params);
+        $res=$this->_dynamicBindResults($stmt);
         $this->reset();
 
         return $res;
@@ -353,15 +353,15 @@ 
      * @return mysqli_stmt
      */
     protected function _prepareQuery() {
-        if (!$stmt = $this->mysqli()->prepare($this->_query)) {
-            $msg = $this->mysqli()->error . " query: " . $this->_query;
-            $num = $this->mysqli()->errno;
+        if (!$stmt=$this->mysqli()->prepare($this->_query)) {
+            $msg=$this->mysqli()->error." query: ".$this->_query;
+            $num=$this->mysqli()->errno;
             $this->reset();
             throw new Exception($msg, $num);
         }
 
         if ($this->traceEnabled) {
-            $this->traceStartQ = microtime(true);
+            $this->traceStartQ=microtime(true);
         }
 
         return $stmt;
@@ -394,10 +394,10 @@ 
             throw new Exception('MySQL host is not set');
         }
 
-        $this->_mysqli = new mysqli($this->host, $this->_username, $this->_password, $this->db, $this->port);
+        $this->_mysqli=new mysqli($this->host, $this->_username, $this->_password, $this->db, $this->port);
 
         if ($this->_mysqli->connect_error) {
-            throw new Exception('Connect Error ' . $this->_mysqli->connect_errno . ': ' . $this->_mysqli->connect_error, $this->_mysqli->connect_errno);
+            throw new Exception('Connect Error '.$this->_mysqli->connect_errno.': '.$this->_mysqli->connect_error, $this->_mysqli->connect_errno);
         }
 
         if ($this->charset) {
@@ -412,26 +412,26 @@ 
      */
     protected function reset() {
         if ($this->traceEnabled) {
-            $this->trace[] = array($this->_lastQuery, (microtime(true) - $this->traceStartQ), $this->_traceGetCaller());
+            $this->trace[]=array($this->_lastQuery, (microtime(true) - $this->traceStartQ), $this->_traceGetCaller());
         }
 
-        $this->_where = array();
-        $this->_having = array();
-        $this->_join = array();
-        $this->_joinAnd = array();
-        $this->_orderBy = array();
-        $this->_groupBy = array();
-        $this->_bindParams = array(''); // Create the empty 0 index
-        $this->_query = null;
-        $this->_queryOptions = array();
-        $this->returnType = 'array';
-        $this->_nestJoin = false;
-        $this->_forUpdate = false;
-        $this->_lockInShareMode = false;
-        $this->tableName = '';
-        $this->_lastInsertId = null;
-        $this->_updateColumns = null;
-        $this->_mapKey = null;
+        $this->_where=array();
+        $this->_having=array();
+        $this->_join=array();
+        $this->_joinAnd=array();
+        $this->_orderBy=array();
+        $this->_groupBy=array();
+        $this->_bindParams=array(''); // Create the empty 0 index
+        $this->_query=null;
+        $this->_queryOptions=array();
+        $this->returnType='array';
+        $this->_nestJoin=false;
+        $this->_forUpdate=false;
+        $this->_lockInShareMode=false;
+        $this->tableName='';
+        $this->_lastInsertId=null;
+        $this->_updateColumns=null;
+        $this->_mapKey=null;
     }
 
     /**
@@ -440,14 +440,14 @@ 
      * @return string with information
      */
     private function _traceGetCaller() {
-        $dd = debug_backtrace();
-        $caller = next($dd);
+        $dd=debug_backtrace();
+        $caller=next($dd);
         while (isset($caller) && $caller["file"] == __FILE__) {
-            $caller = next($dd);
+            $caller=next($dd);
         }
 
-        return __CLASS__ . "->" . $caller["function"] . "() >>  file \"" .
-            str_replace($this->traceStripPrefix, '', $caller["file"]) . "\" line #" . $caller["line"] . " ";
+        return __CLASS__."->".$caller["function"]."() >>  file \"".
+            str_replace($this->traceStripPrefix, '', $caller["file"])."\" line #".$caller["line"]." ";
     }
 
     /**
@@ -495,9 +495,9 @@ 
         //https://github.com/facebook/hhvm/issues/5155
         //Referenced data array is required by mysqli since PHP 5.3+
         if (strnatcmp(phpversion(), '5.3') >= 0) {
-            $refs = array();
+            $refs=array();
             foreach ($arr as $key => $value) {
-                $refs[$key] = &$arr[$key];
+                $refs[$key]=&$arr[$key];
             }
             return $refs;
         }
@@ -513,25 +513,25 @@ 
      * @return string
      */
     protected function replacePlaceHolders($str, $vals) {
-        $i = 1;
-        $newStr = "";
+        $i=1;
+        $newStr="";
 
         if (empty($vals)) {
             return $str;
         }
 
-        while ($pos = strpos($str, "?")) {
-            $val = $vals[$i++];
+        while ($pos=strpos($str, "?")) {
+            $val=$vals[$i++];
             if (is_object($val)) {
-                $val = '[object]';
+                $val='[object]';
             }
             if ($val === null) {
-                $val = 'NULL';
+                $val='NULL';
             }
-            $newStr .= substr($str, 0, $pos) . "'" . $val . "'";
-            $str = substr($str, $pos + 1);
+            $newStr.=substr($str, 0, $pos)."'".$val."'";
+            $str=substr($str, $pos + 1);
         }
-        $newStr .= $str;
+        $newStr.=$str;
         return $newStr;
     }
 
@@ -544,34 +544,34 @@ 
      * @return array The results of the SQL fetch.
      */
     protected function _dynamicBindResults(\mysqli_stmt $stmt) {
-        $parameters = array();
-        $results = array();
+        $parameters=array();
+        $results=array();
         /**
          * @see http://php.net/manual/en/mysqli-result.fetch-fields.php
          */
-        $mysqlLongType = 252;
-        $shouldStoreResult = false;
+        $mysqlLongType=252;
+        $shouldStoreResult=false;
 
-        $meta = $stmt->result_metadata();
+        $meta=$stmt->result_metadata();
 
         // 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();
 
-        $row = array();
-        while ($field = $meta->fetch_field()) {
+        $row=array();
+        while ($field=$meta->fetch_field()) {
             if ($field->type == $mysqlLongType) {
-                $shouldStoreResult = true;
+                $shouldStoreResult=true;
             }
 
             if ($this->_nestJoin && $field->table != $this->tableName) {
-                $field->table = substr($field->table, strlen($this->prefix));
-                $row[$field->table][$field->name] = null;
-                $parameters[] = &$row[$field->table][$field->name];
+                $field->table=substr($field->table, strlen($this->prefix));
+                $row[$field->table][$field->name]=null;
+                $parameters[]=&$row[$field->table][$field->name];
             } else {
-                $row[$field->name] = null;
-                $parameters[] = &$row[$field->name];
+                $row[$field->name]=null;
+                $parameters[]=&$row[$field->name];
             }
         }
 
@@ -584,37 +584,37 @@ 
 
         call_user_func_array(array($stmt, 'bind_result'), $parameters);
 
-        $this->totalCount = 0;
-        $this->count = 0;
+        $this->totalCount=0;
+        $this->count=0;
 
         while ($stmt->fetch()) {
             if ($this->returnType == 'object') {
-                $result = new stdClass ();
+                $result=new stdClass();
                 foreach ($row as $key => $val) {
                     if (is_array($val)) {
-                        $result->$key = new stdClass ();
+                        $result->$key=new stdClass();
                         foreach ($val as $k => $v) {
-                            $result->$key->$k = $v;
+                            $result->$key->$k=$v;
                         }
                     } else {
-                        $result->$key = $val;
+                        $result->$key=$val;
                     }
                 }
             } else {
-                $result = array();
+                $result=array();
                 foreach ($row as $key => $val) {
                     if (is_array($val)) {
                         foreach ($val as $k => $v) {
-                            $result[$key][$k] = $v;
+                            $result[$key][$k]=$v;
                         }
                     } else {
-                        $result[$key] = $val;
+                        $result[$key]=$val;
                     }
                 }
             }
             $this->count++;
             if ($this->_mapKey) {
-                $results[$row[$this->_mapKey]] = count($row) > 2 ? $result : end($result);
+                $results[$row[$this->_mapKey]]=count($row) > 2 ? $result : end($result);
             } else {
                 array_push($results, $result);
             }
@@ -632,9 +632,9 @@ 
         }
 
         if (in_array('SQL_CALC_FOUND_ROWS', $this->_queryOptions)) {
-            $stmt = $this->mysqli()->query('SELECT FOUND_ROWS()');
-            $totalCount = $stmt->fetch_row();
-            $this->totalCount = $totalCount[0];
+            $stmt=$this->mysqli()->query('SELECT FOUND_ROWS()');
+            $totalCount=$stmt->fetch_row();
+            $this->totalCount=$totalCount[0];
         }
 
         if ($this->returnType == 'json') {
@@ -654,21 +654,21 @@ 
      *
      * @return mixed Contains the returned rows from the query.
      */
-    public function rawQueryValue($query, $bindParams = null) {
-        $res = $this->rawQuery($query, $bindParams);
+    public function rawQueryValue($query, $bindParams=null) {
+        $res=$this->rawQuery($query, $bindParams);
         if (!$res) {
             return null;
         }
 
-        $limit = preg_match('/limit\s+1;?$/i', $query);
-        $key = key($res[0]);
+        $limit=preg_match('/limit\s+1;?$/i', $query);
+        $key=key($res[0]);
         if (isset($res[0][$key]) && $limit == true) {
             return $res[0][$key];
         }
 
-        $newRes = Array();
-        for ($i = 0; $i < $this->count; $i++) {
-            $newRes[] = $res[$i][$key];
+        $newRes=Array();
+        for ($i=0; $i < $this->count; $i++) {
+            $newRes[]=$res[$i][$key];
         }
         return $newRes;
     }
@@ -681,13 +681,13 @@ 
      *
      * @return array Contains the returned rows from the query.
      */
-    public function query($query, $numRows = null) {
-        $this->_query = $query;
-        $stmt = $this->_buildQuery($numRows);
+    public function query($query, $numRows=null) {
+        $this->_query=$query;
+        $stmt=$this->_buildQuery($numRows);
         $stmt->execute();
-        $this->_stmtError = $stmt->error;
-        $this->_stmtErrno = $stmt->errno;
-        $res = $this->_dynamicBindResults($stmt);
+        $this->_stmtError=$stmt->error;
+        $this->_stmtErrno=$stmt->errno;
+        $res=$this->_dynamicBindResults($stmt);
         $this->reset();
 
         return $res;
@@ -704,7 +704,7 @@ 
      *
      * @return mysqli_stmt Returns the $stmt object.
      */
-    protected function _buildQuery($numRows = null, $tableData = null) {
+    protected function _buildQuery($numRows=null, $tableData=null) {
         // $this->_buildJoinOld();
         $this->_buildJoin();
         $this->_buildInsertQuery($tableData);
@@ -716,20 +716,20 @@ 
         $this->_buildOnDuplicate($tableData);
 
         if ($this->_forUpdate) {
-            $this->_query .= ' FOR UPDATE';
+            $this->_query.=' FOR UPDATE';
         }
         if ($this->_lockInShareMode) {
-            $this->_query .= ' LOCK IN SHARE MODE';
+            $this->_query.=' LOCK IN SHARE MODE';
         }
 
-        $this->_lastQuery = $this->replacePlaceHolders($this->_query, $this->_bindParams);
+        $this->_lastQuery=$this->replacePlaceHolders($this->_query, $this->_bindParams);
 
         if ($this->isSubQuery) {
             return;
         }
 
         // Prepare query
-        $stmt = $this->_prepareQuery();
+        $stmt=$this->_prepareQuery();
 
         // Bind parameters to statement if any
         if (count($this->_bindParams) > 1) {
@@ -747,20 +747,20 @@ 
             return;
 
         foreach ($this->_join as $data) {
-            list ($joinType, $joinTable, $joinCondition) = $data;
+            list ($joinType, $joinTable, $joinCondition)=$data;
 
             if (is_object($joinTable))
-                $joinStr = $this->_buildPair("", $joinTable);
+                $joinStr=$this->_buildPair("", $joinTable);
             else
-                $joinStr = $joinTable;
+                $joinStr=$joinTable;
 
-            $this->_query .= " " . $joinType . " JOIN " . $joinStr . " on " . $joinCondition;
+            $this->_query.=" ".$joinType." JOIN ".$joinStr." on ".$joinCondition;
 
             // Add join and query
             if (!empty($this->_joinAnd) && isset($this->_joinAnd[$joinStr])) {
                 foreach ($this->_joinAnd[$joinStr] as $join_and_cond) {
-                    list ($concat, $varName, $operator, $val) = $join_and_cond;
-                    $this->_query .= " " . $concat . " " . $varName;
+                    list ($concat, $varName, $operator, $val)=$join_and_cond;
+                    $this->_query.=" ".$concat." ".$varName;
                     $this->conditionToSql($operator, $val);
                 }
             }
@@ -780,13 +780,13 @@ 
     protected function _buildPair($operator, $value) {
         if (!is_object($value)) {
             $this->_bindParam($value);
-            return ' ' . $operator . ' ? ';
+            return ' '.$operator.' ? ';
         }
 
-        $subQuery = $value->getSubQuery();
+        $subQuery=$value->getSubQuery();
         $this->_bindParams($subQuery['params']);
 
-        return " " . $operator . " (" . $subQuery['query'] . ") " . $subQuery['alias'];
+        return " ".$operator." (".$subQuery['query'].") ".$subQuery['alias'];
     }
 
     /**
@@ -795,7 +795,7 @@ 
      * @param string Variable value
      */
     protected function _bindParam($value) {
-        $this->_bindParams[0] .= $this->_determineType($value);
+        $this->_bindParams[0].=$this->_determineType($value);
         array_push($this->_bindParams, $value);
     }
 
@@ -819,33 +819,33 @@ 
         switch (strtolower($operator)) {
             case 'not in':
             case 'in':
-                $comparison = ' ' . $operator . ' (';
+                $comparison=' '.$operator.' (';
                 if (is_object($val)) {
-                    $comparison .= $this->_buildPair("", $val);
+                    $comparison.=$this->_buildPair("", $val);
                 } else {
                     foreach ($val as $v) {
-                        $comparison .= ' ?,';
+                        $comparison.=' ?,';
                         $this->_bindParam($v);
                     }
                 }
-                $this->_query .= rtrim($comparison, ',') . ' ) ';
+                $this->_query.=rtrim($comparison, ',').' ) ';
                 break;
             case 'not between':
             case 'between':
-                $this->_query .= " $operator ? AND ? ";
+                $this->_query.=" $operator ? AND ? ";
                 $this->_bindParams($val);
                 break;
             case 'not exists':
             case 'exists':
-                $this->_query .= $operator . $this->_buildPair("", $val);
+                $this->_query.=$operator.$this->_buildPair("", $val);
                 break;
             default:
                 if (is_array($val))
                     $this->_bindParams($val);
                 else if ($val === null)
-                    $this->_query .= $operator . " NULL";
+                    $this->_query.=$operator." NULL";
                 else if ($val != 'DBNULL' || $val == '0')
-                    $this->_query .= $this->_buildPair($operator, $val);
+                    $this->_query.=$this->_buildPair($operator, $val);
         }
     }
 
@@ -859,20 +859,20 @@ 
             return;
         }
 
-        $isInsert = preg_match('/^[INSERT|REPLACE]/', $this->_query);
-        $dataColumns = array_keys($tableData);
+        $isInsert=preg_match('/^[INSERT|REPLACE]/', $this->_query);
+        $dataColumns=array_keys($tableData);
         if ($isInsert) {
             if (isset ($dataColumns[0]))
-                $this->_query .= ' (`' . implode($dataColumns, '`, `') . '`) ';
-            $this->_query .= ' VALUES (';
+                $this->_query.=' (`'.implode($dataColumns, '`, `').'`) ';
+            $this->_query.=' VALUES (';
         } else {
-            $this->_query .= " SET ";
+            $this->_query.=" SET ";
         }
 
         $this->_buildDataPairs($tableData, $dataColumns, $isInsert);
 
         if ($isInsert) {
-            $this->_query .= ')';
+            $this->_query.=')';
         }
     }
 
@@ -887,54 +887,54 @@ 
      */
     public function _buildDataPairs($tableData, $tableColumns, $isInsert) {
         foreach ($tableColumns as $column) {
-            $value = $tableData[$column];
+            $value=$tableData[$column];
 
             if (!$isInsert) {
                 if (strpos($column, '.') === false) {
-                    $this->_query .= "`" . $column . "` = ";
+                    $this->_query.="`".$column."` = ";
                 } else {
-                    $this->_query .= str_replace('.', '.`', $column) . "` = ";
+                    $this->_query.=str_replace('.', '.`', $column)."` = ";
                 }
             }
 
             // Subquery value
             if ($value instanceof MysqliDb) {
-                $this->_query .= $this->_buildPair("", $value) . ", ";
+                $this->_query.=$this->_buildPair("", $value).", ";
                 continue;
             }
 
             // Simple value
             if (!is_array($value)) {
                 $this->_bindParam($value);
-                $this->_query .= '?, ';
+                $this->_query.='?, ';
                 continue;
             }
 
             // Function value
-            $key = key($value);
-            $val = $value[$key];
+            $key=key($value);
+            $val=$value[$key];
             switch ($key) {
                 case '[I]':
-                    $this->_query .= $column . $val . ", ";
+                    $this->_query.=$column.$val.", ";
                     break;
                 case '[F]':
-                    $this->_query .= $val[0] . ", ";
+                    $this->_query.=$val[0].", ";
                     if (!empty($val[1])) {
                         $this->_bindParams($val[1]);
                     }
                     break;
                 case '[N]':
                     if ($val == null) {
-                        $this->_query .= "!" . $column . ", ";
+                        $this->_query.="!".$column.", ";
                     } else {
-                        $this->_query .= "!" . $val . ", ";
+                        $this->_query.="!".$val.", ";
                     }
                     break;
                 default:
                     throw new Exception("Wrong operation");
             }
         }
-        $this->_query = rtrim($this->_query, ', ');
+        $this->_query=rtrim($this->_query, ', ');
     }
 
     /**
@@ -949,42 +949,42 @@ 
         }
 
         //Prepare the where portion of the query
-        $this->_query .= ' ' . $operator;
+        $this->_query.=' '.$operator;
 
         foreach ($conditions as $cond) {
-            list ($concat, $varName, $operator, $val) = $cond;
-            $this->_query .= " " . $concat . " " . $varName;
+            list ($concat, $varName, $operator, $val)=$cond;
+            $this->_query.=" ".$concat." ".$varName;
 
             switch (strtolower($operator)) {
                 case 'not in':
                 case 'in':
-                    $comparison = ' ' . $operator . ' (';
+                    $comparison=' '.$operator.' (';
                     if (is_object($val)) {
-                        $comparison .= $this->_buildPair("", $val);
+                        $comparison.=$this->_buildPair("", $val);
                     } else {
                         foreach ($val as $v) {
-                            $comparison .= ' ?,';
+                            $comparison.=' ?,';
                             $this->_bindParam($v);
                         }
                     }
-                    $this->_query .= rtrim($comparison, ',') . ' ) ';
+                    $this->_query.=rtrim($comparison, ',').' ) ';
                     break;
                 case 'not between':
                 case 'between':
-                    $this->_query .= " $operator ? AND ? ";
+                    $this->_query.=" $operator ? AND ? ";
                     $this->_bindParams($val);
                     break;
                 case 'not exists':
                 case 'exists':
-                    $this->_query .= $operator . $this->_buildPair("", $val);
+                    $this->_query.=$operator.$this->_buildPair("", $val);
                     break;
                 default:
                     if (is_array($val)) {
                         $this->_bindParams($val);
                     } elseif ($val === null) {
-                        $this->_query .= ' ' . $operator . " NULL";
+                        $this->_query.=' '.$operator." NULL";
                     } elseif ($val != 'DBNULL' || $val == '0') {
-                        $this->_query .= $this->_buildPair($operator, $val);
+                        $this->_query.=$this->_buildPair($operator, $val);
                     }
             }
         }
@@ -1000,13 +1000,13 @@ 
             return;
         }
 
-        $this->_query .= " GROUP BY ";
+        $this->_query.=" GROUP BY ";
 
         foreach ($this->_groupBy as $key => $value) {
-            $this->_query .= $value . ", ";
+            $this->_query.=$value.", ";
         }
 
-        $this->_query = rtrim($this->_query, ', ') . " ";
+        $this->_query=rtrim($this->_query, ', ')." ";
     }
 
     /**
@@ -1019,16 +1019,16 @@ 
             return;
         }
 
-        $this->_query .= " ORDER BY ";
+        $this->_query.=" ORDER BY ";
         foreach ($this->_orderBy as $prop => $value) {
             if (strtolower(str_replace(" ", "", $prop)) == 'rand()') {
-                $this->_query .= "rand(), ";
+                $this->_query.="rand(), ";
             } else {
-                $this->_query .= $prop . " " . $value . ", ";
+                $this->_query.=$prop." ".$value.", ";
             }
         }
 
-        $this->_query = rtrim($this->_query, ', ') . " ";
+        $this->_query=rtrim($this->_query, ', ')." ";
     }
 
     /**
@@ -1045,9 +1045,9 @@ 
         }
 
         if (is_array($numRows)) {
-            $this->_query .= ' LIMIT ' . (int)$numRows[0] . ', ' . (int)$numRows[1];
+            $this->_query.=' LIMIT '.(int) $numRows[0].', '.(int) $numRows[1];
         } else {
-            $this->_query .= ' LIMIT ' . (int)$numRows;
+            $this->_query.=' LIMIT '.(int) $numRows;
         }
     }
 
@@ -1058,18 +1058,18 @@ 
      */
     protected function _buildOnDuplicate($tableData) {
         if (is_array($this->_updateColumns) && !empty($this->_updateColumns)) {
-            $this->_query .= " ON DUPLICATE KEY UPDATE ";
+            $this->_query.=" ON DUPLICATE KEY UPDATE ";
             if ($this->_lastInsertId) {
-                $this->_query .= $this->_lastInsertId . "=LAST_INSERT_ID (" . $this->_lastInsertId . "), ";
+                $this->_query.=$this->_lastInsertId."=LAST_INSERT_ID (".$this->_lastInsertId."), ";
             }
 
             foreach ($this->_updateColumns as $key => $val) {
                 // skip all params without a value
                 if (is_numeric($key)) {
-                    $this->_updateColumns[$val] = '';
+                    $this->_updateColumns[$val]='';
                     unset($this->_updateColumns[$key]);
                 } else {
-                    $tableData[$key] = $val;
+                    $tableData[$key]=$val;
                 }
             }
             $this->_buildDataPairs($tableData, array_keys($this->_updateColumns), false);
@@ -1085,10 +1085,10 @@ 
      *
      * @return bool|array Boolean indicating the insertion failed (false), else return id-array ([int])
      */
-    public function insertMulti($tableName, array $multiInsertData, array $dataKeys = null) {
+    public function insertMulti($tableName, array $multiInsertData, array $dataKeys=null) {
         // only auto-commit our inserts, if no transaction is currently running
-        $autoCommit = (isset($this->_transaction_in_progress) ? !$this->_transaction_in_progress : true);
-        $ids = array();
+        $autoCommit=(isset($this->_transaction_in_progress) ? !$this->_transaction_in_progress : true);
+        $ids=array();
 
         if ($autoCommit) {
             $this->startTransaction();
@@ -1097,17 +1097,17 @@ 
         foreach ($multiInsertData as $insertData) {
             if ($dataKeys !== null) {
                 // apply column-names if given, else assume they're already given in the data
-                $insertData = array_combine($dataKeys, $insertData);
+                $insertData=array_combine($dataKeys, $insertData);
             }
 
-            $id = $this->insert($tableName, $insertData);
+            $id=$this->insert($tableName, $insertData);
             if (!$id) {
                 if ($autoCommit) {
                     $this->rollback();
                 }
                 return false;
             }
-            $ids[] = $id;
+            $ids[]=$id;
         }
 
         if ($autoCommit) {
@@ -1125,7 +1125,7 @@ 
      */
     public function startTransaction() {
         $this->mysqli()->autocommit(false);
-        $this->_transaction_in_progress = true;
+        $this->_transaction_in_progress=true;
         register_shutdown_function(array($this, "_transaction_status_check"));
     }
 
@@ -1155,14 +1155,14 @@ 
             return;
         }
 
-        $this->_query = $operation . " " . implode(' ', $this->_queryOptions) . " INTO " . $this->prefix . $tableName;
-        $stmt = $this->_buildQuery(null, $insertData);
-        $status = $stmt->execute();
-        $this->_stmtError = $stmt->error;
-        $this->_stmtErrno = $stmt->errno;
-        $haveOnDuplicate = !empty ($this->_updateColumns);
+        $this->_query=$operation." ".implode(' ', $this->_queryOptions)." INTO ".$this->prefix.$tableName;
+        $stmt=$this->_buildQuery(null, $insertData);
+        $status=$stmt->execute();
+        $this->_stmtError=$stmt->error;
+        $this->_stmtErrno=$stmt->errno;
+        $haveOnDuplicate=!empty ($this->_updateColumns);
         $this->reset();
-        $this->count = $stmt->affected_rows;
+        $this->count=$stmt->affected_rows;
 
         if ($stmt->affected_rows < 1) {
             // in case of onDuplicate() usage, if no rows were inserted
@@ -1186,8 +1186,8 @@ 
      * @uses mysqli->autocommit(true);
      */
     public function rollback() {
-        $result = $this->mysqli()->rollback();
-        $this->_transaction_in_progress = false;
+        $result=$this->mysqli()->rollback();
+        $this->_transaction_in_progress=false;
         $this->mysqli()->autocommit(true);
         return $result;
     }
@@ -1199,8 +1199,8 @@ 
      * @uses mysqli->autocommit(true);
      */
     public function commit() {
-        $result = $this->mysqli()->commit();
-        $this->_transaction_in_progress = false;
+        $result=$this->mysqli()->commit();
+        $this->_transaction_in_progress=false;
         $this->mysqli()->autocommit(true);
         return $result;
     }
@@ -1226,8 +1226,8 @@ 
      *
      * @return array Contains the returned rows from the select query.
      */
-    public function getOne($tableName, $columns = '*') {
-        $res = $this->get($tableName, 1, $columns);
+    public function getOne($tableName, $columns='*') {
+        $res=$this->get($tableName, 1, $columns);
 
         if ($res instanceof MysqliDb) {
             return $res;
@@ -1250,31 +1250,31 @@ 
      *
      * @return array Contains the returned rows from the select query.
      */
-    public function get($tableName, $numRows = null, $columns = '*') {
+    public function get($tableName, $numRows=null, $columns='*') {
         if (empty($columns)) {
-            $columns = '*';
+            $columns='*';
         }
 
-        $column = is_array($columns) ? implode(', ', $columns) : $columns;
+        $column=is_array($columns) ? implode(', ', $columns) : $columns;
 
         if (strpos($tableName, '.') === false) {
-            $this->tableName = $this->prefix . $tableName;
+            $this->tableName=$this->prefix.$tableName;
         } else {
-            $this->tableName = $tableName;
+            $this->tableName=$tableName;
         }
 
-        $this->_query = 'SELECT ' . implode(' ', $this->_queryOptions) . ' ' .
-            $column . " FROM " . $this->tableName;
-        $stmt = $this->_buildQuery($numRows);
+        $this->_query='SELECT '.implode(' ', $this->_queryOptions).' '.
+            $column." FROM ".$this->tableName;
+        $stmt=$this->_buildQuery($numRows);
 
         if ($this->isSubQuery) {
             return $this;
         }
 
         $stmt->execute();
-        $this->_stmtError = $stmt->error;
-        $this->_stmtErrno = $stmt->errno;
-        $res = $this->_dynamicBindResults($stmt);
+        $this->_stmtError=$stmt->error;
+        $this->_stmtErrno=$stmt->errno;
+        $res=$this->_dynamicBindResults($stmt);
         $this->reset();
 
         return $res;
@@ -1288,19 +1288,19 @@ 
      *
      * @return bool
      */
-    public function update($tableData, $numRows = null) {
+    public function update($tableData, $numRows=null) {
         if ($this->isSubQuery) {
             return;
         }
 
-        $this->_query = "UPDATE " . $this->tableName;
+        $this->_query="UPDATE ".$this->tableName;
 
-        $stmt = $this->_buildQuery($numRows, $tableData);
-        $status = $stmt->execute();
+        $stmt=$this->_buildQuery($numRows, $tableData);
+        $status=$stmt->execute();
         $this->reset();
-        $this->_stmtError = $stmt->error;
-        $this->_stmtErrno = $stmt->errno;
-        $this->count = $stmt->affected_rows;
+        $this->_stmtError=$stmt->error;
+        $this->_stmtErrno=$stmt->errno;
+        $this->count=$stmt->affected_rows;
 
         return $status;
     }
@@ -1313,26 +1313,26 @@ 
      *
      * @return bool Indicates success. 0 or 1.
      */
-    public function delete($numRows = null) {
+    public function delete($numRows=null) {
         if ($this->isSubQuery) {
             return;
         }
 
-        $table = $this->tableName;
+        $table=$this->tableName;
 
         if (count($this->_join)) {
-            $this->_query = "DELETE " . preg_replace('/.* (.*)/', '$1', $table) . " FROM " . $table;
+            $this->_query="DELETE ".preg_replace('/.* (.*)/', '$1', $table)." FROM ".$table;
         } else {
-            $this->_query = "DELETE FROM " . $table;
+            $this->_query="DELETE FROM ".$table;
         }
 
-        $stmt = $this->_buildQuery($numRows);
+        $stmt=$this->_buildQuery($numRows);
         $stmt->execute();
-        $this->_stmtError = $stmt->error;
-        $this->_stmtErrno = $stmt->errno;
+        $this->_stmtError=$stmt->error;
+        $this->_stmtErrno=$stmt->errno;
         $this->reset();
 
-        return ($stmt->affected_rows > -1);    //	affected_rows returns 0 if nothing matched where statement, or required updating, -1 if error
+        return ($stmt->affected_rows > -1); //	affected_rows returns 0 if nothing matched where statement, or required updating, -1 if error
     }
 
     /**
@@ -1344,9 +1344,9 @@ 
      *
      * @return MysqliDb
      */
-    public function onDuplicate($updateColumns, $lastInsertId = null) {
-        $this->_lastInsertId = $lastInsertId;
-        $this->_updateColumns = $updateColumns;
+    public function onDuplicate($updateColumns, $lastInsertId=null) {
+        $this->_lastInsertId=$lastInsertId;
+        $this->_updateColumns=$updateColumns;
         return $this;
     }
 
@@ -1361,7 +1361,7 @@ 
      *
      * @return MysqliDb
      */
-    public function orWhere($whereProp, $whereValue = 'DBNULL', $operator = '=') {
+    public function orWhere($whereProp, $whereValue='DBNULL', $operator='=') {
         return $this->where($whereProp, $whereValue, $operator, 'OR');
     }
 
@@ -1377,18 +1377,18 @@ 
      *
      * @return MysqliDb
      */
-    public function where($whereProp, $whereValue = 'DBNULL', $operator = '=', $cond = 'AND') {
+    public function where($whereProp, $whereValue='DBNULL', $operator='=', $cond='AND') {
         // forkaround for an old operation api
-        if (is_array($whereValue) && ($key = key($whereValue)) != "0") {
-            $operator = $key;
-            $whereValue = $whereValue[$key];
+        if (is_array($whereValue) && ($key=key($whereValue)) != "0") {
+            $operator=$key;
+            $whereValue=$whereValue[$key];
         }
 
         if (count($this->_where) == 0) {
-            $cond = '';
+            $cond='';
         }
 
-        $this->_where[] = array($cond, $whereProp, $operator, $whereValue);
+        $this->_where[]=array($cond, $whereProp, $operator, $whereValue);
         return $this;
     }
 
@@ -1403,7 +1403,7 @@ 
      *
      * @return MysqliDb
      */
-    public function orHaving($havingProp, $havingValue = null, $operator = null) {
+    public function orHaving($havingProp, $havingValue=null, $operator=null) {
         return $this->having($havingProp, $havingValue, $operator, 'OR');
     }
 
@@ -1419,18 +1419,18 @@ 
      * @return MysqliDb
      */
 
-    public function having($havingProp, $havingValue = 'DBNULL', $operator = '=', $cond = 'AND') {
+    public function having($havingProp, $havingValue='DBNULL', $operator='=', $cond='AND') {
         // forkaround for an old operation api
-        if (is_array($havingValue) && ($key = key($havingValue)) != "0") {
-            $operator = $key;
-            $havingValue = $havingValue[$key];
+        if (is_array($havingValue) && ($key=key($havingValue)) != "0") {
+            $operator=$key;
+            $havingValue=$havingValue[$key];
         }
 
         if (count($this->_having) == 0) {
-            $cond = '';
+            $cond='';
         }
 
-        $this->_having[] = array($cond, $havingProp, $operator, $havingValue);
+        $this->_having[]=array($cond, $havingProp, $operator, $havingValue);
         return $this;
     }
 
@@ -1446,19 +1446,19 @@ 
      * @throws Exception
      * @return MysqliDb
      */
-    public function join($joinTable, $joinCondition, $joinType = '') {
-        $allowedTypes = array('LEFT', 'RIGHT', 'OUTER', 'INNER', 'LEFT OUTER', 'RIGHT OUTER');
-        $joinType = strtoupper(trim($joinType));
+    public function join($joinTable, $joinCondition, $joinType='') {
+        $allowedTypes=array('LEFT', 'RIGHT', 'OUTER', 'INNER', 'LEFT OUTER', 'RIGHT OUTER');
+        $joinType=strtoupper(trim($joinType));
 
         if ($joinType && !in_array($joinType, $allowedTypes)) {
-            throw new Exception('Wrong JOIN type: ' . $joinType);
+            throw new Exception('Wrong JOIN type: '.$joinType);
         }
 
         if (!is_object($joinTable)) {
-            $joinTable = $this->prefix . $joinTable;
+            $joinTable=$this->prefix.$joinTable;
         }
 
-        $this->_join[] = Array($joinType, $joinTable, $joinCondition);
+        $this->_join[]=Array($joinType, $joinTable, $joinCondition);
 
         return $this;
     }
@@ -1472,55 +1472,55 @@ 
      * @param string $importSettings An Array defining the import settings as described in the README.md
      * @return boolean
      */
-    public function loadData($importTable, $importFile, $importSettings = null) {
+    public function loadData($importTable, $importFile, $importSettings=null) {
         // We have to check if the file exists
         if (!file_exists($importFile)) {
             // Throw an exception
-            throw new Exception("importCSV -> importFile " . $importFile . " does not exists!");
+            throw new Exception("importCSV -> importFile ".$importFile." does not exists!");
             return;
         }
 
         // Define the default values
         // We will merge it later
-        $settings = Array("fieldChar" => ';', "lineChar" => PHP_EOL, "linesToIgnore" => 1);
+        $settings=Array("fieldChar" => ';', "lineChar" => PHP_EOL, "linesToIgnore" => 1);
 
         // Check the import settings
         if (gettype($importSettings) == "array") {
             // Merge the default array with the custom one
-            $settings = array_merge($settings, $importSettings);
+            $settings=array_merge($settings, $importSettings);
         }
 
         // Add the prefix to the import table
-        $table = $this->prefix . $importTable;
+        $table=$this->prefix.$importTable;
 
         // Add 1 more slash to every slash so maria will interpret it as a path
-        $importFile = str_replace("\\", "\\\\", $importFile);
+        $importFile=str_replace("\\", "\\\\", $importFile);
 
         // Build SQL Syntax
-        $sqlSyntax = sprintf('LOAD DATA INFILE \'%s\' INTO TABLE %s',
+        $sqlSyntax=sprintf('LOAD DATA INFILE \'%s\' INTO TABLE %s',
             $importFile, $table);
 
         // FIELDS
-        $sqlSyntax .= sprintf(' FIELDS TERMINATED BY \'%s\'', $settings["fieldChar"]);
+        $sqlSyntax.=sprintf(' FIELDS TERMINATED BY \'%s\'', $settings["fieldChar"]);
         if (isset($settings["fieldEnclosure"])) {
-            $sqlSyntax .= sprintf(' ENCLOSED BY \'%s\'', $settings["fieldEnclosure"]);
+            $sqlSyntax.=sprintf(' ENCLOSED BY \'%s\'', $settings["fieldEnclosure"]);
         }
 
         // LINES
-        $sqlSyntax .= sprintf(' LINES TERMINATED BY \'%s\'', $settings["lineChar"]);
+        $sqlSyntax.=sprintf(' LINES TERMINATED BY \'%s\'', $settings["lineChar"]);
         if (isset($settings["lineStarting"])) {
-            $sqlSyntax .= sprintf(' STARTING BY \'%s\'', $settings["lineStarting"]);
+            $sqlSyntax.=sprintf(' STARTING BY \'%s\'', $settings["lineStarting"]);
         }
 
         // IGNORE LINES
-        $sqlSyntax .= sprintf(' IGNORE %d LINES', $settings["linesToIgnore"]);
+        $sqlSyntax.=sprintf(' IGNORE %d LINES', $settings["linesToIgnore"]);
 
         // Exceute the query unprepared because LOAD DATA only works with unprepared statements.
-        $result = $this->queryUnprepared($sqlSyntax);
+        $result=$this->queryUnprepared($sqlSyntax);
 
         // Are there rows modified?
         // Let the user know if the import failed / succeeded
-        return (bool)$result;
+        return (bool) $result;
     }
 
     /**
@@ -1533,11 +1533,11 @@ 
      */
     private function queryUnprepared($query) {
         // Execute query
-        $stmt = $this->mysqli()->query($query);
+        $stmt=$this->mysqli()->query($query);
 
         // Failed?
         if (!$stmt) {
-            throw new Exception("Unprepared Query Failed, ERRNO: " . $this->mysqli()->errno . " (" . $this->mysqli()->error . ")", $this->mysqli()->errno);
+            throw new Exception("Unprepared Query Failed, ERRNO: ".$this->mysqli()->errno." (".$this->mysqli()->error.")", $this->mysqli()->errno);
         };
 
         // return stmt for future use
@@ -1555,7 +1555,7 @@ 
      *
      * @return boolean Returns true if the import succeeded, false if it failed.
      */
-    public function loadXml($importTable, $importFile, $importSettings = null) {
+    public function loadXml($importTable, $importFile, $importSettings=null) {
         // We have to check if the file exists
         if (!file_exists($importFile)) {
             // Does not exists
@@ -1564,37 +1564,37 @@ 
         }
 
         // Create default values
-        $settings = Array("linesToIgnore" => 0);
+        $settings=Array("linesToIgnore" => 0);
 
         // Check the import settings
         if (gettype($importSettings) == "array") {
-            $settings = array_merge($settings, $importSettings);
+            $settings=array_merge($settings, $importSettings);
         }
 
         // Add the prefix to the import table
-        $table = $this->prefix . $importTable;
+        $table=$this->prefix.$importTable;
 
         // Add 1 more slash to every slash so maria will interpret it as a path
-        $importFile = str_replace("\\", "\\\\", $importFile);
+        $importFile=str_replace("\\", "\\\\", $importFile);
 
         // Build SQL Syntax
-        $sqlSyntax = sprintf('LOAD XML INFILE \'%s\' INTO TABLE %s',
+        $sqlSyntax=sprintf('LOAD XML INFILE \'%s\' INTO TABLE %s',
             $importFile, $table);
 
         // FIELDS
         if (isset($settings["rowTag"])) {
-            $sqlSyntax .= sprintf(' ROWS IDENTIFIED BY \'%s\'', $settings["rowTag"]);
+            $sqlSyntax.=sprintf(' ROWS IDENTIFIED BY \'%s\'', $settings["rowTag"]);
         }
 
         // IGNORE LINES
-        $sqlSyntax .= sprintf(' IGNORE %d LINES', $settings["linesToIgnore"]);
+        $sqlSyntax.=sprintf(' IGNORE %d LINES', $settings["linesToIgnore"]);
 
         // Exceute the query unprepared because LOAD XML only works with unprepared statements.
-        $result = $this->queryUnprepared($sqlSyntax);
+        $result=$this->queryUnprepared($sqlSyntax);
 
         // Are there rows modified?
         // Let the user know if the import failed / succeeded
-        return (bool)$result;
+        return (bool) $result;
     }
 
     /**
@@ -1609,30 +1609,30 @@ 
      * @throws Exception
      * @return MysqliDb
      */
-    public function orderBy($orderByField, $orderbyDirection = "DESC", $customFields = null) {
-        $allowedDirection = Array("ASC", "DESC");
-        $orderbyDirection = strtoupper(trim($orderbyDirection));
-        $orderByField = preg_replace("/[^-a-z0-9\.\(\),_`\*\'\"]+/i", '', $orderByField);
+    public function orderBy($orderByField, $orderbyDirection="DESC", $customFields=null) {
+        $allowedDirection=Array("ASC", "DESC");
+        $orderbyDirection=strtoupper(trim($orderbyDirection));
+        $orderByField=preg_replace("/[^-a-z0-9\.\(\),_`\*\'\"]+/i", '', $orderByField);
 
         // Add table prefix to orderByField if needed.
         //FIXME: We are adding prefix only if table is enclosed into `` to distinguish aliases
         // from table names
-        $orderByField = preg_replace('/(\`)([`a-zA-Z0-9_]*\.)/', '\1' . $this->prefix . '\2', $orderByField);
+        $orderByField=preg_replace('/(\`)([`a-zA-Z0-9_]*\.)/', '\1'.$this->prefix.'\2', $orderByField);
 
 
         if (empty($orderbyDirection) || !in_array($orderbyDirection, $allowedDirection)) {
-            throw new Exception('Wrong order direction: ' . $orderbyDirection);
+            throw new Exception('Wrong order direction: '.$orderbyDirection);
         }
 
         if (is_array($customFields)) {
             foreach ($customFields as $key => $value) {
-                $customFields[$key] = preg_replace("/[^-a-z0-9\.\(\),_` ]+/i", '', $value);
+                $customFields[$key]=preg_replace("/[^-a-z0-9\.\(\),_` ]+/i", '', $value);
             }
 
-            $orderByField = 'FIELD (' . $orderByField . ', "' . implode('","', $customFields) . '")';
+            $orderByField='FIELD ('.$orderByField.', "'.implode('","', $customFields).'")';
         }
 
-        $this->_orderBy[$orderByField] = $orderbyDirection;
+        $this->_orderBy[$orderByField]=$orderbyDirection;
         return $this;
     }
 
@@ -1646,9 +1646,9 @@ 
      * @return MysqliDb
      */
     public function groupBy($groupByField) {
-        $groupByField = preg_replace("/[^-a-z0-9\.\(\),_\*]+/i", '', $groupByField);
+        $groupByField=preg_replace("/[^-a-z0-9\.\(\),_\*]+/i", '', $groupByField);
 
-        $this->_groupBy[] = $groupByField;
+        $this->_groupBy[]=$groupByField;
         return $this;
     }
 
@@ -1667,7 +1667,7 @@ 
             // Is it READ or WRITE?
             case "READ" || "WRITE":
                 // Succeed
-                $this->_tableLockMethod = $method;
+                $this->_tableLockMethod=$method;
                 break;
             default:
                 // Else throw an exception
@@ -1688,7 +1688,7 @@ 
      */
     public function lock($table) {
         // Main Query
-        $this->_query = "LOCK TABLES";
+        $this->_query="LOCK TABLES";
 
         // Is the table an array?
         if (gettype($table) == "array") {
@@ -1696,22 +1696,22 @@ 
             foreach ($table as $key => $value) {
                 if (gettype($value) == "string") {
                     if ($key > 0) {
-                        $this->_query .= ",";
+                        $this->_query.=",";
                     }
-                    $this->_query .= " " . $this->prefix . $value . " " . $this->_tableLockMethod;
+                    $this->_query.=" ".$this->prefix.$value." ".$this->_tableLockMethod;
                 }
             }
         } else {
             // Build the table prefix
-            $table = $this->prefix . $table;
+            $table=$this->prefix.$table;
 
             // Build the query
-            $this->_query = "LOCK TABLES " . $table . " " . $this->_tableLockMethod;
+            $this->_query="LOCK TABLES ".$table." ".$this->_tableLockMethod;
         }
 
         // Exceute the query unprepared because LOCK only works with unprepared statements.
-        $result = $this->queryUnprepared($this->_query);
-        $errno = $this->mysqli()->errno;
+        $result=$this->queryUnprepared($this->_query);
+        $errno=$this->mysqli()->errno;
 
         // Reset the query
         $this->reset();
@@ -1723,7 +1723,7 @@ 
             return true;
         } // Something went wrong
         else {
-            throw new Exception("Locking of table " . $table . " failed", $errno);
+            throw new Exception("Locking of table ".$table." failed", $errno);
         }
 
         // Return the success value
@@ -1739,11 +1739,11 @@ 
      */
     public function unlock() {
         // Build the query
-        $this->_query = "UNLOCK TABLES";
+        $this->_query="UNLOCK TABLES";
 
         // Exceute the query unprepared because UNLOCK and LOCK only works with unprepared statements.
-        $result = $this->queryUnprepared($this->_query);
-        $errno = $this->mysqli()->errno;
+        $result=$this->queryUnprepared($this->_query);
+        $errno=$this->mysqli()->errno;
 
         // Reset the query
         $this->reset();
@@ -1808,8 +1808,8 @@ 
      *
      * @return MysqliDb
      */
-    public function setPrefix($prefix = '') {
-        $this->prefix = $prefix;
+    public function setPrefix($prefix='') {
+        $this->prefix=$prefix;
         return $this;
     }
 
@@ -1825,7 +1825,7 @@ 
 
         if ($this->_mysqli) {
             $this->_mysqli->close();
-            $this->_mysqli = null;
+            $this->_mysqli=null;
         }
     }
 
@@ -1847,7 +1847,7 @@ 
         if (!$this->_mysqli) {
             return "mysqli is null";
         }
-        return trim($this->_stmtError . " " . $this->mysqli()->error);
+        return trim($this->_stmtError." ".$this->mysqli()->error);
     }
 
     /* Helper functions */
@@ -1872,7 +1872,7 @@ 
         }
 
         array_shift($this->_bindParams);
-        $val = Array('query' => $this->_query,
+        $val=Array('query' => $this->_query,
             'params' => $this->_bindParams,
             'alias' => $this->host
         );
@@ -1891,7 +1891,7 @@ 
      *
      * @return array
      */
-    public function now($diff = null, $func = "NOW()") {
+    public function now($diff=null, $func="NOW()") {
         return array("[F]" => Array($this->interval($diff, $func)));
     }
 
@@ -1906,30 +1906,30 @@ 
      *
      * @return string
      */
-    public function interval($diff, $func = "NOW()") {
-        $types = Array("s" => "second", "m" => "minute", "h" => "hour", "d" => "day", "M" => "month", "Y" => "year");
-        $incr = '+';
-        $items = '';
-        $type = 'd';
+    public function interval($diff, $func="NOW()") {
+        $types=Array("s" => "second", "m" => "minute", "h" => "hour", "d" => "day", "M" => "month", "Y" => "year");
+        $incr='+';
+        $items='';
+        $type='d';
 
         if ($diff && preg_match('/([+-]?) ?([0-9]+) ?([a-zA-Z]?)/', $diff, $matches)) {
             if (!empty($matches[1])) {
-                $incr = $matches[1];
+                $incr=$matches[1];
             }
 
             if (!empty($matches[2])) {
-                $items = $matches[2];
+                $items=$matches[2];
             }
 
             if (!empty($matches[3])) {
-                $type = $matches[3];
+                $type=$matches[3];
             }
 
             if (!in_array($type, array_keys($types))) {
                 throw new Exception("invalid interval type in '{$diff}'");
             }
 
-            $func .= " " . $incr . " interval " . $items . " " . $types[$type] . " ";
+            $func.=" ".$incr." interval ".$items." ".$types[$type]." ";
         }
         return $func;
     }
@@ -1942,11 +1942,11 @@ 
      * @throws Exception
      * @return array
      */
-    public function inc($num = 1) {
+    public function inc($num=1) {
         if (!is_numeric($num)) {
             throw new Exception('Argument supplied to inc must be a number');
         }
-        return array("[I]" => "+" . $num);
+        return array("[I]" => "+".$num);
     }
 
     /**
@@ -1956,11 +1956,11 @@ 
      *
      * @return array
      */
-    public function dec($num = 1) {
+    public function dec($num=1) {
         if (!is_numeric($num)) {
             throw new Exception('Argument supplied to dec must be a number');
         }
-        return array("[I]" => "-" . $num);
+        return array("[I]" => "-".$num);
     }
 
     /**
@@ -1970,8 +1970,8 @@ 
      *
      * @return array
      */
-    public function not($col = null) {
-        return array("[N]" => (string)$col);
+    public function not($col=null) {
+        return array("[N]" => (string) $col);
     }
 
     /**
@@ -1982,7 +1982,7 @@ 
      *
      * @return array
      */
-    public function func($expr, $bindParams = null) {
+    public function func($expr, $bindParams=null) {
         return array("[F]" => array($expr, $bindParams));
     }
 
@@ -1992,8 +1992,8 @@ 
      * @return MysqliDb new mysqlidb object
      */
     public function copy() {
-        $copy = unserialize(serialize($this));
-        $copy->_mysqli = null;
+        $copy=unserialize(serialize($this));
+        $copy->_mysqli=null;
         return $copy;
     }
 
@@ -2018,9 +2018,9 @@ 
      *
      * @return MysqliDb
      */
-    public function setTrace($enabled, $stripPrefix = null) {
-        $this->traceEnabled = $enabled;
-        $this->traceStripPrefix = $stripPrefix;
+    public function setTrace($enabled, $stripPrefix=null) {
+        $this->traceEnabled=$enabled;
+        $this->traceStripPrefix=$stripPrefix;
         return $this;
     }
 
@@ -2032,14 +2032,14 @@ 
      * @return bool True if table exists
      */
     public function tableExists($tables) {
-        $tables = !is_array($tables) ? Array($tables) : $tables;
-        $count = count($tables);
+        $tables=!is_array($tables) ? Array($tables) : $tables;
+        $count=count($tables);
         if ($count == 0) {
             return false;
         }
 
         foreach ($tables as $i => $value)
-            $tables[$i] = $this->prefix . $value;
+            $tables[$i]=$this->prefix.$value;
         $this->where('table_schema', $this->db);
         $this->where('table_name', $tables, 'in');
         $this->get('information_schema.tables', $count);
@@ -2056,7 +2056,7 @@ 
      * @return MysqliDb
      */
     public function map($idField) {
-        $this->_mapKey = $idField;
+        $this->_mapKey=$idField;
         return $this;
     }
 
@@ -2071,7 +2071,7 @@ 
      *
      * @return dbWrapper
      */
-    public function joinOrWhere($whereJoin, $whereProp, $whereValue = 'DBNULL', $operator = '=', $cond = 'AND') {
+    public function joinOrWhere($whereJoin, $whereProp, $whereValue='DBNULL', $operator='=', $cond='AND') {
         return $this->joinWhere($whereJoin, $whereProp, $whereValue, $operator, 'OR');
     }
 
@@ -2086,8 +2086,8 @@ 
      *
      * @return dbWrapper
      */
-    public function joinWhere($whereJoin, $whereProp, $whereValue = 'DBNULL', $operator = '=', $cond = 'AND') {
-        $this->_joinAnd[$whereJoin][] = Array($cond, $whereProp, $operator, $whereValue);
+    public function joinWhere($whereJoin, $whereProp, $whereValue='DBNULL', $operator='=', $cond='AND') {
+        $this->_joinAnd[$whereJoin][]=Array($cond, $whereProp, $operator, $whereValue);
         return $this;
     }
 
@@ -2097,7 +2097,7 @@ 
      * @return $this
      */
     public function table($table) {
-        $this->tableName = $table;
+        $this->tableName=$table;
         return $this;
     }
 
@@ -2107,7 +2107,7 @@ 
      * @return $this
      */
     public function name($name) {
-        $this->tableName = $this->prefix . $name;
+        $this->tableName=$this->prefix.$name;
         return $this;
     }
 
@@ -2121,8 +2121,8 @@ 
      * @param null $default 默认值
      * @return mixed|null
      */
-    public function value($col, $default = null) {
-        $result = $this->getValue($this->tableName, $col);
+    public function value($col, $default=null) {
+        $result=$this->getValue($this->tableName, $col);
         return false !== $result ? $result : $default;
     }
 
@@ -2135,8 +2135,8 @@ 
      *
      * @return mixed Contains the value of a returned column / array of values
      */
-    public function getValue($tableName, $column, $limit = 1) {
-        $res = $this->ArrayBuilder()->get($tableName, $limit, "{$column} AS retval");
+    public function getValue($tableName, $column, $limit=1) {
+        $res=$this->ArrayBuilder()->get($tableName, $limit, "{$column} AS retval");
 
         if (!$res) {
             return null;
@@ -2149,9 +2149,9 @@ 
             return null;
         }
 
-        $newRes = Array();
-        for ($i = 0; $i < $this->count; $i++) {
-            $newRes[] = $res[$i]['retval'];
+        $newRes=Array();
+        for ($i=0; $i < $this->count; $i++) {
+            $newRes[]=$res[$i]['retval'];
         }
         return $newRes;
     }
@@ -2163,7 +2163,7 @@ 
      * @return MysqliDb
      */
     public function arrayBuilder() {
-        $this->returnType = 'array';
+        $this->returnType='array';
         return $this;
     }
 
@@ -2179,12 +2179,12 @@ 
         return $this->value("SUM($field)");
     }
 
-    public function count($field = '*') {
+    public function count($field='*') {
         return $this->value("COUNT($field)");
     }
 
     public function limit($limit) {
-        $this->pageLimit = $limit;
+        $this->pageLimit=$limit;
         return $this;
     }
 
@@ -2197,7 +2197,7 @@ 
     }
 
     public function field($field) {
-        $this->field = $field;
+        $this->field=$field;
         return $this;
     }
 
@@ -2216,9 +2216,9 @@ 
         return $this->_buildInsert($this->tableName, $data, 'REPLACE');
     }
 
-    public function page($page, $pageLimit = '10') {
-        $this->pageLimit = $pageLimit;
-        $info = $this->paginate($this->tableName, $page, $this->field);
+    public function page($page, $pageLimit='10') {
+        $this->pageLimit=$pageLimit;
+        $info=$this->paginate($this->tableName, $page, $this->field);
         return $info;
     }
 
@@ -2231,10 +2231,10 @@ 
      * @param array|string $fields Array or coma separated list of fields to fetch
      * @return array
      */
-    public function paginate($table, $page, $fields = null) {
-        $offset = $this->pageLimit * ($page - 1);
-        $res = $this->withTotalCount()->get($table, Array($offset, $this->pageLimit), $fields);
-        $this->totalPages = ceil($this->totalCount / $this->pageLimit);
+    public function paginate($table, $page, $fields=null) {
+        $offset=$this->pageLimit * ($page - 1);
+        $res=$this->withTotalCount()->get($table, Array($offset, $this->pageLimit), $fields);
+        $this->totalPages=ceil($this->totalCount / $this->pageLimit);
         return $res;
     }
 
@@ -2259,28 +2259,28 @@ 
      * @return MysqliDb
      */
     public function setQueryOption($options) {
-        $allowedOptions = Array('ALL', 'DISTINCT', 'DISTINCTROW', 'HIGH_PRIORITY', 'STRAIGHT_JOIN', 'SQL_SMALL_RESULT',
+        $allowedOptions=Array('ALL', 'DISTINCT', 'DISTINCTROW', 'HIGH_PRIORITY', 'STRAIGHT_JOIN', 'SQL_SMALL_RESULT',
             'SQL_BIG_RESULT', 'SQL_BUFFER_RESULT', 'SQL_CACHE', 'SQL_NO_CACHE', 'SQL_CALC_FOUND_ROWS',
             'LOW_PRIORITY', 'IGNORE', 'QUICK', 'MYSQLI_NESTJOIN', 'FOR UPDATE', 'LOCK IN SHARE MODE');
 
         if (!is_array($options)) {
-            $options = Array($options);
+            $options=Array($options);
         }
 
         foreach ($options as $option) {
-            $option = strtoupper($option);
+            $option=strtoupper($option);
             if (!in_array($option, $allowedOptions)) {
-                throw new Exception('Wrong query option: ' . $option);
+                throw new Exception('Wrong query option: '.$option);
             }
 
             if ($option == 'MYSQLI_NESTJOIN') {
-                $this->_nestJoin = true;
+                $this->_nestJoin=true;
             } elseif ($option == 'FOR UPDATE') {
-                $this->_forUpdate = true;
+                $this->_forUpdate=true;
             } elseif ($option == 'LOCK IN SHARE MODE') {
-                $this->_lockInShareMode = true;
+                $this->_lockInShareMode=true;
             } else {
-                $this->_queryOptions[] = $option;
+                $this->_queryOptions[]=$option;
             }
         }
 
@@ -2298,15 +2298,15 @@ 
         }
 
         foreach ($this->_join as $data) {
-            list ($joinType, $joinTable, $joinCondition) = $data;
+            list ($joinType, $joinTable, $joinCondition)=$data;
 
             if (is_object($joinTable)) {
-                $joinStr = $this->_buildPair("", $joinTable);
+                $joinStr=$this->_buildPair("", $joinTable);
             } else {
-                $joinStr = $joinTable;
+                $joinStr=$joinTable;
             }
 
-            $this->_query .= " " . $joinType . " JOIN " . $joinStr .
+            $this->_query.=" ".$joinType." JOIN ".$joinStr.
                 (false !== stripos($joinCondition, 'using') ? " " : " on ")
                 . $joinCondition;
         }

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

Spacing +24 added lines, -24 removed lines

@@ -15,7 +15,7 @@ 
      *
      * @var array
      */
-    protected $loadedConfigurations = [];
+    protected $loadedConfigurations=[];
 
     /**
      * 应用的根目录.
@@ -30,17 +30,17 @@ 
         $this->initConfig();
     }
 
-    private function initEnv(){
-        try{
-            $dotEnv = new Dotenv($this->basePath);
+    private function initEnv() {
+        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'));
         define('IS_CLI', $this->runningInConsole());
-        define('IS_DEBUG',env('DEBUG',false));
+        define('IS_DEBUG', env('DEBUG', false));
         if (IS_DEBUG) {
             error_reporting(E_ALL);
             @ini_set('display_errors', 'On');
@@ -68,13 +68,13 @@ 
      */
     private function initContainer() {
         static::setInstance($this);
-        $this->instance('app',$this);
-        $this->instance('config',new Config());
-        $this->instance('request',new Request($this->config));
-        $this->instance('route',new Route($this->request));
+        $this->instance('app', $this);
+        $this->instance('config', new Config());
+        $this->instance('request', new Request($this->config));
+        $this->instance('route', new Route($this->request));
         $this->regexBind('#^(\w+)_model$#', "\\app\\models\\\\$1");
-        $this->bind('pinyin','\puck\helpers\PinYin');
-        $this->bind('curl','\puck\helpers\Curl');
+        $this->bind('pinyin', '\puck\helpers\PinYin');
+        $this->bind('curl', '\puck\helpers\Curl');
         $this->bind('dom', '\puck\helpers\Dom');
         $this->bind('db', '\puck\Db');
     }
@@ -95,8 +95,8 @@ 
             return;
         }
         //标记为已加载
-        $this->loadedConfigurations[$name] = true;
-        $path = $this->getConfigurationPath($name);
+        $this->loadedConfigurations[$name]=true;
+        $path=$this->getConfigurationPath($name);
         if ($path) {
             $this->make('config')->set($name, require $path);
         }
@@ -112,21 +112,21 @@ 
      * @param  string|null  $name
      * @return string
      */
-    public function getConfigurationPath($name = null)
+    public function getConfigurationPath($name=null)
     {
-        if (! $name) {
-            $appConfigDir = $this->basePath('configs').'/';
+        if (!$name) {
+            $appConfigDir=$this->basePath('configs').'/';
 
             if (file_exists($appConfigDir)) {
                 return $appConfigDir;
-            } elseif (file_exists($path = __DIR__.'/configs/')) {
+            } elseif (file_exists($path=__DIR__.'/configs/')) {
                 return $path;
             }
         } else {
-            $appConfigPath = $this->basePath('configs').'/'.$name.'.php';
+            $appConfigPath=$this->basePath('configs').'/'.$name.'.php';
             if (file_exists($appConfigPath)) {
                 return $appConfigPath;
-            } elseif (file_exists($path = __DIR__.'/configs/'.$name.'.php')) {
+            } elseif (file_exists($path=__DIR__.'/configs/'.$name.'.php')) {
                 return $path;
             }
         }
@@ -138,15 +138,15 @@ 
      * @param  string|null $path
      * @return string
      */
-    public function basePath($path = null) {
+    public function basePath($path=null) {
         if (isset($this->basePath)) {
-            return $this->basePath . ($path ? '/' . $path : $path);
+            return $this->basePath.($path ? '/'.$path : $path);
         }
 
         if ($this->runningInConsole()) {
-            $this->basePath = getcwd();
+            $this->basePath=getcwd();
         } else {
-            $this->basePath = realpath(getcwd() . '/../');
+            $this->basePath=realpath(getcwd().'/../');
         }
 
         return $this->basePath($path);

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