caoym / phpboot

src/DB/rules/insert.php

Doc Comments +3 added lines, -2 removed lines

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

Spacing +1 added lines, -1 removed lines

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

src/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();
@@ -211,7 +214,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, $_=null) {

Spacing +18 added lines, -18 removed lines

@@ -37,7 +37,7 @@ 
      * @param string|false $asDict
      * @return array
      */
-    public function get($asDict=false) {
+    public function get($asDict = false) {
         return ExecImpl::get($this->context, $asDict);
     }
 
@@ -51,9 +51,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;
@@ -66,8 +66,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);
     }
 }
@@ -78,7 +78,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);
     }
@@ -89,7 +89,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);
     }
@@ -111,7 +111,7 @@ 
 
 class OrderByRule extends LimitRule
 {
-    public function __construct($context){
+    public function __construct($context) {
         parent::__construct($context);
         $this->order = new OrderByImpl();
     }
@@ -126,7 +126,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;
     }
@@ -167,7 +167,7 @@ 
      * @param string $_
      * @return \PhpBoot\DB\rules\select\OrderByRule
      */
-    public function having($expr, $_=null) {
+    public function having($expr, $_ = null) {
         WhereImpl::having($this->context, $expr, array_slice(func_get_args(), 1));
         return new OrderByRule($this->context);
     }
@@ -214,7 +214,7 @@ 
      * @param mixed $_
      * @return \PhpBoot\DB\rules\select\GroupByRule
      */
-    public function where($conditions=null, $_=null) {
+    public function where($conditions = null, $_ = null) {
         WhereImpl::where($this->context, $conditions, array_slice(func_get_args(), 1));
         return new GroupByRule($this->context);
     }
@@ -227,8 +227,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);
     }
     /**
@@ -236,8 +236,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);
     }
     /**
@@ -246,7 +246,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);
     }
     /**
@@ -255,7 +255,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);
     }
 }
@@ -267,7 +267,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);
     }

src/Controller/ResponseHandler.php

Spacing +8 added lines, -8 removed lines

@@ -27,7 +27,7 @@ 
      */
     public function eraseMapping($target)
     {
-        if(!isset($this->mappings[$target])){
+        if (!isset($this->mappings[$target])) {
             return null;
         }
         $ori = $this->mappings[$target];
@@ -41,7 +41,7 @@ 
      */
     public function getMapping($target)
     {
-        if(!array_key_exists($target, $this->mappings)){
+        if (!array_key_exists($target, $this->mappings)) {
             return null;
         }
         return $this->mappings[$target];
@@ -53,12 +53,12 @@ 
      */
     public function getMappingBySource($source)
     {
-        foreach ($this->mappings as $k=>$v){
-            if($v->source == $source){
+        foreach ($this->mappings as $k=>$v) {
+            if ($v->source == $source) {
                 return [$k, $v];
             }
         }
-        return [null,null];
+        return [null, null];
     }
 
 
@@ -75,15 +75,15 @@ 
             'params'=>$params
         ];
 
-        if($return instanceof Response){ //直接返回Response时, 对return不再做映射
+        if ($return instanceof Response) { //直接返回Response时, 对return不再做映射
             return $return;
         }
         $mappings = $this->getMappings();
 
         $output = [];
-        foreach($mappings as $key=>$map){
+        foreach ($mappings as $key=>$map) {
             $val = \JmesPath\search($map->source, $input);
-            if(substr($key, 0, strlen('response.')) == 'response.'){
+            if (substr($key, 0, strlen('response.')) == 'response.') {
                 $key = substr($key, strlen('response.'));
             }
             ArrayHelper::set($output, $key, $val);

src/Controller/Annotations/ReturnAnnotationHandler.php

Spacing +6 added lines, -6 removed lines

@@ -21,20 +21,20 @@ 
      */
     public function __invoke(ControllerContainer $container, $ann, EntityContainerBuilder $entityBuilder)
     {
-        if(!$ann->parent){
+        if (!$ann->parent) {
             //Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()} should be used with parent route");
             return;
         }
         $target = $ann->parent->name;
         $route = $container->getRoute($target);
-        if(!$route){
+        if (!$route) {
             //Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()}::$target should be used with parent route");
-            return ;
+            return;
         }
 
         $params = new AnnotationParams($ann->description, 2);
         $type = $doc = null;
-        if(count($params)>0){
+        if (count($params)>0) {
             $type = TypeHint::normalize($params[0], $container->getClassName());
         }
         $doc = $params->getRawParam(1, '');
@@ -42,10 +42,10 @@ 
         list($_, $meta) = $route
             ->getResponseHandler()
             ->getMappingBySource('return');
-        if($meta){
+        if ($meta) {
             $meta->description = $doc;
             $meta->type = $type;
-            $meta->container = $type == 'void'?null:ContainerFactory::create($entityBuilder, $type);
+            $meta->container = $type == 'void' ? null : ContainerFactory::create($entityBuilder, $type);
         }
     }
 }
\ No newline at end of file

src/Controller/Annotations/RouteAnnotationHandler.php

Spacing +16 added lines, -16 removed lines

@@ -43,7 +43,7 @@ 
             'DELETE'
         ]) or \PhpBoot\abort(new AnnotationSyntaxException("unknown method http $httpMethod in {$container->getClassName()}::$target"));
         //获取方法参数信息
-        $rfl =  new \ReflectionClass($container->getClassName());
+        $rfl = new \ReflectionClass($container->getClassName());
         $method = $rfl->getMethod($target);
         $methodParams = $method->getParameters();
 
@@ -68,9 +68,9 @@ 
         $routeParser = new Std();
         $uri = $params->getParam(1);
         $info = $routeParser->parse($uri); //0.4和1.0返回值不同, 不兼容
-        if(isset($info[0])){
-            foreach ($info[0] as $i){
-                if(is_array($i)) {
+        if (isset($info[0])) {
+            foreach ($info[0] as $i) {
+                if (is_array($i)) {
                     $route->addPathParam($i[0]);
                 }
             }
@@ -79,31 +79,31 @@ 
         $hasRefParam = false;
         //设置参数列表
         $paramsMeta = [];
-        foreach ($methodParams as $param){
+        foreach ($methodParams as $param) {
             $paramName = $param->getName();
             $source = "request.$paramName";
-            if($route->hasPathParam($paramName)){ //参数来自路由
+            if ($route->hasPathParam($paramName)) { //参数来自路由
                 $source = "request.$paramName";
-            }elseif($httpMethod == 'GET'){
+            }elseif ($httpMethod == 'GET') {
                 $source = "request.$paramName"; //GET请求显示指定来自query string
             }
             $paramClass = $param->getClass();
-            if($paramClass){
+            if ($paramClass) {
                 $paramClass = $paramClass->getName();
             }
             $entityContainer = ContainerFactory::create($entityBuilder, $paramClass);
             $meta = new ParamMeta($paramName,
                 $source,
-                $paramClass?:'mixed',
+                $paramClass ?: 'mixed',
                 $param->isOptional(),
-                $param->isOptional()?$param->getDefaultValue():null,
+                $param->isOptional() ? $param->getDefaultValue() : null,
                 $param->isPassedByReference(),
                 null,
                 '',
                 $entityContainer
             );
             $paramsMeta[] = $meta;
-            if($meta->isPassedByReference){
+            if ($meta->isPassedByReference) {
                 $hasRefParam = true;
                 $responseHandler->setMapping('response.content.'.$meta->name, new ReturnMeta(
                     'params.'.$meta->name,
@@ -114,16 +114,16 @@ 
         }
 
         $requestHandler->setParamMetas($paramsMeta);
-        if(!$hasRefParam){
-            $responseHandler->setMapping('response.content', new ReturnMeta('return','mixed','', new MixedTypeContainer()));
-        }else{
+        if (!$hasRefParam) {
+            $responseHandler->setMapping('response.content', new ReturnMeta('return', 'mixed', '', new MixedTypeContainer()));
+        }else {
             //当存在引用参数作为输出时, 默认将 return 数据绑定的到 data 下, 以防止和引用参数作为输出重叠
-            $responseHandler->setMapping($this->returnTarget, new ReturnMeta('return','mixed','', new MixedTypeContainer()));
+            $responseHandler->setMapping($this->returnTarget, new ReturnMeta('return', 'mixed', '', new MixedTypeContainer()));
         }
 
 
         $container->addRoute($target, $route);
     }
 
-    public $returnTarget='response.content.data';
+    public $returnTarget = 'response.content.data';
 }
\ No newline at end of file

Braces +2 added lines, -2 removed lines

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