caoym / phpboot

src/RPC/RpcProxy.php

Braces +3 added lines, -3 removed lines

@@ -52,7 +52,7 @@ 
             $op = $this->http->sendAsync($request);
             $res = MultiRpc::wait($op);
             return $this->mapResponse($method, $route, $res, $args);
-        }else{
+        } else{
             $res = $this->http->send($request);
             return $this->mapResponse($method, $route, $res, $args);
         }
@@ -133,7 +133,7 @@ 
                     $query[$k] = $v;
                 }
             }
-        }else{
+        } else{
             foreach ($request as $k => $v){
                 if(!in_array($k, ['query', 'request', 'files', 'cookies', 'headers'])){
                     if($body === null){
@@ -205,7 +205,7 @@ 
                 ArrayHelper::set($mapping, $return->source, $data);
             }
 
-        }else{
+        } else{
 
             //TODO 如果多个 异常对应同一个 statusCode 怎么处理
             $exceptions = $route->getExceptionHandler()->getExceptions();

src/RPC/MultiRpc.php

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

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/Controller/Annotations/RouteAnnotationHandler.php

Braces +2 added lines, -2 removed lines

@@ -84,7 +84,7 @@ 
             $source = "request.$paramName";
             if($route->hasPathParam($paramName)){ //参数来自路由
                 $source = "request.$paramName";
-            }elseif($httpMethod == 'GET'){
+            } elseif($httpMethod == 'GET'){
                 $source = "request.$paramName"; //GET请求显示指定来自query string
             }
             $paramClass = $param->getClass();
@@ -116,7 +116,7 @@ 
         $requestHandler->setParamMetas($paramsMeta);
         if(!$hasRefParam){
             $responseHandler->setMapping('response.content', new ReturnMeta('return','mixed','', new MixedTypeContainer()));
-        }else{
+        } else{
             //当存在引用参数作为输出时, 默认将 return 数据绑定的到 data 下, 以防止和引用参数作为输出重叠
             $responseHandler->setMapping($this->returnTarget, new ReturnMeta('return','mixed','', new MixedTypeContainer()));
         }

src/DB/DB.php

Braces +3 added lines, -3 removed lines

@@ -101,9 +101,9 @@ 
         $obj = new SelectRule(new Context($this->connection));
         if($column0 == null){
             $args = ['*'];
-        }elseif(is_array($column0)){
+        } elseif(is_array($column0)){
             $args = $column0;
-        }else{
+        } else{
             $args = func_get_args();
         }
         foreach ($args as &$arg){
@@ -170,7 +170,7 @@ 
             $res = $callback($this);
             $this->getConnection()->commit() or \PhpBoot\abort('commit failed');
             return $res;
-        }catch (\Exception $e){
+        } catch (\Exception $e){
             $this->getConnection()->rollBack();
             Logger::warning('commit failed with '.get_class($e).' '.$e->getMessage());
             throw $e;

src/Controller/RequestHandler.php

Braces +3 added lines, -3 removed lines

@@ -45,13 +45,13 @@ 
                 }
                 if($meta->container){
                     $inputs[$meta->name] = $meta->container->make($source);
-                }else{
+                } else{
                     $inputs[$meta->name] = $source;
                 }
                 if($meta->validation){
                     $vld->rule($meta->validation, $meta->name);
                 }
-            }else{
+            } else{
                 $meta->isOptional or \PhpBoot\abort(new BadRequestHttpException("the parameter \"{$meta->source}\" is missing"));
                 $inputs[$meta->name] = $meta->default;
             }
@@ -70,7 +70,7 @@ 
         foreach ($this->paramMetas as $meta){
             if($meta->isPassedByReference){
                 $params[$pos] = &$reference[$meta->name];
-            }else{
+            } else{
                 $params[$pos] = $inputs[$meta->name];
             }
             $pos++;

src/DB/rules/select.php

Braces +2 added lines, -2 removed lines

@@ -184,7 +184,7 @@ 
         }
         if($this->isTheFirst){
             WhereImpl::where($this->context, 'HAVING', $expr, array_slice(func_get_args(), 1));
-        }else{
+        } else{
             WhereImpl::where($this->context, 'AND', $expr, array_slice(func_get_args(), 1));
         }
 
@@ -273,7 +273,7 @@ 
         }
         if($this->isTheFirst){
             WhereImpl::where($this->context, 'WHERE' ,$conditions, array_slice(func_get_args(), 1));
-        }else{
+        } else{
             WhereImpl::where($this->context, 'AND', $conditions, array_slice(func_get_args(), 1));
         }
         return new NextWhereRule($this->context, false);

src/DB/rules/basic.php

Braces +2 added lines, -2 removed lines

@@ -105,7 +105,7 @@ 
         }
         if($this->isTheFirst){
             WhereImpl::where($this->context, 'WHERE' ,$conditions, array_slice(func_get_args(), 1));
-        }else{
+        } else{
             WhereImpl::where($this->context, 'AND', $conditions, array_slice(func_get_args(), 1));
         }
         return new NextWhereRule($this->context, false);
