Rozbo / puck

function.php

Braces +2 added lines, -4 removed lines

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

core/helpers/Chaos.php

Indentation +159 added lines, -159 removed lines

@@ -1,199 +1,199 @@
 <?php
 namespace puck\helpers;
 class Chaos {
-	public $GbToBigArray;
-	public $_pinyin;
-	public $string;
-	public $url='';
-	public $msg='';
-	public $action;
-	private $prefix;
+    public $GbToBigArray;
+    public $_pinyin;
+    public $string;
+    public $url='';
+    public $msg='';
+    public $action;
+    private $prefix;
 	
     function __construct() {
-		$this->_pinyin=new PinYin();
-	}
+        $this->_pinyin=new PinYin();
+    }
 
     /**
      * @param array $prefix
      */
     public function addPrefix(array $prefix) {
         $this->prefix=$prefix[array_rand($prefix)];
-	}
+    }
 
     public function clearPrefix() {
         $this->prefix='';
-	}
+    }
     public function get($str) {
         $this->cutting($str);
         $this->convert();
         $this->clearPrefix();
         return $this->msg;
-	}
+    }
 
-	//分离URL
-	private function cutting($str) {
+    //分离URL
+    private function cutting($str) {
 
-		if (preg_match("@(http://[^\\s]+)@i", $str, $result)) {
-			$this->url=$result[1];
-			$this->msg=$str=str_replace($this->url, '%%%%', $str);
-		} else {
-			$this->msg=$str;
-		}
-	}
+        if (preg_match("@(http://[^\\s]+)@i", $str, $result)) {
+            $this->url=$result[1];
+            $this->msg=$str=str_replace($this->url, '%%%%', $str);
+        } else {
+            $this->msg=$str;
+        }
+    }
 	
 	
 	
-	private function convert($method='msg') {
-		if ($method == 'msg' || $method == 'all') {
-			$this->msg=$this->setPinyin($this->msg);
-			$this->msg=$this->setRepeat($this->msg);
-			//$this->msg = $this->GbToBig($this->msg);
-			$this->msg=$this->setBlankness($this->msg);
+    private function convert($method='msg') {
+        if ($method == 'msg' || $method == 'all') {
+            $this->msg=$this->setPinyin($this->msg);
+            $this->msg=$this->setRepeat($this->msg);
+            //$this->msg = $this->GbToBig($this->msg);
+            $this->msg=$this->setBlankness($this->msg);
 			
-		}
-		if ($method == 'url' || $method == 'all') {
-			$this->url=$this->setChacha($this->url);
-		}
-		$this->msg=$this->prefix.str_replace('%%%%', $this->url, $this->msg);
-	}
+        }
+        if ($method == 'url' || $method == 'all') {
+            $this->url=$this->setChacha($this->url);
+        }
+        $this->msg=$this->prefix.str_replace('%%%%', $this->url, $this->msg);
+    }
 	
