caoym / phpboot

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

Braces +2 added lines, -2 removed lines

@@ -23,11 +23,11 @@
                     $value = json_encode($value, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
                 //}
                 $response->setContent($value);
-            }elseif($key == 'headers'){
+            } elseif($key == 'headers'){
                 foreach ($value as $k=>$v){
                     $response->headers->set($k, $v);
                 }
-            }else{
+            } else{
                 \PhpBoot\abort(new \UnexpectedValueException("Unexpected output target $key"));
             }
 

src/DB/rules/insert.php

Doc Comments +3 added lines, -2 removed lines

@@ -41,6 +41,9 @@ 
 
 class OnDuplicateKeyUpdateRule extends ExecRule
 {
+    /**
+     * @param \PhpBoot\DB\Context $context
+     */
     public function __construct($context)
     {
         parent::__construct($context);
@@ -91,8 +94,6 @@ 
      *      ->onDuplicateKeyUpdate('a=a+1')
      *  => "INSERT INTO table(a,b) VALUES(1,now()) ON DUPLICATE KEY UPDATE a=a+1"
      *
-     * @param string $column
-     * @param mixed $value
      * @return \PhpBoot\DB\rules\basic\ExecRule
      */
     public function onDuplicateKeyUpdate($expr, $_=null) {

Spacing +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
      * @param array $values
      * @return \PhpBoot\DB\rules\insert\OnDuplicateKeyUpdateRule
      */
-    public function batchValues(array $values){
+    public function batchValues(array $values) {
         ValuesImpl::batchValues($this->context, $values);
         return new OnDuplicateKeyUpdateRule($this->context);
     }
@@ -106,7 +106,7 @@ 
      * @param mixed $value
      * @return \PhpBoot\DB\rules\basic\ExecRule
      */
-    public function onDuplicateKeyUpdate($expr, $_=null) {
+    public function onDuplicateKeyUpdate($expr, $_ = null) {
         $this->impl->set($this->context, $expr, array_slice(func_get_args(), 1));
         return new ExecRule($this->context);
     }

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

Braces +2 added lines, -2 removed lines

@@ -84,7 +84,7 @@ 
             $source = "request.$paramName";
             if($route->hasPathParam($paramName)){ //参数来自路由
                 $source = "request.$paramName";
-            }elseif($httpMethod == 'GET'){
+            } elseif($httpMethod == 'GET'){
                 $source = "request.$paramName"; //GET请求显示指定来自query string
             }
             $paramClass = $param->getClass();
@@ -116,7 +116,7 @@ 
         $requestHandler->setParamMetas($paramsMeta);
         if(!$hasRefParam){
             $responseHandler->setMapping('response.content', new ReturnMeta('return','mixed','', new MixedTypeContainer()));
-        }else{
+        } else{
             //当存在引用参数作为输出时, 默认将 return 数据绑定的到 data 下, 以防止和引用参数作为输出重叠
             $responseHandler->setMapping($this->returnTarget, new ReturnMeta('return','mixed','', new MixedTypeContainer()));
         }

src/DB/rules/basic.php

Doc Comments +3 added lines

@@ -48,6 +48,9 @@
 
 class OrderByRule extends LimitRule
 {
+    /**
+     * @param Context $context
+     */
     public function __construct($context){
         parent::__construct($context);
         $this->impl = new OrderByImpl();

Spacing +20 added lines, -20 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();
     }
@@ -63,7 +63,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);
     }
@@ -95,17 +95,17 @@ 
      * @param mixed $_
      * @return NextWhereRule
      */
-    public function where($conditions=null, $_=null) {
-        if(is_callable($conditions)){
-            $callback = function ($context)use($conditions){
+    public function where($conditions = null, $_ = null) {
+        if (is_callable($conditions)) {
+            $callback = function($context)use($conditions){
                 $rule = new ScopedQuery($context);
                 $conditions($rule);
             };
             $conditions = $callback;
         }
-        if($this->isTheFirst){
-            WhereImpl::where($this->context, 'WHERE' ,$conditions, array_slice(func_get_args(), 1));
-        }else{
+        if ($this->isTheFirst) {
+            WhereImpl::where($this->context, 'WHERE', $conditions, array_slice(func_get_args(), 1));
+        }else {
             WhereImpl::where($this->context, 'AND', $conditions, array_slice(func_get_args(), 1));
         }
         return new NextWhereRule($this->context, false);
@@ -133,9 +133,9 @@ 
      * @param mixed $_
      * @return WhereRule
      */
-    public function orWhere($conditions=null, $_=null) {
-        if(is_callable($conditions)){
-            $callback = function ($context)use($conditions){
+    public function orWhere($conditions = null, $_ = null) {
+        if (is_callable($conditions)) {
+            $callback = function($context)use($conditions){
                 $rule = new ScopedQuery($context);
                 $conditions($rule);
             };
@@ -160,17 +160,17 @@ 
      * @param null $_
      * @return NextScopedQuery
      */
-    public function where($expr, $_= null){
-        if(is_callable($expr)){
-            $callback = function ($context)use($expr){
+    public function where($expr, $_ = null) {
+        if (is_callable($expr)) {
+            $callback = function($context)use($expr){
                 $rule = new ScopedQuery($context, true);
                 $expr($rule);
             };
             $expr = $callback;
         }
-        if($this->isTheFirst){
+        if ($this->isTheFirst) {
             WhereImpl::where($this->context, '', $expr, array_slice(func_get_args(), 1));
-        }else{
+        }else {
             WhereImpl::where($this->context, 'AND', $expr, array_slice(func_get_args(), 1));
         }
         return new NextScopedQuery($this->context, false);
@@ -186,9 +186,9 @@ 
      * @param null $_
      * @return ScopedQuery
      */
-    public function orWhere($expr, $_= null){
-        if(is_callable($expr)){
-            $callback = function ($context)use($expr){
+    public function orWhere($expr, $_ = null) {
+        if (is_callable($expr)) {
+            $callback = function($context)use($expr){
                 $rule = new ScopedQuery($context, true);
                 $expr($rule);
             };

Braces +2 added lines, -2 removed lines

@@ -105,7 +105,7 @@ 
         }
         if($this->isTheFirst){
             WhereImpl::where($this->context, 'WHERE' ,$conditions, array_slice(func_get_args(), 1));
-        }else{
+        } else{
             WhereImpl::where($this->context, 'AND', $conditions, array_slice(func_get_args(), 1));
         }
         return new NextWhereRule($this->context, false);
@@ -170,7 +170,7 @@ 
         }
         if($this->isTheFirst){
             WhereImpl::where($this->context, '', $expr, array_slice(func_get_args(), 1));
-        }else{
+        } else{
             WhereImpl::where($this->context, 'AND', $expr, array_slice(func_get_args(), 1));
         }
         return new NextScopedQuery($this->context, false);

src/DB/rules/update.php

Indentation -1 removed lines

@@ -30,7 +30,6 @@
     }
     /**
      * update('table')->set(['a'=>1]) => "UPDATE table SET a=1"
-
      * update('table')->set('a=?',1) => "UPDATE table SET a=1"
      * @param array|string $expr
      * @param mixed $_

Doc Comments +3 added lines

@@ -25,6 +25,9 @@
 
 class UpdateSetRule extends BasicRule
 {
+    /**
+     * @param Context $context
+     */
     public function __construct($context){
         parent::__construct($context);
         $this->impl = new UpdateSetImpl();

Spacing +4 added lines, -4 removed lines

@@ -25,7 +25,7 @@ 
 
 class UpdateSetRule extends BasicRule
 {
-    public function __construct($context){
+    public function __construct($context) {
         parent::__construct($context);
         $this->impl = new UpdateSetImpl();
     }
@@ -37,7 +37,7 @@ 
      * @param mixed $_
      * @return UpdateSetWhereRule
      */
-    public function set($expr, $_=null) {
+    public function set($expr, $_ = null) {
         $this->impl->set($this->context, $expr, array_slice(func_get_args(), 1));
         return new UpdateSetWhereRule($this->context, $this->impl);
     }
@@ -46,7 +46,7 @@ 
 
 class UpdateSetWhereRule extends WhereRule
 {
-    public function __construct(Context $context, UpdateSetImpl $impl){
+    public function __construct(Context $context, UpdateSetImpl $impl) {
         parent::__construct($context);
         $this->impl = $impl;
     }
@@ -57,7 +57,7 @@ 
      * @param mixed $_
      * @return UpdateSetWhereRule
      */
-    public function set($expr, $_=null) {
+    public function set($expr, $_ = null) {
         $this->impl->set($this->context, $expr, array_slice(func_get_args(), 1));
         return new UpdateSetWhereRule($this->context, $this->impl);
     }

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

src/DB/rules/select.php

Doc Comments +4 added lines, -1 removed lines

@@ -113,6 +113,9 @@ 
 
 class OrderByRule extends LimitRule
 {
+    /**
+     * @param Context $context
+     */
     public function __construct($context){
         parent::__construct($context);
         $this->order = new OrderByImpl();
@@ -260,7 +263,7 @@ 
      *      "WHERE a=1 AND b IN(1,2) AND c BETWEEN 1 AND 2 AND d<>1"
      *
      * @param string|array|callable $conditions
-     * @param mixed $_
+     * @param string $_
      * @return \PhpBoot\DB\rules\select\NextWhereRule
      */
     public function where($conditions=null, $_=null) {

Spacing +33 added lines, -33 removed lines

@@ -39,7 +39,7 @@ 
      * @param string|false $asDict
      * @return array
      */
-    public function get($asDict=false) {
+    public function get($asDict = false) {
         return ExecImpl::get($this->context, $asDict);
     }
 
@@ -53,9 +53,9 @@ 
      * Execute sql and get one response
      * @return null
      */
-    public function getFirst(){
+    public function getFirst() {
         $res = ExecImpl::get($this->context);
-        if(count($res)){
+        if (count($res)) {
             return $res[0];
         }
         return null;
@@ -68,8 +68,8 @@ 
      * @param string $table
      * @return \PhpBoot\DB\rules\select\JoinRule
      */
-    public function from($table, $as=null){
-        FromImpl::from($this->context, $table,$as);
+    public function from($table, $as = null) {
+        FromImpl::from($this->context, $table, $as);
         return new JoinRule($this->context);
     }
 }
@@ -80,7 +80,7 @@ 
      * @param string $column
      * @return \PhpBoot\DB\rules\select\GetRule
      */
-    public function of($column){
+    public function of($column) {
         ForUpdateOfImpl::of($this->context, $column);
         return new GetRule($this->context);
     }
@@ -91,7 +91,7 @@ 
      * forUpdate() => 'FOR UPDATE'
      * @return \PhpBoot\DB\rules\select\ForUpdateOfRule
      */
-    public function forUpdate(){
+    public function forUpdate() {
         ForUpdateImpl::forUpdate($this->context);
         return new ForUpdateOfRule($this->context);
     }
@@ -113,7 +113,7 @@ 
 
 class OrderByRule extends LimitRule
 {
-    public function __construct($context){
+    public function __construct($context) {
         parent::__construct($context);
         $this->order = new OrderByImpl();
     }
@@ -128,7 +128,7 @@ 
      * @param string $order Sql::ORDER_BY_ASC or Sql::ORDER_BY_DESC
      * @return \PhpBoot\DB\rules\select\OrderByRule
      */
-    public function orderBy($column, $order=null) {
+    public function orderBy($column, $order = null) {
         $this->order->orderBy($this->context, $column, $order);
         return $this;
     }
@@ -174,17 +174,17 @@ 
      * @param string $_
      * @return \PhpBoot\DB\rules\select\HavingRule
      */
-    public function having($expr, $_=null) {
-        if(is_callable($expr)){
-            $callback = function ($context)use($expr){
+    public function having($expr, $_ = null) {
+        if (is_callable($expr)) {
+            $callback = function($context)use($expr){
                 $rule = new ScopedQuery($context);
                 $expr($rule);
             };
             $expr = $callback;
         }
-        if($this->isTheFirst){
+        if ($this->isTheFirst) {
             WhereImpl::where($this->context, 'HAVING', $expr, array_slice(func_get_args(), 1));
-        }else{
+        }else {
             WhereImpl::where($this->context, 'AND', $expr, array_slice(func_get_args(), 1));
         }
 
@@ -211,9 +211,9 @@ 
      * @param string $_
      * @return \PhpBoot\DB\rules\select\HavingRule
      */
-    public function orHaving($expr, $_=null) {
-        if(is_callable($expr)){
-            $callback = function ($context)use($expr){
+    public function orHaving($expr, $_ = null) {
+        if (is_callable($expr)) {
+            $callback = function($context)use($expr){
                 $rule = new ScopedQuery($context);
                 $expr($rule);
             };
@@ -263,17 +263,17 @@ 
      * @param mixed $_
      * @return \PhpBoot\DB\rules\select\NextWhereRule
      */
-    public function where($conditions=null, $_=null) {
-        if(is_callable($conditions)){
-            $callback = function ($context)use($conditions){
+    public function where($conditions = null, $_ = null) {
+        if (is_callable($conditions)) {
+            $callback = function($context)use($conditions){
                 $rule = new ScopedQuery($context);
                 $conditions($rule);
             };
             $conditions = $callback;
         }
-        if($this->isTheFirst){
-            WhereImpl::where($this->context, 'WHERE' ,$conditions, array_slice(func_get_args(), 1));
-        }else{
+        if ($this->isTheFirst) {
+            WhereImpl::where($this->context, 'WHERE', $conditions, array_slice(func_get_args(), 1));
+        }else {
             WhereImpl::where($this->context, 'AND', $conditions, array_slice(func_get_args(), 1));
         }
         return new NextWhereRule($this->context, false);
@@ -304,9 +304,9 @@ 
      *
      * @TODO orWhere 只能跟在 Where 后
      */
-    public function orWhere($conditions=null, $_=null) {
-        if(is_callable($conditions)){
-            $callback = function ($context)use($conditions){
+    public function orWhere($conditions = null, $_ = null) {
+        if (is_callable($conditions)) {
+            $callback = function($context)use($conditions){
                 $rule = new ScopedQuery($context);
                 $conditions($rule);
             };
@@ -325,8 +325,8 @@ 
      * @param string $table
      * @return \PhpBoot\DB\rules\select\JoinOnRule
      */
-    public function join($table){
-        JoinImpl::join($this->context,null, $table);
+    public function join($table) {
+        JoinImpl::join($this->context, null, $table);
         return new JoinOnRule($this->context);
     }
     /**
@@ -334,8 +334,8 @@ 
      * @param string $table
      * @return \PhpBoot\DB\rules\select\JoinOnRule
      */
-    public function leftJoin($table){
-        JoinImpl::join($this->context,'LEFT', $table);
+    public function leftJoin($table) {
+        JoinImpl::join($this->context, 'LEFT', $table);
         return new JoinOnRule($this->context);
     }
     /**
@@ -344,7 +344,7 @@ 
      * @return \PhpBoot\DB\rules\select\JoinOnRule
      */
     public function rightJoin($table) {
-        JoinImpl::join($this->context,'RIGHT', $table);
+        JoinImpl::join($this->context, 'RIGHT', $table);
         return new JoinOnRule($this->context);
     }
     /**
@@ -353,7 +353,7 @@ 
      * @return \PhpBoot\DB\rules\select\JoinOnRule
      */
     public function innerJoin($table) {
-        JoinImpl::join($this->context,'INNER', $table);
+        JoinImpl::join($this->context, 'INNER', $table);
         return new JoinOnRule($this->context);
     }
 }
@@ -365,7 +365,7 @@ 
      * @param string $condition
      * @return \PhpBoot\DB\rules\select\JoinRule
      */
-    public function on($condition){
+    public function on($condition) {
         JoinOnImpl::on($this->context, $condition);
         return new JoinRule($this->context);
     }

Braces +2 added lines, -2 removed lines

@@ -184,7 +184,7 @@ 
         }
         if($this->isTheFirst){
             WhereImpl::where($this->context, 'HAVING', $expr, array_slice(func_get_args(), 1));
-        }else{
+        } else{
             WhereImpl::where($this->context, 'AND', $expr, array_slice(func_get_args(), 1));
         }
 
@@ -273,7 +273,7 @@ 
         }
         if($this->isTheFirst){
             WhereImpl::where($this->context, 'WHERE' ,$conditions, array_slice(func_get_args(), 1));
-        }else{
+        } else{
             WhereImpl::where($this->context, 'AND', $conditions, array_slice(func_get_args(), 1));
         }
         return new NextWhereRule($this->context, false);

src/DB/impls.php

Indentation +1 added lines, -1 removed lines

@@ -119,7 +119,7 @@
 }
 class ValuesImpl
 {
-     static public function values(Context $context, array $values){
+        static public function values(Context $context, array $values){
         $params = [];
         $stubs = [];
         foreach ($values as $v){

Doc Comments +82 added lines, -1 removed lines

@@ -9,6 +9,12 @@ 
 use PhpBoot\DB\Context;
 
 class ExecResult{
+
+    /**
+     * @param boolean $success
+     * @param \PDO $pdo
+     * @param \PDOStatement $st
+     */
     public function __construct($success, $pdo, $st){
         $this->pdo = $pdo;
         $this->st = $st;
@@ -42,6 +48,10 @@ 
 
 class SelectImpl
 {
+    /**
+     * @param Context $context
+     * @param string $columns
+     */
     static  public function select($context, $columns){
         $context->appendSql("SELECT $columns");
     }
@@ -49,6 +59,10 @@ 
 
 class FromImpl
 {
+    /**
+     * @param Context $context
+     * @param string $tables
+     */
     static public function from($context, $tables,$as=null){
         if($tables instanceof BasicRule){
             $context->appendSql("FROM (".$tables->context->sql.')');
@@ -64,6 +78,10 @@ 
 
 class DeleteImpl
 {
+    /**
+     * @param Context $context
+     * @param string $from
+     */
     static public function deleteFrom($context, $from)
     {
         $context->appendSql("DELETE FROM ".DB::wrap($from));
@@ -72,6 +90,11 @@ 
 
 class JoinImpl
 {
+    /**
+     * @param Context $context
+     * @param null|string $type
+     * @param string $table
+     */
     static public function join($context, $type, $table) {
         $table = DB::wrap($table);
         if($type){
@@ -84,6 +107,10 @@ 
 
 class JoinOnImpl
 {
+    /**
+     * @param Context $context
+     * @param string $condition
+     */
     static public function on($context, $condition) {
         $context->appendSql("ON $condition");
     }
@@ -91,6 +118,9 @@ 
 
 class ForUpdateImpl
 {
+    /**
+     * @param Context $context
+     */
     static public function forUpdate($context){
         $context->appendSql("FOR UPDATE");
     }
@@ -98,6 +128,10 @@ 
 
 class ForUpdateOfImpl
 {
+    /**
+     * @param Context $context
+     * @param string $column
+     */
     static public function of($context, $column){
         $column = DB::wrap($column);
         $context->appendSql("OF $column");
@@ -106,6 +140,10 @@ 
 
 class InsertImpl
 {
+    /**
+     * @param Context $context
+     * @param string $table
+     */
     static public function insertInto($context, $table) {
         $table = DB::wrap($table);
         $context->appendSql("INSERT INTO $table");
@@ -113,6 +151,10 @@ 
 }
 class ReplaceImpl
 {
+    /**
+     * @param Context $context
+     * @param string $table
+     */
     static public function replaceInto($context, $table) {
         $table = DB::wrap($table);
         $context->appendSql("REPLACE INTO $table");
@@ -196,6 +238,10 @@ 
 
 class UpdateImpl
 {
+    /**
+     * @param Context $context
+     * @param string $table
+     */
     static public function update($context, $table){
         $table = DB::wrap($table);
         $context->appendSql("UPDATE $table");
@@ -212,6 +258,9 @@ 
         }
     }
 
+    /**
+     * @param string $expr
+     */
     public function setExpr(Context $context, $expr, $args){
         if($this->first){
             $this->first = false;
@@ -274,6 +323,11 @@ 
         }
         return $this;
     }
+
+    /**
+     * @param string $column
+     * @param string $order
+     */
     public function orderBy(Context $context, $column, $order=null){
         if(is_string($column)){
             if($order === null){
@@ -291,12 +345,20 @@ 
 
 class LimitImpl
 {
+    /**
+     * @param integer $size
+     */
     static public function limit(Context $context, $size){
         $intSize = intval($size);
         strval($intSize) == $size or \PhpBoot\abort(
             new \InvalidArgumentException("invalid params for limit($size)"));
         $context->appendSql("LIMIT $size");
     }
+
+    /**
+     * @param integer $start
+     * @param integer $size
+     */
     static public function limitWithOffset(Context $context, $start, $size){
         $intStart = intval($start);
         $intSize = intval($size);
@@ -308,6 +370,9 @@ 
 
 class WhereImpl{
 
+    /**
+     * @param string $str
+     */
     static private function findQ($str,$offset = 0,$no=0){
         $found = strpos($str, '?', $offset);
         if($no == 0 || $found === false){
@@ -316,6 +381,9 @@ 
         return self::findQ($str, $found+1, $no-1);
     }
 
+    /**
+     * @param string $prefix
+     */
     static public function where(Context $context, $prefix, $expr, $args){
         if(empty($expr)){
             return;
@@ -434,6 +502,10 @@ 
 
         self::condition($context, $prefix, implode(' AND ', $exprs), $params);
     }
+
+    /**
+     * @param string $expr
+     */
     static public function condition(Context $context, $prefix, $expr, $args){
         if(!empty($expr)){
             $expr = "($expr)";
@@ -506,6 +578,10 @@ 
 }
 
 class GroupByImpl{
+
+    /**
+     * @param string $column
+     */
     static public function groupBy(Context $context, $column){
         $column = DB::wrap($column);
         $context->appendSql("GROUP BY $column");
@@ -534,7 +610,6 @@ 
     /**
      *
      * @param Context $context
-     * @param string|false $asDict return  as dict or array
      * @return false|array
      * @throws DBException|\Exception
      */
@@ -605,6 +680,9 @@ 
 }
 class OnDuplicateKeyUpdateImpl
 {
+    /**
+     * @param Context $context
+     */
     public function set($context, $column, $value){
         if(is_string($column)){
             $this->setExpr($context, $column, $value);
@@ -613,6 +691,9 @@ 
         }
     }
 
+    /**
+     * @param string $expr
+     */
     public function setExpr($context, $expr, $args){
         $prefix = '';
         if($this->first){

Spacing +172 added lines, -172 removed lines

@@ -8,14 +8,14 @@ 
 use PhpBoot\DB\rules\basic\BasicRule;
 use PhpBoot\DB\Context;
 
-class ExecResult{
-    public function __construct($success, $pdo, $st){
+class ExecResult {
+    public function __construct($success, $pdo, $st) {
         $this->pdo = $pdo;
         $this->st = $st;
         $this->success = $success;
         $this->rows = $this->st->rowCount();
     }
-    public function lastInsertId($name=null){
+    public function lastInsertId($name = null) {
         return $this->pdo->lastInsertId($name);
     }
     /**
@@ -42,21 +42,21 @@ 
 
 class SelectImpl
 {
-    static  public function select($context, $columns){
+    static  public function select($context, $columns) {
         $context->appendSql("SELECT $columns");
     }
 }
 
 class FromImpl
 {
-    static public function from($context, $tables,$as=null){
-        if($tables instanceof BasicRule){
+    static public function from($context, $tables, $as = null) {
+        if ($tables instanceof BasicRule) {
             $context->appendSql("FROM (".$tables->context->sql.')');
-            $context->params = array_merge($context->params,$tables->context->params);
+            $context->params = array_merge($context->params, $tables->context->params);
         }else {
             $context->appendSql("FROM ".DB::wrap($tables));
         }
-        if($as){
+        if ($as) {
             $context->appendSql("AS ".DB::wrap($as));
         }
     }
@@ -74,9 +74,9 @@ 
 {
     static public function join($context, $type, $table) {
         $table = DB::wrap($table);
-        if($type){
+        if ($type) {
             $context->appendSql("$type JOIN $table");
-        }else{
+        }else {
             $context->appendSql("JOIN $table");
         }
     }
@@ -91,14 +91,14 @@ 
 
 class ForUpdateImpl
 {
-    static public function forUpdate($context){
+    static public function forUpdate($context) {
         $context->appendSql("FOR UPDATE");
     }
 }
 
 class ForUpdateOfImpl
 {
-    static public function of($context, $column){
+    static public function of($context, $column) {
         $column = DB::wrap($column);
         $context->appendSql("OF $column");
     }
@@ -120,57 +120,57 @@ 
 }
 class ValuesImpl
 {
-     static public function values(Context $context, array $values){
+     static public function values(Context $context, array $values) {
         $params = [];
         $stubs = [];
-        foreach ($values as $v){
-            if(is_a($v, Raw::class)){//直接拼接sql，不需要转义
-                $stubs[]=$v->get();
-            }else{
-                $stubs[]='?';
+        foreach ($values as $v) {
+            if (is_a($v, Raw::class)) {//直接拼接sql，不需要转义
+                $stubs[] = $v->get();
+            }else {
+                $stubs[] = '?';
                 $params[] = $v;
             }
         }
         $stubs = implode(',', $stubs);
 
-        if(array_keys($values) === range(0, count($values) - 1)){
+        if (array_keys($values) === range(0, count($values) - 1)) {
             //VALUES(val0, val1, val2)
             $context->appendSql("VALUES($stubs)");
 
-        }else{
+        }else {
             //(col0, col1, col2) VALUES(val0, val1, val2)
-            $columns = implode(',', array_map(function($k){return DB::wrap($k);}, array_keys($values)));
-            $context->appendSql("($columns) VALUES($stubs)",false);
+            $columns = implode(',', array_map(function($k) {return DB::wrap($k); }, array_keys($values)));
+            $context->appendSql("($columns) VALUES($stubs)", false);
         }
         $context->appendParams($params);
     }
     static public function batchValues(Context $context, array $values)
     {
         $count = count($values);
-        if($count == 0){
+        if ($count == 0) {
             return;
         }
         $keys = array_keys($values[0]);
         $row = implode(',', self::toSql(array_values($values[0])));
-        if($keys === range(0, count($keys) - 1)){
+        if ($keys === range(0, count($keys) - 1)) {
             //VALUES(val0, val1, val2)
             $context->appendSql("VALUES($row)");
-        }else{
+        }else {
             //(col0, col1, col2) VALUES(val0, val1, val2)
-            $columns = implode(',', array_map(function($k){return DB::wrap($k);}, $keys));
-            $context->appendSql("($columns) VALUES($row)",false);
+            $columns = implode(',', array_map(function($k) {return DB::wrap($k); }, $keys));
+            $context->appendSql("($columns) VALUES($row)", false);
         }
-        for($i=1; $i<$count; $i++){
+        for ($i = 1; $i<$count; $i++) {
             $value = self::pick($keys, $values[$i]);
             $row = implode(',', self::toSql($value));
-            $context->appendSql(", ($row)",false);
+            $context->appendSql(", ($row)", false);
         }
     }
 
     static protected function pick(array $keys, array $values)
     {
         $res = [];
-        foreach ($keys as $key){
+        foreach ($keys as $key) {
             array_key_exists($key, $values) or \PhpBoot\abort("key $key not exist from the given array");
             $res[$key] = $values[$key];
         }
@@ -178,12 +178,12 @@ 
     }
     static protected function toSql(array $values)
     {
-        foreach ($values as &$v){
-            if($v instanceof Raw){
+        foreach ($values as &$v) {
+            if ($v instanceof Raw) {
                 $v = $v->get();
-            }elseif(is_bool($v)){
-                $v = $v?'true':'false';
-            }elseif(!in_array(gettype($v), ['integer', 'boolean', 'double', 'float'])){
+            }elseif (is_bool($v)) {
+                $v = $v ? 'true' : 'false';
+            }elseif (!in_array(gettype($v), ['integer', 'boolean', 'double', 'float'])) {
                 $v = (string)$v;
                 $v = str_replace("\\", "\\\\", $v);
                 $v = str_replace("'", "\\'", $v);
@@ -196,7 +196,7 @@ 
 
 class UpdateImpl
 {
-    static public function update($context, $table){
+    static public function update($context, $table) {
         $table = DB::wrap($table);
         $context->appendSql("UPDATE $table");
     }
@@ -204,81 +204,81 @@ 
 
 class UpdateSetImpl
 {
-    public function set(Context $context, $expr, $args){
-        if(is_string($expr)){
+    public function set(Context $context, $expr, $args) {
+        if (is_string($expr)) {
             return $this->setExpr($context, $expr, $args);
-        }else{
+        }else {
             return $this->setArgs($context, $expr);
         }
     }
 
-    public function setExpr(Context $context, $expr, $args){
-        if($this->first){
+    public function setExpr(Context $context, $expr, $args) {
+        if ($this->first) {
             $this->first = false;
             $prefix = 'SET ';
-        }else{
+        }else {
             $prefix = ',';
         }
 
-        $context->appendSql("$prefix$expr",$prefix == 'SET ');
+        $context->appendSql("$prefix$expr", $prefix == 'SET ');
         $context->appendParams($args);
 
     }
-    public function setArgs(Context $context, $values){
+    public function setArgs(Context $context, $values) {
         $set = [];
         $params = [];
-        foreach ($values as $k=>$v){
+        foreach ($values as $k=>$v) {
             $k = DB::wrap($k);
-            if(is_a($v, Raw::class)){//直接拼接sql，不需要转义
-                $set[]= "$k=".$v->get();
-            }else{
-                $set[]= "$k=?";
-                $params[]=$v;
+            if (is_a($v, Raw::class)) {//直接拼接sql，不需要转义
+                $set[] = "$k=".$v->get();
+            }else {
+                $set[] = "$k=?";
+                $params[] = $v;
             }
         }
-        if($this->first){
+        if ($this->first) {
             $this->first = false;
             $context->appendSql('SET '.implode(',', $set));
             $context->appendParams($params);
-        }else{
-            $context->appendSql(','.implode(',', $set),false);
+        }else {
+            $context->appendSql(','.implode(',', $set), false);
             $context->appendParams($params);
         }
     }
-    private $first=true;
+    private $first = true;
 }
 class OrderByImpl
 {
-    public function orderByArgs(Context $context, $orders){
-        if(empty($orders)){
+    public function orderByArgs(Context $context, $orders) {
+        if (empty($orders)) {
             return $this;
         }
         $params = array();
-        foreach ($orders as $k=>$v){
-            if(is_integer($k)){
+        foreach ($orders as $k=>$v) {
+            if (is_integer($k)) {
                 $params[] = DB::wrap($v);
-            }else{
+            }else {
                 $k = DB::wrap($k);
 
                 $v = strtoupper($v);
-                ($v =='DESC' || $v =='ASC') or \PhpBoot\abort( new \InvalidArgumentException("invalid params for orderBy(".json_encode($orders).")"));
+                ($v == 'DESC' || $v == 'ASC') or \PhpBoot\abort(new \InvalidArgumentException("invalid params for orderBy(".json_encode($orders).")"));
 
                 $params[] = "$k $v";
             }
         }
-        if($this->first){
+        if ($this->first) {
             $this->first = false;
             $context->appendSql('ORDER BY '.implode(',', $params));
-        }else{
-            $context->appendSql(','.implode(',', $params),false);
+        }else {
+            $context->appendSql(','.implode(',', $params), false);
         }
         return $this;
     }
-    public function orderBy(Context $context, $column, $order=null){
-        if(is_string($column)){
-            if($order === null){
+    public function orderBy(Context $context, $column, $order = null) {
+        if (is_string($column)) {
+            if ($order === null) {
                 $column = [$column];
-            }else{
+            }else {
                 $column = [$column=>$order];
             }
         }
@@ -286,18 +286,18 @@ 
 
 
     }
-    private $first=true;
+    private $first = true;
 }
 
 class LimitImpl
 {
-    static public function limit(Context $context, $size){
+    static public function limit(Context $context, $size) {
         $intSize = intval($size);
         strval($intSize) == $size or \PhpBoot\abort(
             new \InvalidArgumentException("invalid params for limit($size)"));
         $context->appendSql("LIMIT $size");
     }
-    static public function limitWithOffset(Context $context, $start, $size){
+    static public function limitWithOffset(Context $context, $start, $size) {
         $intStart = intval($start);
         $intSize = intval($size);
         strval($intStart) == $start && strval($intSize) == $size or \PhpBoot\abort(
@@ -306,31 +306,31 @@ 
     }
 }
 
-class WhereImpl{
+class WhereImpl {
 
-    static private function findQ($str,$offset = 0,$no=0){
+    static private function findQ($str, $offset = 0, $no = 0) {
         $found = strpos($str, '?', $offset);
-        if($no == 0 || $found === false){
+        if ($no == 0 || $found === false) {
             return $found;
         }
-        return self::findQ($str, $found+1, $no-1);
+        return self::findQ($str, $found + 1, $no - 1);
     }
 
-    static public function where(Context $context, $prefix, $expr, $args){
-        if(empty($expr)){
+    static public function where(Context $context, $prefix, $expr, $args) {
+        if (empty($expr)) {
             return;
         }
-        if(is_callable($expr)){
-            self::conditionClosure($context,$prefix, $expr);
-        }elseif (is_string($expr)){
+        if (is_callable($expr)) {
+            self::conditionClosure($context, $prefix, $expr);
+        }elseif (is_string($expr)) {
             self::condition($context, $prefix, $expr, $args);
-        }else{
+        }else {
             self::conditionArgs($context, $prefix, $expr);
         }
 
     }
 
-    static public function conditionClosure(Context $context, $prefix, callable $callback){
+    static public function conditionClosure(Context $context, $prefix, callable $callback) {
         $context->appendSql($prefix.' (');
         $callback($context);
         $context->appendSql(')');
@@ -356,15 +356,15 @@ 
      * NOT IN   'id'=>['NOT IN' => [1,2,3]]
      * @return void
      */
-    static public function conditionArgs(Context $context, $prefix, $args=[]){
-        if($args ===null){
-            return ;
+    static public function conditionArgs(Context $context, $prefix, $args = []) {
+        if ($args === null) {
+            return;
         }
         $exprs = array();
         $params = array();
-        foreach ($args as $k => $v){
+        foreach ($args as $k => $v) {
             $k = DB::wrap($k);
-            if(!is_array($v)){
+            if (!is_array($v)) {
                 $v = ['='=>$v];
             }
 
@@ -376,56 +376,56 @@ 
                 new \InvalidArgumentException("invalid param $op for whereArgs"));
 
             $var = array_values($v)[0];
-            if($op == 'IN' || $op == 'NOT IN'){
+            if ($op == 'IN' || $op == 'NOT IN') {
                 $stubs = [];
 
-                if($var instanceof BasicRule){
+                if ($var instanceof BasicRule) {
                     $stubs = "({$var->context->sql})";
                     $params = array_merge($params, $var->context->params);
                     $exprs[] = "$k $op $stubs";
-                }else{
-                    foreach ($var as $i){
-                        if(is_a($i, Raw::class)){
-                            $stubs[]=strval($i);
-                        }elseif($i instanceof BasicRule){
+                }else {
+                    foreach ($var as $i) {
+                        if (is_a($i, Raw::class)) {
+                            $stubs[] = strval($i);
+                        }elseif ($i instanceof BasicRule) {
                             $stubs = "({$i->context->sql})";
                             $params = array_merge($params, $i->context->params);
-                        }else{
-                            $stubs[]='?';
+                        }else {
+                            $stubs[] = '?';
                             $params[] = $i;
                         }
                     }
                     $stubs = implode(',', $stubs);
                     $exprs[] = "$k $op ($stubs)";
                 }
-            }else if($op == 'BETWEEN'){
+            }else if ($op == 'BETWEEN') {
                 $cond = "$k BETWEEN";
-                if(is_a($var[0], Raw::class)){
+                if (is_a($var[0], Raw::class)) {
                     $cond = "$cond ".strval($var[0]);
-                }elseif($var[0] instanceof BasicRule){
+                }elseif ($var[0] instanceof BasicRule) {
                     $cond = "$cond ({$var[0]->context->sql})";
                     $params = array_merge($params, $var[0]->context->params);
-                }else{
+                }else {
                     $cond = "$cond ?";
                     $params[] = $var[0];
                 }
-                if(is_a($var[1], Raw::class)){
+                if (is_a($var[1], Raw::class)) {
                     $cond = "$cond AND ".strval($var[1]);
-                }elseif($var[1] instanceof BasicRule){
+                }elseif ($var[1] instanceof BasicRule) {
                     $cond = "$cond AND ({$var[1]->context->sql})";
                     $params = array_merge($params, $var[1]->context->params);
-                }else{
+                }else {
                     $cond = "$cond AND ?";
                     $params[] = $var[1];
                 }
                 $exprs[] = $cond;
-            }else{
-                if(is_a($var, Raw::class)){
+            }else {
+                if (is_a($var, Raw::class)) {
                     $exprs[] = "$k $op ".strval($var);
-                }elseif($var instanceof BasicRule){
+                }elseif ($var instanceof BasicRule) {
                     $exprs[] = "$k $op {$var->context->sql}";
                     $params = array_merge($params, $var->context->params);
-                }else{
+                }else {
                     $exprs[] = "$k $op ?";
                     $params[] = $var;
                 }
@@ -434,22 +434,22 @@ 
 
         self::condition($context, $prefix, implode(' AND ', $exprs), $params);
     }
-    static public function condition(Context $context, $prefix, $expr, $args){
-        if(!empty($expr)){
+    static public function condition(Context $context, $prefix, $expr, $args) {
+        if (!empty($expr)) {
             $expr = "($expr)";
-            if($args){
+            if ($args) {
                 //因为PDO不支持绑定数组变量, 这里需要手动展开数组
                 //也就是说把 where("id IN(?)", [1,2])  展开成 where("id IN(?,?)", 1,2)
                 $cutted = null;
                 $cut = null;
                 $toReplace = array();
 
-                $newArgs=array();
+                $newArgs = array();
                 //找到所有数组对应的?符位置
-                foreach ($args as $k =>$arg){
-                    if(is_array($arg) || is_a($arg, Raw::class) || is_a($arg, BasicRule::class)){
+                foreach ($args as $k =>$arg) {
+                    if (is_array($arg) || is_a($arg, Raw::class) || is_a($arg, BasicRule::class)) {
 
-                        if(!$cutted){
+                        if (!$cutted) {
                             $cut = new NestedStringCut($expr);
                             $cutted = $cut->getText();
                         }
@@ -459,54 +459,54 @@ 
                         $pos !== false or \PhpBoot\abort(
                             new \InvalidArgumentException("unmatched params and ? @ $expr"));
 
-                        if(is_array($arg)){
+                        if (is_array($arg)) {
                             $stubs = [];
-                            foreach ($arg as $i){
-                                if(is_a($i, Raw::class)){
+                            foreach ($arg as $i) {
+                                if (is_a($i, Raw::class)) {
                                     $stubs[] = strval($i);
-                                }else{
+                                }else {
                                     $stubs[] = '?';
                                     $newArgs[] = $i;
                                 }
                             }
                             $stubs = implode(',', $stubs);
-                        }elseif($arg instanceof BasicRule){
+                        }elseif ($arg instanceof BasicRule) {
                             $stubs = "({$arg->context->sql})";
                             $newArgs = array_merge($newArgs, $arg->context->params);
-                        }else{
+                        }else {
                             $stubs = strval($arg);
                         }
                         $toReplace[] = [$pos, $stubs];
 
-                    }else{
-                        $newArgs[]=$arg;
+                    }else {
+                        $newArgs[] = $arg;
                     }
                 }
 
-                if(count($toReplace)){
+                if (count($toReplace)) {
                     $toReplace = array_reverse($toReplace);
-                    foreach ($toReplace as $i){
+                    foreach ($toReplace as $i) {
                         list($pos, $v) = $i;
-                        $expr = substr($expr, 0, $pos).$v.substr($expr, $pos+1);
+                        $expr = substr($expr, 0, $pos).$v.substr($expr, $pos + 1);
                     }
                     $args = $newArgs;
                 }
             }
-            if($prefix){
+            if ($prefix) {
                 $context->appendSql($prefix.' '.$expr);
-            }else{
+            }else {
                 $context->appendSql($expr);
             }
 
-            if($args){
+            if ($args) {
                 $context->appendParams($args);
             }
         }
     }
 }
 
-class GroupByImpl{
-    static public function groupBy(Context $context, $column){
+class GroupByImpl {
+    static public function groupBy(Context $context, $column) {
         $column = DB::wrap($column);
         $context->appendSql("GROUP BY $column");
     }
@@ -522,12 +522,12 @@ 
      * @throws DBException|\Exception
      */
     static public function exec($context) {
-        try{
+        try {
             $st = $context->connection->prepare($context->sql);
             $success = $st->execute($context->params);
             return new ExecResult($success, $context->connection, $st);
-        }catch (\Exception $e){
-            \PhpBoot\abort(new DBException($context, $e->getMessage(),$e->getCode(), $e), ['sql'=>$context->sql, 'params'=>$context->params] );
+        }catch (\Exception $e) {
+            \PhpBoot\abort(new DBException($context, $e->getMessage(), $e->getCode(), $e), ['sql'=>$context->sql, 'params'=>$context->params]);
             return null;
         }
     }
@@ -538,25 +538,25 @@ 
      * @return false|array
      * @throws DBException|\Exception
      */
-    static public function get($context, $dictAs=false){
+    static public function get($context, $dictAs = false) {
 
-        try{
+        try {
             $st = $context->connection->prepare($context->sql);
-            if($st->execute($context->params)){
+            if ($st->execute($context->params)) {
                 $res = $st->fetchAll(\PDO::FETCH_ASSOC);
-                if ($dictAs){
-                    $dict= [];
-                    foreach ($res as $i){
-                        $dict[$i[$dictAs]]=$i;
+                if ($dictAs) {
+                    $dict = [];
+                    foreach ($res as $i) {
+                        $dict[$i[$dictAs]] = $i;
                     }
                     return $context->handleResult($dict);
                 }
                 return $context->handleResult($res);
-            }else{
+            }else {
                 return false;
             }
-        }catch (\Exception $e){
-            \PhpBoot\abort(new DBException($context, $e->getMessage(),$e->getCode(), $e), ['sql'=>$context->sql, 'params'=>$context->params] );
+        }catch (\Exception $e) {
+            \PhpBoot\abort(new DBException($context, $e->getMessage(), $e->getCode(), $e), ['sql'=>$context->sql, 'params'=>$context->params]);
             return false;
         }
 
@@ -567,23 +567,23 @@ 
      * @return int|false
      * @throws DBException|\Exception
      */
-    static public function count($context){
+    static public function count($context) {
 
         $found = [];
-        if(!preg_match('/\bselect\b/i', $context->sql, $found, PREG_OFFSET_CAPTURE) ||
-            count($found)==0){
+        if (!preg_match('/\bselect\b/i', $context->sql, $found, PREG_OFFSET_CAPTURE) ||
+            count($found) == 0) {
             \PhpBoot\abort(new \PDOException("can not use count(*) without select"));
         }
         list($chars, $columnBegin) = $found[0];
-        $columnBegin = $columnBegin + strlen('select')+1;
+        $columnBegin = $columnBegin + strlen('select') + 1;
 
         $columnEnd = 0;
         $found = [];
-        try{
-            if(!preg_match('/\bfrom\b/i', $context->sql, $found, PREG_OFFSET_CAPTURE) ||
-                count($found)==0){
+        try {
+            if (!preg_match('/\bfrom\b/i', $context->sql, $found, PREG_OFFSET_CAPTURE) ||
+                count($found) == 0) {
                 $columnEnd = strlen($context->sql);
-            }else{
+            }else {
                 list($chars, $columnEnd) = $found[0];
             }
             $sql = substr($context->sql, 0, $columnBegin);
@@ -591,61 +591,61 @@ 
             $sql .= substr($context->sql, $columnEnd);
 
             $st = $context->connection->prepare($sql);
-            if($st->execute($context->params)){
+            if ($st->execute($context->params)) {
                 $res = $st->fetchAll(\PDO::FETCH_ASSOC);
                 return intval($res[0]['count']);
-            }else{
+            }else {
                 return false;
             }
-        }catch (\Exception $e){
-            \PhpBoot\abort(new DBException($context, $e->getMessage(),$e->getCode(), $e), ['sql'=>$context->sql, 'params'=>$context->params] );
+        }catch (\Exception $e) {
+            \PhpBoot\abort(new DBException($context, $e->getMessage(), $e->getCode(), $e), ['sql'=>$context->sql, 'params'=>$context->params]);
             return false;
         }
     }
 }
 class OnDuplicateKeyUpdateImpl
 {
-    public function set($context, $column, $value){
-        if(is_string($column)){
+    public function set($context, $column, $value) {
+        if (is_string($column)) {
             $this->setExpr($context, $column, $value);
-        }else{
+        }else {
             $this->setArgs($context, $column);
         }
     }
 
-    public function setExpr($context, $expr, $args){
+    public function setExpr($context, $expr, $args) {
         $prefix = '';
-        if($this->first){
+        if ($this->first) {
             $this->first = false;
             $prefix = 'ON DUPLICATE KEY UPDATE ';
-        }else{
+        }else {
             $prefix = ',';
         }
 
-        $context->appendSql("$prefix$expr",$prefix == 'ON DUPLICATE KEY UPDATE ');
+        $context->appendSql("$prefix$expr", $prefix == 'ON DUPLICATE KEY UPDATE ');
         $context->appendParams($args);
 
     }
-    public function setArgs($context, $values){
+    public function setArgs($context, $values) {
         $set = [];
         $params = [];
-        foreach ($values as $k=>$v){
+        foreach ($values as $k=>$v) {
             $k = DB::wrap($k);
-            if(is_a($v, Raw::class)){//直接拼接sql，不需要转义
-                $set[]= "$k=".$v->get();
-            }else{
-                $set[]= "$k=?";
-                $params[]=$v;
+            if (is_a($v, Raw::class)) {//直接拼接sql，不需要转义
+                $set[] = "$k=".$v->get();
+            }else {
+                $set[] = "$k=?";
+                $params[] = $v;
             }
         }
-        if($this->first){
+        if ($this->first) {
             $this->first = false;
             $context->appendSql('ON DUPLICATE KEY UPDATE '.implode(',', $set));
             $context->appendParams($params);
-        }else{
-            $context->appendSql(','.implode(',', $set),false);
+        }else {
+            $context->appendSql(','.implode(',', $set), false);
             $context->appendParams($params);
         }
     }
-    private $first=true;
+    private $first = true;
 }

Braces +42 added lines, -42 removed lines

@@ -53,7 +53,7 @@ 
         if($tables instanceof BasicRule){
             $context->appendSql("FROM (".$tables->context->sql.')');
             $context->params = array_merge($context->params,$tables->context->params);
-        }else {
+        } else {
             $context->appendSql("FROM ".DB::wrap($tables));
         }
         if($as){
@@ -76,7 +76,7 @@ 
         $table = DB::wrap($table);
         if($type){
             $context->appendSql("$type JOIN $table");
-        }else{
+        } else{
             $context->appendSql("JOIN $table");
         }
     }
@@ -126,7 +126,7 @@ 
         foreach ($values as $v){
             if(is_a($v, Raw::class)){//直接拼接sql，不需要转义
                 $stubs[]=$v->get();
-            }else{
+            } else{
                 $stubs[]='?';
                 $params[] = $v;
             }
@@ -137,7 +137,7 @@ 
             //VALUES(val0, val1, val2)
             $context->appendSql("VALUES($stubs)");
 
-        }else{
+        } else{
             //(col0, col1, col2) VALUES(val0, val1, val2)
             $columns = implode(',', array_map(function($k){return DB::wrap($k);}, array_keys($values)));
             $context->appendSql("($columns) VALUES($stubs)",false);
@@ -155,7 +155,7 @@ 
         if($keys === range(0, count($keys) - 1)){
             //VALUES(val0, val1, val2)
             $context->appendSql("VALUES($row)");
-        }else{
+        } else{
             //(col0, col1, col2) VALUES(val0, val1, val2)
             $columns = implode(',', array_map(function($k){return DB::wrap($k);}, $keys));
             $context->appendSql("($columns) VALUES($row)",false);
@@ -181,9 +181,9 @@ 
         foreach ($values as &$v){
             if($v instanceof Raw){
                 $v = $v->get();
-            }elseif(is_bool($v)){
+            } elseif(is_bool($v)){
                 $v = $v?'true':'false';
-            }elseif(!in_array(gettype($v), ['integer', 'boolean', 'double', 'float'])){
+            } elseif(!in_array(gettype($v), ['integer', 'boolean', 'double', 'float'])){
                 $v = (string)$v;
                 $v = str_replace("\\", "\\\\", $v);
                 $v = str_replace("'", "\\'", $v);
@@ -207,7 +207,7 @@ 
     public function set(Context $context, $expr, $args){
         if(is_string($expr)){
             return $this->setExpr($context, $expr, $args);
-        }else{
+        } else{
             return $this->setArgs($context, $expr);
         }
     }
@@ -216,7 +216,7 @@ 
         if($this->first){
             $this->first = false;
             $prefix = 'SET ';
-        }else{
+        } else{
             $prefix = ',';
         }
 
@@ -231,7 +231,7 @@ 
             $k = DB::wrap($k);
             if(is_a($v, Raw::class)){//直接拼接sql，不需要转义
                 $set[]= "$k=".$v->get();
-            }else{
+            } else{
                 $set[]= "$k=?";
                 $params[]=$v;
             }
@@ -240,7 +240,7 @@ 
             $this->first = false;
             $context->appendSql('SET '.implode(',', $set));
             $context->appendParams($params);
-        }else{
+        } else{
             $context->appendSql(','.implode(',', $set),false);
             $context->appendParams($params);
         }
@@ -257,7 +257,7 @@ 
         foreach ($orders as $k=>$v){
             if(is_integer($k)){
                 $params[] = DB::wrap($v);
-            }else{
+            } else{
                 $k = DB::wrap($k);
 
                 $v = strtoupper($v);
@@ -269,7 +269,7 @@ 
         if($this->first){
             $this->first = false;
             $context->appendSql('ORDER BY '.implode(',', $params));
-        }else{
+        } else{
             $context->appendSql(','.implode(',', $params),false);
         }
         return $this;
@@ -278,7 +278,7 @@ 
         if(is_string($column)){
             if($order === null){
                 $column = [$column];
-            }else{
+            } else{
                 $column = [$column=>$order];
             }
         }
@@ -322,9 +322,9 @@ 
         }
         if(is_callable($expr)){
             self::conditionClosure($context,$prefix, $expr);
-        }elseif (is_string($expr)){
+        } elseif (is_string($expr)){
             self::condition($context, $prefix, $expr, $args);
-        }else{
+        } else{
             self::conditionArgs($context, $prefix, $expr);
         }
 
@@ -383,14 +383,14 @@ 
                     $stubs = "({$var->context->sql})";
                     $params = array_merge($params, $var->context->params);
                     $exprs[] = "$k $op $stubs";
-                }else{
+                } else{
                     foreach ($var as $i){
                         if(is_a($i, Raw::class)){
                             $stubs[]=strval($i);
-                        }elseif($i instanceof BasicRule){
+                        } elseif($i instanceof BasicRule){
                             $stubs = "({$i->context->sql})";
                             $params = array_merge($params, $i->context->params);
-                        }else{
+                        } else{
                             $stubs[]='?';
                             $params[] = $i;
                         }
@@ -398,34 +398,34 @@ 
                     $stubs = implode(',', $stubs);
                     $exprs[] = "$k $op ($stubs)";
                 }
-            }else if($op == 'BETWEEN'){
+            } else if($op == 'BETWEEN'){
                 $cond = "$k BETWEEN";
                 if(is_a($var[0], Raw::class)){
                     $cond = "$cond ".strval($var[0]);
-                }elseif($var[0] instanceof BasicRule){
+                } elseif($var[0] instanceof BasicRule){
                     $cond = "$cond ({$var[0]->context->sql})";
                     $params = array_merge($params, $var[0]->context->params);
-                }else{
+                } else{
                     $cond = "$cond ?";
                     $params[] = $var[0];
                 }
                 if(is_a($var[1], Raw::class)){
                     $cond = "$cond AND ".strval($var[1]);
-                }elseif($var[1] instanceof BasicRule){
+                } elseif($var[1] instanceof BasicRule){
                     $cond = "$cond AND ({$var[1]->context->sql})";
                     $params = array_merge($params, $var[1]->context->params);
-                }else{
+                } else{
                     $cond = "$cond AND ?";
                     $params[] = $var[1];
                 }
                 $exprs[] = $cond;
-            }else{
+            } else{
                 if(is_a($var, Raw::class)){
                     $exprs[] = "$k $op ".strval($var);
-                }elseif($var instanceof BasicRule){
+                } elseif($var instanceof BasicRule){
                     $exprs[] = "$k $op {$var->context->sql}";
                     $params = array_merge($params, $var->context->params);
-                }else{
+                } else{
                     $exprs[] = "$k $op ?";
                     $params[] = $var;
                 }
@@ -464,21 +464,21 @@ 
                             foreach ($arg as $i){
                                 if(is_a($i, Raw::class)){
                                     $stubs[] = strval($i);
-                                }else{
+                                } else{
                                     $stubs[] = '?';
                                     $newArgs[] = $i;
                                 }
                             }
                             $stubs = implode(',', $stubs);
-                        }elseif($arg instanceof BasicRule){
+                        } elseif($arg instanceof BasicRule){
                             $stubs = "({$arg->context->sql})";
                             $newArgs = array_merge($newArgs, $arg->context->params);
-                        }else{
+                        } else{
                             $stubs = strval($arg);
                         }
                         $toReplace[] = [$pos, $stubs];
 
-                    }else{
+                    } else{
                         $newArgs[]=$arg;
                     }
                 }
@@ -494,7 +494,7 @@ 
             }
             if($prefix){
                 $context->appendSql($prefix.' '.$expr);
-            }else{
+            } else{
                 $context->appendSql($expr);
             }
 
@@ -526,7 +526,7 @@ 
             $st = $context->connection->prepare($context->sql);
             $success = $st->execute($context->params);
             return new ExecResult($success, $context->connection, $st);
-        }catch (\Exception $e){
+        } catch (\Exception $e){
             \PhpBoot\abort(new DBException($context, $e->getMessage(),$e->getCode(), $e), ['sql'=>$context->sql, 'params'=>$context->params] );
             return null;
         }
@@ -552,10 +552,10 @@ 
                     return $context->handleResult($dict);
                 }
                 return $context->handleResult($res);
-            }else{
+            } else{
                 return false;
             }
-        }catch (\Exception $e){
+        } catch (\Exception $e){
             \PhpBoot\abort(new DBException($context, $e->getMessage(),$e->getCode(), $e), ['sql'=>$context->sql, 'params'=>$context->params] );
             return false;
         }
@@ -583,7 +583,7 @@ 
             if(!preg_match('/\bfrom\b/i', $context->sql, $found, PREG_OFFSET_CAPTURE) ||
                 count($found)==0){
                 $columnEnd = strlen($context->sql);
-            }else{
+            } else{
                 list($chars, $columnEnd) = $found[0];
             }
             $sql = substr($context->sql, 0, $columnBegin);
@@ -594,10 +594,10 @@ 
             if($st->execute($context->params)){
                 $res = $st->fetchAll(\PDO::FETCH_ASSOC);
                 return intval($res[0]['count']);
-            }else{
+            } else{
                 return false;
             }
-        }catch (\Exception $e){
+        } catch (\Exception $e){
             \PhpBoot\abort(new DBException($context, $e->getMessage(),$e->getCode(), $e), ['sql'=>$context->sql, 'params'=>$context->params] );
             return false;
         }
@@ -608,7 +608,7 @@ 
     public function set($context, $column, $value){
         if(is_string($column)){
             $this->setExpr($context, $column, $value);
-        }else{
+        } else{
             $this->setArgs($context, $column);
         }
     }
@@ -618,7 +618,7 @@ 
         if($this->first){
             $this->first = false;
             $prefix = 'ON DUPLICATE KEY UPDATE ';
-        }else{
+        } else{
             $prefix = ',';
         }
 
@@ -633,7 +633,7 @@ 
             $k = DB::wrap($k);
             if(is_a($v, Raw::class)){//直接拼接sql，不需要转义
                 $set[]= "$k=".$v->get();
-            }else{
+            } else{
                 $set[]= "$k=?";
                 $params[]=$v;
             }
@@ -642,7 +642,7 @@ 
             $this->first = false;
             $context->appendSql('ON DUPLICATE KEY UPDATE '.implode(',', $set));
             $context->appendParams($params);
-        }else{
+        } else{
             $context->appendSql(','.implode(',', $set),false);
             $context->appendParams($params);
         }