caoym / phpboot

src/RPC/MultiRequestCore.php

Spacing +11 added lines, -11 removed lines

@@ -13,13 +13,13 @@ 
      */
     public function __construct(array $threads, callable $waitAll)
     {
-        foreach ($threads as $thread){
+        foreach ($threads as $thread) {
             $pos = count($this->threadResults);
-            $this->threadResults[] = [null,null];
-            $this->threads[] = function ()use($thread, $pos){
-                try{
+            $this->threadResults[] = [null, null];
+            $this->threads[] = function()use($thread, $pos){
+                try {
                     $this->threadResults[$pos][0] = $thread();
-                }catch (\Exception $e){
+                }catch (\Exception $e) {
                     $this->threadResults[$pos][1] = $e;
                 }
             };
@@ -29,7 +29,7 @@ 
 
     public function run()
     {
-        while ($thread = array_pop($this->threads)){
+        while ($thread = array_pop($this->threads)) {
             $thread();
         };
     }
@@ -42,20 +42,20 @@ 
         return $this->threadResults;
     }
 
-    public function wait($waitAble){
+    public function wait($waitAble) {
         array_push($this->waits, $waitAble);
         $this->run();
 
-        if(count($this->waits)){
+        if (count($this->waits)) {
             $waitAll = $this->waitAll;
             $this->waitResults = $waitAll($this->waits);
             $this->waits = [];
         }
 
-        $res =  array_pop($this->waitResults);
-        if(isset($res[1])){
+        $res = array_pop($this->waitResults);
+        if (isset($res[1])) {
              \PhpBoot\abort(new RpcException($res['reason']));
-        }else{
+        }else {
             return $res[0];
         }
     }

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'];
         };
     }

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

src/Annotation/AnnotationReader.php

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

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/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"));
             }
 

src/ORM/ModelWithClass.php

Spacing +10 added lines, -10 removed lines

@@ -29,9 +29,9 @@ 
             ->from($this->entity->getTable())
             ->where("`{$this->entity->getPK()}` = ?", $id)
             ->getFirst();
-        if($row){
+        if ($row) {
             return $this->entity->make($row, false);
-        }else{
+        }else {
             return null;
         }
     }
@@ -53,7 +53,7 @@ 
      * @param mixed|null $_
      * @return \PhpBoot\DB\rules\basic\OrderByRule
      */
-    public function deleteWhere($conditions, $_=null)
+    public function deleteWhere($conditions, $_ = null)
     {
         $query = $this->db->deleteFrom($this->entity->getTable());
         return call_user_func_array([$query, 'where'], func_get_args());
@@ -75,12 +75,12 @@ 
      * @param string $_
      * @return \PhpBoot\DB\rules\select\GroupByRule
      */
-    public function findWhere($conditions=null, $_=null)
+    public function findWhere($conditions = null, $_ = null)
     {
-        $query =  $this->db->select($this->getColumns())
+        $query = $this->db->select($this->getColumns())
             ->from($this->entity->getTable());
-        $query->context->resultHandler = function ($result){
-            foreach ($result as &$i){
+        $query->context->resultHandler = function($result) {
+            foreach ($result as &$i) {
                 $i = $this->entity->make($i, false);
             }
             return $result;
@@ -94,16 +94,16 @@ 
      * @param mixed|null $_
      * @return \PhpBoot\DB\rules\basic\WhereRule
      */
-    public function update($expr, $_=null)
+    public function update($expr, $_ = null)
     {
-        $query =  $this->db->update($this->entity->getTable());
+        $query = $this->db->update($this->entity->getTable());
         return call_user_func_array([$query, 'set'], func_get_args());
     }
 
     protected function getColumns()
     {
         $columns = [];
-        foreach ($this->entity->getProperties() as $p){
+        foreach ($this->entity->getProperties() as $p) {
             $columns[] = $p->name;
         }
         return $columns;

src/functions.php

Spacing +11 added lines, -11 removed lines

@@ -5,7 +5,7 @@ 
 use PhpBoot\ORM\ModelWithObject;
 use PhpBoot\Utils\Logger;
 
-if (! function_exists('PhpBoot\abort')) {
+if (!function_exists('PhpBoot\abort')) {
     /**
      * 抛出异常, 并记录日志
      * @param string|\Exception $error
@@ -13,29 +13,29 @@ 
      * @param string $level "error"|"warning"|"info"|"debug"|null
      * @throws \Exception
      */
-    function abort($error = '', $context=[], $level='warning')
+    function abort($error = '', $context = [], $level = 'warning')
     {
-        if(is_object($context)){
+        if (is_object($context)) {
             $context = get_object_vars($context);
         }
-        if($error instanceof \Exception){
+        if ($error instanceof \Exception) {
             $e = $error;
             $message = "exception '".get_class($error)."' with message {$error->getMessage()}";
-        }else{
+        }else {
             $e = new \RuntimeException($error);
             $message = $error;
         }
         $trace = $e->getTrace();
 
-        if($e->getFile() == __FILE__){
+        if ($e->getFile() == __FILE__) {
             $file = $trace[0]['file'];
             $line = $trace[0]['line'];
-        }else{
+        }else {
             $file = $e->getFile();
             $line = $e->getLine();
         }
-        if($level){
-           Logger::$level($message, $context +['@file'=>$file, '@line'=>$line]);
+        if ($level) {
+           Logger::$level($message, $context + ['@file'=>$file, '@line'=>$line]);
         }
         throw $e;
     }
@@ -61,9 +61,9 @@ 
      */
     function models(DB $db, $entity)
     {
-        if(is_object($entity)){
+        if (is_object($entity)) {
             return $db->getApp()->make(ModelWithObject::class, ['db'=>$db, 'entity'=>$entity]);
-        }else{
+        }else {
             return $db->getApp()->make(ModelWithClass::class, ['db'=>$db, 'entityName'=>$entity]);
         }
     }