caoym / phpboot

src/RPC/MultiRpc.php

Spacing +5 added lines, -5 removed lines

@@ -21,12 +21,12 @@ 
          * ]
          *
          */
-        return MultiRequest::run($threads, function($promises){
+        return MultiRequest::run($threads, function($promises) {
             $res = [];
-            foreach (Promise\settle($promises)->wait() as $i){
-                if(isset($i['reason'])){
+            foreach (Promise\settle($promises)->wait() as $i) {
+                if (isset($i['reason'])) {
                     $res[] = [null, new RpcException($i['reason'])];
-                }else{
+                }else {
                     $res[] = [$i['value'], null];
                 }
             }
@@ -34,7 +34,7 @@ 
         });
     }
 
-    public static function isRunning(){
+    public static function isRunning() {
         return MultiRequest::isRunning();
     }
 

Braces +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
             foreach (Promise\settle($promises)->wait() as $i){
                 if(isset($i['reason'])){
                     $res[] = [null, new RpcException($i['reason'])];
-                }else{
+                } else{
                     $res[] = [$i['value'], null];
                 }
             }

src/Controller/ResponseRenderer.php

Spacing +5 added lines, -5 removed lines

@@ -15,19 +15,19 @@
     {
         $response = new Response();
         $response->headers->set('Content-Type', 'application/json');
-        foreach ($output as $key=>$value){
+        foreach ($output as $key=>$value) {
             //TODO 支持自定义格式输出
             //TODO 支持更多的输出目标
-            if($key == 'content'){
+            if ($key == 'content') {
                 //if(is_array($value) || is_object($value)){
                     $value = json_encode($value, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
                 //}
                 $response->setContent($value);
-            }elseif($key == 'headers'){
-                foreach ($value as $k=>$v){
+            }elseif ($key == 'headers') {
+                foreach ($value as $k=>$v) {
                     $response->headers->set($k, $v);
                 }
-            }else{
+            }else {
                 \PhpBoot\abort(new \UnexpectedValueException("Unexpected output target $key"));
             }
 

Braces +2 added lines, -2 removed lines

@@ -23,11 +23,11 @@
                     $value = json_encode($value, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
                 //}
                 $response->setContent($value);
-            }elseif($key == 'headers'){
+            } elseif($key == 'headers'){
                 foreach ($value as $k=>$v){
                     $response->headers->set($k, $v);
                 }
-            }else{
+            } else{
                 \PhpBoot\abort(new \UnexpectedValueException("Unexpected output target $key"));
             }
 

src/DB/impls.php

Doc Comments +82 added lines, -1 removed lines

@@ -8,6 +8,11 @@ 
 use PhpBoot\DB\Context;
 
 class ExecResult{
+
+    /**
+     * @param \PDO $pdo
+     * @param \PDOStatement $st
+     */
     public function __construct($success, $pdo, $st){
         $this->pdo = $pdo;
         $this->st = $st;
@@ -41,6 +46,10 @@ 
 
 class SelectImpl
 {
+    /**
+     * @param Context $context
+     * @param string $columns
+     */
     static  public function select($context, $columns){
         $context->appendSql("SELECT $columns");
     }
@@ -48,6 +57,10 @@ 
 
 class FromImpl
 {
+    /**
+     * @param Context $context
+     * @param string $tables
+     */
     static public function from($context, $tables,$as=null){
         if($tables instanceof BasicRule){
             $context->appendSql("FROM (".$tables->context->sql.')');
@@ -63,6 +76,10 @@ 
 
 class DeleteImpl
 {
+    /**
+     * @param Context $context
+     * @param string $from
+     */
     static public function deleteFrom($context, $from)
     {
         $context->appendSql("DELETE FROM ".DB::wrap($from));
@@ -71,6 +88,11 @@ 
 
 class JoinImpl
 {
+    /**
+     * @param Context $context
+     * @param null|string $type
+     * @param string $table
+     */
     static public function join($context, $type, $table) {
         $table = DB::wrap($table);
         if($type){
@@ -83,6 +105,10 @@ 
 
 class JoinOnImpl
 {
+    /**
+     * @param Context $context
+     * @param string $condition
+     */
     static public function on($context, $condition) {
         $context->appendSql("ON $condition");
     }
@@ -90,6 +116,9 @@ 
 
 class ForUpdateImpl
 {
+    /**
+     * @param Context $context
+     */
     static public function forUpdate($context){
         $context->appendSql("FOR UPDATE");
     }
@@ -97,6 +126,10 @@ 
 
 class ForUpdateOfImpl
 {
+    /**
+     * @param Context $context
+     * @param string $column
+     */
     static public function of($context, $column){
         $column = DB::wrap($column);
         $context->appendSql("OF $column");
@@ -105,6 +138,10 @@ 
 
 class InsertImpl
 {
+    /**
+     * @param Context $context
+     * @param string $table
+     */
     static public function insertInto($context, $table) {
         $table = DB::wrap($table);
         $context->appendSql("INSERT INTO $table");
@@ -112,6 +149,10 @@ 
 }
 class ReplaceImpl
 {
+    /**
+     * @param Context $context
+     * @param string $table
+     */
     static public function replaceInto($context, $table) {
         $table = DB::wrap($table);
         $context->appendSql("REPLACE INTO $table");
@@ -119,6 +160,9 @@ 
 }
 class ValuesImpl
 {
+    /**
+     * @param Context $context
+     */
     static public function values($context, $values){
         $params = [];
         $stubs = [];
@@ -148,6 +192,10 @@ 
 
 class UpdateImpl
 {
+    /**
+     * @param Context $context
+     * @param string $table
+     */
     static public function update($context, $table){
         $table = DB::wrap($table);
         $context->appendSql("UPDATE $table");
@@ -164,6 +212,9 @@ 
         }
     }
 
+    /**
+     * @param string $expr
+     */
     public function setExpr(Context $context, $expr, $args){
         if($this->first){
             $this->first = false;
@@ -226,6 +277,11 @@ 
         }
         return $this;
     }
+
+    /**
+     * @param string $column
+     * @param string $order
+     */
     public function orderBy(Context $context, $column, $order=null){
         if(is_string($column)){
             if($order === null){
@@ -243,12 +299,20 @@ 
 
 class LimitImpl
 {
+    /**
+     * @param integer $size
+     */
     static public function limit(Context $context, $size){
         $intSize = intval($size);
         strval($intSize) == $size or \PhpBoot\abort(
             new \InvalidArgumentException("invalid params for limit($size)"));
         $context->appendSql("LIMIT $size");
     }
+
+    /**
+     * @param integer $start
+     * @param integer $size
+     */
     static public function limitWithOffset(Context $context, $start, $size){
         $intStart = intval($start);
         $intSize = intval($size);
@@ -260,6 +324,9 @@ 
 
 class WhereImpl{
 
+    /**
+     * @param string $str
+     */
     static private function  findQ($str,$offset = 0,$no=0){
         $found = strpos($str, '?', $offset);
         if($no == 0 || $found === false){
@@ -307,6 +374,7 @@ 
      * LIKE     'id'=>['LIKE' => '1%']
      * IN   'id'=>['IN' => [1,2,3]]
      * NOT IN   'id'=>['NOT IN' => [1,2,3]]
+     * @param string $prefix
      * @return void
      */
     static public function conditionArgs(Context $context, $prefix, $args=[]){
@@ -374,6 +442,10 @@ 
 
         self::condition($context, $prefix, implode(' AND ', $exprs), $params);
     }
+
+    /**
+     * @param string $expr
+     */
     static public function condition(Context $context, $prefix, $expr, $args){
         if(!empty($expr)){
             if($args){
@@ -436,6 +508,10 @@ 
 }
 
 class GroupByImpl{
+
+    /**
+     * @param string $column
+     */
     static public function groupBy(Context $context, $column){
         $column = DB::wrap($column);
         $context->appendSql("GROUP BY $column");
@@ -458,7 +534,6 @@ 
     /**
      *
      * @param Context $context
-     * @param string|false $asDict return  as dict or array
      * @return false|array
      */
     static public function get($context, $dictAs=false){
@@ -517,6 +592,9 @@ 
 }
 class OnDuplicateKeyUpdateImpl
 {
+    /**
+     * @param Context $context
+     */
     public function set($context, $column, $value){
         if(is_string($column)){
             $this->setExpr($context, $column, $value);
@@ -525,6 +603,9 @@ 
         }
     }
 
+    /**
+     * @param string $expr
+     */
     public function setExpr($context, $expr, $args){
         $prefix = '';
         if($this->first){

Spacing +144 added lines, -144 removed lines

@@ -7,14 +7,14 @@ 
 use PhpBoot\DB\rules\basic\BasicRule;
 use PhpBoot\DB\Context;
 
-class ExecResult{
-    public function __construct($success, $pdo, $st){
+class ExecResult {
+    public function __construct($success, $pdo, $st) {
         $this->pdo = $pdo;
         $this->st = $st;
         $this->success = $success;
         $this->rows = $this->st->rowCount();
     }
-    public function lastInsertId($name=null){
+    public function lastInsertId($name = null) {
         return $this->pdo->lastInsertId($name);
     }
     /**
@@ -41,21 +41,21 @@ 
 
 class SelectImpl
 {
-    static  public function select($context, $columns){
+    static  public function select($context, $columns) {
         $context->appendSql("SELECT $columns");
     }
 }
 
 class FromImpl
 {
-    static public function from($context, $tables,$as=null){
-        if($tables instanceof BasicRule){
+    static public function from($context, $tables, $as = null) {
+        if ($tables instanceof BasicRule) {
             $context->appendSql("FROM (".$tables->context->sql.')');
-            $context->params = array_merge($context->params,$tables->context->params);
+            $context->params = array_merge($context->params, $tables->context->params);
         }else {
             $context->appendSql("FROM ".DB::wrap($tables));
         }
-        if($as){
+        if ($as) {
             $context->appendSql("as ".DB::wrap($as));
         }
     }
@@ -73,9 +73,9 @@ 
 {
     static public function join($context, $type, $table) {
         $table = DB::wrap($table);
-        if($type){
+        if ($type) {
             $context->appendSql("$type JOIN $table");
-        }else{
+        }else {
             $context->appendSql("JOIN $table");
         }
     }
@@ -90,14 +90,14 @@ 
 
 class ForUpdateImpl
 {
-    static public function forUpdate($context){
+    static public function forUpdate($context) {
         $context->appendSql("FOR UPDATE");
     }
 }
 
 class ForUpdateOfImpl
 {
-    static public function of($context, $column){
+    static public function of($context, $column) {
         $column = DB::wrap($column);
         $context->appendSql("OF $column");
     }
@@ -119,27 +119,27 @@ 
 }
 class ValuesImpl
 {
-    static public function values($context, $values){
+    static public function values($context, $values) {
         $params = [];
         $stubs = [];
-        foreach ($values as $v){
-            if(is_a($v, Raw::class)){//直接拼接sql，不需要转义
-                $stubs[]=$v->get();
-            }else{
-                $stubs[]='?';
+        foreach ($values as $v) {
+            if (is_a($v, Raw::class)) {//直接拼接sql，不需要转义
+                $stubs[] = $v->get();
+            }else {
+                $stubs[] = '?';
                 $params[] = $v;
             }
         }
         $stubs = implode(',', $stubs);
 
-        if(array_keys($values) === range(0, count($values) - 1)){
+        if (array_keys($values) === range(0, count($values) - 1)) {
             //VALUES(val0, val1, val2)
             $context->appendSql("VALUES($stubs)");
 
-        }else{
+        }else {
             //(col0, col1, col2) VALUES(val0, val1, val2)
-            $columns = implode(',', array_map(function($k){return DB::wrap($k);}, array_keys($values)));
-            $context->appendSql("($columns) VALUES($stubs)",false);
+            $columns = implode(',', array_map(function($k) {return DB::wrap($k); }, array_keys($values)));
+            $context->appendSql("($columns) VALUES($stubs)", false);
         }
         $context->appendParams($params);
     }
@@ -148,7 +148,7 @@ 
 
 class UpdateImpl
 {
-    static public function update($context, $table){
+    static public function update($context, $table) {
         $table = DB::wrap($table);
         $context->appendSql("UPDATE $table");
     }
@@ -156,81 +156,81 @@ 
 
 class UpdateSetImpl
 {
-    public function set(Context $context, $expr, $args){
-        if(is_string($expr)){
+    public function set(Context $context, $expr, $args) {
+        if (is_string($expr)) {
             return $this->setExpr($context, $expr, $args);
-        }else{
+        }else {
             return $this->setArgs($context, $expr);
         }
     }
 
-    public function setExpr(Context $context, $expr, $args){
-        if($this->first){
+    public function setExpr(Context $context, $expr, $args) {
+        if ($this->first) {
             $this->first = false;
             $prefix = 'SET ';
-        }else{
+        }else {
             $prefix = ',';
         }
 
-        $context->appendSql("$prefix$expr",$prefix == 'SET ');
+        $context->appendSql("$prefix$expr", $prefix == 'SET ');
         $context->appendParams($args);
 
     }
-    public function setArgs(Context $context, $values){
+    public function setArgs(Context $context, $values) {
         $set = [];
         $params = [];
-        foreach ($values as $k=>$v){
+        foreach ($values as $k=>$v) {
             $k = DB::wrap($k);
-            if(is_a($v, Raw::class)){//直接拼接sql，不需要转义
-                $set[]= "$k=".$v->get();
-            }else{
-                $set[]= "$k=?";
-                $params[]=$v;
+            if (is_a($v, Raw::class)) {//直接拼接sql，不需要转义
+                $set[] = "$k=".$v->get();
+            }else {
+                $set[] = "$k=?";
+                $params[] = $v;
             }
         }
-        if($this->first){
+        if ($this->first) {
             $this->first = false;
             $context->appendSql('SET '.implode(',', $set));
             $context->appendParams($params);
-        }else{
-            $context->appendSql(','.implode(',', $set),false);
+        }else {
+            $context->appendSql(','.implode(',', $set), false);
             $context->appendParams($params);
         }
     }
-    private $first=true;
+    private $first = true;
 }
 class OrderByImpl
 {
-    public function orderByArgs(Context $context, $orders){
-        if(empty($orders)){
+    public function orderByArgs(Context $context, $orders) {
+        if (empty($orders)) {
             return $this;
         }
         $params = array();
-        foreach ($orders as $k=>$v){
-            if(is_integer($k)){
+        foreach ($orders as $k=>$v) {
+            if (is_integer($k)) {
                 $params[] = DB::wrap($v);
-            }else{
+            }else {
                 $k = DB::wrap($k);
 
                 $v = strtoupper($v);
-                ($v =='DESC' || $v =='ASC') or \PhpBoot\abort( new \InvalidArgumentException("invalid params for orderBy(".json_encode($orders).")"));
+                ($v == 'DESC' || $v == 'ASC') or \PhpBoot\abort(new \InvalidArgumentException("invalid params for orderBy(".json_encode($orders).")"));
 
                 $params[] = "$k $v";
             }
         }
-        if($this->first){
+        if ($this->first) {
             $this->first = false;
             $context->appendSql('ORDER BY '.implode(',', $params));
-        }else{
-            $context->appendSql(','.implode(',', $params),false);
+        }else {
+            $context->appendSql(','.implode(',', $params), false);
         }
         return $this;
     }
-    public function orderBy(Context $context, $column, $order=null){
-        if(is_string($column)){
-            if($order === null){
+    public function orderBy(Context $context, $column, $order = null) {
+        if (is_string($column)) {
+            if ($order === null) {
                 $column = [$column];
-            }else{
+            }else {
                 $column = [$column=>$order];
             }
         }
@@ -238,18 +238,18 @@ 
 
 
     }
-    private $first=true;
+    private $first = true;
 }
 
 class LimitImpl
 {
-    static public function limit(Context $context, $size){
+    static public function limit(Context $context, $size) {
         $intSize = intval($size);
         strval($intSize) == $size or \PhpBoot\abort(
             new \InvalidArgumentException("invalid params for limit($size)"));
         $context->appendSql("LIMIT $size");
     }
-    static public function limitWithOffset(Context $context, $start, $size){
+    static public function limitWithOffset(Context $context, $start, $size) {
         $intStart = intval($start);
         $intSize = intval($size);
         strval($intStart) == $start && strval($intSize) == $size or \PhpBoot\abort(
@@ -258,31 +258,31 @@ 
     }
 }
 
-class WhereImpl{
+class WhereImpl {
 
-    static private function  findQ($str,$offset = 0,$no=0){
+    static private function  findQ($str, $offset = 0, $no = 0) {
         $found = strpos($str, '?', $offset);
-        if($no == 0 || $found === false){
+        if ($no == 0 || $found === false) {
             return $found;
         }
-        return self::findQ($str, $found+1, $no-1);
+        return self::findQ($str, $found + 1, $no - 1);
     }
-    static public function having(Context $context, $expr, $args){
-        if(is_string($expr)){
+    static public function having(Context $context, $expr, $args) {
+        if (is_string($expr)) {
             self::condition($context, 'HAVING', $expr, $args);
-        }else{
+        }else {
             self::conditionArgs($context, 'HAVING', $expr);
         }
         //TODO 支持 OR 、 闭包
 
     }
-    static public function where(Context $context, $expr, $args){
-        if(empty($expr)){
+    static public function where(Context $context, $expr, $args) {
+        if (empty($expr)) {
             return;
         }
-        if (is_string($expr)){
+        if (is_string($expr)) {
             self::condition($context, 'WHERE', $expr, $args);
-        }else{
+        }else {
             self::conditionArgs($context, 'WHERE', $expr);
         }
         //TODO 支持 OR 、 闭包
@@ -309,15 +309,15 @@ 
      * NOT IN   'id'=>['NOT IN' => [1,2,3]]
      * @return void
      */
-    static public function conditionArgs(Context $context, $prefix, $args=[]){
-        if($args ===null){
-            return ;
+    static public function conditionArgs(Context $context, $prefix, $args = []) {
+        if ($args === null) {
+            return;
         }
         $exprs = array();
         $params = array();
-        foreach ($args as $k => $v){
+        foreach ($args as $k => $v) {
             $k = DB::wrap($k);
-            if(is_array($v)){
+            if (is_array($v)) {
                 $ops = ['=', '>', '<', '<>', '>=', '<=', 'IN', 'NOT IN', 'BETWEEN', 'LIKE'];
                 $op = array_keys($v)[0];
                 $op = strtoupper($op);
@@ -326,46 +326,46 @@ 
                     new \InvalidArgumentException("invalid param $op for whereArgs"));
 
                 $var = array_values($v)[0];
-                if($op == 'IN' || $op == 'NOT IN'){
+                if ($op == 'IN' || $op == 'NOT IN') {
                     $stubs = [];
-                    foreach ($var as $i){
-                        if(is_a($i, Raw::class)){
-                            $stubs[]=strval($i);
-                        }else{
-                            $stubs[]='?';
+                    foreach ($var as $i) {
+                        if (is_a($i, Raw::class)) {
+                            $stubs[] = strval($i);
+                        }else {
+                            $stubs[] = '?';
                             $params[] = $i;
                         }
                     }
                     $stubs = implode(',', $stubs);
                     $exprs[] = "$k $op ($stubs)";
-                }else if($op == 'BETWEEN'){
+                }else if ($op == 'BETWEEN') {
                     $cond = "$k BETWEEN";
-                    if(is_a($var[0], Raw::class)){
+                    if (is_a($var[0], Raw::class)) {
                         $cond = "$cond ".strval($var[0]);
-                    }else{
+                    }else {
                         $cond = "$cond ?";
                         $params[] = $var[0];
                     }
-                    if(is_a($var[1], Raw::class)){
+                    if (is_a($var[1], Raw::class)) {
                         $cond = "$cond AND ".strval($var[1]);
-                    }else{
+                    }else {
                         $cond = "$cond AND ?";
                         $params[] = $var[1];
                     }
                     $exprs[] = $cond;
-                }else{
-                    if(is_a($var, Raw::class)){
+                }else {
+                    if (is_a($var, Raw::class)) {
                         $exprs[] = "$k $op ".strval($var);
-                    }else{
+                    }else {
                         $exprs[] = "$k $op ?";
                         $params[] = $var;
                     }
                 }
-            }else{
-                if(is_a($v, Raw::class)){
+            }else {
+                if (is_a($v, Raw::class)) {
                     $exprs[] = "$k = ".strval($v);
 
-                }else{
+                }else {
                     $exprs[] = "$k = ?";
                     $params[] = $v;
                 }
@@ -374,20 +374,20 @@ 
 
         self::condition($context, $prefix, implode(' AND ', $exprs), $params);
     }
-    static public function condition(Context $context, $prefix, $expr, $args){
-        if(!empty($expr)){
-            if($args){
+    static public function condition(Context $context, $prefix, $expr, $args) {
+        if (!empty($expr)) {
+            if ($args) {
                 //因为PDO不支持绑定数组变量, 这里需要手动展开数组
                 //也就是说把 where("id IN(?)", [1,2])  展开成 where("id IN(?,?)", 1,2)
                 $cutted = null;
                 $cut = null;
                 $toReplace = array();
 
-                $newArgs=array();
+                $newArgs = array();
                 //找到所有数组对应的?符位置
-                foreach ($args as $k =>$arg){
-                    if(is_array($arg) || is_a($arg, Raw::class)){
-                        if(!$cutted){
+                foreach ($args as $k =>$arg) {
+                    if (is_array($arg) || is_a($arg, Raw::class)) {
+                        if (!$cutted) {
                             $cut = new NestedStringCut($expr);
                             $cutted = $cut->getText();
                         }
@@ -397,46 +397,46 @@ 
                         $pos !== false or \PhpBoot\abort(
                             new \InvalidArgumentException("unmatched params and ? @ $expr"));
 
-                        if(is_array($arg)){
+                        if (is_array($arg)) {
                             $stubs = [];
-                            foreach ($arg as $i){
-                                if(is_a($i, Raw::class)){
+                            foreach ($arg as $i) {
+                                if (is_a($i, Raw::class)) {
                                     $stubs[] = strval($i);
-                                }else{
+                                }else {
                                     $stubs[] = '?';
                                     $newArgs[] = $i;
                                 }
                             }
                             $stubs = implode(',', $stubs);
-                        }else{
+                        }else {
                             $stubs = strval($arg);
                         }
                         $toReplace[] = [$pos, $stubs];
 
-                    }else{
-                        $newArgs[]=$arg;
+                    }else {
+                        $newArgs[] = $arg;
                     }
                 }
 
-                if(count($toReplace)){
+                if (count($toReplace)) {
                     $toReplace = array_reverse($toReplace);
-                    foreach ($toReplace as $i){
+                    foreach ($toReplace as $i) {
                         list($pos, $v) = $i;
-                        $expr = substr($expr, 0, $pos).$v. substr($expr, $pos+1);
+                        $expr = substr($expr, 0, $pos).$v.substr($expr, $pos + 1);
                     }
                     $args = $newArgs;
                 }
             }
             $context->appendSql($prefix.' '.$expr);
-            if($args){
+            if ($args) {
                 $context->appendParams($args);
             }
         }
     }
 }
 
-class GroupByImpl{
-    static public function groupBy(Context $context, $column){
+class GroupByImpl {
+    static public function groupBy(Context $context, $column) {
         $column = DB::wrap($column);
         $context->appendSql("GROUP BY $column");
     }
@@ -461,20 +461,20 @@ 
      * @param string|false $asDict return  as dict or array
      * @return false|array
      */
-    static public function get($context, $dictAs=false){
+    static public function get($context, $dictAs = false) {
 
         $st = $context->connection->prepare($context->sql);
-        if($st->execute($context->params)){
+        if ($st->execute($context->params)) {
             $res = $st->fetchAll(\PDO::FETCH_ASSOC);
-            if ($dictAs){
-                $dict= [];
-                foreach ($res as $i){
-                    $dict[$i[$dictAs]]=$i;
+            if ($dictAs) {
+                $dict = [];
+                foreach ($res as $i) {
+                    $dict[$i[$dictAs]] = $i;
                 }
                 return $context->handleResult($dict);
             }
             return $context->handleResult($res);
-        }else{
+        }else {
             return false;
         }
     }
@@ -483,22 +483,22 @@ 
      * @param Context $context
      * @return int|false
      */
-    static public function count($context){
+    static public function count($context) {
 
         $found = [];
-        if(!preg_match('/\bselect\b/i', $context->sql, $found, PREG_OFFSET_CAPTURE) ||
-            count($found)==0){
+        if (!preg_match('/\bselect\b/i', $context->sql, $found, PREG_OFFSET_CAPTURE) ||
+            count($found) == 0) {
             \PhpBoot\abort(new \PDOException("can not use count(*) without select"));
         }
         list($chars, $columnBegin) = $found[0];
-        $columnBegin = $columnBegin + strlen('select')+1;
+        $columnBegin = $columnBegin + strlen('select') + 1;
 
         $columnEnd = 0;
         $found = [];
-        if(!preg_match('/\bfrom\b/i', $context->sql, $found, PREG_OFFSET_CAPTURE) ||
-            count($found)==0){
+        if (!preg_match('/\bfrom\b/i', $context->sql, $found, PREG_OFFSET_CAPTURE) ||
+            count($found) == 0) {
             $columnEnd = strlen($context->sql);
-        }else{
+        }else {
             list($chars, $columnEnd) = $found[0];
         }
         $sql = substr($context->sql, 0, $columnBegin);
@@ -506,10 +506,10 @@ 
         $sql .= substr($context->sql, $columnEnd);
 
         $st = $context->connection->prepare($sql);
-        if($st->execute($context->params)){
+        if ($st->execute($context->params)) {
             $res = $st->fetchAll(\PDO::FETCH_ASSOC);
             return $res[0]['count'];
-        }else{
+        }else {
             return false;
         }
 
@@ -517,47 +517,47 @@ 
 }
 class OnDuplicateKeyUpdateImpl
 {
-    public function set($context, $column, $value){
-        if(is_string($column)){
+    public function set($context, $column, $value) {
+        if (is_string($column)) {
             $this->setExpr($context, $column, $value);
-        }else{
+        }else {
             $this->setArgs($context, $column);
         }
     }
 
-    public function setExpr($context, $expr, $args){
+    public function setExpr($context, $expr, $args) {
         $prefix = '';
-        if($this->first){
+        if ($this->first) {
             $this->first = false;
             $prefix = 'ON DUPLICATE KEY UPDATE ';
-        }else{
+        }else {
             $prefix = ',';
         }
 
-        $context->appendSql("$prefix$expr",$prefix == 'ON DUPLICATE KEY UPDATE ');
+        $context->appendSql("$prefix$expr", $prefix == 'ON DUPLICATE KEY UPDATE ');
         $context->appendParams($args);
 
     }
-    public function setArgs($context, $values){
+    public function setArgs($context, $values) {
         $set = [];
         $params = [];
-        foreach ($values as $k=>$v){
+        foreach ($values as $k=>$v) {
             $k = DB::wrap($k);
-            if(is_a($v, Raw::class)){//直接拼接sql，不需要转义
-                $set[]= "$k=".$v->get();
-            }else{
-                $set[]= "$k=?";
-                $params[]=$v;
+            if (is_a($v, Raw::class)) {//直接拼接sql，不需要转义
+                $set[] = "$k=".$v->get();
+            }else {
+                $set[] = "$k=?";
+                $params[] = $v;
             }
         }
-        if($this->first){
+        if ($this->first) {
             $this->first = false;
             $context->appendSql('ON DUPLICATE KEY UPDATE '.implode(',', $set));
             $context->appendParams($params);
-        }else{
-            $context->appendSql(','.implode(',', $set),false);
+        }else {
+            $context->appendSql(','.implode(',', $set), false);
             $context->appendParams($params);
         }
     }
-    private $first=true;
+    private $first = true;
 }

Braces +31 added lines, -31 removed lines

@@ -52,7 +52,7 @@ 
         if($tables instanceof BasicRule){
             $context->appendSql("FROM (".$tables->context->sql.')');
             $context->params = array_merge($context->params,$tables->context->params);
-        }else {
+        } else {
             $context->appendSql("FROM ".DB::wrap($tables));
         }
         if($as){
@@ -75,7 +75,7 @@ 
         $table = DB::wrap($table);
         if($type){
             $context->appendSql("$type JOIN $table");
-        }else{
+        } else{
             $context->appendSql("JOIN $table");
         }
     }
@@ -125,7 +125,7 @@ 
         foreach ($values as $v){
             if(is_a($v, Raw::class)){//直接拼接sql，不需要转义
                 $stubs[]=$v->get();
-            }else{
+            } else{
                 $stubs[]='?';
                 $params[] = $v;
             }
@@ -136,7 +136,7 @@ 
             //VALUES(val0, val1, val2)
             $context->appendSql("VALUES($stubs)");
 
-        }else{
+        } else{
             //(col0, col1, col2) VALUES(val0, val1, val2)
             $columns = implode(',', array_map(function($k){return DB::wrap($k);}, array_keys($values)));
             $context->appendSql("($columns) VALUES($stubs)",false);
@@ -159,7 +159,7 @@ 
     public function set(Context $context, $expr, $args){
         if(is_string($expr)){
             return $this->setExpr($context, $expr, $args);
-        }else{
+        } else{
             return $this->setArgs($context, $expr);
         }
     }
@@ -168,7 +168,7 @@ 
         if($this->first){
             $this->first = false;
             $prefix = 'SET ';
-        }else{
+        } else{
             $prefix = ',';
         }
 
@@ -183,7 +183,7 @@ 
             $k = DB::wrap($k);
             if(is_a($v, Raw::class)){//直接拼接sql，不需要转义
                 $set[]= "$k=".$v->get();
-            }else{
+            } else{
                 $set[]= "$k=?";
                 $params[]=$v;
             }
@@ -192,7 +192,7 @@ 
             $this->first = false;
             $context->appendSql('SET '.implode(',', $set));
             $context->appendParams($params);
-        }else{
+        } else{
             $context->appendSql(','.implode(',', $set),false);
             $context->appendParams($params);
         }
@@ -209,7 +209,7 @@ 
         foreach ($orders as $k=>$v){
             if(is_integer($k)){
                 $params[] = DB::wrap($v);
-            }else{
+            } else{
                 $k = DB::wrap($k);
 
                 $v = strtoupper($v);
@@ -221,7 +221,7 @@ 
         if($this->first){
             $this->first = false;
             $context->appendSql('ORDER BY '.implode(',', $params));
-        }else{
+        } else{
             $context->appendSql(','.implode(',', $params),false);
         }
         return $this;
@@ -230,7 +230,7 @@ 
         if(is_string($column)){
             if($order === null){
                 $column = [$column];
-            }else{
+            } else{
                 $column = [$column=>$order];
             }
         }
@@ -270,7 +270,7 @@ 
     static public function having(Context $context, $expr, $args){
         if(is_string($expr)){
             self::condition($context, 'HAVING', $expr, $args);
-        }else{
+        } else{
             self::conditionArgs($context, 'HAVING', $expr);
         }
         //TODO 支持 OR 、 闭包
@@ -282,7 +282,7 @@ 
         }
         if (is_string($expr)){
             self::condition($context, 'WHERE', $expr, $args);
-        }else{
+        } else{
             self::conditionArgs($context, 'WHERE', $expr);
         }
         //TODO 支持 OR 、 闭包
@@ -331,41 +331,41 @@ 
                     foreach ($var as $i){
                         if(is_a($i, Raw::class)){
                             $stubs[]=strval($i);
-                        }else{
+                        } else{
                             $stubs[]='?';
                             $params[] = $i;
                         }
                     }
                     $stubs = implode(',', $stubs);
                     $exprs[] = "$k $op ($stubs)";
-                }else if($op == 'BETWEEN'){
+                } else if($op == 'BETWEEN'){
                     $cond = "$k BETWEEN";
                     if(is_a($var[0], Raw::class)){
                         $cond = "$cond ".strval($var[0]);
-                    }else{
+                    } else{
                         $cond = "$cond ?";
                         $params[] = $var[0];
                     }
                     if(is_a($var[1], Raw::class)){
                         $cond = "$cond AND ".strval($var[1]);
-                    }else{
+                    } else{
                         $cond = "$cond AND ?";
                         $params[] = $var[1];
                     }
                     $exprs[] = $cond;
-                }else{
+                } else{
                     if(is_a($var, Raw::class)){
                         $exprs[] = "$k $op ".strval($var);
-                    }else{
+                    } else{
                         $exprs[] = "$k $op ?";
                         $params[] = $var;
                     }
                 }
-            }else{
+            } else{
                 if(is_a($v, Raw::class)){
                     $exprs[] = "$k = ".strval($v);
 
-                }else{
+                } else{
                     $exprs[] = "$k = ?";
                     $params[] = $v;
                 }
@@ -402,18 +402,18 @@ 
                             foreach ($arg as $i){
                                 if(is_a($i, Raw::class)){
                                     $stubs[] = strval($i);
-                                }else{
+                                } else{
                                     $stubs[] = '?';
                                     $newArgs[] = $i;
                                 }
                             }
                             $stubs = implode(',', $stubs);
-                        }else{
+                        } else{
                             $stubs = strval($arg);
                         }
                         $toReplace[] = [$pos, $stubs];
 
-                    }else{
+                    } else{
                         $newArgs[]=$arg;
                     }
                 }
@@ -474,7 +474,7 @@ 
                 return $context->handleResult($dict);
             }
             return $context->handleResult($res);
-        }else{
+        } else{
             return false;
         }
     }
@@ -498,7 +498,7 @@ 
         if(!preg_match('/\bfrom\b/i', $context->sql, $found, PREG_OFFSET_CAPTURE) ||
             count($found)==0){
             $columnEnd = strlen($context->sql);
-        }else{
+        } else{
             list($chars, $columnEnd) = $found[0];
         }
         $sql = substr($context->sql, 0, $columnBegin);
@@ -509,7 +509,7 @@ 
         if($st->execute($context->params)){
             $res = $st->fetchAll(\PDO::FETCH_ASSOC);
             return $res[0]['count'];
-        }else{
+        } else{
             return false;
         }
 
@@ -520,7 +520,7 @@ 
     public function set($context, $column, $value){
         if(is_string($column)){
             $this->setExpr($context, $column, $value);
-        }else{
+        } else{
             $this->setArgs($context, $column);
         }
     }
@@ -530,7 +530,7 @@ 
         if($this->first){
             $this->first = false;
             $prefix = 'ON DUPLICATE KEY UPDATE ';
-        }else{
+        } else{
             $prefix = ',';
         }
 
@@ -545,7 +545,7 @@ 
             $k = DB::wrap($k);
             if(is_a($v, Raw::class)){//直接拼接sql，不需要转义
                 $set[]= "$k=".$v->get();
-            }else{
+            } else{
                 $set[]= "$k=?";
                 $params[]=$v;
             }
@@ -554,7 +554,7 @@ 
             $this->first = false;
             $context->appendSql('ON DUPLICATE KEY UPDATE '.implode(',', $set));
             $context->appendParams($params);
-        }else{
+        } else{
             $context->appendSql(','.implode(',', $set),false);
             $context->appendParams($params);
         }

src/DB/rules/insert.php

Doc Comments +3 added lines, -2 removed lines

@@ -41,6 +41,9 @@ 
 
 class OnDuplicateKeyUpdateRule extends ExecRule
 {
+    /**
+     * @param \PhpBoot\DB\Context $context
+     */
     public function __construct($context)
     {
         parent::__construct($context);
@@ -91,8 +94,6 @@ 
      *      ->onDuplicateKeyUpdate('a=a+1')
      *  => "INSERT INTO table(a,b) VALUES(1,now()) ON DUPLICATE KEY UPDATE a=a+1"
      *
-     * @param string $column
-     * @param mixed $value
      * @return \PhpBoot\DB\rules\basic\ExecRule
      */
     public function onDuplicateKeyUpdate($expr, $_=null) {

Spacing +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
      * @param mixed $value
      * @return \PhpBoot\DB\rules\basic\ExecRule
      */
-    public function onDuplicateKeyUpdate($expr, $_=null) {
+    public function onDuplicateKeyUpdate($expr, $_ = null) {
         $this->impl->set($this->context, $expr, array_slice(func_get_args(), 1));
         return new ExecRule($this->context);
     }

src/DB/rules/select.php

Doc Comments +4 added lines, -1 removed lines

@@ -111,6 +111,9 @@ 
 
 class OrderByRule extends LimitRule
 {
+    /**
+     * @param \PhpBoot\DB\Context $context
+     */
     public function __construct($context){
         parent::__construct($context);
         $this->order = new OrderByImpl();
@@ -211,7 +214,7 @@ 
      *      "WHERE a=1 AND b IN(1,2) AND c BETWEEN 1 AND 2 AND d<>1"
      * @param string|array $conditions
      * //TODO where(callable $query)
-     * @param mixed $_
+     * @param string $_
      * @return \PhpBoot\DB\rules\select\GroupByRule
      */
     public function where($conditions=null, $_=null) {

Spacing +18 added lines, -18 removed lines

@@ -37,7 +37,7 @@ 
      * @param string|false $asDict
      * @return array
      */
-    public function get($asDict=false) {
+    public function get($asDict = false) {
         return ExecImpl::get($this->context, $asDict);
     }
 
@@ -51,9 +51,9 @@ 
      * Execute sql and get one response
      * @return null
      */
-    public function getFirst(){
+    public function getFirst() {
         $res = ExecImpl::get($this->context);
-        if(count($res)){
+        if (count($res)) {
             return $res[0];
         }
         return null;
@@ -66,8 +66,8 @@ 
      * @param string $table
      * @return \PhpBoot\DB\rules\select\JoinRule
      */
-    public function from($table, $as=null){
-        FromImpl::from($this->context, $table,$as);
+    public function from($table, $as = null) {
+        FromImpl::from($this->context, $table, $as);
         return new JoinRule($this->context);
     }
 }
@@ -78,7 +78,7 @@ 
      * @param string $column
      * @return \PhpBoot\DB\rules\select\GetRule
      */
-    public function of($column){
+    public function of($column) {
         ForUpdateOfImpl::of($this->context, $column);
         return new GetRule($this->context);
     }
@@ -89,7 +89,7 @@ 
      * forUpdate() => 'FOR UPDATE'
      * @return \PhpBoot\DB\rules\select\ForUpdateOfRule
      */
-    public function forUpdate(){
+    public function forUpdate() {
         ForUpdateImpl::forUpdate($this->context);
         return new ForUpdateOfRule($this->context);
     }
@@ -111,7 +111,7 @@ 
 
 class OrderByRule extends LimitRule
 {
-    public function __construct($context){
+    public function __construct($context) {
         parent::__construct($context);
         $this->order = new OrderByImpl();
     }
@@ -126,7 +126,7 @@ 
      * @param string $order Sql::ORDER_BY_ASC or Sql::ORDER_BY_DESC
      * @return \PhpBoot\DB\rules\select\OrderByRule
      */
-    public function orderBy($column, $order=null) {
+    public function orderBy($column, $order = null) {
         $this->order->orderBy($this->context, $column, $order);
         return $this;
     }
@@ -167,7 +167,7 @@ 
      * @param string $_
      * @return \PhpBoot\DB\rules\select\OrderByRule
      */
-    public function having($expr, $_=null) {
+    public function having($expr, $_ = null) {
         WhereImpl::having($this->context, $expr, array_slice(func_get_args(), 1));
         return new OrderByRule($this->context);
     }
@@ -214,7 +214,7 @@ 
      * @param mixed $_
      * @return \PhpBoot\DB\rules\select\GroupByRule
      */
-    public function where($conditions=null, $_=null) {
+    public function where($conditions = null, $_ = null) {
         WhereImpl::where($this->context, $conditions, array_slice(func_get_args(), 1));
         return new GroupByRule($this->context);
     }
@@ -227,8 +227,8 @@ 
      * @param string $table
      * @return \PhpBoot\DB\rules\select\JoinOnRule
      */
-    public function join($table){
-        JoinImpl::join($this->context,null, $table);
+    public function join($table) {
+        JoinImpl::join($this->context, null, $table);
         return new JoinOnRule($this->context);
     }
     /**
@@ -236,8 +236,8 @@ 
      * @param string $table
      * @return \PhpBoot\DB\rules\select\JoinOnRule
      */
-    public function leftJoin($table){
-        JoinImpl::join($this->context,'LEFT', $table);
+    public function leftJoin($table) {
+        JoinImpl::join($this->context, 'LEFT', $table);
         return new JoinOnRule($this->context);
     }
     /**
@@ -246,7 +246,7 @@ 
      * @return \PhpBoot\DB\rules\select\JoinOnRule
      */
     public function rightJoin($table) {
-        JoinImpl::join($this->context,'RIGHT', $table);
+        JoinImpl::join($this->context, 'RIGHT', $table);
         return new JoinOnRule($this->context);
     }
     /**
@@ -255,7 +255,7 @@ 
      * @return \PhpBoot\DB\rules\select\JoinOnRule
      */
     public function innerJoin($table) {
-        JoinImpl::join($this->context,'INNER', $table);
+        JoinImpl::join($this->context, 'INNER', $table);
         return new JoinOnRule($this->context);
     }
 }
@@ -267,7 +267,7 @@ 
      * @param string $condition
      * @return \PhpBoot\DB\rules\select\JoinRule
      */
-    public function on($condition){
+    public function on($condition) {
         JoinOnImpl::on($this->context, $condition);
         return new JoinRule($this->context);
     }