caoym / phpboot

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

src/ORM/ModelWithObject.php

Spacing +11 added lines, -11 removed lines

@@ -28,11 +28,11 @@ 
     public function create()
     {
         $data = [];
-        foreach ($this->getColumns() as $column){
-            if(isset($this->object->$column)){
-                if(is_array($this->object->$column) || is_object($this->object->$column)){
+        foreach ($this->getColumns() as $column) {
+            if (isset($this->object->$column)) {
+                if (is_array($this->object->$column) || is_object($this->object->$column)) {
                     $data[$column] = json_encode($this->object->$column);
-                }else{
+                }else {
                     $data[$column] = $this->object->$column;
                 }
 
@@ -48,18 +48,18 @@ 
      * @param array $columns columns to update. if columns is empty array, update all of the columns
      * @return int rows updated
      */
-    public function update(array $columns=[])
+    public function update(array $columns = [])
     {
         $data = [];
         $pk = $this->entity->getPK();
-        foreach ($this->getColumns() as $column){
-            if(count($columns) && !in_array($column, $columns)){
+        foreach ($this->getColumns() as $column) {
+            if (count($columns) && !in_array($column, $columns)) {
                 continue;
             }
-            if($pk != $column && isset($this->object->$column)){
-                if(is_array($this->object->$column) || is_object($this->object->$column)){
+            if ($pk != $column && isset($this->object->$column)) {
+                if (is_array($this->object->$column) || is_object($this->object->$column)) {
                     $data[$column] = json_encode($this->object->$column);
-                }else{
+                }else {
                     $data[$column] = $this->object->$column;
                 }
             }
@@ -85,7 +85,7 @@ 
     protected function getColumns()
     {
         $columns = [];
-        foreach ($this->entity->getProperties() as $p){
+        foreach ($this->entity->getProperties() as $p) {
             $columns[] = $p->name;
         }
         return $columns;

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

Spacing +9 added lines, -9 removed lines

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

src/Controller/Annotations/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

src/Controller/RequestHandler.php

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("the parameter \"{$meta->source}\" is missing"));
                 $inputs[$meta->name] = $meta->default;
             }
@@ -67,10 +67,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++;
@@ -78,15 +78,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;
     }
 
@@ -95,9 +95,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/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,25 +29,25 @@ 
 
     public function run()
     {
-        while ($thread = array_pop($this->threads)){
+        while ($thread = array_pop($this->threads)) {
             $thread();
         };
     }
 
-    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/Application.php

Spacing +19 added lines, -19 removed lines

@@ -93,11 +93,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())
@@ -139,11 +139,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;
@@ -160,9 +160,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) {
@@ -190,11 +190,11 @@ 
      * @param string[] $hooks
      * @return void
      */
-    public function loadRoutesFromPath($fromPath, $namespace = '', $hooks=[])
+    public function loadRoutesFromPath($fromPath, $namespace = '', $hooks = [])
     {
         $dir = @dir($fromPath) or abort("dir $fromPath not exist");
 
-        $getEach = function () use ($dir) {
+        $getEach = function() use ($dir) {
             $name = $dir->read();
             if (!$name) {
                 return $name;
@@ -206,11 +206,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');
             }
         }
@@ -223,7 +223,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];
     }
@@ -249,7 +249,7 @@ 
     {
         //  TODO 把 Route里的异常处理 ExceptionRenderer 移到这里更妥?
         $renderer = $this->get(ExceptionRenderer::class);
-        try{
+        try {
             if ($request == null) {
                 $request = $this->make(Request::class);
             }
@@ -259,7 +259,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) {
@@ -268,10 +268,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*/
@@ -284,12 +284,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*/
@@ -304,7 +304,7 @@ 
             }
             return $response;
 
-        }catch (\Exception $e){
+        }catch (\Exception $e) {
             $renderer->render($e);
         }
 

src/Controller/Annotations/ReturnAnnotationHandler.php

Spacing +6 added lines, -6 removed lines

@@ -21,20 +21,20 @@ 
      */
     public function __invoke(ControllerContainer $container, $ann, EntityContainerBuilder $entityBuilder)
     {
-        if(!$ann->parent){
+        if (!$ann->parent) {
             //Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()} should be used with parent route");
             return;
         }
         $target = $ann->parent->name;
         $route = $container->getRoute($target);
-        if(!$route){
+        if (!$route) {
             //Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()}::$target should be used with parent route");
-            return ;
+            return;
         }
 
         $params = new AnnotationParams($ann->description, 2);
         $type = $doc = null;
-        if(count($params)>0){
+        if (count($params)>0) {
             $type = TypeHint::normalize($params[0], $container->getClassName());
         }
         $doc = $params->getRawParam(1, '');
@@ -42,10 +42,10 @@ 
         list($_, $meta) = $route
             ->getResponseHandler()
             ->getMappingBySource('return');
-        if($meta){
+        if ($meta) {
             $meta->description = $doc;
             $meta->type = $type;
-            $meta->container = $type == 'void'?null:ContainerFactory::create($entityBuilder, $type);
+            $meta->container = $type == 'void' ?null:ContainerFactory::create($entityBuilder, $type);
         }
     }
 }
\ No newline at end of file