caoym / phpboot

src/Application.php

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

Spacing +11 added lines, -11 removed lines

@@ -3,7 +3,7 @@ 
 /**
  * @author caoym
  */
-class Context{
+class Context {
 
     public function __construct($connection)
     {
@@ -14,13 +14,13 @@ 
      * 拼接sql语句，并自动插入空格
      * @param string $sql 表达式
      */
-    public function appendSql($sql, $addSpace=true){
-        if($this->sql == ''){
+    public function appendSql($sql, $addSpace = true) {
+        if ($this->sql == '') {
             $this->sql = $sql;
-        }else{
-            if($addSpace){
+        }else {
+            if ($addSpace) {
                 $this->sql = $this->sql.' '.$sql;
-            }else{
+            }else {
                 $this->sql = $this->sql.$sql;
             }
         }
@@ -29,15 +29,15 @@ 
      * 增加绑定变量值
      * @param array $params 变量
      */
-    public function appendParams($params){
+    public function appendParams($params) {
         $this->params = array_merge($this->params, $params);
     }
 
     public function handleResult($result)
     {
-        if($resultHandler = $this->resultHandler){
+        if ($resultHandler = $this->resultHandler) {
             return $resultHandler($result);
-        }else{
+        }else {
             return $result;
         }
     }
@@ -45,8 +45,8 @@ 
      * @var callable
      */
     public $resultHandler;
-    public $sql='';
-    public $params=[];
+    public $sql = '';
+    public $params = [];
     /**
      * @var \PDO
      */

src/DB/NestedStringCut.php

Spacing +22 added lines, -22 removed lines

@@ -7,26 +7,26 @@ 
  * 既从aaa"bb\"b"ccc中, 取出"bb\"b"
  * @author caoym
  */
-class NestedStringCut{
+class NestedStringCut {
     
-    public function __construct($str){
+    public function __construct($str) {
         
         $pos = 0;
         $state = 'stateNormal';
-        while (true){
+        while (true) {
             $pos = $this->$state($str, $pos, $state);
-            if($pos === false){
+            if ($pos === false) {
                 break;
             }
         };
         return false;
     }
     
-    public function  getSnippets(){
+    public function  getSnippets() {
         return $this->snippets;
     }
     
-    public function  getText(){
+    public function  getText() {
         return  implode('', $this->snippets);
     }
     /**
@@ -34,11 +34,11 @@ 
      * @param int $pos 
      * @param int
      */
-    public function mapPos($pos){
+    public function mapPos($pos) {
        
-        foreach ($this->snippets as $k => $v){
+        foreach ($this->snippets as $k => $v) {
             $pos += $k;
-            if($pos < $k + strlen($v)){
+            if ($pos<$k + strlen($v)) {
                 break;
             }
             $pos -= ($k + strlen($v));
@@ -49,21 +49,21 @@ 
     /**
      * 普通状态
      */
-    private function stateNormal($str, $pos, &$next){
+    private function stateNormal($str, $pos, &$next) {
         $ori = $pos;
         $posSQ = strpos($str, '\'', $pos);
         $posDQ = strpos($str, '"', $pos);
         $pos = $posSQ;
         $this->subStateQ = '\'';
         $next = 'stateQ';
-        if($posDQ !== false && (($posDQ < $pos) || ($pos === false)) ){
+        if ($posDQ !== false && (($posDQ<$pos) || ($pos === false))) {
             $pos = $posDQ;
             $this->subStateQ = '"';
         }
-        if($pos !== false){
-            $this->snippets[$ori] = substr($str, $ori, $pos-$ori);
-            $pos ++;
-        }else{
+        if ($pos !== false) {
+            $this->snippets[$ori] = substr($str, $ori, $pos - $ori);
+            $pos++;
+        }else {
             $this->snippets[$ori] = substr($str, $ori);
         }
         return $pos;
@@ -72,27 +72,27 @@ 
     /**
      * 进入引号状态
      */
-    private function stateQ($str, $pos, &$next){
+    private function stateQ($str, $pos, &$next) {
         $posESC = strpos($str, '\\', $pos);
         $posQ = strpos($str, $this->subStateQ, $pos);
         $pos = $posESC;
         $next = 'stateESC';
         
-        if($posQ !== false && (($posQ<$posESC) || ($posESC === false))){
+        if ($posQ !== false && (($posQ<$posESC) || ($posESC === false))) {
             $pos = $posQ;
             $next = 'stateNormal';
         }
-        if($pos !== false){
-            $pos ++;
+        if ($pos !== false) {
+            $pos++;
         }
         return $pos;
     }
     /**
      * 进入转义状态
      */
-    private function stateESC($str, $pos, &$next){
+    private function stateESC($str, $pos, &$next) {
         $pos++;
-        if($pos >= strlen($str)){
+        if ($pos>=strlen($str)) {
             return false;
         }
         $next = 'stateQ';
@@ -102,7 +102,7 @@ 
      * 去掉嵌套字符串后的内容
      * @var array
      */
-    private $snippets=array();
+    private $snippets = array();
     
     private $subStateQ;
 }

src/DB/Rows.php

Spacing +8 added lines, -8 removed lines

@@ -2,30 +2,30 @@
 
 namespace PhpBoot\DB;
 
-if(!function_exists("array_column"))
+if (!function_exists("array_column"))
 {
 
     function array_column($array, $column_name)
     {
 
-        return array_map(function($element) use($column_name){return $element[$column_name];}, $array);
+        return array_map(function($element) use($column_name){return $element[$column_name]; }, $array);
 
     }
 
 }
 class Rows
 {
-    static function column($array,$column_name)
+    static function column($array, $column_name)
     {
 
-        return array_map(function($element) use($column_name){return $element[$column_name];}, $array);
+        return array_map(function($element) use($column_name){return $element[$column_name]; }, $array);
 
     }
-    static public function leftJoin(&$lh, $rh, $lKey, $rkey, $destKey){
-        $map = array_combine(self::column($rh,$rkey),$rh);
+    static public function leftJoin(&$lh, $rh, $lKey, $rkey, $destKey) {
+        $map = array_combine(self::column($rh, $rkey), $rh);
 
-        foreach ($lh as &$v){
-            $v[$destKey]=$map[$v[$lKey]];
+        foreach ($lh as &$v) {
+            $v[$destKey] = $map[$v[$lKey]];
         }
     }
 }
\ No newline at end of file

src/DB/Raw.php

Spacing +2 added lines, -2 removed lines

@@ -13,10 +13,10 @@
     function __construct($str) {
         $this->str = $str;
     }
-    public function __toString(){
+    public function __toString() {
         return $this->str;
     }
-    public function get(){
+    public function get() {
         return $this->str;
     }
     private $str;

src/DB/rules/basic.php

Spacing +4 added lines, -4 removed lines

@@ -11,7 +11,7 @@ 
 
 class BasicRule
 {
-    public function __construct(Context $context){
+    public function __construct(Context $context) {
         $this->context = $context;
     }
 
@@ -48,7 +48,7 @@ 
 
 class OrderByRule extends LimitRule
 {
-    public function __construct($context){
+    public function __construct($context) {
         parent::__construct($context);
         $this->impl = new OrderByImpl();
     }
@@ -72,7 +72,7 @@ 
      * 
      * @return \PhpBoot\DB\rules\basic\LimitRule
      */
-    public function orderBy($column, $order=null) {
+    public function orderBy($column, $order = null) {
         $this->impl->orderBy($this->context, $column, $order);
         return new LimitRule($this->context);
     }
@@ -91,7 +91,7 @@ 
      * @param mixed $_
      * @return \PhpBoot\DB\rules\basic\OrderByRule
      */
-    public function where($expr, $_= null) {
+    public function where($expr, $_ = null) {
         WhereImpl::where($this->context, $expr, array_slice(func_get_args(), 1));
         return new OrderByRule($this->context);
     }

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