caoym / phpboot

src/Cache/FileModifiedChecker.php

Spacing +13 added lines, -13 removed lines

@@ -10,25 +10,25 @@ 
     /**
      * @param string|array $fileName 文件的绝对路径
      */
-    function __construct($fileName){
+    function __construct($fileName) {
         $fileNames = array();
-        if(is_string($fileName)){
-            $fileNames[]=$fileName;
-        }else{
+        if (is_string($fileName)) {
+            $fileNames[] = $fileName;
+        }else {
             is_array($fileName) or \PhpBoot\abort(new \InvalidArgumentException("string or array is required by param 0"));
             $fileNames = $fileName;
         }
-        foreach ($fileNames as $fileName){
-            if(is_file($fileName)){
+        foreach ($fileNames as $fileName) {
+            if (is_file($fileName)) {
                 $this->fileName[$fileName] = @filemtime($fileName);
             }else {
                 $this->fileName[$fileName] = @filemtime($fileName);
-                if(!is_dir($fileName)){
+                if (!is_dir($fileName)) {
                     continue;
                 }
                 $files = @dir($fileName) or \PhpBoot\abort("open dir $fileName failed");
-                while (!!($file = $files->read())){
-                    if($file == '.' || $file == '..') {
+                while (!!($file = $files->read())) {
+                    if ($file == '.' || $file == '..') {
                         continue;
                     }
                     $this->fileName[$fileName.'/'.$file] = @filemtime($fileName.'/'.$file);
@@ -43,13 +43,13 @@ 
      * @param int $createdTime
      * @return boolean
      */
-    public function __invoke($data, $createdTime){
-        foreach ($this->fileName as $name => $time){
-            if(@filemtime($name) != $time){
+    public function __invoke($data, $createdTime) {
+        foreach ($this->fileName as $name => $time) {
+            if (@filemtime($name) != $time) {
                 return false;
             }
         }
         return true;
     }
-    private $fileName=[]; //文件全路径
+    private $fileName = []; //文件全路径
 }

Braces +2 added lines, -2 removed lines

@@ -14,14 +14,14 @@
         $fileNames = array();
         if(is_string($fileName)){
             $fileNames[]=$fileName;
-        }else{
+        } else{
             is_array($fileName) or \PhpBoot\abort(new \InvalidArgumentException("string or array is required by param 0"));
             $fileNames = $fileName;
         }
         foreach ($fileNames as $fileName){
             if(is_file($fileName)){
                 $this->fileName[$fileName] = @filemtime($fileName);
-            }else {
+            } else {
                 $this->fileName[$fileName] = @filemtime($fileName);
                 if(!is_dir($fileName)){
                     continue;

src/functions.php

Indentation +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
             $line = $e->getLine();
         }
         if($level){
-           Logger::$level($message, $context +['@file'=>$file, '@line'=>$line]);
+            Logger::$level($message, $context +['@file'=>$file, '@line'=>$line]);
         }
         throw $e;
     }

Braces +3 added lines, -3 removed lines

@@ -21,7 +21,7 @@ 
         if($error instanceof \Exception){
             $e = $error;
             $message = "exception '".get_class($error)."' with message {$error->getMessage()}";
-        }else{
+        } else{
             $e = new \RuntimeException($error);
             $message = $error;
         }
@@ -30,7 +30,7 @@ 
         if($e->getFile() == __FILE__){
             $file = $trace[0]['file'];
             $line = $trace[0]['line'];
-        }else{
+        } else{
             $file = $e->getFile();
             $line = $e->getLine();
         }
@@ -53,7 +53,7 @@ 
     {
         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]);
         }
     }

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/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
      */

Braces +3 added lines, -3 removed lines

@@ -17,10 +17,10 @@ 
     public function appendSql($sql, $addSpace=true){
         if($this->sql == ''){
             $this->sql = $sql;
-        }else{
+        } else{
             if($addSpace){
                 $this->sql = $this->sql.' '.$sql;
-            }else{
+            } else{
                 $this->sql = $this->sql.$sql;
             }
         }
@@ -37,7 +37,7 @@ 
     {
         if($resultHandler = $this->resultHandler){
             return $resultHandler($result);
-        }else{
+        } else{
             return $result;
         }
     }

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

Braces +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
         if($pos !== false){
             $this->snippets[$ori] = substr($str, $ori, $pos-$ori);
             $pos ++;
-        }else{
+        } else{
             $this->snippets[$ori] = substr($str, $ori);
         }
         return $pos;

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/RPC/MultiRequestCore.php

Indentation +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 
         $res =  array_pop($this->waitResults);
         if(isset($res[1])){
-             \PhpBoot\abort(new RpcException($res['reason']));
+                \PhpBoot\abort(new RpcException($res['reason']));
         }else{
             return $res[0];
         }

Braces +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
             $this->threads[] = function ()use($thread, $pos){
                 try{
                     $this->threadResults[$pos][0] = $thread();
-                }catch (\Exception $e){
+                } catch (\Exception $e){
                     $this->threadResults[$pos][1] = $e;
                 }
             };
@@ -55,7 +55,7 @@ 
         $res =  array_pop($this->waitResults);
         if(isset($res[1])){
              \PhpBoot\abort(new RpcException($res['reason']));
-        }else{
+        } else{
             return $res[0];
         }
     }

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

Braces +3 added lines, -3 removed lines

@@ -52,7 +52,7 @@ 
             $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);
         }
@@ -133,7 +133,7 @@ 
                     $query[$k] = $v;
                 }
             }
-        }else{
+        } else{
             foreach ($request as $k => $v){
                 if(!in_array($k, ['query', 'request', 'files', 'cookies', 'headers'])){
                     if($body === null){
@@ -205,7 +205,7 @@ 
                 ArrayHelper::set($mapping, $return->source, $data);
             }
 
-        }else{
+        } else{
 
             //TODO 如果多个 异常对应同一个 statusCode 怎么处理
             $exceptions = $route->getExceptionHandler()->getExceptions();