caoym / phpboot

src/DB/DB.php

Spacing +16 added lines, -16 removed lines

@@ -55,7 +55,7 @@ 
  *      
  * @author caoym <caoyangmin@gmail.com>
  */
-class DB{
+class DB {
 
     /**
      * DB constructor.
@@ -96,23 +96,23 @@ 
      * @param string $column0
      * @return \PhpBoot\DB\rules\select\FromRule
      */
-    function select($column0=null, $_=null){
+    function select($column0 = null, $_ = null) {
         $obj = new SelectRule(new Context($this->connection));
-        if($column0 == null){
+        if ($column0 == null) {
             $args = ['*'];
-        }elseif(is_array($column0)){
+        }elseif (is_array($column0)) {
             $args = $column0;
-        }else{
+        }else {
             $args = func_get_args();
         }
-        foreach ($args as &$arg){
+        foreach ($args as &$arg) {
             $arg = trim($arg);
-            if($arg == '*'){
+            if ($arg == '*') {
                 continue;
             }
             $found = [];
-            if(preg_match('/^[A-Za-z0-9]+$/', $arg, $found, PREG_OFFSET_CAPTURE)&&
-                count($found)){
+            if (preg_match('/^[A-Za-z0-9]+$/', $arg, $found, PREG_OFFSET_CAPTURE) &&
+                count($found)) {
                 $arg = "`$arg`";
             }
         }
@@ -143,8 +143,8 @@ 
      * @param string $table
      * @return \PhpBoot\DB\rules\basic\WhereRule
      */
-    public function deleteFrom($table){
-        $obj  =  new DeleteRule(new Context($this->connection));
+    public function deleteFrom($table) {
+        $obj = new DeleteRule(new Context($this->connection));
         return $obj->deleteFrom($table);
     }
     /**
@@ -152,8 +152,8 @@ 
      * @param string $table
      * @return \PhpBoot\DB\rules\replace\ValuesRule
      */
-    public function replaceInto($table){
-        $obj  =  new ReplaceIntoRule(new Context($this->connection));
+    public function replaceInto($table) {
+        $obj = new ReplaceIntoRule(new Context($this->connection));
         return $obj->replaceInto($table);
     }
 
@@ -172,7 +172,7 @@ 
      * @param string $str
      * @return Raw
      */
-    static public function raw($str){
+    static public function raw($str) {
         return new Raw($str);
     }
 
@@ -183,8 +183,8 @@ 
     {
         return $this->app;
     }
-    const ORDER_BY_ASC ='ASC';
-    const ORDER_BY_DESC ='DESC';
+    const ORDER_BY_ASC = 'ASC';
+    const ORDER_BY_DESC = 'DESC';
 
     /**
      * @var \PDO

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