-	/**
-	 * @param string $url
-	 */
-	function setChacha($url) {
-		$url=strtolower($url);
-		$arr=array(
-			'a' => array('a', 'A', 'ａ', 'Ａ', 'Α', 'А', 'α'),
-			'b' => array('b', 'B', 'ｂ', 'Ｂ', 'Β', 'В', 'Ь'),
-			'c' => array('c', 'C', 'ｃ', 'Ｃ', 'С', 'с'),
-			'd' => array('d', 'D', 'ｄ', 'Ｄ'),
-			'e' => array('e', 'E', 'ｅ', 'Ｅ', 'Ε', 'Е', 'е'),
-			'f' => array('f', 'F', 'ｆ', 'Ｆ'),
-			'g' => array('g', 'G', 'ｇ', 'Ｇ'),
-			'h' => array('h', 'H', 'ｈ', 'Ｈ', 'Η', 'Н', 'н'),
-			'i' => array('i', 'I', 'ｉ', 'Ｉ', 'Ι', 'Ⅰ'),
-			'j' => array('j', 'J', 'ｊ', 'Ｊ'),
-			'k' => array('k', 'K', 'ｋ', 'Ｋ', 'Κ', 'κ', 'к', 'К'),
-			'l' => array('l', 'L', 'ｌ', 'Ｌ', '︱', '︳', '|'),
-			'm' => array('m', 'M', 'ｍ', 'Ｍ', 'Μ', 'М', 'м'),
-			'n' => array('n', 'N', 'ｎ', 'Ｎ', 'Ν', '∩'),
-			'o' => array('o', 'O', 'ｏ', 'Ｏ', 'Ο', 'О'),
-			'p' => array('p', 'P', 'ｐ', 'Ｐ', 'Ρ', 'Р', 'р'),
-			'q' => array('q', 'Q', 'ｑ', 'Ｑ'),
-			'r' => array('r', 'R', 'ｒ', 'Ｒ'),
-			's' => array('s', 'S', 'ｓ', 'Ｓ'),
-			't' => array('t', 'T', 'ｔ', 'Ｔ', 'Τ', 'Т', 'ㄒ'),
-			'u' => array('u', 'U', 'ｕ', 'Ｕ', '∪'),
-			'v' => array('v', 'V', 'ｖ', 'Ｖ', '∨', 'ν'),
-			'w' => array('w', 'W', 'ｗ', 'Ｗ'),
-			'x' => array('x', 'X', 'ｘ', 'Ｘ', 'Χ', 'χ', 'Х', 'х', 'Ⅹ', '×'),
-			'y' => array('y', 'Y', 'ｙ', 'Ｙ', 'У'),
-			'z' => array('z', 'Z', 'ｚ', 'Ｚ', 'Ζ'),
+    /**
+     * @param string $url
+     */
+    function setChacha($url) {
+        $url=strtolower($url);
+        $arr=array(
+            'a' => array('a', 'A', 'ａ', 'Ａ', 'Α', 'А', 'α'),
+            'b' => array('b', 'B', 'ｂ', 'Ｂ', 'Β', 'В', 'Ь'),
+            'c' => array('c', 'C', 'ｃ', 'Ｃ', 'С', 'с'),
+            'd' => array('d', 'D', 'ｄ', 'Ｄ'),
+            'e' => array('e', 'E', 'ｅ', 'Ｅ', 'Ε', 'Е', 'е'),
+            'f' => array('f', 'F', 'ｆ', 'Ｆ'),
+            'g' => array('g', 'G', 'ｇ', 'Ｇ'),
+            'h' => array('h', 'H', 'ｈ', 'Ｈ', 'Η', 'Н', 'н'),
+            'i' => array('i', 'I', 'ｉ', 'Ｉ', 'Ι', 'Ⅰ'),
+            'j' => array('j', 'J', 'ｊ', 'Ｊ'),
+            'k' => array('k', 'K', 'ｋ', 'Ｋ', 'Κ', 'κ', 'к', 'К'),
+            'l' => array('l', 'L', 'ｌ', 'Ｌ', '︱', '︳', '|'),
+            'm' => array('m', 'M', 'ｍ', 'Ｍ', 'Μ', 'М', 'м'),
+            'n' => array('n', 'N', 'ｎ', 'Ｎ', 'Ν', '∩'),
+            'o' => array('o', 'O', 'ｏ', 'Ｏ', 'Ο', 'О'),
+            'p' => array('p', 'P', 'ｐ', 'Ｐ', 'Ρ', 'Р', 'р'),
+            'q' => array('q', 'Q', 'ｑ', 'Ｑ'),
+            'r' => array('r', 'R', 'ｒ', 'Ｒ'),
+            's' => array('s', 'S', 'ｓ', 'Ｓ'),
+            't' => array('t', 'T', 'ｔ', 'Ｔ', 'Τ', 'Т', 'ㄒ'),
+            'u' => array('u', 'U', 'ｕ', 'Ｕ', '∪'),
+            'v' => array('v', 'V', 'ｖ', 'Ｖ', '∨', 'ν'),
+            'w' => array('w', 'W', 'ｗ', 'Ｗ'),
+            'x' => array('x', 'X', 'ｘ', 'Ｘ', 'Χ', 'χ', 'Х', 'х', 'Ⅹ', '×'),
+            'y' => array('y', 'Y', 'ｙ', 'Ｙ', 'У'),
+            'z' => array('z', 'Z', 'ｚ', 'Ｚ', 'Ζ'),
 			
-			'1' => array('1', '１'),
-			'2' => array('2', '２'),
-			'3' => array('3', '３'),
-			'4' => array('4', '４'),
-			'5' => array('5', '５'),
-			'6' => array('6', '６'),
-			'7' => array('7', '７'),
-			'8' => array('8', '８'),
-			'9' => array('9', '９'),
-			'0' => array('0', '０'),
+            '1' => array('1', '１'),
+            '2' => array('2', '２'),
+            '3' => array('3', '３'),
+            '4' => array('4', '４'),
+            '5' => array('5', '５'),
+            '6' => array('6', '６'),
+            '7' => array('7', '７'),
+            '8' => array('8', '８'),
+            '9' => array('9', '９'),
+            '0' => array('0', '０'),
 			
-			':' => array(':', '：', '∶'),
-			'/' => array('/', '／'),
-			'.' => array('。', '·', '．', '、', '﹒', '，', '丶')
+            ':' => array(':', '：', '∶'),
+            '/' => array('/', '／'),
+            '.' => array('。', '·', '．', '、', '﹒', '，', '丶')
 		
-		);
-		$len=strlen($url);
-		$temp="\n\n";
-		for ($i=0; $i < $len; $i++) {
-			$t_str=substr($url, $i, 1);
-			$sj=mt_rand(0, count($arr[$t_str]) - 1);
-			$temp.=$arr[$t_str][$sj];
-		}
-		return $temp;
-	}
+        );
+        $len=strlen($url);
+        $temp="\n\n";
+        for ($i=0; $i < $len; $i++) {
+            $t_str=substr($url, $i, 1);
+            $sj=mt_rand(0, count($arr[$t_str]) - 1);
+            $temp.=$arr[$t_str][$sj];
+        }
+        return $temp;
+    }
 
