caoym / phpboot

src/Annotation/AnnotationReader.php

Doc Comments +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
         }
     }
     /**
-     * @param $className
+     * @param string $className
      * @return self
      */
     static function readWithoutCache($className)

Braces +3 added lines, -3 removed lines

@@ -62,13 +62,13 @@
                 $meta = self::readWithoutCache($className);
                 $cache->set($key, $meta, 0, $fileName?new ClassModifiedChecker($className):null);
                 return $meta;
-            }catch (\Exception $e){
+            } catch (\Exception $e){
                 $cache->set($key, $e->getMessage(), 0, $fileName?new ClassModifiedChecker($className):null);
                 throw $e;
             }
-        }elseif(is_string($res)){
+        } elseif(is_string($res)){
             \PhpBoot\abort($res);
-        }else{
+        } else{
             return $res;
         }
     }

src/Annotation/AnnotationTag.php

Doc Comments -1 removed lines

@@ -8,7 +8,6 @@
     /**
      * AnnotationTag constructor.
      * @param string $name
-     * @param string $summary
      * @param string $description
      * @param array $children
      * @param AnnotationBlock|AnnotationTag|null $parent

src/Application.php

Doc Comments +1 added lines, -1 removed lines

@@ -375,7 +375,7 @@
     }
 
     /**
-     * @return \string[]
+     * @return string[]
      */
     public function getGlobalHooks()
     {

Braces +3 added lines, -3 removed lines

@@ -87,7 +87,7 @@ 
             $default += [
                 Cache::class => \DI\object(ApcCache::class)
             ];
-        }else{
+        } else{
             $default += [
                 Cache::class => \DI\object(FilesystemCache::class)
                     ->constructorParameter('directory', sys_get_temp_dir())
@@ -270,7 +270,7 @@ 
                     }
                     return $next($request);
 
-                }elseif ($res[0] == Dispatcher::NOT_FOUND) {
+                } elseif ($res[0] == Dispatcher::NOT_FOUND) {
                     \PhpBoot\abort(new NotFoundHttpException(), [$request->getMethod(), $uri]);
                 } elseif ($res[0] == Dispatcher::METHOD_NOT_ALLOWED) {
                     \PhpBoot\abort(new MethodNotAllowedHttpException($res[1]), [$request->getMethod(), $uri]);
@@ -294,7 +294,7 @@ 
             }
             return $response;
 
-        }catch (\Exception $e){
+        } catch (\Exception $e){
             $renderer->render($e);
         }
 

src/Cache/ClassModifiedChecker.php

Doc Comments +3 added lines

