up fix

easy-swoole · Apr 30, 2020 · 175f700 · 175f700
1 parent 7bb0823
commit 175f700
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 5 deletions.
diff --git a/src/AnnotationController.php b/src/AnnotationController.php
@@ -34,7 +34,6 @@ abstract class AnnotationController extends Controller
     private $methodAnnotations = [];
     private $propertyAnnotations = [];
     private $annotation;
-    private $l = [];
 
     public function __construct(?Annotation $annotation = null)
     {
@@ -145,8 +144,12 @@ protected function __annotationHook(string $actionName)
             }
 
             $injectKey = null;
+            $filterNull = false;
+            $filterEmpty = false;
             if(!empty($annotations['InjectParamsContext'])){
                 $injectKey = $annotations['InjectParamsContext'][0]->key;
+                $filterNull = $annotations['InjectParamsContext'][0]->filterNull;
+                $filterEmpty = $annotations['InjectParamsContext'][0]->filterEmpty;
             }
             /*
              * 参数构造与validate验证
@@ -213,7 +216,7 @@ protected function __annotationHook(string $actionName)
                         $value = $param->defaultValue;
                     }
 
-                    if(!empty($param->preHandler)){
+                    if(!empty($param->preHandler) && $value !== null){
                         if(is_callable($param->preHandler)){
                             $value = call_user_func($param->preHandler,$value);
                         }else{
@@ -237,6 +240,24 @@ protected function __annotationHook(string $actionName)
                 }
             }
             if($injectKey){
+                if($filterNull){
+                    foreach ($actionArgs as $key => $arg){
+                        if($arg === null){
+                            unset($actionArgs[$key]);
+                        }else if($filterEmpty){
+                            if(empty($arg)){
+                                unset($actionArgs[$key]);
+                            }
+                        }
+
+                    }
+                }else if($filterEmpty){
+                    foreach ($actionArgs as $key => $arg){
+                        if(empty($arg)){
+                            unset($actionArgs[$key]);
+                        }
+                    }
+                }
                 ContextManager::getInstance()->set($injectKey,$actionArgs);
             }
             //合并参数

diff --git a/src/AnnotationTag/InjectParamsContext.php b/src/AnnotationTag/InjectParamsContext.php
@@ -4,6 +4,7 @@
 namespace EasySwoole\HttpAnnotation\AnnotationTag;
 
 use EasySwoole\Annotation\AbstractAnnotationTag;
+use EasySwoole\Annotation\ValueParser;
 
 /**
  * Class InjectParamsContext
@@ -13,6 +14,15 @@
 class InjectParamsContext extends AbstractAnnotationTag
 {
     public $key = 'INJECT_PARAMS';
+    /**
+     * @var bool
+     */
+    public $filterNull = false;
+
+    /**
+     * @var bool
+     */
+    public $filterEmpty = false;
 
     public function tagName(): string
     {
@@ -21,9 +31,9 @@ public function tagName(): string
 
     public function assetValue(?string $raw)
     {
-        parse_str($raw,$str);
-        if(!empty($str['key'])){
-            $this->key = trim($str['key']," \t\n\r\0\x0B\"'");
+        $allParams = ValueParser::parser($raw);
+        foreach ($allParams as $key => $value){
+            $this->$key = $value;
         }
     }
 }