View GitHub Repository phpboot

Schedule Inspection
Subscribe

GitHub Access Token became invalid

It seems like the GitHub access token used for retrieving details about this repository from GitHub became invalid. This might prevent certain types of inspections from being run (in particular, everything related to pull requests).
Please ask an admin of your repository to re-new the access token on this website.
Passed
Push — master ( 083d1a...28e483 )
by cao
03:15
created
Status
Category
Toggle Patches
src/DB/impls.php 3 patches
Doc Comments   +82 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -8,6 +8,11 @@  discard block
 
 block discarded – undo
8 8 
 use PhpBoot\DB\Context;
9 9
10 10 
 class ExecResult{
11 
+
12 
+    /**
13 
+     * @param \PDO $pdo
14 
+     * @param \PDOStatement $st
15 
+     */
11 16 
     public function __construct($success, $pdo, $st){
12 17 
         $this->pdo = $pdo;
13 18 
         $this->st = $st;
 
@@ -41,6 +46,10 @@  discard block
 
 block discarded – undo
41 46
42 47 
 class SelectImpl
43 48 
 {
49 
+    /**
50 
+     * @param Context $context
51 
+     * @param string $columns
52 
+     */
44 53 
     static  public function select($context, $columns){
45 54 
         $context->appendSql("SELECT $columns");
46 55 
     }
 
@@ -48,6 +57,10 @@  discard block
 
 block discarded – undo
48 57
49 58 
 class FromImpl
50 59 
 {
60 
+    /**
61 
+     * @param Context $context
62 
+     * @param string $tables
63 
+     */
51 64 
     static public function from($context, $tables,$as=null){
52 65 
         if($tables instanceof BasicRule){
53 66 
             $context->appendSql("FROM (".$tables->context->sql.')');
 
@@ -63,6 +76,10 @@  discard block
 
 block discarded – undo
63 76
64 77 
 class DeleteImpl
65 78 
 {
79 
+    /**
80 
+     * @param Context $context
81 
+     * @param string $from
82 
+     */
66 83 
     static public function deleteFrom($context, $from)
67 84 
     {
68 85 
         $context->appendSql("DELETE FROM ".DB::wrap($from));
 
@@ -71,6 +88,11 @@  discard block
 
 block discarded – undo
71 88
72 89 
 class JoinImpl
73 90 
 {
91 
+    /**
92 
+     * @param Context $context
93 
+     * @param null|string $type
94 
+     * @param string $table
95 
+     */
74 96 
     static public function join($context, $type, $table) {
75 97 
         $table = DB::wrap($table);
76 98 
         if($type){
 
@@ -83,6 +105,10 @@  discard block
 
 block discarded – undo
83 105
84 106 
 class JoinOnImpl
85 107 
 {
108 
+    /**
109 
+     * @param Context $context
110 
+     * @param string $condition
111 
+     */
86 112 
     static public function on($context, $condition) {
87 113 
         $context->appendSql("ON $condition");
88 114 
     }
 
@@ -90,6 +116,9 @@  discard block
 
 block discarded – undo
90 116
91 117 
 class ForUpdateImpl
92 118 
 {
119 
+    /**
120 
+     * @param Context $context
121 
+     */
93 122 
     static public function forUpdate($context){
94 123 
         $context->appendSql("FOR UPDATE");
95 124 
     }
 
@@ -97,6 +126,10 @@  discard block
 
 block discarded – undo
97 126
98 127 
 class ForUpdateOfImpl
99 128 
 {
129 
+    /**
130 
+     * @param Context $context
131 
+     * @param string $column
132 
+     */
100 133 
     static public function of($context, $column){
101 134 
         $column = DB::wrap($column);
102 135 
         $context->appendSql("OF $column");
 
@@ -105,6 +138,10 @@  discard block
 
 block discarded – undo
105 138
106 139 
 class InsertImpl
107 140 
 {
141 
+    /**
142 
+     * @param Context $context
143 
+     * @param string $table
144 
+     */
108 145 
     static public function insertInto($context, $table) {
109 146 
         $table = DB::wrap($table);
110 147 
         $context->appendSql("INSERT INTO $table");
 
@@ -112,6 +149,10 @@  discard block
 
 block discarded – undo
112 149 
 }
113 150 
 class ReplaceImpl
114 151 
 {
152 
+    /**
153 
+     * @param Context $context
154 
+     * @param string $table
155 
+     */
115 156 
     static public function replaceInto($context, $table) {
116 157 
         $table = DB::wrap($table);
117 158 
         $context->appendSql("REPLACE INTO $table");
 
@@ -119,6 +160,9 @@  discard block
 
 block discarded – undo
119 160 
 }
120 161 
 class ValuesImpl
121 162 
 {
163 
+    /**
164 
+     * @param Context $context
165 
+     */
122 166 
     static public function values($context, $values){
123 167 
         $params = [];
124 168 
         $stubs = [];
 
@@ -148,6 +192,10 @@  discard block
 
 block discarded – undo
148 192
149 193 
 class UpdateImpl
150 194 
 {
195 
+    /**
196 
+     * @param Context $context
197 
+     * @param string $table
198 
+     */
151 199 
     static public function update($context, $table){
152 200 
         $table = DB::wrap($table);
153 201 
         $context->appendSql("UPDATE $table");
 
@@ -164,6 +212,9 @@  discard block
 
 block discarded – undo
164 212 
         }
165 213 
     }
166 214
215 
+    /**
216 
+     * @param string $expr
217 
+     */
167 218 
     public function setExpr(Context $context, $expr, $args){
168 219 
         if($this->first){
169 220 
             $this->first = false;
 
@@ -226,6 +277,11 @@  discard block
 
 block discarded – undo
226 277 
         }
227 278 
         return $this;
228 279 
     }
280 
+
281 
+    /**
282 
+     * @param string $column
283 
+     * @param string $order
284 
+     */
229 285 
     public function orderBy(Context $context, $column, $order=null){
230 286 
         if(is_string($column)){
231 287 
             if($order === null){
 
@@ -243,12 +299,20 @@  discard block
 
 block discarded – undo
243 299
244 300 
 class LimitImpl
245 301 
 {
302 
+    /**
303 
+     * @param integer $size
304 
+     */
246 305 
     static public function limit(Context $context, $size){
247 306 
         $intSize = intval($size);
248 307 
         strval($intSize) == $size or \PhpBoot\abort(
249 308 
             new \InvalidArgumentException("invalid params for limit($size)"));
250 309 
         $context->appendSql("LIMIT $size");
251 310 
     }
311 
+
312 
+    /**
313 
+     * @param integer $start
314 
+     * @param integer $size
315 
+     */
252 316 
     static public function limitWithOffset(Context $context, $start, $size){
253 317 
         $intStart = intval($start);
254 318 
         $intSize = intval($size);
 
@@ -260,6 +324,9 @@  discard block
 
 block discarded – undo
260 324
261 325 
 class WhereImpl{
262 326
327 
+    /**
328 
+     * @param string $str
329 
+     */
263 330 
     static private function  findQ($str,$offset = 0,$no=0){
264 331 
         $found = strpos($str, '?', $offset);
265 332 
         if($no == 0 || $found === false){
 
@@ -307,6 +374,7 @@  discard block
 
 block discarded – undo
307 374 
      * LIKE     'id'=>['LIKE' => '1%']
308 375 
      * IN   'id'=>['IN' => [1,2,3]]
309 376 
      * NOT IN   'id'=>['NOT IN' => [1,2,3]]
377 
+     * @param string $prefix
310 378 
      * @return void
311 379 
      */
312 380 
     static public function conditionArgs(Context $context, $prefix, $args=[]){
 
@@ -374,6 +442,10 @@  discard block
 
 block discarded – undo
374 442
375 443 
         self::condition($context, $prefix, implode(' AND ', $exprs), $params);
376 444 
     }
445 
+
446 
+    /**
447 
+     * @param string $expr
448 
+     */
377 449 
     static public function condition(Context $context, $prefix, $expr, $args){
378 450 
         if(!empty($expr)){
379 451 
             if($args){
 
@@ -436,6 +508,10 @@  discard block
 
 block discarded – undo
436 508 
 }
437 509
438 510 
 class GroupByImpl{
511 
+
512 
+    /**
513 
+     * @param string $column
514 
+     */
439 515 
     static public function groupBy(Context $context, $column){
440 516 
         $column = DB::wrap($column);
441 517 
         $context->appendSql("GROUP BY $column");
 
@@ -458,7 +534,6 @@  discard block
 
 block discarded – undo
458 534 
     /**
459 535 
      *
460 536 
      * @param Context $context
461 
-     * @param string|false $asDict return  as dict or array
462 537 
      * @return false|array
463 538 
      */
464 539 
     static public function get($context, $dictAs=false){
 
@@ -517,6 +592,9 @@  discard block
 
 block discarded – undo
517 592 
 }
518 593 
 class OnDuplicateKeyUpdateImpl
519 594 
 {
595 
+    /**
596 
+     * @param Context $context
597 
+     */
520 598 
     public function set($context, $column, $value){
521 599 
         if(is_string($column)){
522 600 
             $this->setExpr($context, $column, $value);
 
@@ -525,6 +603,9 @@  discard block
 
 block discarded – undo
525 603 
         }
526 604 
     }
527 605
606 
+    /**
607 
+     * @param string $expr
608 
+     */
528 609 
     public function setExpr($context, $expr, $args){
529 610 
         $prefix = '';
530 611 
         if($this->first){
Please login to merge, or discard this patch.
Spacing   +144 added lines, -144 removed lines patch added patch discarded remove patch 
@@ -7,14 +7,14 @@  discard block
 
 block discarded – undo
7 7 
 use PhpBoot\DB\rules\basic\BasicRule;
8 8 
 use PhpBoot\DB\Context;
9 9
10 
-class ExecResult{
11 
-    public function __construct($success, $pdo, $st){
10 
+class ExecResult {
11 
+    public function __construct($success, $pdo, $st) {
12 12 
         $this->pdo = $pdo;
13 13 
         $this->st = $st;
14 14 
         $this->success = $success;
15 15 
         $this->rows = $this->st->rowCount();
16 16 
     }
17 
-    public function lastInsertId($name=null){
17 
+    public function lastInsertId($name = null) {
18 18 
         return $this->pdo->lastInsertId($name);
19 19 
     }
20 20 
     /**
 
@@ -41,21 +41,21 @@  discard block
 
 block discarded – undo
41 41
42 42 
 class SelectImpl
43 43 
 {
44 
-    static  public function select($context, $columns){
44 
+    static  public function select($context, $columns) {
45 45 
         $context->appendSql("SELECT $columns");
46 46 
     }
47 47 
 }
48 48
49 49 
 class FromImpl
50 50 
 {
51 
-    static public function from($context, $tables,$as=null){
52 
-        if($tables instanceof BasicRule){
51 
+    static public function from($context, $tables, $as = null) {
52 
+        if ($tables instanceof BasicRule) {
53 53 
             $context->appendSql("FROM (".$tables->context->sql.')');
54 
-            $context->params = array_merge($context->params,$tables->context->params);
54 
+            $context->params = array_merge($context->params, $tables->context->params);
55 55 
         }else {
56 56 
             $context->appendSql("FROM ".DB::wrap($tables));
57 57 
         }
58 
-        if($as){
58 
+        if ($as) {
59 59 
             $context->appendSql("as ".DB::wrap($as));
60 60 
         }
61 61 
     }
 
@@ -73,9 +73,9 @@  discard block
 
 block discarded – undo
73 73 
 {
74 74 
     static public function join($context, $type, $table) {
75 75 
         $table = DB::wrap($table);
76 
-        if($type){
76 
+        if ($type) {
77 77 
             $context->appendSql("$type JOIN $table");
78 
-        }else{
78 
+        }else {
79 79 
             $context->appendSql("JOIN $table");
80 80 
         }
81 81 
     }
 
@@ -90,14 +90,14 @@  discard block
 
 block discarded – undo
90 90
91 91 
 class ForUpdateImpl
92 92 
 {
93 
-    static public function forUpdate($context){
93 
+    static public function forUpdate($context) {
94 94 
         $context->appendSql("FOR UPDATE");
95 95 
     }
96 96 
 }
97 97
98 98 
 class ForUpdateOfImpl
99 99 
 {
100 
-    static public function of($context, $column){
100 
+    static public function of($context, $column) {
101 101 
         $column = DB::wrap($column);
102 102 
         $context->appendSql("OF $column");
103 103 
     }
 
@@ -119,27 +119,27 @@  discard block
 
 block discarded – undo
119 119 
 }
120 120 
 class ValuesImpl
121 121 
 {
122 
-    static public function values($context, $values){
122 
+    static public function values($context, $values) {
123 123 
         $params = [];
124 124 
         $stubs = [];
125 
-        foreach ($values as $v){
126 
-            if(is_a($v, Raw::class)){//直接拼接sql，不需要转义
127 
-                $stubs[]=$v->get();
128 
-            }else{
129 
-                $stubs[]='?';
125 
+        foreach ($values as $v) {
126 
+            if (is_a($v, Raw::class)) {//直接拼接sql，不需要转义
127 
+                $stubs[] = $v->get();
128 
+            }else {
129 
+                $stubs[] = '?';
130 130 
                 $params[] = $v;
131 131 
             }
132 132 
         }
133 133 
         $stubs = implode(',', $stubs);
134 134
135 
-        if(array_keys($values) === range(0, count($values) - 1)){
135 
+        if (array_keys($values) === range(0, count($values) - 1)) {
136 136 
             //VALUES(val0, val1, val2)
137 137 
             $context->appendSql("VALUES($stubs)");
138 138
139 
-        }else{
139 
+        }else {
140 140 
             //(col0, col1, col2) VALUES(val0, val1, val2)
141 
-            $columns = implode(',', array_map(function($k){return DB::wrap($k);}, array_keys($values)));
142 
-            $context->appendSql("($columns) VALUES($stubs)",false);
141 
+            $columns = implode(',', array_map(function($k) {return DB::wrap($k); }, array_keys($values)));
142 
+            $context->appendSql("($columns) VALUES($stubs)", false);
143 143 
         }
144 144 
         $context->appendParams($params);
145 145 
     }
 
@@ -148,7 +148,7 @@  discard block
 
 block discarded – undo
148 148
149 149 
 class UpdateImpl
150 150 
 {
151 
-    static public function update($context, $table){
151 
+    static public function update($context, $table) {
152 152 
         $table = DB::wrap($table);
153 153 
         $context->appendSql("UPDATE $table");
154 154 
     }
 
@@ -156,81 +156,81 @@  discard block
 
 block discarded – undo
156 156
157 157 
 class UpdateSetImpl
158 158 
 {
159 
-    public function set(Context $context, $expr, $args){
160 
-        if(is_string($expr)){
159 
+    public function set(Context $context, $expr, $args) {
160 
+        if (is_string($expr)) {
161 161 
             return $this->setExpr($context, $expr, $args);
162 
-        }else{
162 
+        }else {
163 163 
             return $this->setArgs($context, $expr);
164 164 
         }
165 165 
     }
166 166
167 
-    public function setExpr(Context $context, $expr, $args){
168 
-        if($this->first){
167 
+    public function setExpr(Context $context, $expr, $args) {
168 
+        if ($this->first) {
169 169 
             $this->first = false;
170 170 
             $prefix = 'SET ';
171 
-        }else{
171 
+        }else {
172 172 
             $prefix = ',';
173 173 
         }
174 174
175 
-        $context->appendSql("$prefix$expr",$prefix == 'SET ');
175 
+        $context->appendSql("$prefix$expr", $prefix == 'SET ');
176 176 
         $context->appendParams($args);
177 177
178 178 
     }
179 
-    public function setArgs(Context $context, $values){
179 
+    public function setArgs(Context $context, $values) {
180 180 
         $set = [];
181 181 
         $params = [];
182 
-        foreach ($values as $k=>$v){
182 
+        foreach ($values as $k=>$v) {
183 183 
             $k = DB::wrap($k);
184 
-            if(is_a($v, Raw::class)){//直接拼接sql，不需要转义
185 
-                $set[]= "$k=".$v->get();
186 
-            }else{
187 
-                $set[]= "$k=?";
188 
-                $params[]=$v;
184 
+            if (is_a($v, Raw::class)) {//直接拼接sql，不需要转义
185 
+                $set[] = "$k=".$v->get();
186 
+            }else {
187 
+                $set[] = "$k=?";
188 
+                $params[] = $v;
189 189 
             }
190 190 
         }
191 
-        if($this->first){
191 
+        if ($this->first) {
192 192 
             $this->first = false;
193 193 
             $context->appendSql('SET '.implode(',', $set));
194 194 
             $context->appendParams($params);
195 
-        }else{
196 
-            $context->appendSql(','.implode(',', $set),false);
195 
+        }else {
196 
+            $context->appendSql(','.implode(',', $set), false);
197 197 
             $context->appendParams($params);
198 198 
         }
199 199 
     }
200 
-    private $first=true;
200 
+    private $first = true;
201 201 
 }
202 202 
 class OrderByImpl
203 203 
 {
204 
-    public function orderByArgs(Context $context, $orders){
205 
-        if(empty($orders)){
204 
+    public function orderByArgs(Context $context, $orders) {
205 
+        if (empty($orders)) {
206 206 
             return $this;
207 207 
         }
208 208 
         $params = array();
209 
-        foreach ($orders as $k=>$v){
210 
-            if(is_integer($k)){
209 
+        foreach ($orders as $k=>$v) {
210 
+            if (is_integer($k)) {
211 211 
                 $params[] = DB::wrap($v);
212 
-            }else{
212 
+            }else {
213 213 
                 $k = DB::wrap($k);
214 214
215 215 
                 $v = strtoupper($v);
216 
-                ($v =='DESC' || $v =='ASC') or \PhpBoot\abort( new \InvalidArgumentException("invalid params for orderBy(".json_encode($orders).")"));
216 
+                ($v == 'DESC' || $v == 'ASC') or \PhpBoot\abort(new \InvalidArgumentException("invalid params for orderBy(".json_encode($orders).")"));
217 217
218 218 
                 $params[] = "$k $v";
219 219 
             }
220 220 
         }
221 
-        if($this->first){
221 
+        if ($this->first) {
222 222 
             $this->first = false;
223 223 
             $context->appendSql('ORDER BY '.implode(',', $params));
224 
-        }else{
225 
-            $context->appendSql(','.implode(',', $params),false);
224 
+        }else {
225 
+            $context->appendSql(','.implode(',', $params), false);
226 226 
         }
227 227 
         return $this;
228 228 
     }
229 
-    public function orderBy(Context $context, $column, $order=null){
230 
-        if(is_string($column)){
231 
-            if($order === null){
229 
+    public function orderBy(Context $context, $column, $order = null) {
230 
+        if (is_string($column)) {
231 
+            if ($order === null) {
232 232 
                 $column = [$column];
233 
-            }else{
233 
+            }else {
234 234 
                 $column = [$column=>$order];
235 235 
             }
236 236 
         }
 
@@ -238,18 +238,18 @@  discard block
 
 block discarded – undo
238 238
239 239
240 240 
     }
241 
-    private $first=true;
241 
+    private $first = true;
242 242 
 }
243 243
244 244 
 class LimitImpl
245 245 
 {
246 
-    static public function limit(Context $context, $size){
246 
+    static public function limit(Context $context, $size) {
247 247 
         $intSize = intval($size);
248 248 
         strval($intSize) == $size or \PhpBoot\abort(
249 249 
             new \InvalidArgumentException("invalid params for limit($size)"));
250 250 
         $context->appendSql("LIMIT $size");
251 251 
     }
252 
-    static public function limitWithOffset(Context $context, $start, $size){
252 
+    static public function limitWithOffset(Context $context, $start, $size) {
253 253 
         $intStart = intval($start);
254 254 
         $intSize = intval($size);
255 255 
         strval($intStart) == $start && strval($intSize) == $size or \PhpBoot\abort(
 
@@ -258,31 +258,31 @@  discard block
 
 block discarded – undo
258 258 
     }
259 259 
 }
260 260
261 
-class WhereImpl{
261 
+class WhereImpl {
262 262
263 
-    static private function  findQ($str,$offset = 0,$no=0){
263 
+    static private function  findQ($str, $offset = 0, $no = 0) {
264 264 
         $found = strpos($str, '?', $offset);
265 
-        if($no == 0 || $found === false){
265 
+        if ($no == 0 || $found === false) {
266 266 
             return $found;
267 267 
         }
268 
-        return self::findQ($str, $found+1, $no-1);
268 
+        return self::findQ($str, $found + 1, $no - 1);
269 269 
     }
270 
-    static public function having(Context $context, $expr, $args){
271 
-        if(is_string($expr)){
270 
+    static public function having(Context $context, $expr, $args) {
271 
+        if (is_string($expr)) {
272 272 
             self::condition($context, 'HAVING', $expr, $args);
273 
-        }else{
273 
+        }else {
274 274 
             self::conditionArgs($context, 'HAVING', $expr);
275 275 
         }
276 276 
         //TODO 支持 OR 、 闭包
277 277
278 278 
     }
279 
-    static public function where(Context $context, $expr, $args){
280 
-        if(empty($expr)){
279 
+    static public function where(Context $context, $expr, $args) {
280 
+        if (empty($expr)) {
281 281 
             return;
282 282 
         }
283 
-        if (is_string($expr)){
283 
+        if (is_string($expr)) {
284 284 
             self::condition($context, 'WHERE', $expr, $args);
285 
-        }else{
285 
+        }else {
286 286 
             self::conditionArgs($context, 'WHERE', $expr);
287 287 
         }
288 288 
         //TODO 支持 OR 、 闭包
 
@@ -309,15 +309,15 @@  discard block
 
 block discarded – undo
309 309 
      * NOT IN   'id'=>['NOT IN' => [1,2,3]]
310 310 
      * @return void
311 311 
      */
312 
-    static public function conditionArgs(Context $context, $prefix, $args=[]){
313 
-        if($args ===null){
314 
-            return ;
312 
+    static public function conditionArgs(Context $context, $prefix, $args = []) {
313 
+        if ($args === null) {
314 
+            return;
315 315 
         }
316 316 
         $exprs = array();
317 317 
         $params = array();
318 
-        foreach ($args as $k => $v){
318 
+        foreach ($args as $k => $v) {
319 319 
             $k = DB::wrap($k);
320 
-            if(is_array($v)){
320 
+            if (is_array($v)) {
321 321 
                 $ops = ['=', '>', '<', '<>', '>=', '<=', 'IN', 'NOT IN', 'BETWEEN', 'LIKE'];
322 322 
                 $op = array_keys($v)[0];
323 323 
                 $op = strtoupper($op);
 
@@ -326,46 +326,46 @@  discard block
 
 block discarded – undo
326 326 
                     new \InvalidArgumentException("invalid param $op for whereArgs"));
327 327
328 328 
                 $var = array_values($v)[0];
329 
-                if($op == 'IN' || $op == 'NOT IN'){
329 
+                if ($op == 'IN' || $op == 'NOT IN') {
330 330 
                     $stubs = [];
331 
-                    foreach ($var as $i){
332 
-                        if(is_a($i, Raw::class)){
333 
-                            $stubs[]=strval($i);
334 
-                        }else{
335 
-                            $stubs[]='?';
331 
+                    foreach ($var as $i) {
332 
+                        if (is_a($i, Raw::class)) {
333 
+                            $stubs[] = strval($i);
334 
+                        }else {
335 
+                            $stubs[] = '?';
336 336 
                             $params[] = $i;
337 337 
                         }
338 338 
                     }
339 339 
                     $stubs = implode(',', $stubs);
340 340 
                     $exprs[] = "$k $op ($stubs)";
341 
-                }else if($op == 'BETWEEN'){
341 
+                }else if ($op == 'BETWEEN') {
342 342 
                     $cond = "$k BETWEEN";
343 
-                    if(is_a($var[0], Raw::class)){
343 
+                    if (is_a($var[0], Raw::class)) {
344 344 
                         $cond = "$cond ".strval($var[0]);
345 
-                    }else{
345 
+                    }else {
346 346 
                         $cond = "$cond ?";
347 347 
                         $params[] = $var[0];
348 348 
                     }
349 
-                    if(is_a($var[1], Raw::class)){
349 
+                    if (is_a($var[1], Raw::class)) {
350 350 
                         $cond = "$cond AND ".strval($var[1]);
351 
-                    }else{
351 
+                    }else {
352 352 
                         $cond = "$cond AND ?";
353 353 
                         $params[] = $var[1];
354 354 
                     }
355 355 
                     $exprs[] = $cond;
356 
-                }else{
357 
-                    if(is_a($var, Raw::class)){
356 
+                }else {
357 
+                    if (is_a($var, Raw::class)) {
358 358 
                         $exprs[] = "$k $op ".strval($var);
359 
-                    }else{
359 
+                    }else {
360 360 
                         $exprs[] = "$k $op ?";
361 361 
                         $params[] = $var;
362 362 
                     }
363 363 
                 }
364 
-            }else{
365 
-                if(is_a($v, Raw::class)){
364 
+            }else {
365 
+                if (is_a($v, Raw::class)) {
366 366 
                     $exprs[] = "$k = ".strval($v);
367 367
368 
-                }else{
368 
+                }else {
369 369 
                     $exprs[] = "$k = ?";
370 370 
                     $params[] = $v;
371 371 
                 }
 
@@ -374,20 +374,20 @@  discard block
 
 block discarded – undo
374 374
375 375 
         self::condition($context, $prefix, implode(' AND ', $exprs), $params);
376 376 
     }
377 
-    static public function condition(Context $context, $prefix, $expr, $args){
378 
-        if(!empty($expr)){
379 
-            if($args){
377 
+    static public function condition(Context $context, $prefix, $expr, $args) {
378 
+        if (!empty($expr)) {
379 
+            if ($args) {
380 380 
                 //因为PDO不支持绑定数组变量, 这里需要手动展开数组
381 381 
                 //也就是说把 where("id IN(?)", [1,2])  展开成 where("id IN(?,?)", 1,2)
382 382 
                 $cutted = null;
383 383 
                 $cut = null;
384 384 
                 $toReplace = array();
385 385
386 
-                $newArgs=array();
386 
+                $newArgs = array();
387 387 
                 //找到所有数组对应的?符位置
388 
-                foreach ($args as $k =>$arg){
389 
-                    if(is_array($arg) || is_a($arg, Raw::class)){
390 
-                        if(!$cutted){
388 
+                foreach ($args as $k =>$arg) {
389 
+                    if (is_array($arg) || is_a($arg, Raw::class)) {
390 
+                        if (!$cutted) {
391 391 
                             $cut = new NestedStringCut($expr);
392 392 
                             $cutted = $cut->getText();
393 393 
                         }
 
@@ -397,46 +397,46 @@  discard block
 
 block discarded – undo
397 397 
                         $pos !== false or \PhpBoot\abort(
398 398 
                             new \InvalidArgumentException("unmatched params and ? @ $expr"));
399 399
400 
-                        if(is_array($arg)){
400 
+                        if (is_array($arg)) {
401 401 
                             $stubs = [];
402 
-                            foreach ($arg as $i){
403 
-                                if(is_a($i, Raw::class)){
402 
+                            foreach ($arg as $i) {
403 
+                                if (is_a($i, Raw::class)) {
404 404 
                                     $stubs[] = strval($i);
405 
-                                }else{
405 
+                                }else {
406 406 
                                     $stubs[] = '?';
407 407 
                                     $newArgs[] = $i;
408 408 
                                 }
409 409 
                             }
410 410 
                             $stubs = implode(',', $stubs);
411 
-                        }else{
411 
+                        }else {
412 412 
                             $stubs = strval($arg);
413 413 
                         }
414 414 
                         $toReplace[] = [$pos, $stubs];
415 415
416 
-                    }else{
417 
-                        $newArgs[]=$arg;
416 
+                    }else {
417 
+                        $newArgs[] = $arg;
418 418 
                     }
419 419 
                 }
420 420
421 
-                if(count($toReplace)){
421 
+                if (count($toReplace)) {
422 422 
                     $toReplace = array_reverse($toReplace);
423 
-                    foreach ($toReplace as $i){
423 
+                    foreach ($toReplace as $i) {
424 424 
                         list($pos, $v) = $i;
425 
-                        $expr = substr($expr, 0, $pos).$v. substr($expr, $pos+1);
425 
+                        $expr = substr($expr, 0, $pos).$v.substr($expr, $pos + 1);
426 426 
                     }
427 427 
                     $args = $newArgs;
428 428 
                 }
429 429 
             }
430 430 
             $context->appendSql($prefix.' '.$expr);
431 
-            if($args){
431 
+            if ($args) {
432 432 
                 $context->appendParams($args);
433 433 
             }
434 434 
         }
435 435 
     }
436 436 
 }
437 437
438 
-class GroupByImpl{
439 
-    static public function groupBy(Context $context, $column){
438 
+class GroupByImpl {
439 
+    static public function groupBy(Context $context, $column) {
440 440 
         $column = DB::wrap($column);
441 441 
         $context->appendSql("GROUP BY $column");
442 442 
     }
 
@@ -461,20 +461,20 @@  discard block
 
 block discarded – undo
461 461 
      * @param string|false $asDict return  as dict or array
462 462 
      * @return false|array
463 463 
      */
464 
-    static public function get($context, $dictAs=false){
464 
+    static public function get($context, $dictAs = false) {
465 465
466 466 
         $st = $context->connection->prepare($context->sql);
467 
-        if($st->execute($context->params)){
467 
+        if ($st->execute($context->params)) {
468 468 
             $res = $st->fetchAll(\PDO::FETCH_ASSOC);
469 
-            if ($dictAs){
470 
-                $dict= [];
471 
-                foreach ($res as $i){
472 
-                    $dict[$i[$dictAs]]=$i;
469 
+            if ($dictAs) {
470 
+                $dict = [];
471 
+                foreach ($res as $i) {
472 
+                    $dict[$i[$dictAs]] = $i;
473 473 
                 }
474 474 
                 return $context->handleResult($dict);
475 475 
             }
476 476 
             return $context->handleResult($res);
477 
-        }else{
477 
+        }else {
478 478 
             return false;
479 479 
         }
480 480 
     }
 
@@ -483,22 +483,22 @@  discard block
 
 block discarded – undo
483 483 
      * @param Context $context
484 484 
      * @return int|false
485 485 
      */
486 
-    static public function count($context){
486 
+    static public function count($context) {
487 487
488 488 
         $found = [];
489 
-        if(!preg_match('/\bselect\b/i', $context->sql, $found, PREG_OFFSET_CAPTURE) ||
490 
-            count($found)==0){
489 
+        if (!preg_match('/\bselect\b/i', $context->sql, $found, PREG_OFFSET_CAPTURE) ||
490 
+            count($found) == 0) {
491 491 
             \PhpBoot\abort(new \PDOException("can not use count(*) without select"));
492 492 
         }
493 493 
         list($chars, $columnBegin) = $found[0];
494 
-        $columnBegin = $columnBegin + strlen('select')+1;
494 
+        $columnBegin = $columnBegin + strlen('select') + 1;
495 495
496 496 
         $columnEnd = 0;
497 497 
         $found = [];
498 
-        if(!preg_match('/\bfrom\b/i', $context->sql, $found, PREG_OFFSET_CAPTURE) ||
499 
-            count($found)==0){
498 
+        if (!preg_match('/\bfrom\b/i', $context->sql, $found, PREG_OFFSET_CAPTURE) ||
499 
+            count($found) == 0) {
500 500 
             $columnEnd = strlen($context->sql);
501 
-        }else{
501 
+        }else {
502 502 
             list($chars, $columnEnd) = $found[0];
503 503 
         }
504 504 
         $sql = substr($context->sql, 0, $columnBegin);
 
@@ -506,10 +506,10 @@  discard block
 
 block discarded – undo
506 506 
         $sql .= substr($context->sql, $columnEnd);
507 507
508 508 
         $st = $context->connection->prepare($sql);
509 
-        if($st->execute($context->params)){
509 
+        if ($st->execute($context->params)) {
510 510 
             $res = $st->fetchAll(\PDO::FETCH_ASSOC);
511 511 
             return $res[0]['count'];
512 
-        }else{
512 
+        }else {
513 513 
             return false;
514 514 
         }
515 515 
 
@@ -517,47 +517,47 @@  discard block
 
 block discarded – undo
517 517 
 }
518 518 
 class OnDuplicateKeyUpdateImpl
519 519 
 {
520 
-    public function set($context, $column, $value){
521 
-        if(is_string($column)){
520 
+    public function set($context, $column, $value) {
521 
+        if (is_string($column)) {
522 522 
             $this->setExpr($context, $column, $value);
523 
-        }else{
523 
+        }else {
524 524 
             $this->setArgs($context, $column);
525 525 
         }
526 526 
     }
527 527
528 
-    public function setExpr($context, $expr, $args){
528 
+    public function setExpr($context, $expr, $args) {
529 529 
         $prefix = '';
530 
-        if($this->first){
530 
+        if ($this->first) {
531 531 
             $this->first = false;
532 532 
             $prefix = 'ON DUPLICATE KEY UPDATE ';
533 
-        }else{
533 
+        }else {
534 534 
             $prefix = ',';
535 535 
         }
536 536
537 
-        $context->appendSql("$prefix$expr",$prefix == 'ON DUPLICATE KEY UPDATE ');
537 
+        $context->appendSql("$prefix$expr", $prefix == 'ON DUPLICATE KEY UPDATE ');
538 538 
         $context->appendParams($args);
539 539
540 540 
     }
541 
-    public function setArgs($context, $values){
541 
+    public function setArgs($context, $values) {
542 542 
         $set = [];
543 543 
         $params = [];
544 
-        foreach ($values as $k=>$v){
544 
+        foreach ($values as $k=>$v) {
545 545 
             $k = DB::wrap($k);
546 
-            if(is_a($v, Raw::class)){//直接拼接sql，不需要转义
547 
-                $set[]= "$k=".$v->get();
548 
-            }else{
549 
-                $set[]= "$k=?";
550 
-                $params[]=$v;
546 
+            if (is_a($v, Raw::class)) {//直接拼接sql，不需要转义
547 
+                $set[] = "$k=".$v->get();
548 
+            }else {
549 
+                $set[] = "$k=?";
550 
+                $params[] = $v;
551 551 
             }
552 552 
         }
553 
-        if($this->first){
553 
+        if ($this->first) {
554 554 
             $this->first = false;
555 555 
             $context->appendSql('ON DUPLICATE KEY UPDATE '.implode(',', $set));
556 556 
             $context->appendParams($params);
557 
-        }else{
558 
-            $context->appendSql(','.implode(',', $set),false);
557 
+        }else {
558 
+            $context->appendSql(','.implode(',', $set), false);
559 559 
             $context->appendParams($params);
560 560 
         }
561 561 
     }
562 
-    private $first=true;
562 
+    private $first = true;
563 563 
 }
Please login to merge, or discard this patch.
Braces   +31 added lines, -31 removed lines patch added patch discarded remove patch 
@@ -52,7 +52,7 @@  discard block
 
 block discarded – undo
52 52 
         if($tables instanceof BasicRule){
53 53 
             $context->appendSql("FROM (".$tables->context->sql.')');
54 54 
             $context->params = array_merge($context->params,$tables->context->params);
55 
-        }else {
55 
+        } else {
56 56 
             $context->appendSql("FROM ".DB::wrap($tables));
57 57 
         }
58 58 
         if($as){
 
@@ -75,7 +75,7 @@  discard block
 
 block discarded – undo
75 75 
         $table = DB::wrap($table);
76 76 
         if($type){
77 77 
             $context->appendSql("$type JOIN $table");
78 
-        }else{
78 
+        } else{
79 79 
             $context->appendSql("JOIN $table");
80 80 
         }
81 81 
     }
 
@@ -125,7 +125,7 @@  discard block
 
 block discarded – undo
125 125 
         foreach ($values as $v){
126 126 
             if(is_a($v, Raw::class)){//直接拼接sql，不需要转义
127 127 
                 $stubs[]=$v->get();
128 
-            }else{
128 
+            } else{
129 129 
                 $stubs[]='?';
130 130 
                 $params[] = $v;
131 131 
             }
 
@@ -136,7 +136,7 @@  discard block
 
 block discarded – undo
136 136 
             //VALUES(val0, val1, val2)
137 137 
             $context->appendSql("VALUES($stubs)");
138 138
139 
-        }else{
139 
+        } else{
140 140 
             //(col0, col1, col2) VALUES(val0, val1, val2)
141 141 
             $columns = implode(',', array_map(function($k){return DB::wrap($k);}, array_keys($values)));
142 142 
             $context->appendSql("($columns) VALUES($stubs)",false);
 
@@ -159,7 +159,7 @@  discard block
 
 block discarded – undo
159 159 
     public function set(Context $context, $expr, $args){
160 160 
         if(is_string($expr)){
161 161 
             return $this->setExpr($context, $expr, $args);
162 
-        }else{
162 
+        } else{
163 163 
             return $this->setArgs($context, $expr);
164 164 
         }
165 165 
     }
 
@@ -168,7 +168,7 @@  discard block
 
 block discarded – undo
168 168 
         if($this->first){
169 169 
             $this->first = false;
170 170 
             $prefix = 'SET ';
171 
-        }else{
171 
+        } else{
172 172 
             $prefix = ',';
173 173 
         }
174 174 
 
@@ -183,7 +183,7 @@  discard block
 
 block discarded – undo
183 183 
             $k = DB::wrap($k);
184 184 
             if(is_a($v, Raw::class)){//直接拼接sql，不需要转义
185 185 
                 $set[]= "$k=".$v->get();
186 
-            }else{
186 
+            } else{
187 187 
                 $set[]= "$k=?";
188 188 
                 $params[]=$v;
189 189 
             }
 
@@ -192,7 +192,7 @@  discard block
 
 block discarded – undo
192 192 
             $this->first = false;
193 193 
             $context->appendSql('SET '.implode(',', $set));
194 194 
             $context->appendParams($params);
195 
-        }else{
195 
+        } else{
196 196 
             $context->appendSql(','.implode(',', $set),false);
197 197 
             $context->appendParams($params);
198 198 
         }
 
@@ -209,7 +209,7 @@  discard block
 
 block discarded – undo
209 209 
         foreach ($orders as $k=>$v){
210 210 
             if(is_integer($k)){
211 211 
                 $params[] = DB::wrap($v);
212 
-            }else{
212 
+            } else{
213 213 
                 $k = DB::wrap($k);
214 214
215 215 
                 $v = strtoupper($v);
 
@@ -221,7 +221,7 @@  discard block
 
 block discarded – undo
221 221 
         if($this->first){
222 222 
             $this->first = false;
223 223 
             $context->appendSql('ORDER BY '.implode(',', $params));
224 
-        }else{
224 
+        } else{
225 225 
             $context->appendSql(','.implode(',', $params),false);
226 226 
         }
227 227 
         return $this;
 
@@ -230,7 +230,7 @@  discard block
 
 block discarded – undo
230 230 
         if(is_string($column)){
231 231 
             if($order === null){
232 232 
                 $column = [$column];
233 
-            }else{
233 
+            } else{
234 234 
                 $column = [$column=>$order];
235 235 
             }
236 236 
         }
 
@@ -270,7 +270,7 @@  discard block
 
 block discarded – undo
270 270 
     static public function having(Context $context, $expr, $args){
271 271 
         if(is_string($expr)){
272 272 
             self::condition($context, 'HAVING', $expr, $args);
273 
-        }else{
273 
+        } else{
274 274 
             self::conditionArgs($context, 'HAVING', $expr);
275 275 
         }
276 276 
         //TODO 支持 OR 、 闭包
 
@@ -282,7 +282,7 @@  discard block
 
 block discarded – undo
282 282 
         }
283 283 
         if (is_string($expr)){
284 284 
             self::condition($context, 'WHERE', $expr, $args);
285 
-        }else{
285 
+        } else{
286 286 
             self::conditionArgs($context, 'WHERE', $expr);
287 287 
         }
288 288 
         //TODO 支持 OR 、 闭包
 
@@ -331,41 +331,41 @@  discard block
 
 block discarded – undo
331 331 
                     foreach ($var as $i){
332 332 
                         if(is_a($i, Raw::class)){
333 333 
                             $stubs[]=strval($i);
334 
-                        }else{
334 
+                        } else{
335 335 
                             $stubs[]='?';
336 336 
                             $params[] = $i;
337 337 
                         }
338 338 
                     }
339 339 
                     $stubs = implode(',', $stubs);
340 340 
                     $exprs[] = "$k $op ($stubs)";
341 
-                }else if($op == 'BETWEEN'){
341 
+                } else if($op == 'BETWEEN'){
342 342 
                     $cond = "$k BETWEEN";
343 343 
                     if(is_a($var[0], Raw::class)){
344 344 
                         $cond = "$cond ".strval($var[0]);
345 
-                    }else{
345 
+                    } else{
346 346 
                         $cond = "$cond ?";
347 347 
                         $params[] = $var[0];
348 348 
                     }
349 349 
                     if(is_a($var[1], Raw::class)){
350 350 
                         $cond = "$cond AND ".strval($var[1]);
351 
-                    }else{
351 
+                    } else{
352 352 
                         $cond = "$cond AND ?";
353 353 
                         $params[] = $var[1];
354 354 
                     }
355 355 
                     $exprs[] = $cond;
356 
-                }else{
356 
+                } else{
357 357 
                     if(is_a($var, Raw::class)){
358 358 
                         $exprs[] = "$k $op ".strval($var);
359 
-                    }else{
359 
+                    } else{
360 360 
                         $exprs[] = "$k $op ?";
361 361 
                         $params[] = $var;
362 362 
                     }
363 363 
                 }
364 
-            }else{
364 
+            } else{
365 365 
                 if(is_a($v, Raw::class)){
366 366 
                     $exprs[] = "$k = ".strval($v);
367 367
368 
-                }else{
368 
+                } else{
369 369 
                     $exprs[] = "$k = ?";
370 370 
                     $params[] = $v;
371 371 
                 }
 
@@ -402,18 +402,18 @@  discard block
 
 block discarded – undo
402 402 
                             foreach ($arg as $i){
403 403 
                                 if(is_a($i, Raw::class)){
404 404 
                                     $stubs[] = strval($i);
405 
-                                }else{
405 
+                                } else{
406 406 
                                     $stubs[] = '?';
407 407 
                                     $newArgs[] = $i;
408 408 
                                 }
409 409 
                             }
410 410 
                             $stubs = implode(',', $stubs);
411 
-                        }else{
411 
+                        } else{
412 412 
                             $stubs = strval($arg);
413 413 
                         }
414 414 
                         $toReplace[] = [$pos, $stubs];
415 415
416 
-                    }else{
416 
+                    } else{
417 417 
                         $newArgs[]=$arg;
418 418 
                     }
419 419 
                 }
 
@@ -474,7 +474,7 @@  discard block
 
 block discarded – undo
474 474 
                 return $context->handleResult($dict);
475 475 
             }
476 476 
             return $context->handleResult($res);
477 
-        }else{
477 
+        } else{
478 478 
             return false;
479 479 
         }
480 480 
     }
 
@@ -498,7 +498,7 @@  discard block
 
 block discarded – undo
498 498 
         if(!preg_match('/\bfrom\b/i', $context->sql, $found, PREG_OFFSET_CAPTURE) ||
499 499 
             count($found)==0){
500 500 
             $columnEnd = strlen($context->sql);
501 
-        }else{
501 
+        } else{
502 502 
             list($chars, $columnEnd) = $found[0];
503 503 
         }
504 504 
         $sql = substr($context->sql, 0, $columnBegin);
 
@@ -509,7 +509,7 @@  discard block
 
 block discarded – undo
509 509 
         if($st->execute($context->params)){
510 510 
             $res = $st->fetchAll(\PDO::FETCH_ASSOC);
511 511 
             return $res[0]['count'];
512 
-        }else{
512 
+        } else{
513 513 
             return false;
514 514 
         }
515 515 
 
@@ -520,7 +520,7 @@  discard block
 
 block discarded – undo
520 520 
     public function set($context, $column, $value){
521 521 
         if(is_string($column)){
522 522 
             $this->setExpr($context, $column, $value);
523 
-        }else{
523 
+        } else{
524 524 
             $this->setArgs($context, $column);
525 525 
         }
526 526 
     }
 
@@ -530,7 +530,7 @@  discard block
 
 block discarded – undo
530 530 
         if($this->first){
531 531 
             $this->first = false;
532 532 
             $prefix = 'ON DUPLICATE KEY UPDATE ';
533 
-        }else{
533 
+        } else{
534 534 
             $prefix = ',';
535 535 
         }
536 536 
 
@@ -545,7 +545,7 @@  discard block
 
 block discarded – undo
545 545 
             $k = DB::wrap($k);
546 546 
             if(is_a($v, Raw::class)){//直接拼接sql，不需要转义
547 547 
                 $set[]= "$k=".$v->get();
548 
-            }else{
548 
+            } else{
549 549 
                 $set[]= "$k=?";
550 550 
                 $params[]=$v;
551 551 
             }
 
@@ -554,7 +554,7 @@  discard block
 
 block discarded – undo
554 554 
             $this->first = false;
555 555 
             $context->appendSql('ON DUPLICATE KEY UPDATE '.implode(',', $set));
556 556 
             $context->appendParams($params);
557 
-        }else{
557 
+        } else{
558 558 
             $context->appendSql(','.implode(',', $set),false);
559 559 
             $context->appendParams($params);
560 560 
         }
Please login to merge, or discard this patch.
src/DB/rules/insert.php 2 patches
Doc Comments   +3 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -41,6 +41,9 @@  discard block
 
 block discarded – undo
41 41
42 42 
 class OnDuplicateKeyUpdateRule extends ExecRule
43 43 
 {
44 
+    /**
45 
+     * @param \PhpBoot\DB\Context $context
46 
+     */
44 47 
     public function __construct($context)
45 48 
     {
46 49 
         parent::__construct($context);
 
@@ -91,8 +94,6 @@  discard block
 
 block discarded – undo
91 94 
      *      ->onDuplicateKeyUpdate('a=a+1')
92 95 
      *  => "INSERT INTO table(a,b) VALUES(1,now()) ON DUPLICATE KEY UPDATE a=a+1"
93 96 
      *
94 
-     * @param string $column
95 
-     * @param mixed $value
96 97 
      * @return \PhpBoot\DB\rules\basic\ExecRule
97 98 
      */
98 99 
     public function onDuplicateKeyUpdate($expr, $_=null) {
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -95,7 +95,7 @@
 
 block discarded – undo
95 95 
      * @param mixed $value
96 96 
      * @return \PhpBoot\DB\rules\basic\ExecRule
97 97 
      */
98 
-    public function onDuplicateKeyUpdate($expr, $_=null) {
98 
+    public function onDuplicateKeyUpdate($expr, $_ = null) {
99 99 
         $this->impl->set($this->context, $expr, array_slice(func_get_args(), 1));
100 100 
         return new ExecRule($this->context);
101 101 
     }
Please login to merge, or discard this patch.
src/DB/rules/select.php 2 patches
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -111,6 +111,9 @@  discard block
 
 block discarded – undo
111 111
112 112 
 class OrderByRule extends LimitRule
113 113 
 {
114 
+    /**
115 
+     * @param \PhpBoot\DB\Context $context
116 
+     */
114 117 
     public function __construct($context){
115 118 
         parent::__construct($context);
116 119 
         $this->order = new OrderByImpl();
 
@@ -211,7 +214,7 @@  discard block
 
 block discarded – undo
211 214 
      *      "WHERE a=1 AND b IN(1,2) AND c BETWEEN 1 AND 2 AND d<>1"
212 215 
      * @param string|array $conditions
213 216 
      * //TODO where(callable $query)
214 
-     * @param mixed $_
217 
+     * @param string $_
215 218 
      * @return \PhpBoot\DB\rules\select\GroupByRule
216 219 
      */
217 220 
     public function where($conditions=null, $_=null) {
Please login to merge, or discard this patch.
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch 
@@ -37,7 +37,7 @@  discard block
 
 block discarded – undo
37 37 
      * @param string|false $asDict
38 38 
      * @return array
39 39 
      */
40 
-    public function get($asDict=false) {
40 
+    public function get($asDict = false) {
41 41 
         return ExecImpl::get($this->context, $asDict);
42 42 
     }
43 43 
 
@@ -51,9 +51,9 @@  discard block
 
 block discarded – undo
51 51 
      * Execute sql and get one response
52 52 
      * @return null
53 53 
      */
54 
-    public function getFirst(){
54 
+    public function getFirst() {
55 55 
         $res = ExecImpl::get($this->context);
56 
-        if(count($res)){
56 
+        if (count($res)) {
57 57 
             return $res[0];
58 58 
         }
59 59 
         return null;
 
@@ -66,8 +66,8 @@  discard block
 
 block discarded – undo
66 66 
      * @param string $table
67 67 
      * @return \PhpBoot\DB\rules\select\JoinRule
68 68 
      */
69 
-    public function from($table, $as=null){
70 
-        FromImpl::from($this->context, $table,$as);
69 
+    public function from($table, $as = null) {
70 
+        FromImpl::from($this->context, $table, $as);
71 71 
         return new JoinRule($this->context);
72 72 
     }
73 73 
 }
 
@@ -78,7 +78,7 @@  discard block
 
 block discarded – undo
78 78 
      * @param string $column
79 79 
      * @return \PhpBoot\DB\rules\select\GetRule
80 80 
      */
81 
-    public function of($column){
81 
+    public function of($column) {
82 82 
         ForUpdateOfImpl::of($this->context, $column);
83 83 
         return new GetRule($this->context);
84 84 
     }
 
@@ -89,7 +89,7 @@  discard block
 
 block discarded – undo
89 89 
      * forUpdate() => 'FOR UPDATE'
90 90 
      * @return \PhpBoot\DB\rules\select\ForUpdateOfRule
91 91 
      */
92 
-    public function forUpdate(){
92 
+    public function forUpdate() {
93 93 
         ForUpdateImpl::forUpdate($this->context);
94 94 
         return new ForUpdateOfRule($this->context);
95 95 
     }
 
@@ -111,7 +111,7 @@  discard block
 
 block discarded – undo
111 111
112 112 
 class OrderByRule extends LimitRule
113 113 
 {
114 
-    public function __construct($context){
114 
+    public function __construct($context) {
115 115 
         parent::__construct($context);
116 116 
         $this->order = new OrderByImpl();
117 117 
     }
 
@@ -126,7 +126,7 @@  discard block
 
 block discarded – undo
126 126 
      * @param string $order Sql::ORDER_BY_ASC or Sql::ORDER_BY_DESC
127 127 
      * @return \PhpBoot\DB\rules\select\OrderByRule
128 128 
      */
129 
-    public function orderBy($column, $order=null) {
129 
+    public function orderBy($column, $order = null) {
130 130 
         $this->order->orderBy($this->context, $column, $order);
131 131 
         return $this;
132 132 
     }
 
@@ -167,7 +167,7 @@  discard block
 
 block discarded – undo
167 167 
      * @param string $_
168 168 
      * @return \PhpBoot\DB\rules\select\OrderByRule
169 169 
      */
170 
-    public function having($expr, $_=null) {
170 
+    public function having($expr, $_ = null) {
171 171 
         WhereImpl::having($this->context, $expr, array_slice(func_get_args(), 1));
172 172 
         return new OrderByRule($this->context);
173 173 
     }
 
@@ -214,7 +214,7 @@  discard block
 
 block discarded – undo
214 214 
      * @param mixed $_
215 215 
      * @return \PhpBoot\DB\rules\select\GroupByRule
216 216 
      */
217 
-    public function where($conditions=null, $_=null) {
217 
+    public function where($conditions = null, $_ = null) {
218 218 
         WhereImpl::where($this->context, $conditions, array_slice(func_get_args(), 1));
219 219 
         return new GroupByRule($this->context);
220 220 
     }
 
@@ -227,8 +227,8 @@  discard block
 
 block discarded – undo
227 227 
      * @param string $table
228 228 
      * @return \PhpBoot\DB\rules\select\JoinOnRule
229 229 
      */
230 
-    public function join($table){
231 
-        JoinImpl::join($this->context,null, $table);
230 
+    public function join($table) {
231 
+        JoinImpl::join($this->context, null, $table);
232 232 
         return new JoinOnRule($this->context);
233 233 
     }
234 234 
     /**
 
@@ -236,8 +236,8 @@  discard block
 
 block discarded – undo
236 236 
      * @param string $table
237 237 
      * @return \PhpBoot\DB\rules\select\JoinOnRule
238 238 
      */
239 
-    public function leftJoin($table){
240 
-        JoinImpl::join($this->context,'LEFT', $table);
239 
+    public function leftJoin($table) {
240 
+        JoinImpl::join($this->context, 'LEFT', $table);
241 241 
         return new JoinOnRule($this->context);
242 242 
     }
243 243 
     /**
 
@@ -246,7 +246,7 @@  discard block
 
 block discarded – undo
246 246 
      * @return \PhpBoot\DB\rules\select\JoinOnRule
247 247 
      */
248 248 
     public function rightJoin($table) {
249 
-        JoinImpl::join($this->context,'RIGHT', $table);
249 
+        JoinImpl::join($this->context, 'RIGHT', $table);
250 250 
         return new JoinOnRule($this->context);
251 251 
     }
252 252 
     /**
 
@@ -255,7 +255,7 @@  discard block
 
 block discarded – undo
255 255 
      * @return \PhpBoot\DB\rules\select\JoinOnRule
256 256 
      */
257 257 
     public function innerJoin($table) {
258 
-        JoinImpl::join($this->context,'INNER', $table);
258 
+        JoinImpl::join($this->context, 'INNER', $table);
259 259 
         return new JoinOnRule($this->context);
260 260 
     }
261 261 
 }
 
@@ -267,7 +267,7 @@  discard block
 
 block discarded – undo
267 267 
      * @param string $condition
268 268 
      * @return \PhpBoot\DB\rules\select\JoinRule
269 269 
      */
270 
-    public function on($condition){
270 
+    public function on($condition) {
271 271 
         JoinOnImpl::on($this->context, $condition);
272 272 
         return new JoinRule($this->context);
273 273 
     }
Please login to merge, or discard this patch.
src/ORM/ModelWithClass.php 2 patches
Doc Comments   -1 removed lines patch added patch discarded remove patch 
@@ -49,7 +49,6 @@
 
 block discarded – undo
49 49
50 50 
     /**
51 51 
      * where 语法见 @see WhereRule
52 
-     * @param array|string $expr
53 52 
      * @param mixed|null $_
54 53 
      * @return \PhpBoot\DB\rules\basic\OrderByRule
55 54 
      */
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch 
@@ -29,9 +29,9 @@  discard block
 
 block discarded – undo
29 29 
             ->from($this->entity->getTable())
30 30 
             ->where("`{$this->entity->getPK()}` = ?", $id)
31 31 
             ->getFirst();
32 
-        if($row){
32 
+        if ($row) {
33 33 
             return $this->entity->make($row, false);
34 
-        }else{
34 
+        }else {
35 35 
             return null;
36 36 
         }
37 37 
     }
 
@@ -53,7 +53,7 @@  discard block
 
 block discarded – undo
53 53 
      * @param mixed|null $_
54 54 
      * @return \PhpBoot\DB\rules\basic\OrderByRule
55 55 
      */
56 
-    public function deleteWhere($conditions, $_=null)
56 
+    public function deleteWhere($conditions, $_ = null)
57 57 
     {
58 58 
         $query = $this->db->deleteFrom($this->entity->getTable());
59 59 
         return call_user_func_array([$query, 'where'], func_get_args());
 
@@ -75,12 +75,12 @@  discard block
 
 block discarded – undo
75 75 
      * @param string $_
76 76 
      * @return \PhpBoot\DB\rules\select\GroupByRule
77 77 
      */
78 
-    public function findWhere($conditions=null, $_=null)
78 
+    public function findWhere($conditions = null, $_ = null)
79 79 
     {
80 
-        $query =  $this->db->select($this->getColumns())
80 
+        $query = $this->db->select($this->getColumns())
81 81 
             ->from($this->entity->getTable());
82 
-        $query->context->resultHandler = function ($result){
83 
-            foreach ($result as &$i){
82 
+        $query->context->resultHandler = function($result) {
83 
+            foreach ($result as &$i) {
84 84 
                 $i = $this->entity->make($i, false);
85 85 
             }
86 86 
             return $result;
 
@@ -94,16 +94,16 @@  discard block
 
 block discarded – undo
94 94 
      * @param mixed|null $_
95 95 
      * @return \PhpBoot\DB\rules\basic\WhereRule
96 96 
      */
97 
-    public function update($expr, $_=null)
97 
+    public function update($expr, $_ = null)
98 98 
     {
99 
-        $query =  $this->db->update($this->entity->getTable());
99 
+        $query = $this->db->update($this->entity->getTable());
100 100 
         return call_user_func_array([$query, 'set'], func_get_args());
101 101 
     }
102 102
103 103 
     protected function getColumns()
104 104 
     {
105 105 
         $columns = [];
106 
-        foreach ($this->entity->getProperties() as $p){
106 
+        foreach ($this->entity->getProperties() as $p) {
107 107 
             $columns[] = $p->name;
108 108 
         }
109 109 
         return $columns;
Please login to merge, or discard this patch.
src/ORM/ModelWithObject.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch 
@@ -27,11 +27,11 @@  discard block
 
 block discarded – undo
27 27 
     public function create()
28 28 
     {
29 29 
         $data = [];
30 
-        foreach ($this->getColumns() as $column){
31 
-            if(isset($this->object->$column)){
32 
-                if(is_array($this->object->$column) || is_object($this->object->$column)){
30 
+        foreach ($this->getColumns() as $column) {
31 
+            if (isset($this->object->$column)) {
32 
+                if (is_array($this->object->$column) || is_object($this->object->$column)) {
33 33 
                     $data[$column] = json_encode($this->object->$column);
34 
-                }else{
34 
+                }else {
35 35 
                     $data[$column] = $this->object->$column;
36 36 
                 }
37 37 
 
@@ -47,20 +47,20 @@  discard block
 
 block discarded – undo
47 47 
      * @param array $columns columns to update. if columns is empty array, update all of the columns
48 48 
      * @return int rows updated
49 49 
      */
50 
-    public function update(array $columns=[])
50 
+    public function update(array $columns = [])
51 51 
     {
52 52 
         $data = [];
53 53 
         $pk = $this->entity->getPK();
54 
-        foreach ($this->getColumns() as $column){
55 
-            if(count($columns)){
56 
-                if(!in_array($column, $columns)){
54 
+        foreach ($this->getColumns() as $column) {
55 
+            if (count($columns)) {
56 
+                if (!in_array($column, $columns)) {
57 57 
                     continue;
58 58 
                 }
59 59 
             }
60 
-            if($pk != $column && isset($this->object->$column)){
61 
-                if(is_array($this->object->$column) || is_object($this->object->$column)){
60 
+            if ($pk != $column && isset($this->object->$column)) {
61 
+                if (is_array($this->object->$column) || is_object($this->object->$column)) {
62 62 
                     $data[$column] = json_encode($this->object->$column);
63 
-                }else{
63 
+                }else {
64 64 
                     $data[$column] = $this->object->$column;
65 65 
                 }
66 66 
             }
 
@@ -86,7 +86,7 @@  discard block
 
 block discarded – undo
86 86 
     protected function getColumns()
87 87 
     {
88 88 
         $columns = [];
89 
-        foreach ($this->entity->getProperties() as $p){
89 
+        foreach ($this->entity->getProperties() as $p) {
90 90 
             $columns[] = $p->name;
91 91 
         }
92 92 
         return $columns;
Please login to merge, or discard this patch.
src/functions.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch 
@@ -5,7 +5,7 @@  discard block
 
 block discarded – undo
5 5 
 use PhpBoot\ORM\ModelWithObject;
6 6 
 use PhpBoot\Utils\Logger;
7 7
8 
-if (! function_exists('PhpBoot\abort')) {
8 
+if (!function_exists('PhpBoot\abort')) {
9 9 
     /**
10 10 
      * 抛出异常, 并记录日志
11 11 
      * @param string|\Exception $error
 
@@ -13,29 +13,29 @@  discard block
 
 block discarded – undo
13 13 
      * @param string $level "error"|"warning"|"info"|"debug"|null
14 14 
      * @throws \Exception
15 15 
      */
16 
-    function abort($error = '', $context=[], $level='warning')
16 
+    function abort($error = '', $context = [], $level = 'warning')
17 17 
     {
18 
-        if(is_object($context)){
18 
+        if (is_object($context)) {
19 19 
             $context = get_object_vars($context);
20 20 
         }
21 
-        if($error instanceof \Exception){
21 
+        if ($error instanceof \Exception) {
22 22 
             $e = $error;
23 23 
             $message = "exception '".get_class($error)."' with message {$error->getMessage()}";
24 
-        }else{
24 
+        }else {
25 25 
             $e = new \RuntimeException($error);
26 26 
             $message = $error;
27 27 
         }
28 28 
         $trace = $e->getTrace();
29 29
30 
-        if($e->getFile() == __FILE__){
30 
+        if ($e->getFile() == __FILE__) {
31 31 
             $file = $trace[0]['file'];
32 32 
             $line = $trace[0]['line'];
33 
-        }else{
33 
+        }else {
34 34 
             $file = $e->getFile();
35 35 
             $line = $e->getLine();
36 36 
         }
37 
-        if($level){
38 
-           Logger::$level($message, $context +['@file'=>$file, '@line'=>$line]);
37 
+        if ($level) {
38 
+           Logger::$level($message, $context + ['@file'=>$file, '@line'=>$line]);
39 39 
         }
40 40 
         throw $e;
41 41 
     }
 
@@ -61,9 +61,9 @@  discard block
 
 block discarded – undo
61 61 
      */
62 62 
     function models(DB $db, $entity)
63 63 
     {
64 
-        if(is_object($entity)){
64 
+        if (is_object($entity)) {
65 65 
             return $db->getApp()->make(ModelWithObject::class, ['db'=>$db, 'entity'=>$entity]);
66 
-        }else{
66 
+        }else {
67 67 
             return $db->getApp()->make(ModelWithClass::class, ['db'=>$db, 'entityName'=>$entity]);
68 68 
         }
69 69 
     }
Please login to merge, or discard this patch.
src/DB/rules/update.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -24,7 +24,7 @@  discard block
 
 block discarded – undo
24 24
25 25 
 class UpdateSetRule extends WhereRule
26 26 
 {
27 
-    public function __construct($context){
27 
+    public function __construct($context) {
28 28 
         parent::__construct($context);
29 29 
         $this->impl = new UpdateSetImpl();
30 30 
     }
 
@@ -37,7 +37,7 @@  discard block
 
 block discarded – undo
37 37 
      * @param mixed $_
38 38 
      * @return \PhpBoot\DB\rules\update\UpdateSetRule
39 39 
      */
40 
-    public function set($expr, $_=null) {
40 
+    public function set($expr, $_ = null) {
41 41 
         $this->impl->set($this->context, $expr, array_slice(func_get_args(), 1));
42 42 
         return $this;
43 43 
     }
Please login to merge, or discard this patch.
src/DB/DB.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch 
@@ -55,7 +55,7 @@  discard block
 
 block discarded – undo
55 55 
  *
56 56 
  * @author caoym <[email protected]>
57 57 
  */
58 
-class DB{
58 
+class DB {
59 59
60 60 
     /**
61 61 
      * DB constructor.
 
@@ -96,18 +96,18 @@  discard block
 
 block discarded – undo
96 96 
      * @param string $column0
97 97 
      * @return \PhpBoot\DB\rules\select\FromRule
98 98 
      */
99 
-    function select($column0=null, $_=null){
99 
+    function select($column0 = null, $_ = null) {
100 100 
         $obj = new SelectRule(new Context($this->connection));
101 
-        if($column0 == null){
101 
+        if ($column0 == null) {
102 102 
             $args = ['*'];
103 
-        }elseif(is_array($column0)){
103 
+        }elseif (is_array($column0)) {
104 104 
             $args = $column0;
105 
-        }else{
105 
+        }else {
106 106 
             $args = func_get_args();
107 107 
         }
108 
-        foreach ($args as &$arg){
108 
+        foreach ($args as &$arg) {
109 109 
             $arg = DB::wrap($arg);
110 
-            if($arg == '*'){
110 
+            if ($arg == '*') {
111 111 
                 continue;
112 112 
             }
113 113 
 
@@ -139,8 +139,8 @@  discard block
 
 block discarded – undo
139 139 
      * @param string $table
140 140 
      * @return \PhpBoot\DB\rules\basic\WhereRule
141 141 
      */
142 
-    public function deleteFrom($table){
143 
-        $obj  =  new DeleteRule(new Context($this->connection));
142 
+    public function deleteFrom($table) {
143 
+        $obj = new DeleteRule(new Context($this->connection));
144 144 
         return $obj->deleteFrom($table);
145 145 
     }
146 146 
     /**
 
@@ -148,8 +148,8 @@  discard block
 
 block discarded – undo
148 148 
      * @param string $table
149 149 
      * @return \PhpBoot\DB\rules\replace\ValuesRule
150 150 
      */
151 
-    public function replaceInto($table){
152 
-        $obj  =  new ReplaceIntoRule(new Context($this->connection));
151 
+    public function replaceInto($table) {
152 
+        $obj = new ReplaceIntoRule(new Context($this->connection));
153 153 
         return $obj->replaceInto($table);
154 154 
     }
155 155 
 
@@ -168,7 +168,7 @@  discard block
 
 block discarded – undo
168 168 
      * @param string $str
169 169 
      * @return Raw
170 170 
      */
171 
-    static public function raw($str){
171 
+    static public function raw($str) {
172 172 
         return new Raw($str);
173 173 
     }
174 174 
     static public function wrap($value)
 
@@ -176,7 +176,7 @@  discard block
 
 block discarded – undo
176 176 
         if ($value === '*') {
177 177 
             return $value;
178 178 
         }
179 
-        if($value instanceof Raw){
179 
+        if ($value instanceof Raw) {
180 180 
             return $value->get();
181 181 
         }
182 182 
         return '`'.str_replace('`', '``', $value).'`';
 
@@ -189,8 +189,8 @@  discard block
 
 block discarded – undo
189 189 
     {
190 190 
         return $this->app;
191 191 
     }
192 
-    const ORDER_BY_ASC ='ASC';
193 
-    const ORDER_BY_DESC ='DESC';
192 
+    const ORDER_BY_ASC = 'ASC';
193 
+    const ORDER_BY_DESC = 'DESC';
194 194
195 195 
     /**
196 196 
      * @var \PDO
Please login to merge, or discard this patch.