@@ -4,6 +4,9 @@
 
 class ClassModifiedChecker extends FileModifiedChecker
 {
+    /**
+     * @param string $className
+     */
     function __construct($className){
         $class = new \ReflectionClass($className);
         $files = [];

src/Controller/RequestHandler.php

Doc Comments +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
 
     /**
      * 获取指定参数信息
-     * @param $name
+     * @param string|null $name
      * @return ParamMeta|null
      */
     public function getParamMeta($name){

Braces +3 added lines, -3 removed lines

@@ -45,13 +45,13 @@ 
                 }
                 if($meta->container){
                     $inputs[$meta->name] = $meta->container->make($source);
-                }else{
+                } else{
                     $inputs[$meta->name] = $source;
                 }
                 if($meta->validation){
                     $vld->rule($meta->validation, $meta->name);
                 }
-            }else{
+            } else{
                 $meta->isOptional or \PhpBoot\abort(new BadRequestHttpException("param $source is required"));
                 $inputs[$meta->name] = $meta->default;
             }
@@ -69,7 +69,7 @@ 
         foreach ($this->paramMetas as $meta){
             if($meta->isPassedByReference){
                 $params[$pos] = &$reference[$meta->name];
-            }else{
+            } else{
                 $params[$pos] = $inputs[$meta->name];
             }
             $pos++;

src/DB/DB.php

Doc Comments +3 added lines

@@ -82,6 +82,9 @@
         return new DB($app, $connection);
     }
 
+    /**
+     * @param \PDO $connection
+     */
     public function __construct(Application $app, $connection)
     {
         $this->app = $app;

Braces +2 added lines, -2 removed lines

@@ -100,9 +100,9 @@
         $obj = new SelectRule(new Context($this->connection));
         if($column0 == null){
             $args = ['*'];
-        }elseif(is_array($column0)){
+        } elseif(is_array($column0)){
             $args = $column0;
-        }else{
+        } else{
             $args = func_get_args();
         }
         foreach ($args as &$arg){

src/DB/impls.php

Doc Comments +116 added lines, -1 removed lines

@@ -7,6 +7,11 @@ 
 use PhpBoot\DB\Context;
 
 class ExecResult{
+
+    /**
+     * @param \PDO $pdo
+     * @param \PDOStatement $st
+     */
     public function __construct($success, $pdo, $st){
         $this->pdo = $pdo;
         $this->st = $st;
@@ -40,6 +45,10 @@ 
 
 class SelectImpl
 {
+    /**
+     * @param Context $context
+     * @param string $columns
+     */
     static  public function select($context, $columns){
         $context->appendSql("SELECT $columns");
     }
@@ -47,6 +56,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.')');
@@ -62,6 +75,10 @@ 
 
 class DeleteImpl
 {
+    /**
+     * @param Context $context
+     * @param string $from
+     */
     static public function deleteFrom($context, $from)
     {
         $context->appendSql("DELETE FROM `$from`");
@@ -70,6 +87,11 @@ 
 
 class JoinImpl
 {
+    /**
+     * @param Context $context
+     * @param null|string $type
+     * @param string $table
+     */
     static public function join($context, $type, $table) {
         if($type){
             $context->appendSql("$type JOIN $table");
@@ -81,6 +103,10 @@ 
 
 class JoinOnImpl
 {
+    /**
+     * @param Context $context
+     * @param string $condition
+     */
     static public function on($context, $condition) {
         $context->appendSql("ON $condition");
     }
@@ -88,6 +114,9 @@ 
 
 class ForUpdateImpl
 {
+    /**
+     * @param Context $context
+     */
     static public function forUpdate($context){
         $context->appendSql("FOR UPDATE");
     }
@@ -95,6 +124,10 @@ 
 
 class ForUpdateOfImpl
 {
+    /**
+     * @param Context $context
+     * @param string $column
+     */
     static public function of($context, $column){
         $context->appendSql("OF $column");
     }
@@ -102,18 +135,29 @@ 
 
 class InsertImpl
 {
+    /**
+     * @param Context $context
+     * @param string $table
+     */
     static public function insertInto($context, $table) {
         $context->appendSql("INSERT INTO `$table`");
     }
 }
 class ReplaceImpl
 {
+    /**
+     * @param Context $context
+     * @param string $table
+     */
     static public function replaceInto($context, $table) {
         $context->appendSql("REPLACE INTO `$table`");
     }
 }
 class ValuesImpl
 {
+    /**
+     * @param Context $context
+     */
     static public function values($context, $values){
         $params = [];
         $stubs = [];
@@ -143,6 +187,10 @@ 
 
 class UpdateImpl
 {
+    /**
+     * @param Context $context
+     * @param string $table
+     */
     static public function update($context, $table){
         $context->appendSql("UPDATE `$table`");
     }
@@ -150,6 +198,10 @@ 
 
 class UpdateSetImpl
 {
+    /**
+     * @param Context $context
+     * @param string $column
+     */
     public function set($context, $column, $value){
         $prefix = '';
         if($this->first){
@@ -166,6 +218,10 @@ 
         }
     }
 
+    /**
+     * @param Context $context
+     * @param string $expr
+     */
     public function setExpr($context, $expr, $args){
         $prefix = '';
         if($this->first){
@@ -179,6 +235,10 @@ 
         $context->appendParams($args);
 
     }
+
+    /**
+     * @param Context $context
+     */
     public function setArgs($context, $values){
         $set = [];
         $params = [];
@@ -203,6 +263,9 @@ 
 }
 class OrderByImpl
 {
+    /**
+     * @param Context $context
+     */
     public function orderByArgs($context, $orders){
         if(empty($orders)){
             return $this;
@@ -230,6 +293,12 @@ 
         }
         return $this;
     }
+
+    /**
+     * @param Context $context
+     * @param string $column
+     * @param string $order
+     */
     public function orderBy($context, $column, $order=null){
         if($this->first){
             $this->first = false;
@@ -247,12 +316,22 @@ 
 
 class LimitImpl
 {
+    /**
+     * @param Context $context
+     * @param integer $size
+     */
     static public function limit($context, $size){
         $intSize = intval($size);
         strval($intSize) == $size or \PhpBoot\abort(
             new \InvalidArgumentException("invalid params for limit($size)"));
         $context->appendSql("LIMIT $size");
     }
+
+    /**
+     * @param Context $context
+     * @param integer $start
+     * @param integer $size
+     */
     static public function limitWithOffset($context,$start, $size){
         $intStart = intval($start);
         $intSize = intval($size);
@@ -264,6 +343,9 @@ 
 
 class WhereImpl{
 
+    /**
+     * @param string $str
+     */
     static private function  findQ($str,$offset = 0,$no=0){
         $found = strpos($str, '?', $offset);
         if($no == 0 || $found === false){
@@ -271,16 +353,33 @@ 
         }
         return self::findQ($str, $found+1, $no-1);
     }
+
+    /**
+     * @param Context $context
+     * @param string $expr
+     */
     static public function having($context, $expr, $args){
         self::condition($context, 'HAVING', $expr, $args);
     }
+
+    /**
+     * @param Context $context
+     * @param string $expr
+     */
     static public function where($context, $expr, $args){
         self::condition($context, 'WHERE', $expr, $args);
     }
 
+    /**
+     * @param Context $context
+     */
     static public function havingArgs($context, $args){
         self::conditionArgs($context, 'HAVING', $args);
     }
+
+    /**
+     * @param Context $context
+     */
     static public function whereArgs($context, $args){
         self::conditionArgs($context, 'WHERE', $args);
     }
@@ -305,6 +404,7 @@ 
      * NOT IN   'id'=>['NOT IN' => [1,2,3]]
      *
      * @param array $args
+     * @param string $prefix
      */
     static public function conditionArgs($context, $prefix, $args=[]){
         if($args ===null){
@@ -432,6 +532,11 @@ 
 }
 
 class GroupByImpl{
+
+    /**
+     * @param Context $context
+     * @param string $column
+     */
     static public function groupBy($context, $column){
         $context->appendSql("GROUP BY $column");
     }
@@ -453,7 +558,6 @@ 
     /**
      *
      * @param Context $context
-     * @param string|false $asDict return  as dict or array
      * @return false|array
      */
     static public function get($context, $dictAs=false){
@@ -512,6 +616,10 @@ 
 }
 class OnDuplicateKeyUpdateImpl
 {
+    /**
+     * @param Context $context
+     * @param string $column
+     */
     public function set($context, $column, $value){
         $prefix = '';
         if($this->first){
@@ -528,6 +636,9 @@ 
         }
     }
 
+    /**
+     * @param Context $context
+     */
     public function setExpr($context, $expr, $args){
         $prefix = '';
         if($this->first){
@@ -541,6 +652,10 @@ 
         $context->appendParams($args);
 
     }
+
+    /**
+     * @param Context $context
+     */
     public function setArgs($context, $values){
         $set = [];
         $params = [];

Braces +31 added lines, -31 removed lines

@@ -51,7 +51,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 `$tables`");
         }
         if($as){
@@ -73,7 +73,7 @@ 
     static public function join($context, $type, $table) {
         if($type){
             $context->appendSql("$type JOIN $table");
-        }else{
+        } else{
             $context->appendSql("JOIN $table");
         }
     }
@@ -120,7 +120,7 @@ 
         foreach ($values as $v){
             if(is_a($v, Raw::class)){//直接拼接sql，不需要转义
                 $stubs[]=$v->get();
-            }else{
+            } else{
                 $stubs[]='?';
                 $params[] = $v;
             }
@@ -131,7 +131,7 @@ 
             //VALUES(val0, val1, val2)
             $context->appendSql("VALUES($stubs)");
 
-        }else{
+        } else{
             //(col0, col1, col2) VALUES(val0, val1, val2)
             $columns = implode(',', array_keys($values));
             $context->appendSql("($columns) VALUES($stubs)",false);
@@ -155,12 +155,12 @@ 
         if($this->first){
             $this->first = false;
             $prefix = 'SET ';
-        }else{
+        } else{
             $prefix = ',';
         }
         if(is_a($value, Raw::class)){
             $context->appendSql("$prefix$column=$value",$prefix == 'SET ');
-        }else{
+        } else{
             $context->appendSql("$prefix$column=?",$prefix == 'SET ');
             $context->appendParams([$value]);
         }
@@ -171,7 +171,7 @@ 
         if($this->first){
             $this->first = false;
             $prefix = 'SET ';
-        }else{
+        } else{
             $prefix = ',';
         }
 
@@ -185,7 +185,7 @@ 
         foreach ($values as $k=>$v){
             if(is_a($v, Raw::class)){//直接拼接sql，不需要转义
                 $set[]= "$k=".$v->get();
-            }else{
+            } else{
                 $set[]= "$k=?";
                 $params[]=$v;
             }
@@ -194,7 +194,7 @@ 
             $this->first = false;
             $context->appendSql('SET '.implode(',', $set));
             $context->appendParams($params);
-        }else{
+        } else{
             $context->appendSql(','.implode(',', $set),false);
             $context->appendParams($params);
         }
@@ -214,7 +214,7 @@ 
                     new \InvalidArgumentException("invalid params for orderBy(".json_encode($orders).")"));
 
                 $params[] = $v;
-            }else{
+            } else{
                 $v = strtoupper($v);
                 preg_match('/^[a-zA-Z0-9_.]+$/', $k) &&
                 ($v =='DESC' || $v =='ASC') or \PhpBoot\abort( new \InvalidArgumentException("invalid params for orderBy(".json_encode($orders).")"));
@@ -225,7 +225,7 @@ 
         if($this->first){
             $this->first = false;
             $context->appendSql('ORDER BY '.implode(',', $params));
-        }else{
+        } else{
             $context->appendSql(','.implode(',', $params),false);
         }
         return $this;
@@ -234,7 +234,7 @@ 
         if($this->first){
             $this->first = false;
             $context->appendSql("ORDER BY $column");
-        }else{
+        } else{
             $context->appendSql(",$column", false);
         }
         if($order){
@@ -327,41 +327,41 @@ 
                     foreach ($var as $i){
                         if(is_a($i, Raw::class)){
                             $stubs[]=strval($i);
-                        }else{
+                        } 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)){
                         $cond = "$cond ".strval($var[0]);
-                    }else{
+                    } else{
                         $cond = "$cond ?";
                         $params[] = $var[0];
                     }
                     if(is_a($var[1], Raw::class)){
                         $cond = "$cond AND ".strval($var[1]);
-                    }else{
+                    } else{
                         $cond = "$cond AND ?";
                         $params[] = $var[1];
                     }
                     $exprs[] = $cond;
-                }else{
+                } else{
                     if(is_a($var, Raw::class)){
                         $exprs[] = "$k $op ".strval($var);
-                    }else{
+                    } else{
                         $exprs[] = "$k $op ?";
                         $params[] = $var;
                     }
                 }
-            }else{
+            } else{
                 if(is_a($v, Raw::class)){
                     $exprs[] = "$k = ".strval($v);
 
-                }else{
+                } else{
                     $exprs[] = "$k = ?";
                     $params[] = $v;
                 }
@@ -398,18 +398,18 @@ 
                             foreach ($arg as $i){
                                 if(is_a($i, Raw::class)){
                                     $stubs[] = strval($i);
-                                }else{
+                                } else{
                                     $stubs[] = '?';
                                     $newArgs[] = $i;
                                 }
                             }
                             $stubs = implode(',', $stubs);
-                        }else{
+                        } else{
                             $stubs = strval($arg);
                         }
                         $toReplace[] = [$pos, $stubs];
 
-                    }else{
+                    } else{
                         $newArgs[]=$arg;
                     }
                 }
@@ -469,7 +469,7 @@ 
                 return $context->handleResult($dict);
             }
             return $context->handleResult($res);
-        }else{
+        } else{
             return false;
         }
     }
@@ -493,7 +493,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);
@@ -504,7 +504,7 @@ 
         if($st->execute($context->params)){
             $res = $st->fetchAll(\PDO::FETCH_ASSOC);
             return $res[0]['count'];
-        }else{
+        } else{
             return false;
         }
 
@@ -517,12 +517,12 @@ 
         if($this->first){
             $this->first = false;
             $prefix = 'ON DUPLICATE KEY UPDATE ';
-        }else{
+        } else{
             $prefix = ',';
         }
         if(is_a($value, Raw::class)){
             $context->appendSql("$prefix$column=$value",$prefix == 'ON DUPLICATE KEY UPDATE ');
-        }else{
+        } else{
             $context->appendSql("$prefix$column=?",$prefix == 'ON DUPLICATE KEY UPDATE ');
             $context->appendParams([$value]);
         }
@@ -533,7 +533,7 @@ 
         if($this->first){
             $this->first = false;
             $prefix = 'ON DUPLICATE KEY UPDATE ';
-        }else{
+        } else{
             $prefix = ',';
         }
 
@@ -547,7 +547,7 @@ 
         foreach ($values as $k=>$v){
             if(is_a($v, Raw::class)){//直接拼接sql，不需要转义
                 $set[]= "$k=".$v->get();
-            }else{
+            } else{
                 $set[]= "$k=?";
                 $params[]=$v;
             }
@@ -556,7 +556,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);
         }

src/DB/rules/insert.php

Doc Comments +4 added lines, -4 removed lines

@@ -40,6 +40,9 @@ 
 
 class OnDuplicateKeyUpdateRule extends ExecRule
 {
+    /**
+     * @param \PhpBoot\DB\Context $context
+     */
     public function __construct($context)
     {
         parent::__construct($context);
@@ -69,8 +72,7 @@ 
      *      ->onDuplicateKeyUpdateArgs(['a'=>Sql::raw('a+1')])
      *  => "INSERT INTO table(a,b) VALUES(1,now()) ON DUPLICATE KEY UPDATE a=a+1"
      *
-     * @param string $column
-     * @param mixed $value
+     * @param mixed $values
      * @return \PhpBoot\DB\rules\basic\ExecRule
      */
     public function onDuplicateKeyUpdateArgs($values) {
@@ -85,8 +87,6 @@ 
      *      ->onDuplicateKeyUpdateExpr('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 onDuplicateKeyUpdateExpr($expr, $_=null) {

src/DB/rules/select.php

Doc Comments +4 added lines, -1 removed lines

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

Braces +1 added lines, -1 removed lines

@@ -214,7 +214,7 @@
     public function where($conditions, $_=null) {
         if(is_array($conditions)){
             WhereImpl::whereArgs($this->context, $conditions);
-        }else{
+        } else{
             WhereImpl::where($this->context, $conditions, array_slice(func_get_args(), 1));
         }