@@ -170,7 +170,7 @@ 
         }
         if($this->isTheFirst){
             WhereImpl::where($this->context, '', $expr, array_slice(func_get_args(), 1));
-        }else{
+        } else{
             WhereImpl::where($this->context, 'AND', $expr, array_slice(func_get_args(), 1));
         }
         return new NextScopedQuery($this->context, false);

src/DB/impls.php

Braces +39 added lines, -39 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);
@@ -154,7 +154,7 @@ 
         if($keys === range(0, count($keys) - 1)){
             //VALUES(val0, val1, val2)
             $context->appendSql("VALUES($row)");
-        }else{
+        } else{
             //(col0, col1, col2) VALUES(val0, val1, val2)
             $columns = implode(',', array_map(function($k){return DB::wrap($k);}, $keys));
             $context->appendSql("($columns) VALUES($row)",false);
@@ -180,9 +180,9 @@ 
         foreach ($values as &$v){
             if($v instanceof Raw){
                 $v = $v->get();
-            }elseif(is_bool($v)){
+            } elseif(is_bool($v)){
                 $v = $v?'true':'false';
-            }elseif(!in_array(gettype($v), ['integer', 'boolean', 'double', 'float'])){
+            } elseif(!in_array(gettype($v), ['integer', 'boolean', 'double', 'float'])){
                 $v = (string)$v;
                 $v = str_replace("\\", "\\\\", $v);
                 $v = str_replace("'", "\\'", $v);
@@ -206,7 +206,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);
         }
     }
@@ -215,7 +215,7 @@ 
         if($this->first){
             $this->first = false;
             $prefix = 'SET ';
-        }else{
+        } else{
             $prefix = ',';
         }
 
@@ -230,7 +230,7 @@ 
             $k = DB::wrap($k);
             if(is_a($v, Raw::class)){//直接拼接sql，不需要转义
                 $set[]= "$k=".$v->get();
-            }else{
+            } else{
                 $set[]= "$k=?";
                 $params[]=$v;
             }
@@ -239,7 +239,7 @@ 
             $this->first = false;
             $context->appendSql('SET '.implode(',', $set));
             $context->appendParams($params);
-        }else{
+        } else{
             $context->appendSql(','.implode(',', $set),false);
             $context->appendParams($params);
         }
@@ -256,7 +256,7 @@ 
         foreach ($orders as $k=>$v){
             if(is_integer($k)){
                 $params[] = DB::wrap($v);
-            }else{
+            } else{
                 $k = DB::wrap($k);
 
                 $v = strtoupper($v);
@@ -268,7 +268,7 @@ 
         if($this->first){
             $this->first = false;
             $context->appendSql('ORDER BY '.implode(',', $params));
-        }else{
+        } else{
             $context->appendSql(','.implode(',', $params),false);
         }
         return $this;
@@ -277,7 +277,7 @@ 
         if(is_string($column)){
             if($order === null){
                 $column = [$column];
-            }else{
+            } else{
                 $column = [$column=>$order];
             }
         }
@@ -321,9 +321,9 @@ 
         }
         if(is_callable($expr)){
             self::conditionClosure($context,$prefix, $expr);
-        }elseif (is_string($expr)){
+        } elseif (is_string($expr)){
             self::condition($context, $prefix, $expr, $args);
-        }else{
+        } else{
             self::conditionArgs($context, $prefix, $expr);
         }
 
@@ -382,14 +382,14 @@ 
                     $stubs = "({$var->context->sql})";
                     $params = array_merge($params, $var->context->params);
                     $exprs[] = "$k $op $stubs";
-                }else{
+                } else{
                     foreach ($var as $i){
                         if(is_a($i, Raw::class)){
                             $stubs[]=strval($i);
-                        }elseif($i instanceof BasicRule){
+                        } elseif($i instanceof BasicRule){
                             $stubs = "({$i->context->sql})";
                             $params = array_merge($params, $i->context->params);
-                        }else{
+                        } else{
                             $stubs[]='?';
                             $params[] = $i;
                         }
@@ -397,34 +397,34 @@ 
                     $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]);
