caoym / phpboot

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/rules/update.php

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

Indentation -2 removed lines

@@ -31,7 +31,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 $_
@@ -52,7 +51,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 $_

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;
     }
@@ -58,7 +58,7 @@ 
      * @param mixed $_
      * @return WhereRule
      */
-    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/DB/rules/basic.php

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