caoym / phpboot

src/DB/rules/insert.php

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/ExceptionRenderer.php

Spacing +3 added lines, -3 removed lines

@@ -14,11 +14,11 @@
      */
     public function render(\Exception $e)
     {
-        if($e instanceof HttpException){
+        if ($e instanceof HttpException) {
             return new Response($e->getMessage(), $e->getStatusCode(), $e->getHeaders());
-        } if($e instanceof \InvalidArgumentException){
+        } if ($e instanceof \InvalidArgumentException) {
             return new Response($e->getMessage(), Response::HTTP_BAD_REQUEST);
-        }else{
+        }else {
             return new Response($e->getMessage(), Response::HTTP_INTERNAL_SERVER_ERROR);
         }
     }

src/Cache/ClassModifiedChecker.php

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->getFileName();
             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/Docgen/Swagger/Swagger.php

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/Annotation/ContainerBuilder.php

Spacing +15 added lines, -15 removed lines

@@ -41,22 +41,22 @@ 
         //TODO【重要】 使用全局的缓存版本号, 而不是针对每个文件判断缓存过期与否
         $rfl = new \ReflectionClass($className) or \PhpBoot\abort("load class $className failed");
         $fileName = $rfl->getFileName();
-        $key = str_replace('\\','.',get_class($this)).md5(serialize($this->annotations).$fileName.$className);
+        $key = str_replace('\\', '.', get_class($this)).md5(serialize($this->annotations).$fileName.$className);
         $cache = new CheckableCache($this->cache);
         $res = $cache->get($key, $this);
-        if($res === $this){
-            try{
+        if ($res === $this) {
+            try {
                 $meta = $this->buildWithoutCache($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){
+            }catch (\Exception $e) {
                 Logger::warning(__METHOD__.' failed with '.$e->getMessage());
-                $cache->set($key, $e->getMessage(), 0, $fileName?new ClassModifiedChecker($className):null);
+                $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;
         }
     }
@@ -71,7 +71,7 @@ 
     {
 
     }
-    protected function handleAnnotation($handlerName, $container, $ann){
+    protected function handleAnnotation($handlerName, $container, $ann) {
         $handler = new $handlerName();
         return $handler($container, $ann);
     }
@@ -83,15 +83,15 @@ 
     {
         $container = $this->createContainer($className);
         $anns = AnnotationReader::read($className, $this->cache);
-        foreach ($this->annotations as $i){
+        foreach ($this->annotations as $i) {
             list($class, $target) = $i;
 
             $found = \JmesPath\search($target, $anns);
-            if(is_array($found)){
-                foreach ($found as $f){
-                    $this->handleAnnotation($class, $container,$f); //TODO 支持
+            if (is_array($found)) {
+                foreach ($found as $f) {
+                    $this->handleAnnotation($class, $container, $f); //TODO 支持
                 }
-            }else{
+            }else {
                 $this->handleAnnotation($class, $container, $found);
             }
         }
@@ -102,7 +102,7 @@ 
     /**
      * @var array
      */
-    private $annotations=[];
+    private $annotations = [];
     /**
      * @var Cache
      */

src/Console/ConsoleContainerBuilder.php

Spacing +3 added lines, -3 removed lines

@@ -21,7 +21,7 @@ 
 
 class ConsoleContainerBuilder extends ContainerBuilder
 {
-    static $DEFAULT_ANNOTATIONS=[
+    static $DEFAULT_ANNOTATIONS = [
         [ClassAnnotationHandler::class, 'class'],
         [CommandNameAnnotationHandler::class, "class.children[?name=='command']"],
         [CommandAnnotationHandler::class, "methods.*.children[?name=='command'][]"],
@@ -43,9 +43,9 @@ 
                                 array $annotations = null
     )
     {
-        if($annotations){
+        if ($annotations) {
             parent::__construct($annotations, $cache);
-        }else{
+        }else {
             parent::__construct(self::$DEFAULT_ANNOTATIONS, $cache);
         }
         $this->factory = $factory;

src/Console/Annotations/CommandAnnotationHandler.php

Spacing +5 added lines, -5 removed lines

@@ -25,7 +25,7 @@ 
         $name = $params->getParam(0, $target);
 
         //获取方法参数信息
-        $rfl =  new \ReflectionClass($container->getClassName());
+        $rfl = new \ReflectionClass($container->getClassName());
         $method = $rfl->getMethod($target);
         $methodParams = $method->getParameters();
 
@@ -35,19 +35,19 @@ 
 
         //设置参数列表
         $paramsMeta = [];
-        foreach ($methodParams as $param){
+        foreach ($methodParams as $param) {
             $paramName = $param->getName();
             $source = "argv.$paramName";
             $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,
                 '',

src/Console/Annotations/ParamAnnotationHandler.php

Spacing +9 added lines, -9 removed lines

@@ -22,17 +22,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"));
             }
         }
@@ -45,15 +45,15 @@ 
      */
     public function __invoke(ConsoleContainer $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;
         $command = $container->getCommand($target);
-        if(!$command){
+        if (!$command) {
             //Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()}::$target should be used with parent route");
-            return ;
+            return;
         }
         $className = $container->getClassName();
 
@@ -62,8 +62,8 @@ 
         $paramMeta = $command->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;
         }

src/Console/Annotations/ValidateAnnotationHandler.php

Spacing +7 added lines, -7 removed lines

@@ -18,29 +18,29 @@
      */
     public function __invoke(ConsoleContainer $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;
         $command = $container->getCommand($target);
-        if(!$command){
+        if (!$command) {
             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 = $command->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)) {