caoym / phpboot

src/RPC/MultiRequest.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
         return $request->getResults();
     }
 
-    public static function isRunning(){
+    public static function isRunning() {
         return !!self::$currentContext;
     }
 

src/RPC/RpcProxy.php

Spacing +35 added lines, -35 removed lines

@@ -33,7 +33,7 @@ 
                                 ControllerContainerBuilder $builder,
                                 Client $http,
                                 $interface,
-                                $prefix='/')
+                                $prefix = '/')
     {
         $this->container = $builder->build($interface);
         $this->http = $http;
@@ -48,11 +48,11 @@ 
 
         $request = $this->createRequest($method, $route, $args);
 
-        if(MultiRpc::isRunning()){
+        if (MultiRpc::isRunning()) {
             $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);
         }
@@ -69,25 +69,25 @@ 
         $params = $route->getRequestHandler()->getParamMetas();
         //TODO 支持 query、content、path以外的其他参数, 如cookie,path等
         $request = [];
-        foreach ($params as $pos=>$param){
-            if(!array_key_exists($pos, $args) && $param->isOptional){
+        foreach ($params as $pos=>$param) {
+            if (!array_key_exists($pos, $args) && $param->isOptional) {
                 $args[$pos] = $param->default;
             }
             array_key_exists($pos, $args) or \PhpBoot\abort(
                 $this->container->getClassName()." $actionName missing param {$param->name}");
 
-            if(!$param->isPassedByReference){
+            if (!$param->isPassedByReference) {
                 ArrayHelper::set($request, $param->source, $args[$pos]);
             }
         }
 
-        if(isset($request['request'])){
+        if (isset($request['request'])) {
             $request = $request['request'];
         }
         $uri = $route->getUri();
-        foreach($route->getPathParams() as $path){
-            if(isset($request[$path])){
-                $uri = str_replace('{'.$path.'}', urlencode($request[$path]) , $uri);
+        foreach ($route->getPathParams() as $path) {
+            if (isset($request[$path])) {
+                $uri = str_replace('{'.$path.'}', urlencode($request[$path]), $uri);
                 unset($request[$path]);
             }
         }
@@ -97,53 +97,53 @@ 
         $body = null;
         $headers = [];
 
-        if(isset($request['query'])){
+        if (isset($request['query'])) {
             $query += $request['query'];
         }
         unset($request['query']);
 
-        if(isset($request['headers'])){
+        if (isset($request['headers'])) {
             $headers += $request['headers'];
         }
         unset($request['headers']);
 
-        if(isset($request['cookies'])){
+        if (isset($request['cookies'])) {
             $cookies = [];
-            foreach ($request['cookies'] as $k=>$v){
+            foreach ($request['cookies'] as $k=>$v) {
                 $cookies[] = "$k=$v";
             }
             $headers['Cookie'] = implode('; ', $cookies);
         }
         unset($request['cookies']);
 
-        if(isset($request['request'])){
-            if($body === null){
+        if (isset($request['request'])) {
+            if ($body === null) {
                 $body = [];
             }
             $body += $request['request'];
         }
         unset($request['request']);
 
-        if(isset($request['files'])){
+        if (isset($request['files'])) {
             \PhpBoot\abort(new \UnexpectedValueException("sending request with files is not support"));
         }
-        if(in_array($httpMethod, ['GET', 'OPTION'])){
-            foreach ($request as $k => $v){
-                if(!in_array($k, ['query', 'request', 'files', 'cookies', 'headers'])){
+        if (in_array($httpMethod, ['GET', 'OPTION'])) {
+            foreach ($request as $k => $v) {
+                if (!in_array($k, ['query', 'request', 'files', 'cookies', 'headers'])) {
                     $query[$k] = $v;
                 }
             }
-        }else{
-            foreach ($request as $k => $v){
-                if(!in_array($k, ['query', 'request', 'files', 'cookies', 'headers'])){
-                    if($body === null){
+        }else {
+            foreach ($request as $k => $v) {
+                if (!in_array($k, ['query', 'request', 'files', 'cookies', 'headers'])) {
+                    if ($body === null) {
                         $body = [];
                     }
                     $body[$k] = $v;
                 }
             }
         }
-        if($body !== null){
+        if ($body !== null) {
             $body = json_encode($body, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
         }
         $uri = $this->uriPrefix.ltrim($uri, '/').'?'.http_build_query($query);
@@ -156,7 +156,7 @@ 
     }
 
 
-    public function mapResponse($actionName, Route $route, ResponseInterface $response, $requestArg=[])
+    public function mapResponse($actionName, Route $route, ResponseInterface $response, $requestArg = [])
     {
         $response = \Symfony\Component\HttpFoundation\Response::create(
             (string)$response->getBody(),
@@ -165,9 +165,9 @@ 
             );
         $namedArgs = [];
 
-        foreach ($route->getRequestHandler()->getParamMetas() as $pos=>$param){
+        foreach ($route->getRequestHandler()->getParamMetas() as $pos=>$param) {
 
-            if($param->isPassedByReference){
+            if ($param->isPassedByReference) {
                 $namedArgs[$param->name] = &$requestArg[$pos];
             }
         }
@@ -178,7 +178,7 @@ 
         //TODO 远端接口没有抛出异常,但设置了 status( status 不是200)时如何处理
         $handler = $route->getResponseHandler();
 
-        if($response->getStatusCode() >= 200 && $response->getStatusCode() <300){
+        if ($response->getStatusCode()>=200 && $response->getStatusCode()<300) {
 
 
             $returns = $handler->getMappings();
@@ -195,30 +195,30 @@ 
                 'params'=>$namedArgs
             ];
 
-            foreach ($returns as $map=>$return){
+            foreach ($returns as $map=>$return) {
 
                 $data = \JmesPath\search($map, $buffer);
-                if(!$return->container){
+                if (!$return->container) {
                     continue;
                 }
                 $data = $return->container->make($data, false);
                 ArrayHelper::set($mapping, $return->source, $data);
             }
 
-        }else{
+        }else {
 
             //TODO 如果多个 异常对应同一个 statusCode 怎么处理
             $exceptions = $route->getExceptionHandler()->getExceptions();
 
             $errName = null;
-            foreach ($exceptions as $err){
+            foreach ($exceptions as $err) {
 
                 $renderer = $this->app->get(ExceptionRenderer::class);
                 $exec = $renderer->render(
                     $this->app->make($err, ['message'=>(string)$response->getContent()])
                 );
 
-                if( $exec->getStatusCode() == $response->getStatusCode()){
+                if ($exec->getStatusCode() == $response->getStatusCode()) {
                     throw $exec;
                 }
             }
@@ -226,7 +226,7 @@ 
 
         };
 
-        if(isset($mapping['return'])){
+        if (isset($mapping['return'])) {
             return $mapping['return'];
         };
     }

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

Spacing +5 added lines, -5 removed lines

@@ -21,12 +21,12 @@ 
          * ]
          *
          */
-        return MultiRequest::run($threads, function($promises){
+        return MultiRequest::run($threads, function($promises) {
             $res = [];
-            foreach (Promise\settle($promises)->wait() as $i){
-                if(isset($i['reason'])){
+            foreach (Promise\settle($promises)->wait() as $i) {
+                if (isset($i['reason'])) {
                     $res[] = [null, new RpcException($i['reason'])];
-                }else{
+                }else {
                     $res[] = [$i['value'], null];
                 }
             }
@@ -34,7 +34,7 @@ 
         });
     }
 
-    public static function isRunning(){
+    public static function isRunning() {
         return MultiRequest::isRunning();
     }
 

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/Docgen/Swagger/Swagger.php

Unused Use Statements -2 removed lines

@@ -8,7 +8,6 @@ 
 use PhpBoot\Docgen\Swagger\Schemas\ArraySchemaObject;
 use PhpBoot\Docgen\Swagger\Schemas\BodyParameterObject;
 use PhpBoot\Docgen\Swagger\Schemas\OperationObject;
-use PhpBoot\Docgen\Swagger\Schemas\OtherParameterObject;
 use PhpBoot\Docgen\Swagger\Schemas\PrimitiveSchemaObject;
 use PhpBoot\Docgen\Swagger\Schemas\RefSchemaObject;
 use PhpBoot\Docgen\Swagger\Schemas\ResponseObject;
@@ -22,7 +21,6 @@ 
 use PhpBoot\Metas\ParamMeta;
 use PhpBoot\Metas\ReturnMeta;
 use PhpBoot\Utils\ArrayHelper;
-use PhpBoot\Validator\Validator;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class Swagger extends SwaggerObject

Indentation +12 added lines, -12 removed lines

@@ -234,10 +234,10 @@ 
      * @return RefSchemaObject
      */
     public function makeTempSchema(Application $app,
-                                   ControllerContainer $controller,
-                                   $action,
-                                   Route $route,
-                                   array $arr, $suffix)
+                                    ControllerContainer $controller,
+                                    $action,
+                                    Route $route,
+                                    array $arr, $suffix)
     {
         $className = self::getShortClassName($controller->getClassName());
         $name = $className . ucfirst($action) . $suffix;
@@ -293,10 +293,10 @@ 
      * @return RefSchemaObject
      */
     public function getRefSchema(Application $app,
-                                 ControllerContainer $controller,
-                                 $action,
-                                 Route $route,
-                                 EntityContainer $container)
+                                    ControllerContainer $controller,
+                                    $action,
+                                    Route $route,
+                                    EntityContainer $container)
     {
         $name = $container->getClassName();
         if (!isset($this->definitions[$name])) {
@@ -444,10 +444,10 @@ 
      * @return ArraySchemaObject
      */
     public function getArraySchema(Application $app,
-                                   ControllerContainer $controller,
-                                   $action,
-                                   Route $route,
-                                   ArrayContainer $container)
+                                    ControllerContainer $controller,
+                                    $action,
+                                    Route $route,
+                                    ArrayContainer $container)
     {
         $schema = new ArraySchemaObject();
         $itemContainer = $container->getContainer();

Doc Comments +9 added lines, -3 removed lines

@@ -93,7 +93,7 @@ 
     }
 
     /**
-     * @param $object
+     * @param Swagger $object
      * @return array
      */
     static public function objectToArray($object)
@@ -118,7 +118,7 @@ 
     /**
      * @param Application $app
      * @param ControllerContainer $controller
-     * @param $action
+     * @param integer $action
      * @param Route $route
      * @return array
      */
@@ -167,7 +167,7 @@ 
     /**
      * @param Application $app
      * @param ControllerContainer $controller
-     * @param $action
+     * @param integer $action
      * @param Route $route
      * @return null|ResponseObject
      */
@@ -305,6 +305,9 @@ 
         return new RefSchemaObject("#/definitions/$name");
     }
 
+    /**
+     * @param integer $action
+     */
     public function getParamsSchema(Application $app,
                                     ControllerContainer $controller,
                                     $action,
@@ -577,6 +580,9 @@ 
         return $className;
     }
 
+    /**
+     * @param string $glue
+     */
     static public function implode($glue , array $pieces )
     {
         $pieces = array_filter($pieces, function($i){return trim($i) !== '';});

Braces +6 added lines, -6 removed lines

@@ -138,10 +138,10 @@ 
             $ins = null;
             try{
                 $ins = $app->make($name);
-            }catch (\Exception $e){
+            } catch (\Exception $e){
                 try{
                     $ins = new $name("");
-                }catch (\Exception $e){
+                } catch (\Exception $e){
 
                 }
             }
@@ -223,9 +223,9 @@ 
     {
         if ($content instanceof ReturnMeta || $content instanceof ParamMeta) {
             return $this->makeExample($content->container);
-        }elseif ($content instanceof TypeContainerInterface){
+        } elseif ($content instanceof TypeContainerInterface){
             return $content->makeExample();
-        }elseif(is_array($content)) {
+        } elseif(is_array($content)) {
             $res = [];
             foreach ($content as $k => $v) {
                 $res[$k] = $this->makeExample($v);
@@ -384,7 +384,7 @@ 
                     $paramSchema = new PrimitiveSchemaObject();
                     if($isFile){
                         $paramSchema->type = 'file';
-                    }else{
+                    } else{
                         $paramSchema->type = self::mapType($param->type);
                         self::mapValidation($param->validation, $paramSchema);
                     }
@@ -442,7 +442,7 @@ 
         } elseif($container == null){
             $schema = null ;//new PrimitiveSchemaObject();
             //$schema->type = null;
-        }else {
+        } else {
             $schema = new PrimitiveSchemaObject();
             //$schema->type = 'mixed';
         }

Spacing +39 added lines, -39 removed lines

@@ -58,7 +58,7 @@ 
             $op->description = $route->getDescription();
 
             $op->parameters = $this->getParamsSchema($app, $controller, $action, $route);
-            if($this->hasFileParam($route)){
+            if ($this->hasFileParam($route)) {
                 $op->consumes = ['multipart/form-data'];
             }
 
@@ -108,7 +108,7 @@ 
             }
             if (is_array($v) || is_object($v)) {
                 $res[$k] = self::objectToArray($v);
-            } else {
+            }else {
                 $res[$k] = $v;
             }
         }
@@ -136,12 +136,12 @@ 
             list($name, $desc) = $exception;
 
             $ins = null;
-            try{
+            try {
                 $ins = $app->make($name);
-            }catch (\Exception $e){
-                try{
+            }catch (\Exception $e) {
+                try {
                     $ins = new $name("");
-                }catch (\Exception $e){
+                }catch (\Exception $e) {
 
                 }
             }
@@ -149,21 +149,21 @@ 
             //TODO status 重复怎么办
             if ($ins instanceof HttpException) {
                 $status = $ins->getStatusCode();
-            } else {
+            }else {
                 $status = 500;
             }
             if (isset($schemas[$status])) {
                 //$this->warnings[] = "status response $status has been used for $name, $desc";
                 $res = $schemas[$status];
-            } else {
+            }else {
                 $res = new ResponseObject();
             }
             $shortName = self::getShortClassName($name);
             $desc = "$shortName: $desc";
             $res->description = self::implode("\n", [$res->description, $desc]);
-            if($ins){
+            if ($ins) {
                 $error = $app->get(ExceptionRenderer::class)->render($ins)->getContent();
-                if($error){
+                if ($error) {
                     $res->examples = [$shortName => $error];
                 }
             }
@@ -223,9 +223,9 @@ 
     {
         if ($content instanceof ReturnMeta || $content instanceof ParamMeta) {
             return $this->makeExample($content->container);
-        }elseif ($content instanceof TypeContainerInterface){
+        }elseif ($content instanceof TypeContainerInterface) {
             return $content->makeExample();
-        }elseif(is_array($content)) {
+        }elseif (is_array($content)) {
             $res = [];
             foreach ($content as $k => $v) {
                 $res[$k] = $this->makeExample($v);
@@ -250,7 +250,7 @@ 
                                    array $arr, $suffix)
     {
         $className = self::getShortClassName($controller->getClassName());
-        $name = $className . ucfirst($action) . $suffix;
+        $name = $className.ucfirst($action).$suffix;
 
         $schema = new SimpleModelSchemaObject();
 
@@ -259,7 +259,7 @@ 
                 $schema->properties[$k] = $this->makeTempSchema($app, $controller, $action, $route, $v, $suffix);
             } elseif ($v instanceof ReturnMeta) {
                 $sub = $this->getAnySchema($app, $controller, $action, $route, $v->container);
-                if($sub){
+                if ($sub) {
                     $sub->description = $v->description;
                 }
                 $schema->properties[$k] = $sub;
@@ -270,13 +270,13 @@ 
                 } elseif ($v->container instanceof EntityContainer) {
                     $sub = $this->getRefSchema($app, $controller, $action, $route, $v->container);
                     //TODO array for validation
-                } else {
+                }else {
                     $sub = new PrimitiveSchemaObject();
                     $sub->type = self::mapType($v->type);
                     self::mapValidation($v->validation, $sub);
                     unset($sub->required);
                 }
-                if($sub){
+                if ($sub) {
                     $sub->description = $v->description;
                     $sub->default = $v->default;
                 }
@@ -284,14 +284,14 @@ 
                     $schema->required[] = $k;
                 }
                 $schema->properties[$k] = $sub;
-            } else {
+            }else {
                 //TODO how to do?
             }
         }
         $unused = $name;
         $tempId = 0;
         while (isset($this->definitions[$unused])) {
-            $unused = $name . $tempId;
+            $unused = $name.$tempId;
             $tempId++;
         }
         $this->definitions[$unused] = $schema;
@@ -330,7 +330,7 @@ 
         $in = 'query';
 
         $bodyType = 'body'; // 当有文件上传时, 必须是formData方式
-        if($this->hasFileParam($route)){
+        if ($this->hasFileParam($route)) {
             $bodyType = 'formData';
         }
 
@@ -369,7 +369,7 @@ 
                     || $route->getMethod() == 'PATCH'
                 ) {
                     $in = $bodyType;
-                } else {
+                }else {
                     $in = 'query';
                 }
             }
@@ -380,11 +380,11 @@ 
                 } elseif ($param->container instanceof EntityContainer) {
                     $paramSchema = $this->getRefSchema($app, $controller, $action, $route, $param->container);
                     //TODO array for validation
-                } else {
+                }else {
                     $paramSchema = new PrimitiveSchemaObject();
-                    if($isFile){
+                    if ($isFile) {
                         $paramSchema->type = 'file';
-                    }else{
+                    }else {
                         $paramSchema->type = self::mapType($param->type);
                         self::mapValidation($param->validation, $paramSchema);
                     }
@@ -396,10 +396,10 @@ 
                 $paramSchema->default = $param->default;
                 $paramSchema->required = !$param->isOptional;
                 $parameters[] = $paramSchema;
-            } else {
+            }else {
                 if (!$name) {
                     $body = $param;
-                } else {
+                }else {
                     ArrayHelper::set($body, $name, $param);
                 }
 
@@ -412,7 +412,7 @@ 
             $paramSchema->in = 'body';
             if (is_array($body)) {
                 $paramSchema->schema = $this->makeTempSchema($app, $controller, $action, $route, $body, 'Req');
-            } else {
+            }else {
                 $paramSchema->schema = $this->getAnySchema($app, $controller, $action, $route, $body->container);
             }
 
@@ -439,8 +439,8 @@ 
         } elseif ($container instanceof ScalarTypeContainer) {
             $schema = new PrimitiveSchemaObject();
             $schema->type = self::mapType($container->getType());
-        } elseif($container == null){
-            $schema = null ;//new PrimitiveSchemaObject();
+        } elseif ($container == null) {
+            $schema = null; //new PrimitiveSchemaObject();
             //$schema->type = null;
         }else {
             $schema = new PrimitiveSchemaObject();
@@ -472,7 +472,7 @@ 
         } elseif ($itemContainer instanceof ScalarTypeContainer) {
             $itemSchema = new PrimitiveSchemaObject();
             $itemSchema->type = self::mapType($itemContainer->getType());
-        } else {
+        }else {
             $itemSchema = new PrimitiveSchemaObject();
             //$itemSchema->type = 'mixed';
         }
@@ -498,7 +498,7 @@ 
                 $propertySchema = $this->getRefSchema($app, $controller, $action, $route, $property->container);
             } elseif ($property->container instanceof ArrayContainer) {
                 $propertySchema = $this->getArraySchema($app, $controller, $action, $route, $property->container);
-            } else {
+            }else {
                 $propertySchema = new PrimitiveSchemaObject();
                 $propertySchema->type = self::mapType($property->type);
                 $propertySchema->description = self::implode("\n", [$property->summary, $property->description]);
@@ -515,7 +515,7 @@ 
     {
         $params = $route->getRequestHandler()->getParamMetas();
         foreach ($params as $name => $param) {
-            if(strpos($param->source, 'request.files.')===0){
+            if (strpos($param->source, 'request.files.') === 0) {
                 return true;
             }
         }
@@ -528,7 +528,7 @@ 
      */
     static public function mapValidation($v, PrimitiveSchemaObject $schemaObject)
     {
-        if(!$v){
+        if (!$v) {
             return $schemaObject;
         }
         $rules = explode('|', $v);
@@ -544,15 +544,15 @@ 
             } elseif ($rule == 'lengthBetween' && isset($params[0]) && isset($params[1])) {
                 $schemaObject->minLength = intval($params[0]);
                 $schemaObject->maxLength = intval($params[1]);
-            } elseif ($rule == 'lengthMin'&& isset($params[0])) {
+            } elseif ($rule == 'lengthMin' && isset($params[0])) {
                 $schemaObject->minLength = intval($params[0]);
-            } elseif ($rule == 'lengthMax'&& isset($params[0])) {
+            } elseif ($rule == 'lengthMax' && isset($params[0])) {
                 $schemaObject->maxLength = intval($params[0]);
-            } elseif ($rule == 'min'&& isset($params[0])) {
+            } elseif ($rule == 'min' && isset($params[0])) {
                 $schemaObject->minimum = floatval($params[0]);
-            } elseif ($rule == 'max'&& isset($params[0])) {
+            } elseif ($rule == 'max' && isset($params[0])) {
                 $schemaObject->maximum = floatval($params[0]);
-            } elseif ($rule == 'regex'&& isset($params[0])) {
+            } elseif ($rule == 'regex' && isset($params[0])) {
                 $schemaObject->pattern = $params[0];
             } elseif ($rule == 'optional') {
                 $schemaObject->required = false;
@@ -591,9 +591,9 @@ 
         return $className;
     }
 
-    static public function implode($glue , array $pieces )
+    static public function implode($glue, array $pieces)
     {
-        $pieces = array_filter($pieces, function($i){return trim($i) !== '';});
+        $pieces = array_filter($pieces, function($i) {return trim($i) !== ''; });
         return implode($glue, $pieces);
     }
 }
\ No newline at end of file

src/Controller/ResponseRenderer.php

Spacing +5 added lines, -5 removed lines

@@ -15,19 +15,19 @@
     {
         $response = new Response();
         $response->headers->set('Content-Type', 'application/json');
-        foreach ($output as $key=>$value){
+        foreach ($output as $key=>$value) {
             //TODO 支持自定义格式输出
             //TODO 支持更多的输出目标
-            if($key == 'content'){
+            if ($key == 'content') {
                 //if(is_array($value) || is_object($value)){
                     $value = json_encode($value, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
                 //}
                 $response->setContent($value);
-            }elseif($key == 'headers'){
-                foreach ($value as $k=>$v){
+            }elseif ($key == 'headers') {
+                foreach ($value as $k=>$v) {
                     $response->headers->set($k, $v);
                 }
-            }else{
+            }else {
                 \PhpBoot\abort(new \UnexpectedValueException("Unexpected output target $key"));
             }
 

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/DB/rules/insert.php

Doc Comments +3 added lines, -2 removed lines

@@ -41,6 +41,9 @@ 
 
 class OnDuplicateKeyUpdateRule extends ExecRule
 {
+    /**
+     * @param \PhpBoot\DB\Context $context
+     */
     public function __construct($context)
     {
         parent::__construct($context);
@@ -91,8 +94,6 @@ 
      *      ->onDuplicateKeyUpdate('a=a+1')
      *  => "INSERT INTO table(a,b) VALUES(1,now()) ON DUPLICATE KEY UPDATE a=a+1"
      *
-     * @param string $column
-     * @param mixed $value
      * @return \PhpBoot\DB\rules\basic\ExecRule
      */
     public function onDuplicateKeyUpdate($expr, $_=null) {

Spacing +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
      * @param array $values
      * @return \PhpBoot\DB\rules\insert\OnDuplicateKeyUpdateRule
      */
-    public function batchValues(array $values){
+    public function batchValues(array $values) {
         ValuesImpl::batchValues($this->context, $values);
         return new OnDuplicateKeyUpdateRule($this->context);
     }
@@ -106,7 +106,7 @@ 
      * @param mixed $value
      * @return \PhpBoot\DB\rules\basic\ExecRule
      */
-    public function onDuplicateKeyUpdate($expr, $_=null) {
+    public function onDuplicateKeyUpdate($expr, $_ = null) {
         $this->impl->set($this->context, $expr, array_slice(func_get_args(), 1));
         return new ExecRule($this->context);
     }

src/Controller/ResponseHandler.php

Spacing +8 added lines, -8 removed lines

@@ -27,7 +27,7 @@ 
      */
     public function eraseMapping($target)
     {
-        if(!isset($this->mappings[$target])){
+        if (!isset($this->mappings[$target])) {
             return null;
         }
         $ori = $this->mappings[$target];
@@ -41,7 +41,7 @@ 
      */
     public function getMapping($target)
     {
-        if(!array_key_exists($target, $this->mappings)){
+        if (!array_key_exists($target, $this->mappings)) {
             return null;
         }
         return $this->mappings[$target];
@@ -53,12 +53,12 @@ 
      */
     public function getMappingBySource($source)
     {
-        foreach ($this->mappings as $k=>$v){
-            if($v->source == $source){
+        foreach ($this->mappings as $k=>$v) {
+            if ($v->source == $source) {
                 return [$k, $v];
             }
         }
-        return [null,null];
+        return [null, null];
     }
 
 
@@ -75,15 +75,15 @@ 
             'params'=>$params
         ];
 
-        if($return instanceof Response){ //直接返回Response时, 对return不再做映射
+        if ($return instanceof Response) { //直接返回Response时, 对return不再做映射
             return $return;
         }
         $mappings = $this->getMappings();
 
         $output = [];
-        foreach($mappings as $key=>$map){
+        foreach ($mappings as $key=>$map) {
             $val = \JmesPath\search($map->source, $input);
-            if(substr($key, 0, strlen('response.')) == 'response.'){
+            if (substr($key, 0, strlen('response.')) == 'response.') {
                 $key = substr($key, strlen('response.'));
             }
             ArrayHelper::set($output, $key, $val);

src/Controller/Annotations/RouteAnnotationHandler.php

Spacing +16 added lines, -16 removed lines

@@ -43,7 +43,7 @@ 
             'DELETE'
         ]) or \PhpBoot\abort(new AnnotationSyntaxException("unknown method http $httpMethod in {$container->getClassName()}::$target"));
         //获取方法参数信息
-        $rfl =  new \ReflectionClass($container->getClassName());
+        $rfl = new \ReflectionClass($container->getClassName());
         $method = $rfl->getMethod($target);
         $methodParams = $method->getParameters();
 
@@ -68,9 +68,9 @@ 
         $routeParser = new Std();
         $uri = $params->getParam(1);
         $info = $routeParser->parse($uri); //0.4和1.0返回值不同, 不兼容
-        if(isset($info[0])){
-            foreach ($info[0] as $i){
-                if(is_array($i)) {
+        if (isset($info[0])) {
+            foreach ($info[0] as $i) {
+                if (is_array($i)) {
                     $route->addPathParam($i[0]);
                 }
             }
@@ -79,31 +79,31 @@ 
         $hasRefParam = false;
         //设置参数列表
         $paramsMeta = [];
-        foreach ($methodParams as $param){
+        foreach ($methodParams as $param) {
             $paramName = $param->getName();
             $source = "request.$paramName";
-            if($route->hasPathParam($paramName)){ //参数来自路由
+            if ($route->hasPathParam($paramName)) { //参数来自路由
                 $source = "request.$paramName";
-            }elseif($httpMethod == 'GET'){
+            }elseif ($httpMethod == 'GET') {
                 $source = "request.$paramName"; //GET请求显示指定来自query string
             }
             $paramClass = $param->getClass();
-            if($paramClass){
+            if ($paramClass) {
                 $paramClass = $paramClass->getName();
             }
             $entityContainer = ContainerFactory::create($entityBuilder, $paramClass);
             $meta = new ParamMeta($paramName,
                 $source,
-                $paramClass?:'mixed',
+                $paramClass ?: 'mixed',
                 $param->isOptional(),
-                $param->isOptional()?$param->getDefaultValue():null,
+                $param->isOptional() ? $param->getDefaultValue() : null,
                 $param->isPassedByReference(),
                 null,
                 '',
                 $entityContainer
             );
             $paramsMeta[] = $meta;
-            if($meta->isPassedByReference){
+            if ($meta->isPassedByReference) {
                 $hasRefParam = true;
                 $responseHandler->setMapping('response.content.'.$meta->name, new ReturnMeta(
                     'params.'.$meta->name,
@@ -114,16 +114,16 @@ 
         }
 
         $requestHandler->setParamMetas($paramsMeta);
-        if(!$hasRefParam){
-            $responseHandler->setMapping('response.content', new ReturnMeta('return','mixed','', new MixedTypeContainer()));
-        }else{
+        if (!$hasRefParam) {
+            $responseHandler->setMapping('response.content', new ReturnMeta('return', 'mixed', '', new MixedTypeContainer()));
+        }else {
             //当存在引用参数作为输出时, 默认将 return 数据绑定的到 data 下, 以防止和引用参数作为输出重叠
-            $responseHandler->setMapping($this->returnTarget, new ReturnMeta('return','mixed','', new MixedTypeContainer()));
+            $responseHandler->setMapping($this->returnTarget, new ReturnMeta('return', 'mixed', '', new MixedTypeContainer()));
         }
 
 
         $container->addRoute($target, $route);
     }
 
-    public $returnTarget='response.content.data';
+    public $returnTarget = 'response.content.data';
 }
\ No newline at end of file

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/rules/basic.php

Doc Comments +3 added lines

@@ -48,6 +48,9 @@
 
 class OrderByRule extends LimitRule
 {
+    /**
+     * @param Context $context
+     */
     public function __construct($context){
         parent::__construct($context);
         $this->impl = new OrderByImpl();

Spacing +20 added lines, -20 removed lines

@@ -11,7 +11,7 @@ 
 
 class BasicRule
 {
-    public function __construct(Context $context){
+    public function __construct(Context $context) {
         $this->context = $context;
     }
 
@@ -48,7 +48,7 @@ 
 
 class OrderByRule extends LimitRule
 {
-    public function __construct($context){
+    public function __construct($context) {
         parent::__construct($context);
         $this->impl = new OrderByImpl();
     }
@@ -63,7 +63,7 @@ 
      * 
      * @return \PhpBoot\DB\rules\basic\LimitRule
      */
-    public function orderBy($column, $order=null) {
+    public function orderBy($column, $order = null) {
         $this->impl->orderBy($this->context, $column, $order);
         return new LimitRule($this->context);
     }
@@ -95,17 +95,17 @@ 
      * @param mixed $_
      * @return NextWhereRule
      */
-    public function where($conditions=null, $_=null) {
-        if(is_callable($conditions)){
-            $callback = function ($context)use($conditions){
+    public function where($conditions = null, $_ = null) {
+        if (is_callable($conditions)) {
+            $callback = function($context)use($conditions){
                 $rule = new ScopedQuery($context);
                 $conditions($rule);
             };
             $conditions = $callback;
         }
-        if($this->isTheFirst){
-            WhereImpl::where($this->context, 'WHERE' ,$conditions, array_slice(func_get_args(), 1));
-        }else{
+        if ($this->isTheFirst) {
+            WhereImpl::where($this->context, 'WHERE', $conditions, array_slice(func_get_args(), 1));
+        }else {
             WhereImpl::where($this->context, 'AND', $conditions, array_slice(func_get_args(), 1));
         }
         return new NextWhereRule($this->context, false);
@@ -133,9 +133,9 @@ 
      * @param mixed $_
      * @return WhereRule
      */
-    public function orWhere($conditions=null, $_=null) {
-        if(is_callable($conditions)){
-            $callback = function ($context)use($conditions){
+    public function orWhere($conditions = null, $_ = null) {
+        if (is_callable($conditions)) {
+            $callback = function($context)use($conditions){
                 $rule = new ScopedQuery($context);
                 $conditions($rule);
             };
@@ -160,17 +160,17 @@ 
      * @param null $_
      * @return NextScopedQuery
      */
-    public function where($expr, $_= null){
-        if(is_callable($expr)){
-            $callback = function ($context)use($expr){
+    public function where($expr, $_ = null) {
+        if (is_callable($expr)) {
+            $callback = function($context)use($expr){
                 $rule = new ScopedQuery($context, true);
                 $expr($rule);
             };
             $expr = $callback;
         }
-        if($this->isTheFirst){
+        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);
@@ -186,9 +186,9 @@ 
      * @param null $_
      * @return ScopedQuery
      */
-    public function orWhere($expr, $_= null){
-        if(is_callable($expr)){
-            $callback = function ($context)use($expr){
+    public function orWhere($expr, $_ = null) {
+        if (is_callable($expr)) {
+            $callback = function($context)use($expr){
                 $rule = new ScopedQuery($context, true);
                 $expr($rule);
             };

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);