@@ -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 | } |
@@ -36,7 +36,7 @@ |
||
| 36 | 36 | { |
| 37 | 37 | if($annotations){ |
| 38 | 38 | parent::__construct($annotations, $cache); |
| 39 | - }else{ |
|
| 39 | + } else{ |
|
| 40 | 40 | parent::__construct(self::$DEFAULT_ANNOTATIONS, $cache); |
| 41 | 41 | } |
| 42 | 42 | $this->factory = $factory; |
@@ -105,13 +105,13 @@ discard block |
||
| 105 | 105 | } |
| 106 | 106 | if($meta->container){ |
| 107 | 107 | $inputs[$meta->name] = $meta->container->make($source); |
| 108 | - }else{ |
|
| 108 | + } else{ |
|
| 109 | 109 | $inputs[$meta->name] = $source; |
| 110 | 110 | } |
| 111 | 111 | if($meta->validation){ |
| 112 | 112 | $vld->rule($meta->validation, $meta->name); |
| 113 | 113 | } |
| 114 | - }else{ |
|
| 114 | + } else{ |
|
| 115 | 115 | $meta->isOptional or \PhpBoot\abort(new \InvalidArgumentException("the parameter \"{$meta->source}\" is missing")); |
| 116 | 116 | $inputs[$meta->name] = $meta->default; |
| 117 | 117 | } |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | foreach ($this->paramMetas as $meta){ |
| 131 | 131 | if($meta->isPassedByReference){ |
| 132 | 132 | $params[$pos] = null; |
| 133 | - }else{ |
|
| 133 | + } else{ |
|
| 134 | 134 | $params[$pos] = $inputs[$meta->name]; |
| 135 | 135 | } |
| 136 | 136 | $pos++; |
@@ -25,13 +25,13 @@ |
||
| 25 | 25 | $params = new AnnotationParams($text, 2); |
| 26 | 26 | $paramName = substr($params->getParam(0), 1); |
| 27 | 27 | $paramDoc = $params->getRawParam(1, ''); |
| 28 | - }else{ |
|
| 28 | + } else{ |
|
| 29 | 29 | $params = new AnnotationParams($text, 3); |
| 30 | 30 | if ($params->count() >=2 && substr($params->getParam(1), 0, 1) == '$'){ |
| 31 | 31 | $paramType = $params->getParam(0); //TODO 检测类型是否合法 |
| 32 | 32 | $paramName = substr($params->getParam(1), 1); |
| 33 | 33 | $paramDoc = $params->getRawParam(2, ''); |
| 34 | - }else{ |
|
| 34 | + } else{ |
|
| 35 | 35 | \PhpBoot\abort(new AnnotationSyntaxException("@param $text syntax error")); |
| 36 | 36 | } |
| 37 | 37 | } |
@@ -38,7 +38,7 @@ |
||
| 38 | 38 | $paramMeta = $command->getParamMeta($paramName); |
| 39 | 39 | if($params->count()>1){ |
| 40 | 40 | $paramMeta->validation = [$params[0], $params[1]]; |
| 41 | - }else{ |
|
| 41 | + } else{ |
|
| 42 | 42 | $paramMeta->validation = $params[0]; |
| 43 | 43 | if($paramMeta->validation) { |
| 44 | 44 | $v = new Validator(); |
@@ -12,7 +12,7 @@ discard block |
||
| 12 | 12 | $key = 'lock:'.$key; |
| 13 | 13 | if(function_exists('apc_add')){ |
| 14 | 14 | $lock = new ApcLock(); |
| 15 | - }else{ |
|
| 15 | + } else{ |
|
| 16 | 16 | $lock = new FileLock(); |
| 17 | 17 | } |
| 18 | 18 | try{ |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | } |
| 30 | 30 | //嵌套加锁 |
| 31 | 31 | self::$currentLock[$key]++; |
| 32 | - }catch (\Exception $e){ |
|
| 32 | + } catch (\Exception $e){ |
|
| 33 | 33 | if($error){ |
| 34 | 34 | return $error(); |
| 35 | 35 | } |
@@ -38,12 +38,12 @@ discard block |
||
| 38 | 38 | $res = null; |
| 39 | 39 | try{ |
| 40 | 40 | $res = $success(); |
| 41 | - }catch (\Exception $e){ |
|
| 41 | + } catch (\Exception $e){ |
|
| 42 | 42 | self::$currentLock[$key]--; |
| 43 | 43 | if(self::$currentLock[$key] == 0){ |
| 44 | 44 | try{ |
| 45 | 45 | $lock->unlock($key); |
| 46 | - }catch (\Exception $e){ |
|
| 46 | + } catch (\Exception $e){ |
|
| 47 | 47 | |
| 48 | 48 | } |
| 49 | 49 | } |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | if(self::$currentLock[$key] == 0){ |
| 54 | 54 | try{ |
| 55 | 55 | $lock->unlock($key); |
| 56 | - }catch (\Exception $e){ |
|
| 56 | + } catch (\Exception $e){ |
|
| 57 | 57 | |
| 58 | 58 | } |
| 59 | 59 | } |