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

Spacing +21 added lines, -21 removed lines

@@ -45,9 +45,9 @@ 
 }
 class AnnotationReader implements \ArrayAccess
 {
-    static public function createDocBlockFactory(){
+    static public function createDocBlockFactory() {
         $fqsenResolver = new FqsenResolver();
-        $tagFactory = new StandardTagFactory($fqsenResolver,[]);
+        $tagFactory = new StandardTagFactory($fqsenResolver, []);
         $descriptionFactory = new DescriptionFactory($tagFactory);
         $tagFactory->addService($descriptionFactory);
         $tagFactory->addService(new TypeResolver($fqsenResolver));
@@ -72,22 +72,22 @@ 
         self::assertAnnotationEnabled();
         $rfl = new \ReflectionClass($className) or \PhpBoot\abort("load class $className failed");
         $fileName = $rfl->getFileName();
-        $key = str_replace('\\','.',self::class).md5($fileName.$className);
+        $key = str_replace('\\', '.', self::class).md5($fileName.$className);
         $oldData = null;
-        $cache = new CheckableCache($localCache?:new ApcCache());
+        $cache = new CheckableCache($localCache ?: new ApcCache());
         $res = $cache->get('ann:'.$key, null, $oldData, false);
-        if($res === null){
-            try{
+        if ($res === null) {
+            try {
                 $meta = self::readWithoutCache($className);
-                $cache->set($key, $meta, 0, $fileName?new ClassModifiedChecker($className):null);
+                $cache->set($key, $meta, 0, $fileName ? new ClassModifiedChecker($className) : null);
                 return $meta;
-            }catch (\Exception $e){
-                $cache->set($key, $e->getMessage(), 0, $fileName?new ClassModifiedChecker($className):null);
+            }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;
         }
     }
@@ -104,19 +104,19 @@ 
         $reader->class->name = $className;
 
         //method annotations
-        foreach ($rfl->getMethods() as $i){
+        foreach ($rfl->getMethods() as $i) {
             $block = self::readAnnotationBlock($i->getDocComment());
             $block->name = $i->getName();
-            $reader->methods[$i->getName()]=$block;
+            $reader->methods[$i->getName()] = $block;
         }
         //property annotations
-        foreach ($rfl->getProperties() as $i){
+        foreach ($rfl->getProperties() as $i) {
             if ($i->isStatic()) {
                 continue;
             }
             $block = self::readAnnotationBlock($i->getDocComment());
             $block->name = $i->getName();
-            $reader->properties[$i->getName()]=$block;
+            $reader->properties[$i->getName()] = $block;
         }
         while ($rfl = $rfl->getParentClass()) {
             foreach ($rfl->getProperties(\ReflectionProperty::IS_PRIVATE) as $i) {
@@ -125,7 +125,7 @@ 
                 }
                 $block = self::readAnnotationBlock($i->getDocComment());
                 $block->name = $i->getName();
-                $reader->properties[$i->getName()]=$block;
+                $reader->properties[$i->getName()] = $block;
             }
         }
         return $reader;
@@ -134,7 +134,7 @@ 
     static private function readAnnotationBlock($doc)
     {
         $annBlock = new AnnotationBlock();
-        if(empty($doc)){
+        if (empty($doc)) {
             return $annBlock;
         }
         $docFactory = AnnotationReader::createDocBlockFactory();
@@ -149,8 +149,8 @@ 
             $annTag->parent = $annBlock;
             $annTag->description = strval($desc);
             $annTag->name = $tag->getName();
-            $annTag->children=[];
-            if($desc){
+            $annTag->children = [];
+            if ($desc) {
                 $output = new AnnotationTagsOutput();
                 $desc->render($output);
                 foreach ($output->tags as $child) {
@@ -174,11 +174,11 @@ 
      * @var AnnotationBlock[]
      */
 
-    public $methods=[];
+    public $methods = [];
     /**
      * @var AnnotationBlock[]
      */
-    public $properties=[];
+    public $properties = [];
 
     public function offsetExists($offset)
     {

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

Spacing +6 added lines, -6 removed lines

@@ -13,10 +13,10 @@ 
      * @param array $children
      * @param AnnotationBlock|AnnotationTag|null $parent
      */
-    public function __construct($name='',
-                                $description='',
-                                $children=[],
-                                $parent=null)
+    public function __construct($name = '',
+                                $description = '',
+                                $children = [],
+                                $parent = null)
     {
         $this->name = $name;
         $this->description = $description;
@@ -31,11 +31,11 @@ 
     /**
      * @var string
      */
-    public $description='';
+    public $description = '';
     /**
      * @var AnnotationBlock[]
      */
-    public $children=[];
+    public $children = [];
 
     /**
      * @var AnnotationBlock|null

src/Application.php

Doc Comments +1 added lines, -1 removed lines

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

Unused Use Statements -1 removed lines

@@ -24,7 +24,6 @@
 use PhpBoot\DB\DB;
 use PhpBoot\DI\DIContainerBuilder;
 use PhpBoot\DI\Traits\EnableDIAnnotations;
-use PhpBoot\Lock\LocalAutoLock;
 use PhpBoot\Utils\Logger;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;

Spacing +19 added lines, -19 removed lines

@@ -83,11 +83,11 @@ 
 
             Request::class => \DI\factory([Application::class, 'createRequestFromGlobals']),
         ];
-        if(function_exists('apc_fetch')){
+        if (function_exists('apc_fetch')) {
             $default += [
                 Cache::class => \DI\object(ApcCache::class)
             ];
-        }else{
+        }else {
             $default += [
                 Cache::class => \DI\object(FilesystemCache::class)
                     ->constructorParameter('directory', sys_get_temp_dir())
@@ -129,11 +129,11 @@ 
      * @param string[] $hooks hook class names
      * @return void
      */
-    public function loadRoutesFromClass($className, $hooks=[])
+    public function loadRoutesFromClass($className, $hooks = [])
     {
         $cache = new CheckableCache($this->cache);
 
-        $key = 'loadRoutesFromClass:' . md5(__CLASS__ . ':' . $className);
+        $key = 'loadRoutesFromClass:'.md5(__CLASS__.':'.$className);
         $routes = $cache->get($key, $this);
 
         $controller = null;
@@ -150,9 +150,9 @@ 
             $this->routes[] = [
                 $method,
                 $uri,
-                function (Application $app, Request $request) use ($cache, $className, $actionName, $controller) {
+                function(Application $app, Request $request) use ($cache, $className, $actionName, $controller) {
 
-                    $key = 'loadRoutesFromClass:route:' . md5(__CLASS__ . ':' . $className . ':' . $actionName);
+                    $key = 'loadRoutesFromClass:route:'.md5(__CLASS__.':'.$className.':'.$actionName);
 
                     $routeInstance = $cache->get($key, $this);
                     if ($routeInstance == $this) {
@@ -180,11 +180,11 @@ 
      * @param string[] $hooks
      * @return void
      */
-    public function loadRoutesFromPath($fromPath, $namespace = '', $hooks=[])
+    public function loadRoutesFromPath($fromPath, $namespace = '', $hooks = [])
     {
         $dir = @dir($fromPath);
 
-        $getEach = function () use ($dir) {
+        $getEach = function() use ($dir) {
             $name = $dir->read();
             if (!$name) {
                 return $name;
@@ -196,11 +196,11 @@ 
             if ($entry == '.' || $entry == '..') {
                 continue;
             }
-            $path = $fromPath . '/' . str_replace('\\', '/', $entry);
+            $path = $fromPath.'/'.str_replace('\\', '/', $entry);
             if (is_file($path) && substr_compare($entry, '.php', strlen($entry) - 4, 4, true) == 0) {
-                $class_name = $namespace . '\\' . substr($entry, 0, strlen($entry) - 4);
+                $class_name = $namespace.'\\'.substr($entry, 0, strlen($entry) - 4);
                 $this->loadRoutesFromClass($class_name, $hooks);
-            } else {
+            }else {
                 //\Log::debug($path.' ignored');
             }
         }
@@ -213,7 +213,7 @@ 
      * @param callable $handler function(Application $app, Request $request):Response
      * @param string[] $hooks
      */
-    public function addRoute($method, $uri, callable $handler, $hooks=[])
+    public function addRoute($method, $uri, callable $handler, $hooks = [])
     {
         $this->routes[] = [$method, $uri, $handler, $hooks];
     }
@@ -239,7 +239,7 @@ 
     {
         //  TODO 把 Route里的异常处理 ExceptionRenderer 移到这里更妥?
         $renderer = $this->get(ExceptionRenderer::class);
-        try{
+        try {
             if ($request == null) {
                 $request = $this->make(Request::class);
             }
@@ -249,7 +249,7 @@ 
             }
             $uri = rawurldecode($uri);
 
-            $next = function (Request $request)use($uri){
+            $next = function(Request $request)use($uri){
                 $dispatcher = $this->getDispatcher();
                 $res = $dispatcher->dispatch($request->getMethod(), $uri);
                 if ($res[0] == Dispatcher::FOUND) {
@@ -258,10 +258,10 @@ 
                         $request->attributes->add($res[2]);
                     }
                     list($handler, $hooks) = $res[1];
-                    $next = function (Request $request)use($handler){
+                    $next = function(Request $request)use($handler){
                         return $handler($this, $request);
                     };
-                    foreach (array_reverse($hooks) as $hookName){
+                    foreach (array_reverse($hooks) as $hookName) {
                         $next = function($request)use($hookName, $next){
                             $hook = $this->get($hookName);
                             /**@var $hook HookInterface*/
@@ -274,12 +274,12 @@ 
                     \PhpBoot\abort(new NotFoundHttpException(), [$request->getMethod(), $uri]);
                 } elseif ($res[0] == Dispatcher::METHOD_NOT_ALLOWED) {
                     \PhpBoot\abort(new MethodNotAllowedHttpException($res[1]), [$request->getMethod(), $uri]);
-                } else {
+                }else {
                     \PhpBoot\abort("unknown dispatch return {$res[0]}");
                 }
             };
 
-            foreach (array_reverse($this->getGlobalHooks()) as $hookName){
+            foreach (array_reverse($this->getGlobalHooks()) as $hookName) {
                 $next = function($request)use($hookName, $next){
                     $hook = $this->get($hookName);
                     /**@var $hook HookInterface*/
@@ -294,7 +294,7 @@ 
             }
             return $response;
 
-        }catch (\Exception $e){
+        }catch (\Exception $e) {
             $renderer->render($e);
         }
 

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 = [];

Spacing +6 added lines, -6 removed lines

@@ -4,11 +4,11 @@ 
 
 class ClassModifiedChecker extends FileModifiedChecker
 {
-    function __construct($className){
+    function __construct($className) {
         $class = new \ReflectionClass($className);
         $files = [];
 
-        if($class->getFileName()){
+        if ($class->getFileName()) {
             $files[] = $class->getFileName();
             self::getParentFileName($class, $files);
         }
@@ -18,15 +18,15 @@ 
     static public function getParentFileName(\ReflectionClass $class, array &$files)
     {
         $parent = $class->getParentClass();
-        if(!$parent){
+        if (!$parent) {
             return;
         }
-        if($parent->getFileName()){
+        if ($parent->getFileName()) {
             $files[] = $parent->getParentClass();
             self::getParentFileName($parent, $files);
         }
-        foreach ($class->getInterfaces() as $interface){
-            if($interface->getFileName()){
+        foreach ($class->getInterfaces() as $interface) {
+            if ($interface->getFileName()) {
                 $files[] = $interface->getFileName();
                 self::getParentFileName($interface, $files);
             }

src/Controller/ControllerContainerBuilder.php

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 use DI\FactoryInterface;
 use \DI\InvokerInterface as DIInvokerInterface;
 use Doctrine\Common\Cache\Cache;
-use PhpBoot\Cache\LocalCacheInterface;
 use PhpBoot\Controller\Annotations\BindAnnotationHandler;
 use PhpBoot\Controller\Annotations\ClassAnnotationHandler;
 use PhpBoot\Controller\Annotations\HookAnnotationHandler;

Spacing +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
 
 class ControllerContainerBuilder extends ContainerBuilder
 {
-    static $DEFAULT_ANNOTATIONS=[
+    static $DEFAULT_ANNOTATIONS = [
         [ClassAnnotationHandler::class, 'class'],
         [PathAnnotationHandler::class, "class.children[?name=='path']"],
         [RouteAnnotationHandler::class, "methods.*.children[?name=='route'][]"],
@@ -43,9 +43,9 @@ 
                                 Cache $cache,
                                 array $annotations = null)
     {
-        if($annotations){
+        if ($annotations) {
             parent::__construct($annotations, $cache);
-        }else{
+        }else {
             parent::__construct(self::$DEFAULT_ANNOTATIONS, $cache);
         }
 

Braces +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
     {
         if($annotations){
             parent::__construct($annotations, $cache);
-        }else{
+        } else{
             parent::__construct(self::$DEFAULT_ANNOTATIONS, $cache);
         }
 

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

Spacing +19 added lines, -19 removed lines

@@ -15,7 +15,7 @@ 
     /**
      * @param ParamMeta[] $paramMates
      */
-    public function __construct(array $paramMates=[]){
+    public function __construct(array $paramMates = []) {
         $this->paramMetas = $paramMates;
     }
 
@@ -26,32 +26,32 @@ 
      * @param array $reference
      * @return void
      */
-    public function handle(Application $app, Request $request, array &$params, array &$reference){
+    public function handle(Application $app, Request $request, array &$params, array &$reference) {
 
         $vld = new Validator();
         $req = ['request'=>$request];
         $requestArray = new ArrayAdaptor($req);
         $inputs = [];
-        foreach ($this->paramMetas as $k=>$meta){
-            if($meta->isPassedByReference){
+        foreach ($this->paramMetas as $k=>$meta) {
+            if ($meta->isPassedByReference) {
                 // param PassedByReference is used to output
                 continue;
             }
             $source = \JmesPath\search($meta->source, $requestArray);
-            if ($source !== null){
+            if ($source !== null) {
                 $source = ArrayAdaptor::strip($source);
-                if($source instanceof ParameterBag){
+                if ($source instanceof ParameterBag) {
                     $source = $source->all();
                 }
-                if($meta->container){
+                if ($meta->container) {
                     $inputs[$meta->name] = $meta->container->make($source);
-                }else{
+                }else {
                     $inputs[$meta->name] = $source;
                 }
-                if($meta->validation){
+                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;
             }
@@ -66,10 +66,10 @@ 
         );
 
         $pos = 0;
-        foreach ($this->paramMetas as $meta){
-            if($meta->isPassedByReference){
+        foreach ($this->paramMetas as $meta) {
+            if ($meta->isPassedByReference) {
                 $params[$pos] = &$reference[$meta->name];
-            }else{
+            }else {
                 $params[$pos] = $inputs[$meta->name];
             }
             $pos++;
@@ -77,15 +77,15 @@ 
         }
     }
 
-    public function getParamNames(){
-        return array_map(function($meta){return $meta->name;}, $this->paramMetas);
+    public function getParamNames() {
+        return array_map(function($meta) {return $meta->name; }, $this->paramMetas);
     }
 
     /**
      * 获取参数列表
      * @return ParamMeta[]
      */
-    public function getParamMetas(){
+    public function getParamMetas() {
         return $this->paramMetas;
     }
 
@@ -94,9 +94,9 @@ 
      * @param $name
      * @return ParamMeta|null
      */
-    public function getParamMeta($name){
-        foreach ($this->paramMetas as $meta){
-            if($meta->name == $name){
+    public function getParamMeta($name) {
+        foreach ($this->paramMetas as $meta) {
+            if ($meta->name == $name) {
                 return $meta;
             }
         }

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;

Indentation +5 added lines, -5 removed lines

@@ -67,10 +67,10 @@ 
      */
 
     static public function connect(Application $app,
-                                   $dsn,
-                                  $username,
-                                  $password,
-                                  $options = [])
+                                    $dsn,
+                                    $username,
+                                    $password,
+                                    $options = [])
     {
         $options += [
             \PDO::ATTR_ERRMODE =>\PDO::ERRMODE_EXCEPTION,
@@ -165,7 +165,7 @@ 
         return $this->connection;
     }
     /**
-	 * Splice sql use raw string(without escaping)
+     * Splice sql use raw string(without escaping)
      * for example:
      * where('time>?', 'now()') => " WHERE time > 'now()' "
      * where('time>?', Sql::raw('now()')) => " WHERE time > now() "

Spacing +16 added lines, -16 removed lines

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

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 = [];

Spacing +148 added lines, -148 removed lines

@@ -6,14 +6,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);
     }
     /**
@@ -40,21 +40,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 `$tables`");
         }
-        if($as){
+        if ($as) {
             $context->appendSql("as `$as`");
         }
     }
@@ -71,9 +71,9 @@ 
 class JoinImpl
 {
     static public function join($context, $type, $table) {
-        if($type){
+        if ($type) {
             $context->appendSql("$type JOIN $table");
-        }else{
+        }else {
             $context->appendSql("JOIN $table");
         }
     }
@@ -88,14 +88,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) {
         $context->appendSql("OF $column");
     }
 }
@@ -114,27 +114,27 @@ 
 }
 class ValuesImpl
 {
-    static public function values($context, $values){
+    static public function values($context, $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_keys($values));
-            $context->appendSql("($columns) VALUES($stubs)",false);
+            $context->appendSql("($columns) VALUES($stubs)", false);
         }
         $context->appendParams($params);
     }
@@ -143,117 +143,117 @@ 
 
 class UpdateImpl
 {
-    static public function update($context, $table){
+    static public function update($context, $table) {
         $context->appendSql("UPDATE `$table`");
     }
 }
 
 class UpdateSetImpl
 {
-    public function set($context, $column, $value){
+    public function set($context, $column, $value) {
         $prefix = '';
-        if($this->first){
+        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{
-            $context->appendSql("$prefix$column=?",$prefix == 'SET ');
+        if (is_a($value, Raw::class)) {
+            $context->appendSql("$prefix$column=$value", $prefix == 'SET ');
+        }else {
+            $context->appendSql("$prefix$column=?", $prefix == 'SET ');
             $context->appendParams([$value]);
         }
     }
 
-    public function setExpr($context, $expr, $args){
+    public function setExpr($context, $expr, $args) {
         $prefix = '';
-        if($this->first){
+        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, $values){
+    public function setArgs($context, $values) {
         $set = [];
         $params = [];
-        foreach ($values as $k=>$v){
-            if(is_a($v, Raw::class)){//直接拼接sql，不需要转义
-                $set[]= "$k=".$v->get();
-            }else{
-                $set[]= "$k=?";
-                $params[]=$v;
+        foreach ($values as $k=>$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, $orders){
-        if(empty($orders)){
+    public function orderByArgs($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)) {
                 preg_match('/^[a-zA-Z0-9_.]+$/', $v) or \PhpBoot\abort(
                     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).")"));
+                ($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, $column, $order=null){
-        if($this->first){
+    public function orderBy($context, $column, $order = null) {
+        if ($this->first) {
             $this->first = false;
             $context->appendSql("ORDER BY $column");
-        }else{
+        }else {
             $context->appendSql(",$column", false);
         }
-        if($order){
+        if ($order) {
             $context->appendSql($order);
         }
         return $this;
     }
-    private $first=true;
+    private $first = true;
 }
 
 class LimitImpl
 {
-    static public function limit($context, $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");
     }
-    static public function limitWithOffset($context,$start, $size){
+    static public function limitWithOffset($context, $start, $size) {
         $intStart = intval($start);
         $intSize = intval($size);
         strval($intStart) == $start && strval($intSize) == $size or \PhpBoot\abort(
@@ -262,26 +262,26 @@ 
     }
 }
 
-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 having($context, $expr, $args){
+    static public function having($context, $expr, $args) {
         self::condition($context, 'HAVING', $expr, $args);
     }
-    static public function where($context, $expr, $args){
+    static public function where($context, $expr, $args) {
         self::condition($context, 'WHERE', $expr, $args);
     }
 
-    static public function havingArgs($context, $args){
+    static public function havingArgs($context, $args) {
         self::conditionArgs($context, 'HAVING', $args);
     }
-    static public function whereArgs($context, $args){
+    static public function whereArgs($context, $args) {
         self::conditionArgs($context, 'WHERE', $args);
     }
     /**
@@ -306,14 +306,14 @@ 
      *
      * @param array $args
      */
-    static public function conditionArgs($context, $prefix, $args=[]){
-        if($args ===null){
-            return ;
+    static public function conditionArgs($context, $prefix, $args = []) {
+        if ($args === null) {
+            return;
         }
         $exprs = array();
         $params = array();
-        foreach ($args as $k => $v){
-            if(is_array($v)){
+        foreach ($args as $k => $v) {
+            if (is_array($v)) {
                 $ops = ['=', '>', '<', '<>', '>=', '<=', 'IN', 'NOT IN', 'BETWEEN', 'LIKE'];
                 $op = array_keys($v)[0];
                 $op = strtoupper($op);
@@ -322,46 +322,46 @@ 
                     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 = [];
-                    foreach ($var as $i){
-                        if(is_a($i, Raw::class)){
-                            $stubs[]=strval($i);
-                        }else{
-                            $stubs[]='?';
+                    foreach ($var as $i) {
+                        if (is_a($i, Raw::class)) {
+                            $stubs[] = strval($i);
+                        }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]);
-                    }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]);
-                    }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);
-                    }else{
+                    }else {
                         $exprs[] = "$k $op ?";
                         $params[] = $var;
                     }
                 }
-            }else{
-                if(is_a($v, Raw::class)){
+            }else {
+                if (is_a($v, Raw::class)) {
                     $exprs[] = "$k = ".strval($v);
 
-                }else{
+                }else {
                     $exprs[] = "$k = ?";
                     $params[] = $v;
                 }
@@ -370,20 +370,20 @@ 
 
         return self::condition($context, $prefix, implode(' AND ', $exprs), $params);
     }
-    static public function condition($context, $prefix, $expr, $args){
-        if(!empty($expr)){
-            if($args){
+    static public function condition($context, $prefix, $expr, $args) {
+        if (!empty($expr)) {
+            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)){
-                        if(!$cutted){
+                foreach ($args as $k =>$arg) {
+                    if (is_array($arg) || is_a($arg, Raw::class)) {
+                        if (!$cutted) {
                             $cut = new NestedStringCut($expr);
                             $cutted = $cut->getText();
                         }
@@ -393,46 +393,46 @@ 
                         $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);
-                        }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;
                 }
             }
             $context->appendSql($prefix.' '.$expr);
-            if($args){
+            if ($args) {
                 $context->appendParams($args);
             }
         }
     }
 }
 
-class GroupByImpl{
-    static public function groupBy($context, $column){
+class GroupByImpl {
+    static public function groupBy($context, $column) {
         $context->appendSql("GROUP BY $column");
     }
 }
@@ -456,20 +456,20 @@ 
      * @param string|false $asDict return  as dict or array
      * @return false|array
      */
-    static public function get($context, $dictAs=false){
+    static public function get($context, $dictAs = false) {
 
         $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;
         }
     }
@@ -478,22 +478,22 @@ 
      * @param Context $context
      * @return int|false
      */
-    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 = [];
-        if(!preg_match('/\bfrom\b/i', $context->sql, $found, PREG_OFFSET_CAPTURE) ||
-            count($found)==0){
+        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);
@@ -501,10 +501,10 @@ 
         $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 $res[0]['count'];
-        }else{
+        }else {
             return false;
         }
 
@@ -512,54 +512,54 @@ 
 }
 class OnDuplicateKeyUpdateImpl
 {
-    public function set($context, $column, $value){
+    public function set($context, $column, $value) {
         $prefix = '';
-        if($this->first){
+        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{
-            $context->appendSql("$prefix$column=?",$prefix == 'ON DUPLICATE KEY UPDATE ');
+        if (is_a($value, Raw::class)) {
+            $context->appendSql("$prefix$column=$value", $prefix == 'ON DUPLICATE KEY UPDATE ');
+        }else {
+            $context->appendSql("$prefix$column=?", $prefix == 'ON DUPLICATE KEY UPDATE ');
             $context->appendParams([$value]);
         }
     }
 
-    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){
-            if(is_a($v, Raw::class)){//直接拼接sql，不需要转义
-                $set[]= "$k=".$v->get();
-            }else{
-                $set[]= "$k=?";
-                $params[]=$v;
+        foreach ($values as $k=>$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 +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) {

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
      * @param mixed $value
      * @return \PhpBoot\DB\rules\basic\ExecRule
      */
-    public function onDuplicateKeyUpdateExpr($expr, $_=null) {
+    public function onDuplicateKeyUpdateExpr($expr, $_ = null) {
         $this->impl->setExpr($this->context, $expr, array_slice(func_get_args(), 1));
         return new ExecRule($this->context);
     }