-	//随机把一个字符转为拼音
+    //随机把一个字符转为拼音
 
-	/**
-	 * @param string $str
-	 */
-	function setPinyin($str) {
-		$py = mt_rand(0, iconv_strlen( $str, 'UTF-8' )-1);
-		$t_str = iconv_substr( $str, $py, 1, 'UTF-8');
-		if(mt_rand(0,10) > 5) {
-		    $pinyin = " ";
-		}
-		$pinyin = $this->_pinyin->convert($t_str,PINYIN_UNICODE);
+    /**
+     * @param string $str
+     */
+    function setPinyin($str) {
+        $py = mt_rand(0, iconv_strlen( $str, 'UTF-8' )-1);
+        $t_str = iconv_substr( $str, $py, 1, 'UTF-8');
+        if(mt_rand(0,10) > 5) {
+            $pinyin = " ";
+        }
+        $pinyin = $this->_pinyin->convert($t_str,PINYIN_UNICODE);
         $pinyin=implode(" ",$pinyin);
-		if(mt_rand(0,10) > 5) {
-		    $pinyin .= " ";
-		}
-		if($t_str != "%"){
-			$str = preg_replace("'$t_str'", $pinyin, $str, 1);
-		}
-		return $str;
-	}
+        if(mt_rand(0,10) > 5) {
+            $pinyin .= " ";
+        }
+        if($t_str != "%"){
+            $str = preg_replace("'$t_str'", $pinyin, $str, 1);
+        }
+        return $str;
+    }
 	
-	//随机重复一个字符
+    //随机重复一个字符
 
