@@ -26,7 +26,7 @@ |
||
| 26 | 26 | foreach (Promise\settle($promises)->wait() as $i){ |
| 27 | 27 | if(isset($i['reason'])){ |
| 28 | 28 | $res[] = [null, new RpcException($i['reason'])]; |
| 29 | - }else{ |
|
| 29 | + } else{ |
|
| 30 | 30 | $res[] = [$i['value'], null]; |
| 31 | 31 | } |
| 32 | 32 | } |
@@ -23,11 +23,11 @@ |
||
| 23 | 23 | $value = json_encode($value, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE); |
| 24 | 24 | //} |
| 25 | 25 | $response->setContent($value); |
| 26 | - }elseif($key == 'headers'){ |
|
| 26 | + } elseif($key == 'headers'){ |
|
| 27 | 27 | foreach ($value as $k=>$v){ |
| 28 | 28 | $response->headers->set($k, $v); |
| 29 | 29 | } |
| 30 | - }else{ |
|
| 30 | + } else{ |
|
| 31 | 31 | \PhpBoot\abort(new \UnexpectedValueException("Unexpected output target $key")); |
| 32 | 32 | } |
| 33 | 33 | |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | $source = "request.$paramName"; |
| 85 | 85 | if($route->hasPathParam($paramName)){ //参数来自路由 |
| 86 | 86 | $source = "request.$paramName"; |
| 87 | - }elseif($httpMethod == 'GET'){ |
|
| 87 | + } elseif($httpMethod == 'GET'){ |
|
| 88 | 88 | $source = "request.$paramName"; //GET请求显示指定来自query string |
| 89 | 89 | } |
| 90 | 90 | $paramClass = $param->getClass(); |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | $requestHandler->setParamMetas($paramsMeta); |
| 117 | 117 | if(!$hasRefParam){ |
| 118 | 118 | $responseHandler->setMapping('response.content', new ReturnMeta('return','mixed','', new MixedTypeContainer())); |
| 119 | - }else{ |
|
| 119 | + } else{ |
|
| 120 | 120 | //当存在引用参数作为输出时, 默认将 return 数据绑定的到 data 下, 以防止和引用参数作为输出重叠 |
| 121 | 121 | $responseHandler->setMapping($this->returnTarget, new ReturnMeta('return','mixed','', new MixedTypeContainer())); |
| 122 | 122 | } |
@@ -101,9 +101,9 @@ discard block |
||
| 101 | 101 | $obj = new SelectRule(new Context($this->connection)); |
| 102 | 102 | if($column0 == null){ |
| 103 | 103 | $args = ['*']; |
| 104 | - }elseif(is_array($column0)){ |
|
| 104 | + } elseif(is_array($column0)){ |
|
| 105 | 105 | $args = $column0; |
| 106 | - }else{ |
|
| 106 | + } else{ |
|
| 107 | 107 | $args = func_get_args(); |
| 108 | 108 | } |
| 109 | 109 | foreach ($args as &$arg){ |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | $res = $callback($this); |
| 171 | 171 | $this->getConnection()->commit() or \PhpBoot\abort('commit failed'); |
| 172 | 172 | return $res; |
| 173 | - }catch (\Exception $e){ |
|
| 173 | + } catch (\Exception $e){ |
|
| 174 | 174 | $this->getConnection()->rollBack(); |
| 175 | 175 | Logger::warning('commit failed with '.get_class($e).' '.$e->getMessage()); |
| 176 | 176 | throw $e; |
@@ -45,13 +45,13 @@ discard block |
||
| 45 | 45 | } |
| 46 | 46 | if($meta->container){ |
| 47 | 47 | $inputs[$meta->name] = $meta->container->make($source); |
| 48 | - }else{ |
|
| 48 | + } else{ |
|
| 49 | 49 | $inputs[$meta->name] = $source; |
| 50 | 50 | } |
| 51 | 51 | if($meta->validation){ |
| 52 | 52 | $vld->rule($meta->validation, $meta->name); |
| 53 | 53 | } |
| 54 | - }else{ |
|
| 54 | + } else{ |
|
| 55 | 55 | $meta->isOptional or \PhpBoot\abort(new BadRequestHttpException("the parameter \"{$meta->source}\" is missing")); |
| 56 | 56 | $inputs[$meta->name] = $meta->default; |
| 57 | 57 | } |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | foreach ($this->paramMetas as $meta){ |
| 71 | 71 | if($meta->isPassedByReference){ |
| 72 | 72 | $params[$pos] = &$reference[$meta->name]; |
| 73 | - }else{ |
|
| 73 | + } else{ |
|
| 74 | 74 | $params[$pos] = $inputs[$meta->name]; |
| 75 | 75 | } |
| 76 | 76 | $pos++; |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | } |
| 185 | 185 | if($this->isTheFirst){ |
| 186 | 186 | WhereImpl::where($this->context, 'HAVING', $expr, array_slice(func_get_args(), 1)); |
| 187 | - }else{ |
|
| 187 | + } else{ |
|
| 188 | 188 | WhereImpl::where($this->context, 'AND', $expr, array_slice(func_get_args(), 1)); |
| 189 | 189 | } |
| 190 | 190 | |
@@ -273,7 +273,7 @@ discard block |
||
| 273 | 273 | } |
| 274 | 274 | if($this->isTheFirst){ |
| 275 | 275 | WhereImpl::where($this->context, 'WHERE' ,$conditions, array_slice(func_get_args(), 1)); |
| 276 | - }else{ |
|
| 276 | + } else{ |
|
| 277 | 277 | WhereImpl::where($this->context, 'AND', $conditions, array_slice(func_get_args(), 1)); |
| 278 | 278 | } |
| 279 | 279 | return new NextWhereRule($this->context, false); |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | } |
| 106 | 106 | if($this->isTheFirst){ |
| 107 | 107 | WhereImpl::where($this->context, 'WHERE' ,$conditions, array_slice(func_get_args(), 1)); |
| 108 | - }else{ |
|
| 108 | + } else{ |
|
| 109 | 109 | WhereImpl::where($this->context, 'AND', $conditions, array_slice(func_get_args(), 1)); |
| 110 | 110 | } |
| 111 | 111 | return new NextWhereRule($this->context, false); |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | } |
| 171 | 171 | if($this->isTheFirst){ |
| 172 | 172 | WhereImpl::where($this->context, '', $expr, array_slice(func_get_args(), 1)); |
| 173 | - }else{ |
|
| 173 | + } else{ |
|
| 174 | 174 | WhereImpl::where($this->context, 'AND', $expr, array_slice(func_get_args(), 1)); |
| 175 | 175 | } |
| 176 | 176 | return new NextScopedQuery($this->context, false); |
@@ -18,7 +18,7 @@ |
||
| 18 | 18 | return new Response($e->getMessage(), $e->getStatusCode(), $e->getHeaders()); |
| 19 | 19 | } if($e instanceof \InvalidArgumentException){ |
| 20 | 20 | return new Response($e->getMessage(), Response::HTTP_BAD_REQUEST); |
| 21 | - }else{ |
|
| 21 | + } else{ |
|
| 22 | 22 | return new Response($e->getMessage(), Response::HTTP_INTERNAL_SERVER_ERROR); |
| 23 | 23 | } |
| 24 | 24 | } |
@@ -138,10 +138,10 @@ discard block |
||
| 138 | 138 | $ins = null; |
| 139 | 139 | try{ |
| 140 | 140 | $ins = $app->make($name); |
| 141 | - }catch (\Exception $e){ |
|
| 141 | + } catch (\Exception $e){ |
|
| 142 | 142 | try{ |
| 143 | 143 | $ins = new $name(""); |
| 144 | - }catch (\Exception $e){ |
|
| 144 | + } catch (\Exception $e){ |
|
| 145 | 145 | |
| 146 | 146 | } |
| 147 | 147 | } |
@@ -223,9 +223,9 @@ discard block |
||
| 223 | 223 | { |
| 224 | 224 | if ($content instanceof ReturnMeta || $content instanceof ParamMeta) { |
| 225 | 225 | return $this->makeExample($content->container); |
| 226 | - }elseif ($content instanceof TypeContainerInterface){ |
|
| 226 | + } elseif ($content instanceof TypeContainerInterface){ |
|
| 227 | 227 | return $content->makeExample(); |
| 228 | - }elseif(is_array($content)) { |
|
| 228 | + } elseif(is_array($content)) { |
|
| 229 | 229 | $res = []; |
| 230 | 230 | foreach ($content as $k => $v) { |
| 231 | 231 | $res[$k] = $this->makeExample($v); |
@@ -384,7 +384,7 @@ discard block |
||
| 384 | 384 | $paramSchema = new PrimitiveSchemaObject(); |
| 385 | 385 | if($isFile){ |
| 386 | 386 | $paramSchema->type = 'file'; |
| 387 | - }else{ |
|
| 387 | + } else{ |
|
| 388 | 388 | $paramSchema->type = self::mapType($param->type); |
| 389 | 389 | self::mapValidation($param->validation, $paramSchema); |
| 390 | 390 | } |
@@ -442,7 +442,7 @@ discard block |
||
| 442 | 442 | } elseif($container == null){ |
| 443 | 443 | $schema = null ;//new PrimitiveSchemaObject(); |
| 444 | 444 | //$schema->type = null; |
| 445 | - }else { |
|
| 445 | + } else { |
|
| 446 | 446 | $schema = new PrimitiveSchemaObject(); |
| 447 | 447 | //$schema->type = 'mixed'; |
| 448 | 448 | } |