Upgrade to hyperf 3.0.0

lphkxd · lphkxd · commit 4b0285b6d307 · 2022-08-10T18:51:40.000+08:00
diff --git a/.gitignore b/.gitignore
diff --git a/composer.json b/composer.json
@@ -10,13 +10,10 @@
   "description": "hyperf-plus validate 支持request 和方法场景验证，兼容tp5写法 支持控制器注解验证、方法注解验证",
   "license": "Apache-2.0",
   "require": {
-    "php": ">=7.2",
-    "hyperf/di": "^2.0",
-    "hyperf/http-message": "^2.0",
-    "hyperf/utils": "^2.0"
-  },
-  "require-dev": {
-    "friendsofphp/php-cs-fixer": "^2.14"
+    "php": ">=8.0",
+    "hyperf/di": "^3.0.0",
+    "hyperf/http-message": "^3.0.0",
+    "hyperf/utils": "^3.0.0"
   },
   "suggest": {
     "ext-json": "Required to use JSON."
diff --git a/src/Annotations/RequestValidation.php b/src/Annotations/RequestValidation.php
@@ -2,58 +2,58 @@
 
 namespace HPlus\Validate\Annotations;
 
+use Attribute;
 use Hyperf\Di\Annotation\AbstractAnnotation;
 
-/**
- * @Annotation
- * @Target("METHOD")
- */
+#[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_METHOD)]
 class RequestValidation extends AbstractAnnotation
 {
     /**
-     * 规则类
-     * @var string
-     */
-    public $rules = [];
-    /**
-     * 验证器
-     * @var string
-     */
-    public $validate = '';
-    /**
-     * 场景
-     * @var string
-     */
-    public $scene = '';
-    /**
-     * 场景
-     * @var string
-     */
-    public $value = '';
-    /**
-     * 是否过滤多余字段
-     * @var bool
-     */
-    public $filter = false;
-    /**
-     * 安全模式严格按照规则字段，如果多字段会抛出异常
-     * @var bool
-     */
-    public $security = false;
-    /**
-     * 是否批量验证
-     * @var bool
-     */
-    public $batch = false;
-    /**
-     * 验证数据类型，支持json|xml|form表单
-     * @var string
-     */
-    public $dateType = 'json';
-
-    public function __construct($value = null)
+     * @param array $rules
+     * @param string|null $validate
+     * @param string|null $scene
+     * @param bool $filter
+     * @param bool $security
+     * @param bool $batch
+     * @param string $dateType
+     */
+    public function __construct(
+        /**
+         * 规则类
+         * @var string
+         */
+        public array   $rules = [],
+        /**
+         * 验证器
+         * @var string
+         */
+        public ?string $validate = null,
+        /**
+         * 场景
+         * @var string
+         */
+        public ?string $scene = null,
+        /**
+         * 是否过滤多余字段
+         * @var bool
+         */
+        public bool    $filter = false,
+        /**
+         * 安全模式严格按照规则字段，如果多字段会抛出异常
+         * @var bool
+         */
+        public bool    $security = false,
+        /**
+         * 是否批量验证
+         * @var bool
+         */
+        public bool    $batch = false,
+        /**
+         * 验证数据类型，支持json|xml|form表单
+         * @var string
+         */
+        public string  $dateType = 'json'
+    )
     {
-        parent::__construct($value);
-        $this->bindMainProperty('scene', $value);
     }
 }
diff --git a/src/Annotations/Validation.php b/src/Annotations/Validation.php
@@ -2,59 +2,69 @@
 
 namespace HPlus\Validate\Annotations;
 
+use Attribute;
 use Hyperf\Di\Annotation\AbstractAnnotation;
 
-/**
- * @Annotation
- * @Target("METHOD")
- */
+#[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_METHOD)]
 class Validation extends AbstractAnnotation
 {
     /**
-     * 自定义规则
-     * @var string
+     * @param array $rules
+     * @param string|null $validate
+     * @param string|null $value
+     * @param string|null $scene
+     * @param bool $filter
+     * @param bool $security
+     * @param bool $batch
+     * @param string $field
      */
-    public  $rules = [];
-    /**
-     * 验证器
-     * @var string
-     */
-    public  $validate = '';
-    /**
-     * 场景
-     * @var string
-     */
-    public  $value = '';
-    /**
-     * 场景
-     * @var string
-     */
-    public  $scene = '';
-    /**
-     * 是否过滤多余字段
-     * @var bool
-     */
-    public  $filter = false;
-    /**
-     * 安全模式严格按照规则字段，如果多字段会抛出异常
-     * @var bool
-     */
-    public $security = false;
+    public function __construct(
 
-    /**
-     * 是否批量验证
-     * @var bool
-     */
-    public  $batch = false;
-    /**
-     * 验证哪个参数
-     * @var string
-     */
-    public  $field = "data";
+        /**
+         * 自定义规则
+         * @var string
+         */
+        public array   $rules = [],
+        /**
+         * 验证器
+         * @var string
+         */
+        public ?string $validate = null,
+        /**
+         * 场景
+         * @var string
+         */
+        public ?string $value = null,
+        /**
+         * 场景
+         * @var string
+         */
+        public ?string $scene = null,
+        /**
+         * 是否过滤多余字段
+         * @var bool
+         */
+        public bool    $filter = false,
+        /**
+         * 安全模式严格按照规则字段，如果多字段会抛出异常
+         * @var bool
+         */
+        public bool    $security = false,
+
+        /**
+         * 是否批量验证
+         * @var bool
+         */
+        public bool    $batch = false,
+        /**
+         * 验证哪个参数
+         * @var string
+         */
+        public string  $field = "data"
 
-    public function __construct($value = null)
+
+    )
     {
-        parent::__construct($value);
-        $this->bindMainProperty('scene', $value);
+
     }
 }
diff --git a/src/Aspect/ValidationAspect.php b/src/Aspect/ValidationAspect.php
@@ -1,6 +1,6 @@
 <?php
-declare(strict_types=1);
 
+declare (strict_types=1);
 namespace HPlus\Validate\Aspect;
 
 use HPlus\Validate\Annotations\RequestValidation;
@@ -11,30 +11,26 @@
 use Hyperf\Di\Aop\AbstractAspect;
 use Hyperf\Di\Aop\ProceedingJoinPoint;
 use Hyperf\Di\Exception\Exception;
-use Hyperf\Utils\Context;
+use Hyperf\Context\Context;
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ServerRequestInterface;
 
-/**
- * @Aspect
- */
+#[Aspect]
 class ValidationAspect extends AbstractAspect
 {
+    
     protected $container;
+    
     protected $request;
-
     // 要切入的类，可以多个，亦可通过 :: 标识到具体的某个方法，通过 * 可以模糊匹配
-    public $annotations = [
-        Validation::class,
-        RequestValidation::class
-    ];
-
+    // 要切入的类，可以多个，亦可通过 :: 标识到具体的某个方法，通过 * 可以模糊匹配
+    public array $annotations = [Validation::class, RequestValidation::class];
+    
     public function __construct(ContainerInterface $container, ServerRequestInterface $Request)
     {
         $this->container = $container;
         $this->request = $this->container->get(ServerRequestInterface::class);
     }
-
     /**
      * @param ProceedingJoinPoint $proceedingJoinPoint
      * @return mixed
@@ -62,7 +58,6 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint)
         }
         return $proceedingJoinPoint->process();
     }
-
     /**
      * @param $validation
      * @param $verData
@@ -84,7 +79,7 @@ private function validationData($validation, $verData, $class, $proceedingJoinPo
             $rules = $validation->rules;
         } else {
             if (class_exists($class)) {
-                $validate = new $class;
+                $validate = new $class();
             } else {
                 throw new ValidateException('class not exists:' . $class);
             }
@@ -103,16 +98,15 @@ private function validationData($validation, $verData, $class, $proceedingJoinPo
                     throw new ValidateException('params ' . $key . ' invalid');
                 }
             }
-        };
+        }
         if ($validation->filter) {
             $fields = $this->getFields($rules);
-            $verData = array_filter($verData, function ($value, $key) use ($fields) {
+            $verData = array_filter($verData, function ($value, $key) use($fields) {
                 return in_array($key, $fields);
             }, ARRAY_FILTER_USE_BOTH);
-
             switch ($isRequest) {
                 case true:
-                    Context::override(ServerRequestInterface::class, function (ServerRequestInterface $request) use ($verData) {
+                    Context::override(ServerRequestInterface::class, function (ServerRequestInterface $request) use($verData) {
                         return $request->withParsedBody($verData);
                     });
                     break;
@@ -122,7 +116,7 @@ private function validationData($validation, $verData, $class, $proceedingJoinPo
             }
         }
     }
-
+    
     protected function getFields(array $rules)
     {
         $fields = [];
@@ -132,7 +126,7 @@ protected function getFields(array $rules)
             }
             if (strpos($field, '|')) {
                 // 字段|描述 用于指定属性名称
-                list($field,) = explode('|', $field);
+                list($field, ) = explode('|', $field);
             }
             $fields[] = $field;
         }
diff --git a/src/Validate.php b/src/Validate.php