-	/**
-	 * @param string $str
-	 */
-	function setRepeat($str) {
-		$len = iconv_strlen( $str, 'UTF-8' );
-		$action = 0;
-		$temp = '';
-		for( $i=0;  $i<$len; $i++ ){
-			$t_str = iconv_substr( $str, $i, 1 ,'UTF-8');
-			if( mt_rand( 1, 50 ) > 48 && $action == 0) {
-				if(!preg_match("@[a-z0-9%\\s]+@i", $t_str)) {
-					$temp .= $t_str;
-					$action = 1;
-				}
-			}
-			$temp .= $t_str;
-		}
-		return $temp;
-	}
+    /**
+     * @param string $str
+     */
+    function setRepeat($str) {
+        $len = iconv_strlen( $str, 'UTF-8' );
+        $action = 0;
+        $temp = '';
+        for( $i=0;  $i<$len; $i++ ){
+            $t_str = iconv_substr( $str, $i, 1 ,'UTF-8');
+            if( mt_rand( 1, 50 ) > 48 && $action == 0) {
+                if(!preg_match("@[a-z0-9%\\s]+@i", $t_str)) {
+                    $temp .= $t_str;
+                    $action = 1;
+                }
+            }
+            $temp .= $t_str;
+        }
+        return $temp;
+    }
 	
-	//随机插入不影响阅读的字符
+    //随机插入不影响阅读的字符
 
-	/**
-	 * @param string $str
-	 */
-	function setBlankness($str) {
-		$blankness=array(" ", '　', '҉', '̅̅', '̲', '̲̲', '̅', '̲̲̅̅');
-		$len=iconv_strlen($str, 'UTF-8');
-		$temp='';
-		for ($i=0; $i < $len; $i++) {
-			$t_str=iconv_substr($str, $i, 1, 'UTF-8');
-			if (mt_rand(1, 50) > 48) {
-				if (!preg_match("@[a-z0-9%\\s]+@i", $t_str)) {
-					$temp.=$blankness[mt_rand(0, 7)];
-				}
-			}
-			$temp.=$t_str;
-		}
-		return $temp;
-	}
+    /**
+     * @param string $str
+     */
+    function setBlankness($str) {
+        $blankness=array(" ", '　', '҉', '̅̅', '̲', '̲̲', '̅', '̲̲̅̅');
+        $len=iconv_strlen($str, 'UTF-8');
+        $temp='';
+        for ($i=0; $i < $len; $i++) {
+            $t_str=iconv_substr($str, $i, 1, 'UTF-8');
+            if (mt_rand(1, 50) > 48) {
+                if (!preg_match("@[a-z0-9%\\s]+@i", $t_str)) {
+                    $temp.=$blankness[mt_rand(0, 7)];
+                }
+            }
+            $temp.=$t_str;
+        }
+        return $temp;
+    }
 	
-	//随机进行繁体中文转换
-	function GbToBig($str) {
-		$len=iconv_strlen($str, 'UTF-8');
-		$temp='';
-		for ($i=0; $i < $len; $i++) {
-			$t_str=iconv_substr($str, $i, 1, 'UTF-8');
-			if (mt_rand(1, 50) > 48) {
-				$t_str=strtr($t_str, $this->GbToBigArray);
-			}
-			$temp.=$t_str;
-		}
-		return $temp;
-	}
+    //随机进行繁体中文转换
+    function GbToBig($str) {
+        $len=iconv_strlen($str, 'UTF-8');
+        $temp='';
+        for ($i=0; $i < $len; $i++) {
+            $t_str=iconv_substr($str, $i, 1, 'UTF-8');
+            if (mt_rand(1, 50) > 48) {
+                $t_str=strtr($t_str, $this->GbToBigArray);
+            }
+            $temp.=$t_str;
+        }
+        return $temp;
+    }
 }
 
 

core/Route.php

Braces +1 added lines, -2 removed lines

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

core/Mysql.php

Braces +27 added lines, -20 removed lines

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

core/App.php

Braces +1 added lines, -2 removed lines

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

core/Model.php

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/helpers/Dispatch.php

Braces +2 added lines, -2 removed lines

@@ -109,10 +109,10 @@
 
         if($renderType=='json'){
             $response=json($res);
-        }elseif ($renderType=='xml'){
+        } elseif ($renderType=='xml'){
             //todo:: 支持xml格式化输出
             $response='don\'t support xml now!';
-        }elseif ($renderType==""){
+        } elseif ($renderType==""){
             if(is_array($res)||is_object($res)){
                 $response=json($res);
             }