改进Model类saveall方法的数据验证机制

library/think/Model.php

@@ -734,6 +734,15 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
      */
     public function saveAll($dataSet, $replace = true)
     {
+        if ($this->validate) {
+            // 数据批量验证
+            foreach ($dataSet as $data) {
+                if (!$this->validateData($data)) {
+                    return false;
+                }
+            }
+        }
+
         $result = [];
         $db     = $this->db();
         $db->startTrans();
@@ -744,9 +753,9 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
             }
             foreach ($dataSet as $key => $data) {
                 if (!empty($auto) && isset($data[$pk])) {
-                    $result[$key] = self::update($data, [], $this->validate, true);
+                    $result[$key] = self::update($data);
                 } else {
-                    $result[$key] = self::create($data, $this->validate, true);
+                    $result[$key] = self::create($data);
                 }
             }
             $db->commit();
@@ -960,19 +969,13 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
      * 写入数据
      * @access public
      * @param array     $data 数据数组
-     * @param mixed     $validate 数据验证规则
+     * @return $this
-     * @param boolean   $exception 验证失败是否抛出异常
-     * @return $this|false
      */
-    public static function create($data = [], $validate = null, $exception = false)
+    public static function create($data = [])
     {
         $model = new static();
-        $result = $model
+        $model->isUpdate(false)->save($data, []);
-            ->validate($validate)
+        return $model;
-            ->validateFailException($exception)
-            ->isUpdate(false)
-            ->save($data, []);
-        return false === $result ? false : $model;
     }
 
     /**
@@ -980,19 +983,13 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
      * @access public
      * @param array     $data 数据数组
      * @param array     $where 更新条件
-     * @param mixed     $validate 数据验证规则
+     * @return $this
-     * @param boolean   $exception 验证失败是否抛出异常
-     * @return $this|false
      */
-    public static function update($data = [], $where = [], $validate = null, $exception = false)
+    public static function update($data = [], $where = [])
     {
         $model  = new static();
-        $result = $model
+        $result = $model->isUpdate(true)->save($data, $where);
-            ->validate($validate)
+        return $model;
-            ->validateFailException($exception)
-            ->isUpdate(true)
-            ->save($data, $where);
-        return false === $result ? false : $model;
     }
 
     /**

library/think/exception/DbException.php

@@ -25,7 +25,7 @@ class DbException extends Exception
      * @param string    $sql
      * @param int       $code
      */
-    public function __construct($message, Array $config, $sql, $code = 10500)
+    public function __construct($message, array $config, $sql, $code = 10500)
     {
         $this->message = $message;
         $this->code    = $code;
@@ -33,11 +33,10 @@ class DbException extends Exception
         $this->setData('Database Status', [
             'Error Code'    => $code,
             'Error Message' => $message,
-            'Error SQL'     => $sql
+            'Error SQL'     => $sql,
         ]);
 
         $this->setData('Database Config', $config);
     }
 
-
 }

library/think/exception/HttpException.php

@@ -11,7 +11,6 @@
 
 namespace think\exception;
 
-
 class HttpException extends \RuntimeException
 {
     private $statusCode;

library/think/exception/HttpResponseException.php

@@ -11,7 +11,6 @@
 
 namespace think\exception;
 
-
 use think\Response;
 
 class HttpResponseException extends \RuntimeException
@@ -31,5 +30,4 @@ class HttpResponseException extends \RuntimeException
         return $this->response;
     }
 
-
 }

library/think/exception/PDOException.php

@@ -26,14 +26,14 @@ class PDOException extends DbException
      * @param string        $sql
      * @param int           $code
      */
-    public function __construct(\PDOException $exception, Array $config, $sql, $code = 10501)
+    public function __construct(\PDOException $exception, array $config, $sql, $code = 10501)
     {
         $error = $exception->errorInfo;
 
         $this->setData('PDO Error Info', [
             'SQLSTATE'             => $error[0],
             'Driver Error Code'    => $error[1],
-            'Driver Error Message' => isset($error[2]) ? $error[2] : ''
+            'Driver Error Message' => isset($error[2]) ? $error[2] : '',
         ]);
 
         parent::__construct($exception->getMessage(), $config, $sql, $code);

library/think/exception/ThrowableError.php

@@ -11,7 +11,6 @@
 
 namespace think\exception;
 
-
 class ThrowableError extends \ErrorException
 {
     public function __construct(\Throwable $e)
@@ -36,7 +35,6 @@ class ThrowableError extends \ErrorException
             $e->getLine()
         );
 
-
         $this->setTrace($e->getTrace());
     }