-                }elseif($var[0] instanceof BasicRule){
+                } elseif($var[0] instanceof BasicRule){
                     $cond = "$cond ({$var[0]->context->sql})";
                     $params = array_merge($params, $var[0]->context->params);
-                }else{
+                } else{
                     $cond = "$cond ?";
                     $params[] = $var[0];
                 }
                 if(is_a($var[1], Raw::class)){
                     $cond = "$cond AND ".strval($var[1]);
-                }elseif($var[1] instanceof BasicRule){
+                } elseif($var[1] instanceof BasicRule){
                     $cond = "$cond AND ({$var[1]->context->sql})";
                     $params = array_merge($params, $var[1]->context->params);
-                }else{
+                } else{
                     $cond = "$cond AND ?";
                     $params[] = $var[1];
                 }
                 $exprs[] = $cond;
-            }else{
+            } else{
                 if(is_a($var, Raw::class)){
                     $exprs[] = "$k $op ".strval($var);
-                }elseif($var instanceof BasicRule){
+                } elseif($var instanceof BasicRule){
                     $exprs[] = "$k $op {$var->context->sql}";
                     $params = array_merge($params, $var->context->params);
-                }else{
+                } else{
                     $exprs[] = "$k $op ?";
                     $params[] = $var;
                 }
@@ -463,21 +463,21 @@ 
                             foreach ($arg as $i){
                                 if(is_a($i, Raw::class)){
                                     $stubs[] = strval($i);
-                                }else{
+                                } else{
                                     $stubs[] = '?';
                                     $newArgs[] = $i;
                                 }
                             }
                             $stubs = implode(',', $stubs);
-                        }elseif($arg instanceof BasicRule){
+                        } elseif($arg instanceof BasicRule){
                             $stubs = "({$arg->context->sql})";
                             $newArgs = array_merge($newArgs, $arg->context->params);
-                        }else{
+                        } else{
                             $stubs = strval($arg);
                         }
                         $toReplace[] = [$pos, $stubs];
 
-                    }else{
+                    } else{
                         $newArgs[]=$arg;
                     }
                 }
@@ -493,7 +493,7 @@ 
             }
             if($prefix){
                 $context->appendSql($prefix.' '.$expr);
-            }else{
+            } else{
                 $context->appendSql($expr);
             }
 
@@ -543,7 +543,7 @@ 
                 return $context->handleResult($dict);
             }
             return $context->handleResult($res);
-        }else{
+        } else{
             return false;
         }
     }
@@ -567,7 +567,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);
@@ -578,7 +578,7 @@ 
         if($st->execute($context->params)){
             $res = $st->fetchAll(\PDO::FETCH_ASSOC);
             return intval($res[0]['count']);
-        }else{
+        } else{
             return false;
         }
 
@@ -589,7 +589,7 @@ 
     public function set($context, $column, $value){
         if(is_string($column)){
             $this->setExpr($context, $column, $value);
-        }else{
+        } else{
             $this->setArgs($context, $column);
         }
     }
@@ -599,7 +599,7 @@ 
         if($this->first){
             $this->first = false;
             $prefix = 'ON DUPLICATE KEY UPDATE ';
-        }else{
+        } else{
             $prefix = ',';
         }
 
@@ -614,7 +614,7 @@ 
             $k = DB::wrap($k);
             if(is_a($v, Raw::class)){//直接拼接sql，不需要转义
                 $set[]= "$k=".$v->get();
-            }else{
+            } else{
                 $set[]= "$k=?";
                 $params[]=$v;
             }
@@ -623,7 +623,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);
         }