caoym / phpboot

src/Controller/Hooks/Cors.php

Spacing +4 added lines, -4 removed lines

@@ -15,7 +15,7 @@ 
     use EnableDIAnnotations;
 
     protected $settings = array(
-        'origin' => '*',    // Wide Open!
+        'origin' => '*', // Wide Open!
         'allowMethods' => 'GET,HEAD,PUT,POST,DELETE,PATCH,OPTIONS',
     );
     protected function setOrigin(Request $req, Response $rsp) {
@@ -66,7 +66,7 @@ 
             }
         }
         else {  // Otherwise, use request headers
-            $allowHeaders = $req->headers->get("Access-Control-Request-Headers", null ,false);
+            $allowHeaders = $req->headers->get("Access-Control-Request-Headers", null, false);
         }
         if (isset($allowHeaders)) {
             $rsp->headers->set('Access-Control-Allow-Headers', $allowHeaders);
@@ -99,9 +99,9 @@ 
             $response = new Response("", 200);
         }
         else {
-            try{
+            try {
                 $response = $next($request);
-            }catch(\Exception $e){
+            }catch (\Exception $e) {
                 $response = $this->exceptionRenderer->render($e);
             }
         }

Braces +4 added lines, -7 removed lines

@@ -64,8 +64,7 @@ 
             if (is_array($allowHeaders)) {
                 $allowHeaders = implode(", ", $allowHeaders);
             }
-        }
-        else {  // Otherwise, use request headers
+        } else {  // Otherwise, use request headers
             $allowHeaders = $req->headers->get("Access-Control-Request-Headers", null ,false);
         }
         if (isset($allowHeaders)) {
@@ -81,8 +80,7 @@ 
             $this->setAllowCredentials($req, $rsp);
             $this->setAllowMethods($req, $rsp);
             $this->setAllowHeaders($req, $rsp);
-        }
-        else {
+        } else {
             $this->setOrigin($req, $rsp);
             $this->setExposeHeaders($req, $rsp);
             $this->setAllowCredentials($req, $rsp);
@@ -97,11 +95,10 @@ 
     public function handle(Request $request, \Closure $next) {
         if ($request->getMethod() == 'OPTIONS') {
             $response = new Response("", 200);
-        }
-        else {
+        } else {
             try{
                 $response = $next($request);
-            }catch(\Exception $e){
+            } catch(\Exception $e){
                 $response = $this->exceptionRenderer->render($e);
             }
         }

src/Controller/ExceptionHandler.php

Spacing +3 added lines, -3 removed lines

@@ -50,10 +50,10 @@
      * @param callable $call
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function handler(Application $app, callable $call){
-        try{
+    public function handler(Application $app, callable $call) {
+        try {
             return $call();
-        }catch (\Exception $e){
+        }catch (\Exception $e) {
             $renderer = $app->get(ExceptionRenderer::class); //TODO 放在这里是否合适
             return $renderer->render($e);
         }

Braces +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
     public function handler(Application $app, callable $call){
         try{
             return $call();
-        }catch (\Exception $e){
+        } catch (\Exception $e){
             $renderer = $app->get(ExceptionRenderer::class); //TODO 放在这里是否合适
             return $renderer->render($e);
         }

src/Controller/Annotations/ParamAnnotationHandler.php

Spacing +12 added lines, -12 removed lines

@@ -21,17 +21,17 @@ 
         $paramType = null;
         $paramName = null;
         $paramDoc = '';
-        if(substr($text, 0, 1) == '$'){ //带$前缀的是变量
+        if (substr($text, 0, 1) == '$') { //带$前缀的是变量
             $params = new AnnotationParams($text, 2);
             $paramName = substr($params->getParam(0), 1);
             $paramDoc = $params->getRawParam(1, '');
-        }else{
+        }else {
             $params = new AnnotationParams($text, 3);
-            if ($params->count() >=2 && substr($params->getParam(1), 0, 1) == '$'){
+            if ($params->count()>=2 && substr($params->getParam(1), 0, 1) == '$') {
                 $paramType = $params->getParam(0); //TODO 检测类型是否合法
                 $paramName = substr($params->getParam(1), 1);
                 $paramDoc = $params->getRawParam(2, '');
-            }else{
+            }else {
                 \PhpBoot\abort(new AnnotationSyntaxException("@param $text syntax error"));
             }
         }
@@ -44,15 +44,15 @@ 
      */
     public function __invoke(ControllerContainer $container, $ann, EntityContainerBuilder $entityBuilder)
     {
-        if(!$ann->parent){
+        if (!$ann->parent) {
             //Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()} should be used with parent route");
             return;
         }
         $target = $ann->parent->name;
         $route = $container->getRoute($target);
-        if(!$route){
+        if (!$route) {
             //Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()}::$target should be used with parent route");
-            return ;
+            return;
         }
         $className = $container->getClassName();
 
@@ -61,18 +61,18 @@ 
         $paramMeta = $route->getRequestHandler()->getParamMeta($paramName);
         $paramMeta or \PhpBoot\abort(new AnnotationSyntaxException("$className::$target param $paramName not exist "));
         //TODO 检测声明的类型和注释的类型是否匹配
-        if($paramType){
-            $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 "));
+        if ($paramType) {
+            $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 "));
             $container = ContainerFactory::create($entityBuilder, $paramMeta->type);
             $paramMeta->container = $container;
         }
         $paramMeta->description = $paramDoc;
 
         $responseHandler = $route->getResponseHandler();
-        if($paramMeta->isPassedByReference && $responseHandler){
+        if ($paramMeta->isPassedByReference && $responseHandler) {
             $mappings = $responseHandler->getMappings();
-            foreach ($mappings as $k => $v){
-                if($v->source == 'params.'.$paramMeta->name){
+            foreach ($mappings as $k => $v) {
+                if ($v->source == 'params.'.$paramMeta->name) {
                     $v->description = $paramMeta->description;
                     $v->type = $paramMeta->type;
                     $v->container = $paramMeta->container;

Braces +2 added lines, -2 removed lines

@@ -25,13 +25,13 @@
             $params = new AnnotationParams($text, 2);
             $paramName = substr($params->getParam(0), 1);
             $paramDoc = $params->getRawParam(1, '');
-        }else{
+        } else{
             $params = new AnnotationParams($text, 3);
             if ($params->count() >=2 && substr($params->getParam(1), 0, 1) == '$'){
                 $paramType = $params->getParam(0); //TODO 检测类型是否合法
                 $paramName = substr($params->getParam(1), 1);
                 $paramDoc = $params->getRawParam(2, '');
-            }else{
+            } else{
                 \PhpBoot\abort(new AnnotationSyntaxException("@param $text syntax error"));
             }
         }

src/Controller/Annotations/BindAnnotationHandler.php

Braces +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
                 $handler->setMapping($params[0], $return);
             }
 
-        }elseif($ann->parent->name == 'param'){
+        } elseif($ann->parent->name == 'param'){
             list($paramType, $paramName, $paramDoc) = ParamAnnotationHandler::getParamInfo($ann->parent->description);
 
             $paramMeta = $route->getRequestHandler()->getParamMeta($paramName);
@@ -59,7 +59,7 @@ 
                         ContainerFactory::create($entityBuilder, $paramMeta->type)
                     )
                 );
-            }else{
+            } else{
                 $paramMeta->source = $params[0];
             }
         }

Spacing +9 added lines, -9 removed lines

@@ -21,15 +21,15 @@ 
      */
     public function __invoke(ControllerContainer $container, $ann, EntityContainerBuilder $entityBuilder)
     {
-        if(!$ann->parent || !$ann->parent->parent){
+        if (!$ann->parent || !$ann->parent->parent) {
             Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()} should be used with parent param/return");
             return;
         }
         $target = $ann->parent->parent->name;
         $route = $container->getRoute($target);
-        if(!$route){
+        if (!$route) {
             Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()}::$target should be used with parent param/return");
-            return ;
+            return;
         }
 
         $params = new AnnotationParams($ann->description, 2);
@@ -38,20 +38,20 @@ 
 
         $handler = $route->getResponseHandler();
 
-        if ($ann->parent->name == 'return'){
+        if ($ann->parent->name == 'return') {
             list($target, $return) = $handler->getMappingBySource('return');
-            if($return){
+            if ($return) {
                 $handler->eraseMapping($target);
                 $handler->setMapping($params[0], $return);
             }
 
-        }elseif($ann->parent->name == 'param'){
+        }elseif ($ann->parent->name == 'param') {
             list($paramType, $paramName, $paramDoc) = ParamAnnotationHandler::getParamInfo($ann->parent->description);
 
             $paramMeta = $route->getRequestHandler()->getParamMeta($paramName);
-            if($paramMeta->isPassedByReference){
+            if ($paramMeta->isPassedByReference) {
                 list($target, $ori) = $handler->getMappingBySource('params.'.$paramName);
-                if($ori){
+                if ($ori) {
                     $handler->eraseMapping($target);
                 }
                 //输出绑定
@@ -63,7 +63,7 @@ 
                         ContainerFactory::create($entityBuilder, $paramMeta->type)
                     )
                 );
-            }else{
+            }else {
                 $paramMeta->source = $params[0];
             }
         }

src/Controller/Annotations/ThrowsAnnotationHandler.php

Spacing +3 added lines, -3 removed lines

@@ -19,15 +19,15 @@
      */
     public function __invoke(ControllerContainer $container, $ann)
     {
-        if(!$ann->parent){
+        if (!$ann->parent) {
             //Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()} should be used with parent route");
             return;
         }
         $target = $ann->parent->name;
         $route = $container->getRoute($target);
-        if(!$route){
+        if (!$route) {
             //Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()}::$target should be used with parent route");
-            return ;
+            return;
         }
         $params = new AnnotationParams($ann->description, 2);
         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"));

src/Controller/Annotations/ValidateAnnotationHandler.php

Spacing +7 added lines, -7 removed lines

@@ -18,29 +18,29 @@
      */
     public function __invoke(ControllerContainer $container, $ann)
     {
-        if(!$ann->parent || !$ann->parent->parent){
+        if (!$ann->parent || !$ann->parent->parent) {
             Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()} should be used with parent parent");
             return;
         }
         $target = $ann->parent->parent->name;
         $route = $container->getRoute($target);
-        if(!$route){
+        if (!$route) {
             Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()}::$target should be used with parent parent");
-            return ;
+            return;
         }
         $params = new AnnotationParams($ann->description, 2);
 
         count($params)>0 or \PhpBoot\abort(new AnnotationSyntaxException("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()}::$target require 1 param, {$params->count()} given"));
 
-        if($ann->parent->name == 'param'){
+        if ($ann->parent->name == 'param') {
             list($paramType, $paramName, $paramDoc) = ParamAnnotationHandler::getParamInfo($ann->parent->description);
 
             $paramMeta = $route->getRequestHandler()->getParamMeta($paramName);
-            if($params->count()>1){
+            if ($params->count()>1) {
                 $paramMeta->validation = [$params[0], $params[1]];
-            }else{
+            }else {
                 $paramMeta->validation = $params[0];
-                if($paramMeta->validation) {
+                if ($paramMeta->validation) {
                     $v = new Validator();
                     $v->rule($paramMeta->validation, $paramMeta->name);
                     if ($v->hasRule('optional', $paramMeta->name)) {

Braces +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
             $paramMeta = $route->getRequestHandler()->getParamMeta($paramName);
             if($params->count()>1){
                 $paramMeta->validation = [$params[0], $params[1]];
-            }else{
+            } else{
                 $paramMeta->validation = $params[0];
                 if($paramMeta->validation) {
                     $v = new Validator();

src/Controller/Annotations/HookAnnotationHandler.php

Spacing +3 added lines, -3 removed lines

@@ -18,15 +18,15 @@
      */
     public function __invoke(ControllerContainer $container, $ann)
     {
-        if(!$ann->parent){
+        if (!$ann->parent) {
             Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()} should be used with parent route");
             return;
         }
         $target = $ann->parent->name;
         $route = $container->getRoute($target);
-        if(!$route){
+        if (!$route) {
             Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()}::$target should be used with parent route");
-            return ;
+            return;
         }
         $params = new AnnotationParams($ann->description, 2);
         count($params)>0 or \PhpBoot\abort("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()}::$target require at least one param, 0 given");

src/Controller/ControllerContainer.php

Spacing +4 added lines, -4 removed lines

@@ -48,7 +48,7 @@ 
      */
     public function getRoute($actionName)
     {
-        if (array_key_exists($actionName, $this->routes)){
+        if (array_key_exists($actionName, $this->routes)) {
             return $this->routes[$actionName];
         }
         return false;
@@ -170,16 +170,16 @@ 
     /**
      * @var Route[]
      */
-    private $routes=[];
+    private $routes = [];
 
     /**
      * @var string
      */
-    private $description='';
+    private $description = '';
     /**
      * @var string
      */
-    private $summary='';
+    private $summary = '';
 
     /**
      * @var string

src/Controller/Route.php

Spacing +10 added lines, -10 removed lines

@@ -8,12 +8,12 @@ 
 class Route
 {
     public function __construct(
-        $method='',
-        $uri='',
-        RequestHandler $requestHandler=null,
-        ResponseHandler $responseHandler=null,
-        ExceptionHandler $exceptionHandler=null,
-        $hooks=[],
+        $method = '',
+        $uri = '',
+        RequestHandler $requestHandler = null,
+        ResponseHandler $responseHandler = null,
+        ExceptionHandler $exceptionHandler = null,
+        $hooks = [],
         $summary = '',
         $description = '')
     {
@@ -50,7 +50,7 @@ 
                     $res = call_user_func_array($function, $params);
                     return $this->responseHandler->handle($app, $res, $reference);
                 };
-                foreach (array_reverse($this->hooks) as $hookName){
+                foreach (array_reverse($this->hooks) as $hookName) {
                     $next = function($request)use($app, $hookName, $next){
                         $hook = $app->get($hookName);
                         /**@var $hook HookInterface*/
@@ -262,17 +262,17 @@ 
     /**
      * @var string
      */
-    private $description='';
+    private $description = '';
 
     /**
      * hook class names
      * @var string[]
      */
-    private $hooks=[];
+    private $hooks = [];
 
     /**
      * @var string[]
      */
-    private $pathParams =[];
+    private $pathParams = [];
 
 }
\ No newline at end of file