@@ -10,7 +10,7 @@ |
||
| 10 | 10 | * representation. |
| 11 | 11 | * @var string |
| 12 | 12 | */ |
| 13 | - public $description=''; |
|
| 13 | + public $description = ''; |
|
| 14 | 14 | /** |
| 15 | 15 | * A definition of the response structure. It can be a primitive, an array or an object. If this field |
| 16 | 16 | * does not exist, it means no content is returned as part of the response. As an extension to the Schema |
@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | use EnableDIAnnotations; |
| 16 | 16 | |
| 17 | 17 | protected $settings = array( |
| 18 | - 'origin' => '*', // Wide Open! |
|
| 18 | + 'origin' => '*', // Wide Open! |
|
| 19 | 19 | 'allowMethods' => 'GET,HEAD,PUT,POST,DELETE,PATCH,OPTIONS', |
| 20 | 20 | ); |
| 21 | 21 | protected function setOrigin(Request $req, Response $rsp) { |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | 68 | else { // Otherwise, use request headers |
| 69 | - $allowHeaders = $req->headers->get("Access-Control-Request-Headers", null ,false); |
|
| 69 | + $allowHeaders = $req->headers->get("Access-Control-Request-Headers", null, false); |
|
| 70 | 70 | } |
| 71 | 71 | if (isset($allowHeaders)) { |
| 72 | 72 | $rsp->headers->set('Access-Control-Allow-Headers', $allowHeaders); |
@@ -99,9 +99,9 @@ discard block |
||
| 99 | 99 | $response = new Response("", 200); |
| 100 | 100 | } |
| 101 | 101 | else { |
| 102 | - try{ |
|
| 102 | + try { |
|
| 103 | 103 | $response = $next($request); |
| 104 | - }catch(\Exception $e){ |
|
| 104 | + }catch (\Exception $e) { |
|
| 105 | 105 | $response = $this->exceptionRenderer->render($e); |
| 106 | 106 | } |
| 107 | 107 | } |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | |
| 20 | 20 | class ControllerContainerBuilder extends ContainerBuilder |
| 21 | 21 | { |
| 22 | - static $DEFAULT_ANNOTATIONS=[ |
|
| 22 | + static $DEFAULT_ANNOTATIONS = [ |
|
| 23 | 23 | [ClassAnnotationHandler::class, 'class'], |
| 24 | 24 | [PathAnnotationHandler::class, "class.children[?name=='path']"], |
| 25 | 25 | [RouteAnnotationHandler::class, "methods.*.children[?name=='route'][]"], |
@@ -43,9 +43,9 @@ discard block |
||
| 43 | 43 | Cache $cache, |
| 44 | 44 | array $annotations = null) |
| 45 | 45 | { |
| 46 | - if($annotations){ |
|
| 46 | + if ($annotations) { |
|
| 47 | 47 | parent::__construct($annotations, $cache); |
| 48 | - }else{ |
|
| 48 | + }else { |
|
| 49 | 49 | parent::__construct(self::$DEFAULT_ANNOTATIONS, $cache); |
| 50 | 50 | } |
| 51 | 51 | |
@@ -50,10 +50,10 @@ |
||
| 50 | 50 | * @param callable $call |
| 51 | 51 | * @return \Symfony\Component\HttpFoundation\Response |
| 52 | 52 | */ |
| 53 | - public function handler(Application $app, callable $call){ |
|
| 54 | - try{ |
|
| 53 | + public function handler(Application $app, callable $call) { |
|
| 54 | + try { |
|
| 55 | 55 | return $call(); |
| 56 | - }catch (\Exception $e){ |
|
| 56 | + }catch (\Exception $e) { |
|
| 57 | 57 | $renderer = $app->get(ExceptionRenderer::class); //TODO 放在这里是否合适 |
| 58 | 58 | return $renderer->render($e); |
| 59 | 59 | } |
@@ -21,17 +21,17 @@ discard block |
||
| 21 | 21 | $paramType = null; |
| 22 | 22 | $paramName = null; |
| 23 | 23 | $paramDoc = ''; |
| 24 | - if(substr($text, 0, 1) == '$'){ //带$前缀的是变量 |
|
| 24 | + if (substr($text, 0, 1) == '$') { //带$前缀的是变量 |
|
| 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 | - if ($params->count() >=2 && substr($params->getParam(1), 0, 1) == '$'){ |
|
| 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 | } |
@@ -44,15 +44,15 @@ discard block |
||
| 44 | 44 | */ |
| 45 | 45 | public function __invoke(ControllerContainer $container, $ann, EntityContainerBuilder $entityBuilder) |
| 46 | 46 | { |
| 47 | - if(!$ann->parent){ |
|
| 47 | + if (!$ann->parent) { |
|
| 48 | 48 | //Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()} should be used with parent route"); |
| 49 | 49 | return; |
| 50 | 50 | } |
| 51 | 51 | $target = $ann->parent->name; |
| 52 | 52 | $route = $container->getRoute($target); |
| 53 | - if(!$route){ |
|
| 53 | + if (!$route) { |
|
| 54 | 54 | //Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()}::$target should be used with parent route"); |
| 55 | - return ; |
|
| 55 | + return; |
|
| 56 | 56 | } |
| 57 | 57 | $className = $container->getClassName(); |
| 58 | 58 | |
@@ -61,18 +61,18 @@ discard block |
||
| 61 | 61 | $paramMeta = $route->getRequestHandler()->getParamMeta($paramName); |
| 62 | 62 | $paramMeta or \PhpBoot\abort(new AnnotationSyntaxException("$className::$target param $paramName not exist ")); |
| 63 | 63 | //TODO 检测声明的类型和注释的类型是否匹配 |
| 64 | - if($paramType){ |
|
| 65 | - $paramMeta->type = TypeHint::normalize($paramType, $className);//or \PhpBoot\abort(new AnnotationSyntaxException("{$container->getClassName()}::{$ann->parent->name} @{$ann->name} syntax error, param $paramName unknown type:$paramType ")); |
|
| 64 | + if ($paramType) { |
|
| 65 | + $paramMeta->type = TypeHint::normalize($paramType, $className); //or \PhpBoot\abort(new AnnotationSyntaxException("{$container->getClassName()}::{$ann->parent->name} @{$ann->name} syntax error, param $paramName unknown type:$paramType ")); |
|
| 66 | 66 | $container = ContainerFactory::create($entityBuilder, $paramMeta->type); |
| 67 | 67 | $paramMeta->container = $container; |
| 68 | 68 | } |
| 69 | 69 | $paramMeta->description = $paramDoc; |
| 70 | 70 | |
| 71 | 71 | $responseHandler = $route->getResponseHandler(); |
| 72 | - if($paramMeta->isPassedByReference && $responseHandler){ |
|
| 72 | + if ($paramMeta->isPassedByReference && $responseHandler) { |
|
| 73 | 73 | $mappings = $responseHandler->getMappings(); |
| 74 | - foreach ($mappings as $k => $v){ |
|
| 75 | - if($v->source == 'params.'.$paramMeta->name){ |
|
| 74 | + foreach ($mappings as $k => $v) { |
|
| 75 | + if ($v->source == 'params.'.$paramMeta->name) { |
|
| 76 | 76 | $v->description = $paramMeta->description; |
| 77 | 77 | $v->type = $paramMeta->type; |
| 78 | 78 | $v->container = $paramMeta->container; |
@@ -19,15 +19,15 @@ |
||
| 19 | 19 | */ |
| 20 | 20 | public function __invoke(ControllerContainer $container, $ann) |
| 21 | 21 | { |
| 22 | - if(!$ann->parent){ |
|
| 22 | + if (!$ann->parent) { |
|
| 23 | 23 | //Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()} should be used with parent route"); |
| 24 | 24 | return; |
| 25 | 25 | } |
| 26 | 26 | $target = $ann->parent->name; |
| 27 | 27 | $route = $container->getRoute($target); |
| 28 | - if(!$route){ |
|
| 28 | + if (!$route) { |
|
| 29 | 29 | //Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()}::$target should be used with parent route"); |
| 30 | - return ; |
|
| 30 | + return; |
|
| 31 | 31 | } |
| 32 | 32 | $params = new AnnotationParams($ann->description, 2); |
| 33 | 33 | count($params)>0 or \PhpBoot\abort(new AnnotationSyntaxException("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()}::$target require at least one param, {$params->count()} given")); |
@@ -18,29 +18,29 @@ |
||
| 18 | 18 | */ |
| 19 | 19 | public function __invoke(ControllerContainer $container, $ann) |
| 20 | 20 | { |
| 21 | - if(!$ann->parent || !$ann->parent->parent){ |
|
| 21 | + if (!$ann->parent || !$ann->parent->parent) { |
|
| 22 | 22 | Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()} should be used with parent parent"); |
| 23 | 23 | return; |
| 24 | 24 | } |
| 25 | 25 | $target = $ann->parent->parent->name; |
| 26 | 26 | $route = $container->getRoute($target); |
| 27 | - if(!$route){ |
|
| 27 | + if (!$route) { |
|
| 28 | 28 | Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()}::$target should be used with parent parent"); |
| 29 | - return ; |
|
| 29 | + return; |
|
| 30 | 30 | } |
| 31 | 31 | $params = new AnnotationParams($ann->description, 2); |
| 32 | 32 | |
| 33 | 33 | count($params)>0 or \PhpBoot\abort(new AnnotationSyntaxException("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()}::$target require 1 param, {$params->count()} given")); |
| 34 | 34 | |
| 35 | - if($ann->parent->name == 'param'){ |
|
| 35 | + if ($ann->parent->name == 'param') { |
|
| 36 | 36 | list($paramType, $paramName, $paramDoc) = ParamAnnotationHandler::getParamInfo($ann->parent->description); |
| 37 | 37 | |
| 38 | 38 | $paramMeta = $route->getRequestHandler()->getParamMeta($paramName); |
| 39 | - if($params->count()>1){ |
|
| 39 | + if ($params->count()>1) { |
|
| 40 | 40 | $paramMeta->validation = [$params[0], $params[1]]; |
| 41 | - }else{ |
|
| 41 | + }else { |
|
| 42 | 42 | $paramMeta->validation = $params[0]; |
| 43 | - if($paramMeta->validation) { |
|
| 43 | + if ($paramMeta->validation) { |
|
| 44 | 44 | $v = new Validator(); |
| 45 | 45 | $v->rule($paramMeta->validation, $paramMeta->name); |
| 46 | 46 | if ($v->hasRule('optional', $paramMeta->name)) { |
@@ -18,15 +18,15 @@ |
||
| 18 | 18 | */ |
| 19 | 19 | public function __invoke(ControllerContainer $container, $ann) |
| 20 | 20 | { |
| 21 | - if(!$ann->parent){ |
|
| 21 | + if (!$ann->parent) { |
|
| 22 | 22 | Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()} should be used with parent route"); |
| 23 | 23 | return; |
| 24 | 24 | } |
| 25 | 25 | $target = $ann->parent->name; |
| 26 | 26 | $route = $container->getRoute($target); |
| 27 | - if(!$route){ |
|
| 27 | + if (!$route) { |
|
| 28 | 28 | Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()}::$target should be used with parent route"); |
| 29 | - return ; |
|
| 29 | + return; |
|
| 30 | 30 | } |
| 31 | 31 | $params = new AnnotationParams($ann->description, 2); |
| 32 | 32 | count($params)>0 or \PhpBoot\abort("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()}::$target require at least one param, 0 given"); |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | */ |
| 49 | 49 | public function getRoute($actionName) |
| 50 | 50 | { |
| 51 | - if (array_key_exists($actionName, $this->routes)){ |
|
| 51 | + if (array_key_exists($actionName, $this->routes)) { |
|
| 52 | 52 | return $this->routes[$actionName]; |
| 53 | 53 | } |
| 54 | 54 | return false; |
@@ -170,16 +170,16 @@ discard block |
||
| 170 | 170 | /** |
| 171 | 171 | * @var Route[] |
| 172 | 172 | */ |
| 173 | - private $routes=[]; |
|
| 173 | + private $routes = []; |
|
| 174 | 174 | |
| 175 | 175 | /** |
| 176 | 176 | * @var string |
| 177 | 177 | */ |
| 178 | - private $description=''; |
|
| 178 | + private $description = ''; |
|
| 179 | 179 | /** |
| 180 | 180 | * @var string |
| 181 | 181 | */ |
| 182 | - private $summary=''; |
|
| 182 | + private $summary = ''; |
|
| 183 | 183 | |
| 184 | 184 | /** |
| 185 | 185 | * @var string |