改进依赖和验证方法的异常处理

Author: liu21st

composer.json

@@ -18,7 +18,8 @@
         "ext-pdo": "*",
         "psr/simple-cache": ">=1.0",
         "psr/log": ">=1.0",
-        "topthink/think-helper":"^3.1"
+        "topthink/think-helper":"^3.1",
+        "topthink/think-validate":"^3.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.6|^10"

src/Model.php

@@ -15,7 +15,6 @@
 
 use ArrayAccess;
 use Closure;
-use InvalidArgumentException;
 use JsonSerializable;
 use think\contract\Arrayable;
 use think\contract\Jsonable;
@@ -320,21 +319,16 @@ protected function parseValidate(): string
      * @param array $data 数据
      * @param array $allow 需要验证的字段
      *
-     * @throws InvalidArgumentException
+     * @throws ValidateException
      * @return void
      */
     protected function validate(array $data, array $allow = []): void
     {
         $validater = $this->getOption('validate');
-        if (!empty($validater) && class_exists('think\validate')) {
-            try {
-                validate($validater)
-                    ->only($allow ?: array_keys($data))
-                    ->check($data);
-            } catch (ValidateException $e) {
-                // 验证失败 输出错误信息
-                throw new InvalidArgumentException($e->getError());
-            }
+        if (!empty($validater)) {
+            validate($validater)
+                ->only($allow ?: array_keys($data))
+                ->check($data);
         }
     }
 

src/model/View.php

@@ -13,7 +13,6 @@
 
 namespace think\model;
 
-use InvalidArgumentException;
 use ReflectionClass;
 use ReflectionProperty;
 use think\Entity;
@@ -324,23 +323,19 @@ protected function convertData(): array
      * @param array $data 数据
      * @param array $allow 需要验证的字段
      *
-     * @throws InvalidArgumentException
+     * @throws ValidateException
      * @return array
      */
     protected function validate(array $data = [], array $allow = []): array
     {
         $validater = $this->getOption('validate');
-        if (!empty($validater) && class_exists('think\validate')) {
-            $data  = $data ?: $this->getData();
-            try {
-                return validate($validater)
-                    ->only($allow ?: array_keys($data))
-                    ->checked($data);
-            } catch (ValidateException $e) {
-                // 验证失败 输出错误信息
-                throw new InvalidArgumentException($e->getError());
-            }
+        $data      = $data ?: $this->getData();
+        if (!empty($validater)) {
+            return validate($validater)
+                ->only($allow ?: array_keys($data))
+                ->checked($data);
         }
+        return $data;
     }
 
     /**