caoym / phpboot

src/Annotation/AnnotationReader.php

Doc Comments +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
         }
     }
     /**
-     * @param $className
+     * @param string $className
      * @return self
      */
     static function readWithoutCache($className)

Spacing +21 added lines, -21 removed lines

@@ -45,9 +45,9 @@ 
 }
 class AnnotationReader implements \ArrayAccess
 {
-    static public function createDocBlockFactory(){
+    static public function createDocBlockFactory() {
         $fqsenResolver = new FqsenResolver();
-        $tagFactory = new StandardTagFactory($fqsenResolver,[]);
+        $tagFactory = new StandardTagFactory($fqsenResolver, []);
         $descriptionFactory = new DescriptionFactory($tagFactory);
         $tagFactory->addService($descriptionFactory);
         $tagFactory->addService(new TypeResolver($fqsenResolver));
@@ -72,22 +72,22 @@ 
         self::assertAnnotationEnabled();
         $rfl = new \ReflectionClass($className) or \PhpBoot\abort("load class $className failed");
         $fileName = $rfl->getFileName();
-        $key = str_replace('\\','.',self::class).md5($fileName.$className);
+        $key = str_replace('\\', '.', self::class).md5($fileName.$className);
         $oldData = null;
-        $cache = new CheckableCache($localCache?:new ApcCache());
+        $cache = new CheckableCache($localCache ?: new ApcCache());
         $res = $cache->get('ann:'.$key, null, $oldData, false);
-        if($res === null){
-            try{
+        if ($res === null) {
+            try {
                 $meta = self::readWithoutCache($className);
-                $cache->set($key, $meta, 0, $fileName?new ClassModifiedChecker($className):null);
+                $cache->set($key, $meta, 0, $fileName ? new ClassModifiedChecker($className) : null);
                 return $meta;
-            }catch (\Exception $e){
-                $cache->set($key, $e->getMessage(), 0, $fileName?new ClassModifiedChecker($className):null);
+            }catch (\Exception $e) {
+                $cache->set($key, $e->getMessage(), 0, $fileName ? new ClassModifiedChecker($className) : null);
                 throw $e;
             }
-        }elseif(is_string($res)){
+        }elseif (is_string($res)) {
             \PhpBoot\abort($res);
-        }else{
+        }else {
             return $res;
         }
     }
@@ -104,19 +104,19 @@ 
         $reader->class->name = $className;
 
         //method annotations
-        foreach ($rfl->getMethods() as $i){
+        foreach ($rfl->getMethods() as $i) {
             $block = self::readAnnotationBlock($i->getDocComment());
             $block->name = $i->getName();
-            $reader->methods[$i->getName()]=$block;
+            $reader->methods[$i->getName()] = $block;
         }
         //property annotations
-        foreach ($rfl->getProperties() as $i){
+        foreach ($rfl->getProperties() as $i) {
             if ($i->isStatic()) {
                 continue;
             }
             $block = self::readAnnotationBlock($i->getDocComment());
             $block->name = $i->getName();
-            $reader->properties[$i->getName()]=$block;
+            $reader->properties[$i->getName()] = $block;
         }
         while ($rfl = $rfl->getParentClass()) {
             foreach ($rfl->getProperties(\ReflectionProperty::IS_PRIVATE) as $i) {
@@ -125,7 +125,7 @@ 
                 }
                 $block = self::readAnnotationBlock($i->getDocComment());
                 $block->name = $i->getName();
-                $reader->properties[$i->getName()]=$block;
+                $reader->properties[$i->getName()] = $block;
             }
         }
         return $reader;
@@ -134,7 +134,7 @@ 
     static private function readAnnotationBlock($doc)
     {
         $annBlock = new AnnotationBlock();
-        if(empty($doc)){
+        if (empty($doc)) {
             return $annBlock;
         }
         $docFactory = AnnotationReader::createDocBlockFactory();
@@ -149,8 +149,8 @@ 
             $annTag->parent = $annBlock;
             $annTag->description = strval($desc);
             $annTag->name = $tag->getName();
-            $annTag->children=[];
-            if($desc){
+            $annTag->children = [];
+            if ($desc) {
                 $output = new AnnotationTagsOutput();
                 $desc->render($output);
                 foreach ($output->tags as $child) {
@@ -174,11 +174,11 @@ 
      * @var AnnotationBlock[]
      */
 
-    public $methods=[];
+    public $methods = [];
     /**
      * @var AnnotationBlock[]
      */
-    public $properties=[];
+    public $properties = [];
 
     public function offsetExists($offset)
     {

src/Annotation/AnnotationTag.php

Doc Comments -1 removed lines

@@ -8,7 +8,6 @@
     /**
      * AnnotationTag constructor.
      * @param string $name
-     * @param string $summary
      * @param string $description
      * @param array $children
      * @param AnnotationBlock|AnnotationTag|null $parent

Spacing +6 added lines, -6 removed lines

@@ -13,10 +13,10 @@ 
      * @param array $children
      * @param AnnotationBlock|AnnotationTag|null $parent
      */
-    public function __construct($name='',
-                                $description='',
-                                $children=[],
-                                $parent=null)
+    public function __construct($name = '',
+                                $description = '',
+                                $children = [],
+                                $parent = null)
     {
         $this->name = $name;
         $this->description = $description;
@@ -31,11 +31,11 @@ 
     /**
      * @var string
      */
-    public $description='';
+    public $description = '';
     /**
      * @var AnnotationBlock[]
      */
-    public $children=[];
+    public $children = [];
 
     /**
      * @var AnnotationBlock|null

src/Application.php

Doc Comments +1 added lines, -1 removed lines

@@ -375,7 +375,7 @@
     }
 
     /**
-     * @return \string[]
+     * @return string[]
      */
     public function getGlobalHooks()
     {

Spacing +19 added lines, -19 removed lines

@@ -83,11 +83,11 @@ 
 
             Request::class => \DI\factory([Application::class, 'createRequestFromGlobals']),
         ];
-        if(function_exists('apc_fetch')){
+        if (function_exists('apc_fetch')) {
             $default += [
                 Cache::class => \DI\object(ApcCache::class)
             ];
-        }else{
+        }else {
             $default += [
                 Cache::class => \DI\object(FilesystemCache::class)
                     ->constructorParameter('directory', sys_get_temp_dir())
@@ -129,11 +129,11 @@ 
      * @param string[] $hooks hook class names
      * @return void
      */
-    public function loadRoutesFromClass($className, $hooks=[])
+    public function loadRoutesFromClass($className, $hooks = [])
     {
         $cache = new CheckableCache($this->cache);
 
-        $key = 'loadRoutesFromClass:' . md5(__CLASS__ . ':' . $className);
+        $key = 'loadRoutesFromClass:'.md5(__CLASS__.':'.$className);
         $routes = $cache->get($key, $this);
 
         $controller = null;
@@ -150,9 +150,9 @@ 
             $this->routes[] = [
                 $method,
                 $uri,
-                function (Application $app, Request $request) use ($cache, $className, $actionName, $controller) {
+                function(Application $app, Request $request) use ($cache, $className, $actionName, $controller) {
 
-                    $key = 'loadRoutesFromClass:route:' . md5(__CLASS__ . ':' . $className . ':' . $actionName);
+                    $key = 'loadRoutesFromClass:route:'.md5(__CLASS__.':'.$className.':'.$actionName);
 
                     $routeInstance = $cache->get($key, $this);
                     if ($routeInstance == $this) {
@@ -180,11 +180,11 @@ 
      * @param string[] $hooks
      * @return void
      */
-    public function loadRoutesFromPath($fromPath, $namespace = '', $hooks=[])
+    public function loadRoutesFromPath($fromPath, $namespace = '', $hooks = [])
     {
         $dir = @dir($fromPath);
 
-        $getEach = function () use ($dir) {
+        $getEach = function() use ($dir) {
             $name = $dir->read();
             if (!$name) {
                 return $name;
@@ -196,11 +196,11 @@ 
             if ($entry == '.' || $entry == '..') {
                 continue;
             }
-            $path = $fromPath . '/' . str_replace('\\', '/', $entry);
+            $path = $fromPath.'/'.str_replace('\\', '/', $entry);
             if (is_file($path) && substr_compare($entry, '.php', strlen($entry) - 4, 4, true) == 0) {
-                $class_name = $namespace . '\\' . substr($entry, 0, strlen($entry) - 4);
+                $class_name = $namespace.'\\'.substr($entry, 0, strlen($entry) - 4);
                 $this->loadRoutesFromClass($class_name, $hooks);
-            } else {
+            }else {
                 //\Log::debug($path.' ignored');
             }
         }
@@ -213,7 +213,7 @@ 
      * @param callable $handler function(Application $app, Request $request):Response
      * @param string[] $hooks
      */
-    public function addRoute($method, $uri, callable $handler, $hooks=[])
+    public function addRoute($method, $uri, callable $handler, $hooks = [])
     {
         $this->routes[] = [$method, $uri, $handler, $hooks];
     }
@@ -239,7 +239,7 @@ 
     {
         //  TODO 把 Route里的异常处理 ExceptionRenderer 移到这里更妥?
         $renderer = $this->get(ExceptionRenderer::class);
-        try{
+        try {
             if ($request == null) {
                 $request = $this->make(Request::class);
             }
@@ -249,7 +249,7 @@ 
             }
             $uri = rawurldecode($uri);
 
-            $next = function (Request $request)use($uri){
+            $next = function(Request $request)use($uri){
                 $dispatcher = $this->getDispatcher();
                 $res = $dispatcher->dispatch($request->getMethod(), $uri);
                 if ($res[0] == Dispatcher::FOUND) {
@@ -258,10 +258,10 @@ 
                         $request->attributes->add($res[2]);
                     }
                     list($handler, $hooks) = $res[1];
-                    $next = function (Request $request)use($handler){
+                    $next = function(Request $request)use($handler){
                         return $handler($this, $request);
                     };
-                    foreach (array_reverse($hooks) as $hookName){
+                    foreach (array_reverse($hooks) as $hookName) {
                         $next = function($request)use($hookName, $next){
                             $hook = $this->get($hookName);
                             /**@var $hook HookInterface*/
@@ -274,12 +274,12 @@ 
                     \PhpBoot\abort(new NotFoundHttpException(), [$request->getMethod(), $uri]);
                 } elseif ($res[0] == Dispatcher::METHOD_NOT_ALLOWED) {
                     \PhpBoot\abort(new MethodNotAllowedHttpException($res[1]), [$request->getMethod(), $uri]);
-                } else {
+                }else {
                     \PhpBoot\abort("unknown dispatch return {$res[0]}");
                 }
             };
 
-            foreach (array_reverse($this->getGlobalHooks()) as $hookName){
+            foreach (array_reverse($this->getGlobalHooks()) as $hookName) {
                 $next = function($request)use($hookName, $next){
                     $hook = $this->get($hookName);
                     /**@var $hook HookInterface*/
@@ -294,7 +294,7 @@ 
             }
             return $response;
 
-        }catch (\Exception $e){
+        }catch (\Exception $e) {
             $renderer->render($e);
         }
 

src/Cache/ClassModifiedChecker.php

Doc Comments +3 added lines

@@ -4,6 +4,9 @@
 
 class ClassModifiedChecker extends FileModifiedChecker
 {
+    /**
+     * @param string $className
+     */
     function __construct($className){
         $class = new \ReflectionClass($className);
         $files = [];

Spacing +6 added lines, -6 removed lines

@@ -4,11 +4,11 @@ 
 
 class ClassModifiedChecker extends FileModifiedChecker
 {
-    function __construct($className){
+    function __construct($className) {
         $class = new \ReflectionClass($className);
         $files = [];
 
-        if($class->getFileName()){
+        if ($class->getFileName()) {
             $files[] = $class->getFileName();
             self::getParentFileName($class, $files);
         }
@@ -18,15 +18,15 @@ 
     static public function getParentFileName(\ReflectionClass $class, array &$files)
     {
         $parent = $class->getParentClass();
-        if(!$parent){
+        if (!$parent) {
             return;
         }
-        if($parent->getFileName()){
+        if ($parent->getFileName()) {
             $files[] = $parent->getParentClass();
             self::getParentFileName($parent, $files);
         }
-        foreach ($class->getInterfaces() as $interface){
-            if($interface->getFileName()){
+        foreach ($class->getInterfaces() as $interface) {
+            if ($interface->getFileName()) {
                 $files[] = $interface->getFileName();
                 self::getParentFileName($interface, $files);
             }

src/Controller/RequestHandler.php

Doc Comments +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
 
     /**
      * 获取指定参数信息
-     * @param $name
+     * @param string|null $name
      * @return ParamMeta|null
      */
     public function getParamMeta($name){

Spacing +19 added lines, -19 removed lines

@@ -15,7 +15,7 @@ 
     /**
      * @param ParamMeta[] $paramMates
      */
-    public function __construct(array $paramMates=[]){
+    public function __construct(array $paramMates = []) {
         $this->paramMetas = $paramMates;
     }
 
@@ -26,32 +26,32 @@ 
      * @param array $reference
      * @return void
      */
-    public function handle(Application $app, Request $request, array &$params, array &$reference){
+    public function handle(Application $app, Request $request, array &$params, array &$reference) {
 
         $vld = new Validator();
         $req = ['request'=>$request];
         $requestArray = new ArrayAdaptor($req);
         $inputs = [];
-        foreach ($this->paramMetas as $k=>$meta){
-            if($meta->isPassedByReference){
+        foreach ($this->paramMetas as $k=>$meta) {
+            if ($meta->isPassedByReference) {
                 // param PassedByReference is used to output
                 continue;
             }
             $source = \JmesPath\search($meta->source, $requestArray);
-            if ($source !== null){
+            if ($source !== null) {
                 $source = ArrayAdaptor::strip($source);
-                if($source instanceof ParameterBag){
+                if ($source instanceof ParameterBag) {
                     $source = $source->all();
                 }
-                if($meta->container){
+                if ($meta->container) {
                     $inputs[$meta->name] = $meta->container->make($source);
-                }else{
+                }else {
                     $inputs[$meta->name] = $source;
                 }
-                if($meta->validation){
+                if ($meta->validation) {
                     $vld->rule($meta->validation, $meta->name);
                 }
-            }else{
+            }else {
                 $meta->isOptional or \PhpBoot\abort(new BadRequestHttpException("param $source is required"));
                 $inputs[$meta->name] = $meta->default;
             }
@@ -66,10 +66,10 @@ 
         );
 
         $pos = 0;
-        foreach ($this->paramMetas as $meta){
-            if($meta->isPassedByReference){
+        foreach ($this->paramMetas as $meta) {
+            if ($meta->isPassedByReference) {
                 $params[$pos] = &$reference[$meta->name];
-            }else{
+            }else {
                 $params[$pos] = $inputs[$meta->name];
             }
             $pos++;
@@ -77,15 +77,15 @@ 
         }
     }
 
-    public function getParamNames(){
-        return array_map(function($meta){return $meta->name;}, $this->paramMetas);
+    public function getParamNames() {
+        return array_map(function($meta) {return $meta->name; }, $this->paramMetas);
     }
 
     /**
      * 获取参数列表
      * @return ParamMeta[]
      */
-    public function getParamMetas(){
+    public function getParamMetas() {
         return $this->paramMetas;
     }
 
@@ -94,9 +94,9 @@ 
      * @param $name
      * @return ParamMeta|null
      */
-    public function getParamMeta($name){
-        foreach ($this->paramMetas as $meta){
-            if($meta->name == $name){
+    public function getParamMeta($name) {
+        foreach ($this->paramMetas as $meta) {
+            if ($meta->name == $name) {
                 return $meta;
             }
         }

src/DB/DB.php

Doc Comments +3 added lines

@@ -82,6 +82,9 @@
         return new DB($app, $connection);
     }
 
+    /**
+     * @param \PDO $connection
+     */
     public function __construct(Application $app, $connection)
     {
         $this->app = $app;

Spacing +15 added lines, -15 removed lines

@@ -55,7 +55,7 @@ 
  *      
  * @author caoym <caoyangmin@gmail.com>
  */
-class DB{
+class DB {
 
     /**
      * DB constructor.
@@ -96,18 +96,18 @@ 
      * @param string $column0
      * @return \PhpBoot\DB\rules\select\FromRule
      */
-    function select($column0=null, $_=null){
+    function select($column0 = null, $_ = null) {
         $obj = new SelectRule(new Context($this->connection));
-        if($column0 == null){
+        if ($column0 == null) {
             $args = ['*'];
-        }elseif(is_array($column0)){
+        }elseif (is_array($column0)) {
             $args = $column0;
-        }else{
+        }else {
             $args = func_get_args();
         }
-        foreach ($args as &$arg){
+        foreach ($args as &$arg) {
             $arg = DB::wrap($arg);
-            if($arg == '*'){
+            if ($arg == '*') {
                 continue;
             }
 
@@ -139,8 +139,8 @@ 
      * @param string $table
      * @return \PhpBoot\DB\rules\basic\WhereRule
      */
-    public function deleteFrom($table){
-        $obj  =  new DeleteRule(new Context($this->connection));
+    public function deleteFrom($table) {
+        $obj = new DeleteRule(new Context($this->connection));
         return $obj->deleteFrom($table);
     }
     /**
@@ -148,8 +148,8 @@ 
      * @param string $table
      * @return \PhpBoot\DB\rules\replace\ValuesRule
      */
-    public function replaceInto($table){
-        $obj  =  new ReplaceIntoRule(new Context($this->connection));
+    public function replaceInto($table) {
+        $obj = new ReplaceIntoRule(new Context($this->connection));
         return $obj->replaceInto($table);
     }
 
@@ -168,7 +168,7 @@ 
      * @param string $str
      * @return Raw
      */
-    static public function raw($str){
+    static public function raw($str) {
         return new Raw($str);
     }
     static public function wrap($value)
@@ -176,7 +176,7 @@ 
         if ($value === '*') {
             return $value;
         }
-        if($value instanceof Raw){
+        if ($value instanceof Raw) {
             return $value->get();
         }
         return '`'.str_replace('`', '``', $value).'`';
@@ -189,8 +189,8 @@ 
     {
         return $this->app;
     }
-    const ORDER_BY_ASC ='ASC';
-    const ORDER_BY_DESC ='DESC';
+    const ORDER_BY_ASC = 'ASC';
+    const ORDER_BY_DESC = 'DESC';
 
     /**
      * @var \PDO

src/DB/rules/update.php

Doc Comments +3 added lines

@@ -24,6 +24,9 @@
 
 class UpdateSetRule extends WhereRule
 {
+    /**
+     * @param \PhpBoot\DB\Context $context
+     */
     public function __construct($context){
         parent::__construct($context);
         $this->impl = new UpdateSetImpl();

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
 
 class UpdateSetRule extends WhereRule
 {
-    public function __construct($context){
+    public function __construct($context) {
         parent::__construct($context);
         $this->impl = new UpdateSetImpl();
     }
@@ -37,7 +37,7 @@ 
      * @param mixed $_
      * @return \PhpBoot\DB\rules\update\UpdateSetRule
      */
-    public function set($expr, $_=null) {
+    public function set($expr, $_ = null) {
         $this->impl->set($this->context, $expr, array_slice(func_get_args(), 1));
         return $this;
     }

src/Docgen/Swagger/Swagger.php

Doc Comments +6 added lines, -3 removed lines

@@ -88,7 +88,7 @@ 
     }
 
     /**
-     * @param $object
+     * @param Swagger $object
      * @return array
      */
     static public function objectToArray($object)
@@ -113,7 +113,7 @@ 
     /**
      * @param Application $app
      * @param ControllerContainer $controller
-     * @param $action
+     * @param integer $action
      * @param Route $route
      * @return array
      */
@@ -162,7 +162,7 @@ 
     /**
      * @param Application $app
      * @param ControllerContainer $controller
-     * @param $action
+     * @param integer $action
      * @param Route $route
      * @return null|ResponseObject
      */
@@ -299,6 +299,9 @@ 
         return new RefSchemaObject("#/definitions/$name");
     }
 
+    /**
+     * @param integer $action
+     */
     public function getParamsSchema(Application $app,
                                     ControllerContainer $controller,
                                     $action,

Spacing +30 added lines, -30 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;
             }
         }
@@ -140,21 +140,21 @@ 
             //TODO status 重复怎么办
             if ($ins instanceof HttpException) {
                 $status = $ins->getStatusCode();
-            } else {
+            }else {
 
                 $status = 500;
             }
             if (isset($res[$status])) {
                 //$this->warnings[] = "status response $status has been used for $name, $desc";
                 $res = $res[$status];
-            } else {
+            }else {
                 $res = new ResponseObject();
             }
             $shortName = self::getShortClassName($name);
             $desc = "$shortName: $desc";
             $res->description = implode("\n", [$res->description, $desc]);
             $error = $app->get(ExceptionRenderer::class)->render($ins)->getContent();
-            if($error){
+            if ($error) {
                 $res->examples = [$shortName => $error];
             }
             //$res->schema = new RefSchemaObject("#/definitions/$name");
@@ -213,9 +213,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);
@@ -240,7 +240,7 @@ 
                                    array $arr, $suffix)
     {
         $className = self::getShortClassName($controller->getClassName());
-        $name = $className . ucfirst($action) . $suffix;
+        $name = $className.ucfirst($action).$suffix;
 
         $schema = new SimpleModelSchemaObject();
 
@@ -258,7 +258,7 @@ 
                 } 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);
@@ -270,14 +270,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;
@@ -316,7 +316,7 @@ 
         $in = 'query';
 
         $bodyType = 'body'; // 当有文件上传时, 必须是formData方式
-        if($this->hasFileParam($route)){
+        if ($this->hasFileParam($route)) {
             $bodyType = 'formData';
         }
 
@@ -355,7 +355,7 @@ 
                     || $route->getMethod() == 'PATCH'
                 ) {
                     $in = $bodyType;
-                } else {
+                }else {
                     $in = 'query';
                 }
             }
@@ -366,11 +366,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);
                     }
@@ -382,10 +382,10 @@ 
                 $paramSchema->default = $param->default;
                 $paramSchema->required = !$param->isOptional;
                 $parameters[] = $paramSchema;
-            } else {
+            }else {
                 if (!$name) {
                     $body = $param;
-                } else {
+                }else {
                     ArrayHelper::set($body, $name, $param);
                 }
 
@@ -398,7 +398,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);
             }
 
@@ -425,8 +425,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();
@@ -458,7 +458,7 @@ 
         } elseif ($itemContainer instanceof ScalarTypeContainer) {
             $itemSchema = new PrimitiveSchemaObject();
             $itemSchema->type = self::mapType($itemContainer->getType());
-        } else {
+        }else {
             $itemSchema = new PrimitiveSchemaObject();
             //$itemSchema->type = 'mixed';
         }
@@ -484,7 +484,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 = implode("\n", [$property->summary, $property->description]);
@@ -501,7 +501,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;
             }
         }
@@ -514,7 +514,7 @@ 
      */
     static public function mapValidation($v, PrimitiveSchemaObject $schemaObject)
     {
-        if(!$v){
+        if (!$v) {
             return $schemaObject;
         }
         $rules = explode('|', $v);
@@ -530,15 +530,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;

src/Utils/AnnotationParams.php

Doc Comments +12 added lines

@@ -5,6 +5,9 @@ 
  */
 class AnnotationParams implements \Countable, \ArrayAccess
 {
+    /**
+     * @param integer $limit
+     */
     public function __construct($text, $limit)
     {
         if($limit == 1){
@@ -142,6 +145,12 @@ 
         }
     }
 
+    /**
+     * @param integer $pos
+     * @param string $default
+     *
+     * @return string
+     */
     public function getRawParam($pos, $default = null)
     {
         if(isset($this->rawParams[$pos])){
@@ -151,6 +160,9 @@ 
         }
     }
 
+    /**
+     * @param boolean $ignoreError
+     */
     private function stripSlashes($text, $ignoreError)
     {
         if(strlen($text)>=2 && substr($text,0,1) == '"'){

Spacing +36 added lines, -36 removed lines

@@ -7,31 +7,31 @@ 
 {
     public function __construct($text, $limit)
     {
-        if($limit == 1){
+        if ($limit == 1) {
             $this->rawParams[] = $text;
             return;
         }
-        if($limit <= 0){
+        if ($limit<=0) {
             return;
         }
         $text = ltrim($text);
         $pos = 0;
         $state = 'stateNormal';
         $len = strlen($text);
-        if($len == 0){
+        if ($len == 0) {
             return;
         }
-        while (true){
-            if($state == 'stateNormal' && count($this->rawParams)+1 == $limit){
+        while (true) {
+            if ($state == 'stateNormal' && count($this->rawParams) + 1 == $limit) {
                 break;
             }
             $pos = $this->$state($text, $pos, $state);
-            if($pos === false || $pos>= $len){
+            if ($pos === false || $pos>=$len) {
                 break;
             }
         };
-        if($this->prePos != strlen($text)){
-            $this->rawParams[] = substr($text,$this->prePos);
+        if ($this->prePos != strlen($text)) {
+            $this->rawParams[] = substr($text, $this->prePos);
         }
     }
 
@@ -42,16 +42,16 @@ 
     {
         //查找引号或者空格
         $found = [];
-        $todo = substr($text,$pos);
-        if(!preg_match('/[\s"\']/', $todo, $found, PREG_OFFSET_CAPTURE) ||
-            count($found)==0){
-            $this->rawParams[] = substr($text,$this->prePos);
+        $todo = substr($text, $pos);
+        if (!preg_match('/[\s"\']/', $todo, $found, PREG_OFFSET_CAPTURE) ||
+            count($found) == 0) {
+            $this->rawParams[] = substr($text, $this->prePos);
             $this->prePos = strlen($text);
             return false;
         }
         list($chars, $offset) = $found[0];
 
-        if($chars == '"'){
+        if ($chars == '"') {
             $next = 'stateDoubleQ';
             return $pos + $offset + 1;
         }
@@ -59,8 +59,8 @@ 
 //            $next = 'stateSingleQ';
 //            return $pos + $offset + 1;
 //        }
-        else{
-            $this->rawParams[] = substr($text,$this->prePos, $pos-$this->prePos+$offset);
+        else {
+            $this->rawParams[] = substr($text, $this->prePos, $pos - $this->prePos + $offset);
             $next = 'stateSpace';
             $this->prePos = $pos + $offset + 1;
             return $this->prePos;
@@ -73,9 +73,9 @@ 
     private function stateSpace($text, $pos, &$next)
     {
         $found = [];
-        $todo = substr($text,$pos);
-        if(!preg_match('/\S/', $todo, $found, PREG_OFFSET_CAPTURE) ||
-            count($found)==0){
+        $todo = substr($text, $pos);
+        if (!preg_match('/\S/', $todo, $found, PREG_OFFSET_CAPTURE) ||
+            count($found) == 0) {
             return false;
         }
         list($chars, $offset) = $found[0];
@@ -105,20 +105,20 @@ 
     /**
      * 进入双引号状态
      */
-    private function stateDoubleQ($text, $pos, &$next){
+    private function stateDoubleQ($text, $pos, &$next) {
 
         $found = [];
-        $todo = substr($text,$pos);
-        if(!preg_match('/[\\\\"]/', $todo, $found, PREG_OFFSET_CAPTURE) ||
-            count($found)==0){
+        $todo = substr($text, $pos);
+        if (!preg_match('/[\\\\"]/', $todo, $found, PREG_OFFSET_CAPTURE) ||
+            count($found) == 0) {
             return false;
         }
         list($chars, $offset) = $found[0];
-        if($chars == '\\'){
-            return $pos+$offset+2;
-        }else{
+        if ($chars == '\\') {
+            return $pos + $offset + 2;
+        }else {
             $next = 'stateNormal';
-            return $pos+$offset+1;
+            return $pos + $offset + 1;
         }
     }
 
@@ -127,38 +127,38 @@ 
         return count($this->rawParams);
     }
 
-    public function getParam($pos, $default = null, $ignoreError=false)
+    public function getParam($pos, $default = null, $ignoreError = false)
     {
-        if(isset($this->cachedParams[$pos])){
+        if (isset($this->cachedParams[$pos])) {
             return $this->cachedParams[$pos];
         }
-        if(isset($this->rawParams[$pos])){
+        if (isset($this->rawParams[$pos])) {
             $param = $this->rawParams[$pos];
             $param = $this->stripSlashes($param, $ignoreError);
             $this->cachedParams[$pos] = $param;
             return $param;
-        }else{
+        }else {
             return $default;
         }
     }
 
     public function getRawParam($pos, $default = null)
     {
-        if(isset($this->rawParams[$pos])){
+        if (isset($this->rawParams[$pos])) {
             return $this->rawParams[$pos];
-        }else{
+        }else {
             return $default;
         }
     }
 
     private function stripSlashes($text, $ignoreError)
     {
-        if(strlen($text)>=2 && substr($text,0,1) == '"'){
+        if (strlen($text)>=2 && substr($text, 0, 1) == '"') {
             $decoded = json_decode($text);
-            if(json_last_error()){
-                if($ignoreError){
+            if (json_last_error()) {
+                if ($ignoreError) {
                     return $text;
-                }else{
+                }else {
                     \PhpBoot\abort('json_decode failed with '.json_last_error_msg(), [$text]);
                 }
             }