diff --git a/app/BaseController.php b/app/BaseController.php
index ebc71f3..127daf9 100644
--- a/app/BaseController.php
+++ b/app/BaseController.php
@@ -116,6 +116,8 @@ abstract class BaseController
             $url = $_SERVER["HTTP_REFERER"];
         } elseif ($url) {
             $url = (strpos($url, '://') || 0 === strpos($url, '/')) ? $url : app('route')->buildUrl($url);
+        }else{
+            $url = app('route')->buildUrl("/");
         }
 
         $result = [
@@ -152,7 +154,6 @@ abstract class BaseController
         } elseif ($url) {
             $url = (strpos($url, '://') || 0 === strpos($url, '/')) ? $url : $this->app->route->buildUrl($url);
         }
-
         $result = [
             'code' => 0,
             'msg' => $msg,
@@ -160,7 +161,6 @@ abstract class BaseController
             'url' => $url,
             'wait' => $wait,
         ];
-
         $type = $this->getResponseType();
         if ($type == 'html') {
             $response = view(config('app.dispatch_success_tmpl'), $result);
diff --git a/app/admin/controller/Index.php b/app/admin/controller/Index.php
index 6912828..777efcb 100644
--- a/app/admin/controller/Index.php
+++ b/app/admin/controller/Index.php
@@ -15,6 +15,7 @@ use Exception;
 use think\db\exception\DataNotFoundException;
 use think\db\exception\DbException;
 use think\db\exception\ModelNotFoundException;
+use think\facade\Request;
 
 class Index extends AuthController
 {
@@ -82,11 +83,9 @@ class Index extends AuthController
      */
     public function sitemap()
     {
-        //获取协议
-        $protocol = ((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off') || $_SERVER['SERVER_PORT'] == 443) ?
-            "https://" : "http://";
+
         //获取域名
-        $domain = $protocol . $_SERVER['HTTP_HOST'];
+        $domain = Request::domain();
         //获取页码
         $page = input('page/d');
         if (!$page) {
@@ -114,10 +113,9 @@ class Index extends AuthController
             ->where('status', 1)->where('status', 1)
             ->page($page, $pagesize)
             ->order('id desc')->select();
-
         foreach ($categoryInfo as $v) {
             $str .= '<url>';
-            $str .= '<loc>' . $domain . url('article/lists?id=' . $v['id']) . '</loc>';
+            $str .= '<loc>' . url('index/article/lists',["id"=>$v['id']],".html",$domain) . '</loc>';
             $str .= '<lastmod>' . $v['create_time'] . '</lastmod>';
             $str .= '<changefreq>always</changefreq>';
             $str .= '<priority>0.8</priority>';
@@ -132,7 +130,7 @@ class Index extends AuthController
 
         foreach ($documentInfo as $v) {
             $str .= '<url>';
-            $str .= '<loc>' . $domain . url('article/detail?id=' . $v['id']) . $v['id'] . '</loc>';
+            $str .= '<loc>' . url('/index/article/detail',["id"=>$v['id']],".html",$domain) . '</loc>';
             $str .= '<lastmod>' . $v['create_time'] . '</lastmod>';
             $str .= '<changefreq>monthly</changefreq>';
             $str .= '<priority>0.6</priority>';
@@ -140,17 +138,13 @@ class Index extends AuthController
         }
         if (count($categoryInfo) < $pagesize && count($documentInfo) < $pagesize) {
             $str .= '</urlset>';
-            if (!(file_put_contents('sitemap.xml', $str, FILE_APPEND | LOCK_EX))) {
-                $this->error('站点地图更新失败!',"/admin/");
-            } else {
-                $this->success('站点地图全部更新完成！', "/admin/");
-            }
+            return (!(file_put_contents('sitemap.xml', $str, FILE_APPEND | LOCK_EX))) ?
+                $this->failedNotice("站点地图更新失败!", "/admin/") :
+                $this->successfulNotice("站点地图全部更新完成!", "/admin/");
         }
         //写入
-        if (!(file_put_contents('sitemap.xml', $str, FILE_APPEND | LOCK_EX))) {
-            $this->error('站点地图更新失败！');
-        } else {
-            $this->success('站点地图正在生成，请稍后（' . $page . '）...', 'sitemap?page=' . ($page + 1));
-        }
+        return (!(file_put_contents('sitemap.xml', $str, FILE_APPEND | LOCK_EX))) ?
+            $this->failedNotice("站点地图更新失败!", "/admin/") :
+            $this->successfulNotice('站点地图正在生成，请稍后（' . $page . '）...', 'sitemap?page=' . ($page + 1));
     }
 }
\ No newline at end of file
diff --git a/app/admin/view/index/index.html b/app/admin/view/index/index.html
index 0bd97a3..728af5d 100644
--- a/app/admin/view/index/index.html
+++ b/app/admin/view/index/index.html
@@ -38,9 +38,10 @@
         <aside class="lyear-layout-sidebar">
             <!-- logo -->
             <div id="logo" class="sidebar-header">
-                <a href="/admin/index/index.html"><img src="/static/admin/img/logo-sidebar.png"
-                                                       title="{:system_config('title')}后台管理系统"
-                                                       alt="{:system_config('title')}后台管理系统"/></a>
+                <a href="/admin/index/index.html">
+                    <img src="/static/admin/img/logo-sidebar.png" title="{:system_config('title')}后台管理系统"
+                                alt="{:system_config('title')}后台管理系统"/>
+                </a>
             </div>
             <div class="lyear-layout-sidebar-scroll">
                 <nav class="sidebar-main">
diff --git a/app/admin/view/index/main.html b/app/admin/view/index/main.html
index 3167ad8..0e3416e 100644
--- a/app/admin/view/index/main.html
+++ b/app/admin/view/index/main.html
@@ -69,6 +69,22 @@
             </div>
         </div>
     </div>
+    <div class="row">
+        <div class="col-lg-12">
+            <div class="card">
+                <div class="card-header"><h4>常用功能</h4></div>
+                <div class="card-body">
+                    <div class="row">
+                        <div class="example-box">
+                            <div class="col-sm-3 col-md-2">
+                                <a class="btn btn-primary btn-w-md" href="{:url('index/sitemap')}" type="button">网站地图</a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
     <div class="row">
         <div class="col-lg-12">
             <div class="card">
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 7abe563..97406f1 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -3,8 +3,21 @@
 // autoload.php @generated by Composer
 
 if (PHP_VERSION_ID < 50600) {
-    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
-    exit(1);
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, $err);
+        } elseif (!headers_sent()) {
+            echo $err;
+        }
+    }
+    trigger_error(
+        $err,
+        E_USER_ERROR
+    );
 }
 
 require_once __DIR__ . '/composer/autoload_real.php';
diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
index afef3fa..a72151c 100644
--- a/vendor/composer/ClassLoader.php
+++ b/vendor/composer/ClassLoader.php
@@ -42,6 +42,9 @@ namespace Composer\Autoload;
  */
 class ClassLoader
 {
+    /** @var \Closure(string):void */
+    private static $includeFile;
+
     /** @var ?string */
     private $vendorDir;
 
@@ -106,6 +109,7 @@ class ClassLoader
     public function __construct($vendorDir = null)
     {
         $this->vendorDir = $vendorDir;
+        self::initializeIncludeClosure();
     }
 
     /**
@@ -425,7 +429,8 @@ class ClassLoader
     public function loadClass($class)
     {
         if ($file = $this->findFile($class)) {
-            includeFile($file);
+            $includeFile = self::$includeFile;
+            $includeFile($file);
 
             return true;
         }
@@ -555,18 +560,26 @@ class ClassLoader
 
         return false;
     }
-}
 
-/**
- * Scope isolated include.
- *
- * Prevents access to $this/self from included files.
- *
- * @param  string $file
- * @return void
- * @private
- */
-function includeFile($file)
-{
-    include $file;
+    /**
+     * @return void
+     */
+    private static function initializeIncludeClosure()
+    {
+        if (self::$includeFile !== null) {
+            return;
+        }
+
+        /**
+         * Scope isolated include.
+         *
+         * Prevents access to $this/self from included files.
+         *
+         * @param  string $file
+         * @return void
+         */
+        self::$includeFile = \Closure::bind(static function($file) {
+            include $file;
+        }, null, null);
+    }
 }
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
index 8b50536..2d097a5 100644
--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -10,7 +10,7 @@ return array(
     'think\\composer\\' => array($vendorDir . '/topthink/think-installer/src'),
     'think\\captcha\\' => array($vendorDir . '/topthink/think-captcha/src'),
     'think\\app\\' => array($vendorDir . '/topthink/think-multi-app/src'),
-    'think\\' => array($vendorDir . '/topthink/framework/src/think', $vendorDir . '/topthink/think-filesystem/src', $vendorDir . '/topthink/think-helper/src', $vendorDir . '/topthink/think-orm/src', $vendorDir . '/topthink/think-template/src'),
+    'think\\' => array($vendorDir . '/topthink/think-helper/src', $vendorDir . '/topthink/think-orm/src', $vendorDir . '/topthink/framework/src/think', $vendorDir . '/topthink/think-filesystem/src', $vendorDir . '/topthink/think-template/src'),
     'mailer\\' => array($vendorDir . '/yzh52521/think-mail/src/mailer'),
     'liliuwei\\social\\' => array($vendorDir . '/liliuwei/thinkphp-social/src'),
     'liliuwei\\sitemap\\' => array($vendorDir . '/liliuwei/php-sitemap/src'),
@@ -39,6 +39,7 @@ return array(
     'League\\Flysystem\\' => array($vendorDir . '/league/flysystem/src'),
     'FormBuilder\\' => array($vendorDir . '/xaboy/form-builder/src'),
     'Egulias\\EmailValidator\\' => array($vendorDir . '/egulias/email-validator/src'),
-    'Doctrine\\Common\\Lexer\\' => array($vendorDir . '/doctrine/lexer/lib/Doctrine/Common/Lexer'),
+    'Doctrine\\Deprecations\\' => array($vendorDir . '/doctrine/deprecations/lib/Doctrine/Deprecations'),
+    'Doctrine\\Common\\Lexer\\' => array($vendorDir . '/doctrine/lexer/src'),
     'Doctrine\\Common\\Annotations\\' => array($vendorDir . '/doctrine/annotations/lib/Doctrine/Common/Annotations'),
 );
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index 182e79f..a9bcb65 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -33,25 +33,18 @@ class ComposerAutoloaderInit4b57298e8d0e895486f3307a354a7e1a
 
         $loader->register(true);
 
-        $includeFiles = \Composer\Autoload\ComposerStaticInit4b57298e8d0e895486f3307a354a7e1a::$files;
-        foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire4b57298e8d0e895486f3307a354a7e1a($fileIdentifier, $file);
+        $filesToLoad = \Composer\Autoload\ComposerStaticInit4b57298e8d0e895486f3307a354a7e1a::$files;
+        $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
+            if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
+                $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
+
+                require $file;
+            }
+        }, null, null);
+        foreach ($filesToLoad as $fileIdentifier => $file) {
+            $requireFile($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
-
-/**
- * @param string $fileIdentifier
- * @param string $file
- * @return void
- */
-function composerRequire4b57298e8d0e895486f3307a354a7e1a($fileIdentifier, $file)
-{
-    if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
-        $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
-
-        require $file;
-    }
-}
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index caa2c65..3eef2c9 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -82,6 +82,7 @@ class ComposerStaticInit4b57298e8d0e895486f3307a354a7e1a
         ),
         'D' => 
         array (
+            'Doctrine\\Deprecations\\' => 22,
             'Doctrine\\Common\\Lexer\\' => 22,
             'Doctrine\\Common\\Annotations\\' => 28,
         ),
@@ -106,10 +107,10 @@ class ComposerStaticInit4b57298e8d0e895486f3307a354a7e1a
         ),
         'think\\' => 
         array (
-            0 => __DIR__ . '/..' . '/topthink/framework/src/think',
-            1 => __DIR__ . '/..' . '/topthink/think-filesystem/src',
-            2 => __DIR__ . '/..' . '/topthink/think-helper/src',
-            3 => __DIR__ . '/..' . '/topthink/think-orm/src',
+            0 => __DIR__ . '/..' . '/topthink/think-helper/src',
+            1 => __DIR__ . '/..' . '/topthink/think-orm/src',
+            2 => __DIR__ . '/..' . '/topthink/framework/src/think',
+            3 => __DIR__ . '/..' . '/topthink/think-filesystem/src',
             4 => __DIR__ . '/..' . '/topthink/think-template/src',
         ),
         'mailer\\' => 
@@ -224,9 +225,13 @@ class ComposerStaticInit4b57298e8d0e895486f3307a354a7e1a
         array (
             0 => __DIR__ . '/..' . '/egulias/email-validator/src',
         ),
+        'Doctrine\\Deprecations\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/doctrine/deprecations/lib/Doctrine/Deprecations',
+        ),
         'Doctrine\\Common\\Lexer\\' => 
         array (
-            0 => __DIR__ . '/..' . '/doctrine/lexer/lib/Doctrine/Common/Lexer',
+            0 => __DIR__ . '/..' . '/doctrine/lexer/src',
         ),
         'Doctrine\\Common\\Annotations\\' => 
         array (
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 2fcfb95..55ac9ad 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -2,17 +2,17 @@
     "packages": [
         {
             "name": "doctrine/annotations",
-            "version": "1.13.3",
-            "version_normalized": "1.13.3.0",
+            "version": "1.14.3",
+            "version_normalized": "1.14.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/annotations.git",
-                "reference": "648b0343343565c4a056bfc8392201385e8d89f0"
+                "reference": "fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/648b0343343565c4a056bfc8392201385e8d89f0",
-                "reference": "648b0343343565c4a056bfc8392201385e8d89f0",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af",
+                "reference": "fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -22,20 +22,23 @@
                 ]
             },
             "require": {
-                "doctrine/lexer": "1.*",
+                "doctrine/lexer": "^1 || ^2",
                 "ext-tokenizer": "*",
                 "php": "^7.1 || ^8.0",
                 "psr/cache": "^1 || ^2 || ^3"
             },
             "require-dev": {
                 "doctrine/cache": "^1.11 || ^2.0",
-                "doctrine/coding-standard": "^6.0 || ^8.1",
-                "phpstan/phpstan": "^1.4.10 || ^1.8.0",
-                "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5",
-                "symfony/cache": "^4.4 || ^5.2",
+                "doctrine/coding-standard": "^9 || ^10",
+                "phpstan/phpstan": "~1.4.10 || ^1.8.0",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "symfony/cache": "^4.4 || ^5.4 || ^6",
                 "vimeo/psalm": "^4.10"
             },
-            "time": "2022-07-02T10:48:51+00:00",
+            "suggest": {
+                "php": "PHP 8.0 or higher comes with attributes, a native replacement for annotations"
+            },
+            "time": "2023-02-01T09:20:38+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -78,23 +81,23 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/annotations/issues",
-                "source": "https://github.com/doctrine/annotations/tree/1.13.3"
+                "source": "https://github.com/doctrine/annotations/tree/1.14.3"
             },
             "install-path": "../doctrine/annotations"
         },
         {
-            "name": "doctrine/lexer",
-            "version": "1.2.3",
-            "version_normalized": "1.2.3.0",
+            "name": "doctrine/deprecations",
+            "version": "v1.0.0",
+            "version_normalized": "1.0.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/doctrine/lexer.git",
-                "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229"
+                "url": "https://github.com/doctrine/deprecations.git",
+                "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/c268e882d4dbdd85e36e4ad69e02dc284f89d229",
-                "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229",
+                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
+                "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -104,20 +107,74 @@
                 ]
             },
             "require": {
-                "php": "^7.1 || ^8.0"
+                "php": "^7.1|^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^9.0",
-                "phpstan/phpstan": "^1.3",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "vimeo/psalm": "^4.11"
+                "doctrine/coding-standard": "^9",
+                "phpunit/phpunit": "^7.5|^8.5|^9.5",
+                "psr/log": "^1|^2|^3"
             },
-            "time": "2022-02-28T11:07:21+00:00",
+            "suggest": {
+                "psr/log": "Allows logging deprecations via PSR-3 logger implementation"
+            },
+            "time": "2022-05-02T15:47:09+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
+                    "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.",
+            "homepage": "https://www.doctrine-project.org/",
+            "support": {
+                "issues": "https://github.com/doctrine/deprecations/issues",
+                "source": "https://github.com/doctrine/deprecations/tree/v1.0.0"
+            },
+            "install-path": "../doctrine/deprecations"
+        },
+        {
+            "name": "doctrine/lexer",
+            "version": "2.1.0",
+            "version_normalized": "2.1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/lexer.git",
+                "reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/39ab8fcf5a51ce4b85ca97c7a7d033eb12831124",
+                "reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "require": {
+                "doctrine/deprecations": "^1.0",
+                "php": "^7.1 || ^8.0"
+            },
+            "require-dev": {
+                "doctrine/coding-standard": "^9 || ^10",
+                "phpstan/phpstan": "^1.3",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "psalm/plugin-phpunit": "^0.18.3",
+                "vimeo/psalm": "^4.11 || ^5.0"
+            },
+            "time": "2022-12-14T08:49:07+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Common\\Lexer\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -149,7 +206,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/lexer/issues",
-                "source": "https://github.com/doctrine/lexer/tree/1.2.3"
+                "source": "https://github.com/doctrine/lexer/tree/2.1.0"
             },
             "funding": [
                 {
@@ -169,17 +226,17 @@
         },
         {
             "name": "egulias/email-validator",
-            "version": "3.2.1",
-            "version_normalized": "3.2.1.0",
+            "version": "3.2.5",
+            "version_normalized": "3.2.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/egulias/EmailValidator.git",
-                "reference": "f88dcf4b14af14a98ad96b14b2b317969eab6715"
+                "reference": "b531a2311709443320c786feb4519cfaf94af796"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/f88dcf4b14af14a98ad96b14b2b317969eab6715",
-                "reference": "f88dcf4b14af14a98ad96b14b2b317969eab6715",
+                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/b531a2311709443320c786feb4519cfaf94af796",
+                "reference": "b531a2311709443320c786feb4519cfaf94af796",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -189,19 +246,18 @@
                 ]
             },
             "require": {
-                "doctrine/lexer": "^1.2",
+                "doctrine/lexer": "^1.2|^2",
                 "php": ">=7.2",
                 "symfony/polyfill-intl-idn": "^1.15"
             },
             "require-dev": {
-                "php-coveralls/php-coveralls": "^2.2",
                 "phpunit/phpunit": "^8.5.8|^9.3.3",
                 "vimeo/psalm": "^4"
             },
             "suggest": {
                 "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
             },
-            "time": "2022-06-18T20:57:19+00:00",
+            "time": "2023-01-02T17:26:14+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -234,7 +290,7 @@
             ],
             "support": {
                 "issues": "https://github.com/egulias/EmailValidator/issues",
-                "source": "https://github.com/egulias/EmailValidator/tree/3.2.1"
+                "source": "https://github.com/egulias/EmailValidator/tree/3.2.5"
             },
             "funding": [
                 {
@@ -544,17 +600,17 @@
         },
         {
             "name": "phpmailer/phpmailer",
-            "version": "v6.6.4",
-            "version_normalized": "6.6.4.0",
+            "version": "v6.7.1",
+            "version_normalized": "6.7.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPMailer/PHPMailer.git",
-                "reference": "a94fdebaea6bd17f51be0c2373ab80d3d681269b"
+                "reference": "49cd7ea3d2563f028d7811f06864a53b1f15ff55"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/a94fdebaea6bd17f51be0c2373ab80d3d681269b",
-                "reference": "a94fdebaea6bd17f51be0c2373ab80d3d681269b",
+                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/49cd7ea3d2563f028d7811f06864a53b1f15ff55",
+                "reference": "49cd7ea3d2563f028d7811f06864a53b1f15ff55",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -570,24 +626,26 @@
                 "php": ">=5.5.0"
             },
             "require-dev": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
-                "doctrine/annotations": "^1.2",
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",
+                "doctrine/annotations": "^1.2.6 || ^1.13.3",
                 "php-parallel-lint/php-console-highlighter": "^1.0.0",
                 "php-parallel-lint/php-parallel-lint": "^1.3.2",
                 "phpcompatibility/php-compatibility": "^9.3.5",
                 "roave/security-advisories": "dev-latest",
-                "squizlabs/php_codesniffer": "^3.6.2",
-                "yoast/phpunit-polyfills": "^1.0.0"
+                "squizlabs/php_codesniffer": "^3.7.1",
+                "yoast/phpunit-polyfills": "^1.0.4"
             },
             "suggest": {
                 "ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses",
+                "ext-openssl": "Needed for secure SMTP sending and DKIM signing",
+                "greew/oauth2-azure-provider": "Needed for Microsoft Azure XOAUTH2 authentication",
                 "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
                 "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
                 "psr/log": "For optional PSR-3 debug logging",
-                "stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication",
-                "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)"
+                "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)",
+                "thenetworg/oauth2-azure": "Needed for Microsoft XOAUTH2 authentication"
             },
-            "time": "2022-08-22T09:22:00+00:00",
+            "time": "2022-12-08T13:30:06+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -619,7 +677,7 @@
             "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
             "support": {
                 "issues": "https://github.com/PHPMailer/PHPMailer/issues",
-                "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.6.4"
+                "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.7.1"
             },
             "funding": [
                 {
@@ -805,17 +863,17 @@
         },
         {
             "name": "psr/http-message",
-            "version": "1.0.1",
-            "version_normalized": "1.0.1.0",
+            "version": "1.1",
+            "version_normalized": "1.1.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-message.git",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
+                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -825,13 +883,13 @@
                 ]
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": "^7.2 || ^8.0"
             },
-            "time": "2016-08-06T14:39:51+00:00",
+            "time": "2023-04-04T09:50:52+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.1.x-dev"
                 }
             },
             "installation-source": "dist",
@@ -861,7 +919,7 @@
                 "response"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-message/tree/master"
+                "source": "https://github.com/php-fig/http-message/tree/1.1"
             },
             "install-path": "../psr/http-message"
         },
@@ -1121,17 +1179,17 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v5.4.9",
-            "version_normalized": "5.4.9.0",
+            "version": "v5.4.22",
+            "version_normalized": "5.4.22.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc"
+                "reference": "1df20e45d56da29a4b1d8259dd6e950acbf1b13f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc",
-                "reference": "8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/1df20e45d56da29a4b1d8259dd6e950acbf1b13f",
+                "reference": "1df20e45d56da29a4b1d8259dd6e950acbf1b13f",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -1167,7 +1225,7 @@
                 "symfony/dependency-injection": "",
                 "symfony/http-kernel": ""
             },
-            "time": "2022-05-05T16:45:39+00:00",
+            "time": "2023-03-17T11:31:58+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -1195,7 +1253,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.9"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.22"
             },
             "funding": [
                 {
@@ -1303,17 +1361,17 @@
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v5.4.15",
-            "version_normalized": "5.4.15.0",
+            "version": "v5.4.23",
+            "version_normalized": "5.4.23.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "75bd663ff2db90141bfb733682459d5bbe9e29c3"
+                "reference": "af9fbb378f5f956c8f29d4886644c84c193780ac"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/75bd663ff2db90141bfb733682459d5bbe9e29c3",
-                "reference": "75bd663ff2db90141bfb733682459d5bbe9e29c3",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/af9fbb378f5f956c8f29d4886644c84c193780ac",
+                "reference": "af9fbb378f5f956c8f29d4886644c84c193780ac",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -1340,7 +1398,7 @@
             "suggest": {
                 "symfony/mime": "To use the file extension guesser"
             },
-            "time": "2022-10-12T09:43:19+00:00",
+            "time": "2023-04-18T06:30:11+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -1368,7 +1426,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v5.4.15"
+                "source": "https://github.com/symfony/http-foundation/tree/v5.4.23"
             },
             "funding": [
                 {
@@ -1388,17 +1446,17 @@
         },
         {
             "name": "symfony/mailer",
-            "version": "v5.4.15",
-            "version_normalized": "5.4.15.0",
+            "version": "v5.4.22",
+            "version_normalized": "5.4.22.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mailer.git",
-                "reference": "926f4deddb60d40024e6058fd8f94e70e4024930"
+                "reference": "6330cd465dfd8b7a07515757a1c37069075f7b0b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mailer/zipball/926f4deddb60d40024e6058fd8f94e70e4024930",
-                "reference": "926f4deddb60d40024e6058fd8f94e70e4024930",
+                "url": "https://api.github.com/repos/symfony/mailer/zipball/6330cd465dfd8b7a07515757a1c37069075f7b0b",
+                "reference": "6330cd465dfd8b7a07515757a1c37069075f7b0b",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -1408,7 +1466,7 @@
                 ]
             },
             "require": {
-                "egulias/email-validator": "^2.1.10|^3",
+                "egulias/email-validator": "^2.1.10|^3|^4",
                 "php": ">=7.2.5",
                 "psr/event-dispatcher": "^1",
                 "psr/log": "^1|^2|^3",
@@ -1422,10 +1480,10 @@
                 "symfony/http-kernel": "<4.4"
             },
             "require-dev": {
-                "symfony/http-client-contracts": "^1.1|^2|^3",
+                "symfony/http-client": "^4.4|^5.0|^6.0",
                 "symfony/messenger": "^4.4|^5.0|^6.0"
             },
-            "time": "2022-10-27T07:55:40+00:00",
+            "time": "2023-03-10T10:15:32+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -1453,7 +1511,7 @@
             "description": "Helps sending emails",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/mailer/tree/v5.4.15"
+                "source": "https://github.com/symfony/mailer/tree/v5.4.22"
             },
             "funding": [
                 {
@@ -1473,17 +1531,17 @@
         },
         {
             "name": "symfony/mime",
-            "version": "v5.4.14",
-            "version_normalized": "5.4.14.0",
+            "version": "v5.4.23",
+            "version_normalized": "5.4.23.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "1c118b253bb3495d81e95a6e3ec6c2766a98a0c4"
+                "reference": "ae0a1032a450a3abf305ee44fc55ed423fbf16e3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/1c118b253bb3495d81e95a6e3ec6c2766a98a0c4",
-                "reference": "1c118b253bb3495d81e95a6e3ec6c2766a98a0c4",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/ae0a1032a450a3abf305ee44fc55ed423fbf16e3",
+                "reference": "ae0a1032a450a3abf305ee44fc55ed423fbf16e3",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -1507,14 +1565,14 @@
                 "symfony/serializer": "<5.4.14|>=6.0,<6.0.14|>=6.1,<6.1.6"
             },
             "require-dev": {
-                "egulias/email-validator": "^2.1.10|^3.1",
+                "egulias/email-validator": "^2.1.10|^3.1|^4",
                 "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
                 "symfony/dependency-injection": "^4.4|^5.0|^6.0",
                 "symfony/property-access": "^4.4|^5.1|^6.0",
                 "symfony/property-info": "^4.4|^5.1|^6.0",
                 "symfony/serializer": "^5.4.14|~6.0.14|^6.1.6"
             },
-            "time": "2022-10-07T08:01:20+00:00",
+            "time": "2023-04-19T09:49:13+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -1546,7 +1604,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v5.4.14"
+                "source": "https://github.com/symfony/mime/tree/v5.4.23"
             },
             "funding": [
                 {
@@ -2214,17 +2272,17 @@
         },
         {
             "name": "topthink/framework",
-            "version": "v6.1.1",
-            "version_normalized": "6.1.1.0",
+            "version": "v6.1.2",
+            "version_normalized": "6.1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/top-think/framework.git",
-                "reference": "2cb56f3e6f3c479fe90ea5f28d38d3b5ef6c4210"
+                "reference": "67235be5b919aaaf1de5aed9839f65d8e766aca3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/top-think/framework/zipball/2cb56f3e6f3c479fe90ea5f28d38d3b5ef6c4210",
-                "reference": "2cb56f3e6f3c479fe90ea5f28d38d3b5ef6c4210",
+                "url": "https://api.github.com/repos/top-think/framework/zipball/67235be5b919aaaf1de5aed9839f65d8e766aca3",
+                "reference": "67235be5b919aaaf1de5aed9839f65d8e766aca3",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -2242,7 +2300,7 @@
                 "psr/log": "~1.0",
                 "psr/simple-cache": "^1.0",
                 "topthink/think-helper": "^3.1.1",
-                "topthink/think-orm": "^2.0"
+                "topthink/think-orm": "^2.0|^3.0"
             },
             "require-dev": {
                 "guzzlehttp/psr7": "^2.1.0",
@@ -2250,7 +2308,7 @@
                 "mockery/mockery": "^1.2",
                 "phpunit/phpunit": "^7.0"
             },
-            "time": "2022-10-26T03:48:53+00:00",
+            "time": "2023-02-08T02:24:01+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -2282,23 +2340,23 @@
             ],
             "support": {
                 "issues": "https://github.com/top-think/framework/issues",
-                "source": "https://github.com/top-think/framework/tree/v6.1.1"
+                "source": "https://github.com/top-think/framework/tree/v6.1.2"
             },
             "install-path": "../topthink/framework"
         },
         {
             "name": "topthink/think-captcha",
-            "version": "v3.0.8",
-            "version_normalized": "3.0.8.0",
+            "version": "v3.0.9",
+            "version_normalized": "3.0.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/top-think/think-captcha.git",
-                "reference": "52fba122c953995bec3013c635025172491ae299"
+                "reference": "b1ef360670578214edeebcf824aaf6ab7ee0528b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/top-think/think-captcha/zipball/52fba122c953995bec3013c635025172491ae299",
-                "reference": "52fba122c953995bec3013c635025172491ae299",
+                "url": "https://api.github.com/repos/top-think/think-captcha/zipball/b1ef360670578214edeebcf824aaf6ab7ee0528b",
+                "reference": "b1ef360670578214edeebcf824aaf6ab7ee0528b",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -2308,9 +2366,9 @@
                 ]
             },
             "require": {
-                "topthink/framework": "^6.0"
+                "topthink/framework": "^6.0|^8.0"
             },
-            "time": "2022-10-26T07:59:42+00:00",
+            "time": "2023-04-27T07:18:40+00:00",
             "type": "library",
             "extra": {
                 "think": {
@@ -2344,23 +2402,23 @@
             "description": "captcha package for thinkphp",
             "support": {
                 "issues": "https://github.com/top-think/think-captcha/issues",
-                "source": "https://github.com/top-think/think-captcha/tree/v3.0.8"
+                "source": "https://github.com/top-think/think-captcha/tree/v3.0.9"
             },
             "install-path": "../topthink/think-captcha"
         },
         {
             "name": "topthink/think-filesystem",
-            "version": "v2.0.0",
-            "version_normalized": "2.0.0.0",
+            "version": "v2.0.2",
+            "version_normalized": "2.0.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/top-think/think-filesystem.git",
-                "reference": "63e525fd74f451b2df1df060c3194e9b6e724730"
+                "reference": "c08503232fcae0c3c7fefae5e6b5c841ffe09f2f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/top-think/think-filesystem/zipball/63e525fd74f451b2df1df060c3194e9b6e724730",
-                "reference": "63e525fd74f451b2df1df060c3194e9b6e724730",
+                "url": "https://api.github.com/repos/top-think/think-filesystem/zipball/c08503232fcae0c3c7fefae5e6b5c841ffe09f2f",
+                "reference": "c08503232fcae0c3c7fefae5e6b5c841ffe09f2f",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -2371,14 +2429,14 @@
             },
             "require": {
                 "league/flysystem": "^2.0",
-                "topthink/framework": "^6.1"
+                "topthink/framework": "^6.1|^8.0"
             },
             "require-dev": {
                 "mikey179/vfsstream": "^1.6",
                 "mockery/mockery": "^1.2",
                 "phpunit/phpunit": "^8.0"
             },
-            "time": "2022-10-26T04:51:41+00:00",
+            "time": "2023-02-08T01:23:42+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -2399,7 +2457,7 @@
             "description": "The ThinkPHP6.1 Filesystem Package",
             "support": {
                 "issues": "https://github.com/top-think/think-filesystem/issues",
-                "source": "https://github.com/top-think/think-filesystem/tree/v2.0.0"
+                "source": "https://github.com/top-think/think-filesystem/tree/v2.0.2"
             },
             "install-path": "../topthink/think-filesystem"
         },
@@ -2514,17 +2572,17 @@
         },
         {
             "name": "topthink/think-multi-app",
-            "version": "v1.0.15",
-            "version_normalized": "1.0.15.0",
+            "version": "v1.0.16",
+            "version_normalized": "1.0.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/top-think/think-multi-app.git",
-                "reference": "387e0dac059c20f92cac5da41a871e10829c1c97"
+                "reference": "07b9183855150455e1f76f8cbe9d77d6d1bc399f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/top-think/think-multi-app/zipball/387e0dac059c20f92cac5da41a871e10829c1c97",
-                "reference": "387e0dac059c20f92cac5da41a871e10829c1c97",
+                "url": "https://api.github.com/repos/top-think/think-multi-app/zipball/07b9183855150455e1f76f8cbe9d77d6d1bc399f",
+                "reference": "07b9183855150455e1f76f8cbe9d77d6d1bc399f",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -2535,9 +2593,9 @@
             },
             "require": {
                 "php": ">=7.1.0",
-                "topthink/framework": "^6.0"
+                "topthink/framework": "^6.0|^8.0"
             },
-            "time": "2022-10-26T08:03:06+00:00",
+            "time": "2023-02-07T08:40:09+00:00",
             "type": "library",
             "extra": {
                 "think": {
@@ -2565,23 +2623,23 @@
             "description": "thinkphp6 multi app support",
             "support": {
                 "issues": "https://github.com/top-think/think-multi-app/issues",
-                "source": "https://github.com/top-think/think-multi-app/tree/v1.0.15"
+                "source": "https://github.com/top-think/think-multi-app/tree/v1.0.16"
             },
             "install-path": "../topthink/think-multi-app"
         },
         {
             "name": "topthink/think-orm",
-            "version": "v2.0.54",
-            "version_normalized": "2.0.54.0",
+            "version": "v2.0.61",
+            "version_normalized": "2.0.61.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/top-think/think-orm.git",
-                "reference": "97b061b47616301ff29fbd4c35ed9184e1162e4e"
+                "reference": "10528ebf4a5106b19c3bac9c6deae7a67ff49de6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/top-think/think-orm/zipball/97b061b47616301ff29fbd4c35ed9184e1162e4e",
-                "reference": "97b061b47616301ff29fbd4c35ed9184e1162e4e",
+                "url": "https://api.github.com/repos/top-think/think-orm/zipball/10528ebf4a5106b19c3bac9c6deae7a67ff49de6",
+                "reference": "10528ebf4a5106b19c3bac9c6deae7a67ff49de6",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -2601,7 +2659,7 @@
             "require-dev": {
                 "phpunit/phpunit": "^7|^8|^9.5"
             },
-            "time": "2022-07-05T05:25:51+00:00",
+            "time": "2023-04-20T14:27:51+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -2629,23 +2687,23 @@
             ],
             "support": {
                 "issues": "https://github.com/top-think/think-orm/issues",
-                "source": "https://github.com/top-think/think-orm/tree/v2.0.54"
+                "source": "https://github.com/top-think/think-orm/tree/v2.0.61"
             },
             "install-path": "../topthink/think-orm"
         },
         {
             "name": "topthink/think-template",
-            "version": "v2.0.8",
-            "version_normalized": "2.0.8.0",
+            "version": "v2.0.9",
+            "version_normalized": "2.0.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/top-think/think-template.git",
-                "reference": "abfc293f74f9ef5127b5c416310a01fe42e59368"
+                "reference": "6d25642ae0e306166742fd7073dc7a159e18073c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/top-think/think-template/zipball/abfc293f74f9ef5127b5c416310a01fe42e59368",
-                "reference": "abfc293f74f9ef5127b5c416310a01fe42e59368",
+                "url": "https://api.github.com/repos/top-think/think-template/zipball/6d25642ae0e306166742fd7073dc7a159e18073c",
+                "reference": "6d25642ae0e306166742fd7073dc7a159e18073c",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -2658,7 +2716,7 @@
                 "php": ">=7.1.0",
                 "psr/simple-cache": "^1.0"
             },
-            "time": "2020-12-10T07:52:03+00:00",
+            "time": "2023-02-14T10:50:39+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -2679,7 +2737,7 @@
             "description": "the php template engine",
             "support": {
                 "issues": "https://github.com/top-think/think-template/issues",
-                "source": "https://github.com/top-think/think-template/tree/v2.0.8"
+                "source": "https://github.com/top-think/think-template/tree/v2.0.9"
             },
             "install-path": "../topthink/think-template"
         },
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index 90fbea0..45dc978 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
         'name' => 'topthink/think',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => 'e3cf01d01f242927ac3fd497b0cbc88fad1c9df2',
+        'reference' => 'c7deee9ae9a946ac4af3f530791f720402b7692d',
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -11,27 +11,36 @@
     ),
     'versions' => array(
         'doctrine/annotations' => array(
-            'pretty_version' => '1.13.3',
-            'version' => '1.13.3.0',
-            'reference' => '648b0343343565c4a056bfc8392201385e8d89f0',
+            'pretty_version' => '1.14.3',
+            'version' => '1.14.3.0',
+            'reference' => 'fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af',
             'type' => 'library',
             'install_path' => __DIR__ . '/../doctrine/annotations',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
+        'doctrine/deprecations' => array(
+            'pretty_version' => 'v1.0.0',
+            'version' => '1.0.0.0',
+            'reference' => '0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../doctrine/deprecations',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
         'doctrine/lexer' => array(
-            'pretty_version' => '1.2.3',
-            'version' => '1.2.3.0',
-            'reference' => 'c268e882d4dbdd85e36e4ad69e02dc284f89d229',
+            'pretty_version' => '2.1.0',
+            'version' => '2.1.0.0',
+            'reference' => '39ab8fcf5a51ce4b85ca97c7a7d033eb12831124',
             'type' => 'library',
             'install_path' => __DIR__ . '/../doctrine/lexer',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'egulias/email-validator' => array(
-            'pretty_version' => '3.2.1',
-            'version' => '3.2.1.0',
-            'reference' => 'f88dcf4b14af14a98ad96b14b2b317969eab6715',
+            'pretty_version' => '3.2.5',
+            'version' => '3.2.5.0',
+            'reference' => 'b531a2311709443320c786feb4519cfaf94af796',
             'type' => 'library',
             'install_path' => __DIR__ . '/../egulias/email-validator',
             'aliases' => array(),
@@ -74,9 +83,9 @@
             'dev_requirement' => false,
         ),
         'phpmailer/phpmailer' => array(
-            'pretty_version' => 'v6.6.4',
-            'version' => '6.6.4.0',
-            'reference' => 'a94fdebaea6bd17f51be0c2373ab80d3d681269b',
+            'pretty_version' => 'v6.7.1',
+            'version' => '6.7.1.0',
+            'reference' => '49cd7ea3d2563f028d7811f06864a53b1f15ff55',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpmailer/phpmailer',
             'aliases' => array(),
@@ -116,9 +125,9 @@
             ),
         ),
         'psr/http-message' => array(
-            'pretty_version' => '1.0.1',
-            'version' => '1.0.1.0',
-            'reference' => 'f6561bf28d520154e4b0ec72be95418abe6d9363',
+            'pretty_version' => '1.1',
+            'version' => '1.1.0.0',
+            'reference' => 'cb6ce4845ce34a8ad9e68117c10ee90a29919eba',
             'type' => 'library',
             'install_path' => __DIR__ . '/../psr/http-message',
             'aliases' => array(),
@@ -161,9 +170,9 @@
             'dev_requirement' => false,
         ),
         'symfony/event-dispatcher' => array(
-            'pretty_version' => 'v5.4.9',
-            'version' => '5.4.9.0',
-            'reference' => '8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc',
+            'pretty_version' => 'v5.4.22',
+            'version' => '5.4.22.0',
+            'reference' => '1df20e45d56da29a4b1d8259dd6e950acbf1b13f',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/event-dispatcher',
             'aliases' => array(),
@@ -185,27 +194,27 @@
             ),
         ),
         'symfony/http-foundation' => array(
-            'pretty_version' => 'v5.4.15',
-            'version' => '5.4.15.0',
-            'reference' => '75bd663ff2db90141bfb733682459d5bbe9e29c3',
+            'pretty_version' => 'v5.4.23',
+            'version' => '5.4.23.0',
+            'reference' => 'af9fbb378f5f956c8f29d4886644c84c193780ac',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/http-foundation',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'symfony/mailer' => array(
-            'pretty_version' => 'v5.4.15',
-            'version' => '5.4.15.0',
-            'reference' => '926f4deddb60d40024e6058fd8f94e70e4024930',
+            'pretty_version' => 'v5.4.22',
+            'version' => '5.4.22.0',
+            'reference' => '6330cd465dfd8b7a07515757a1c37069075f7b0b',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/mailer',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'symfony/mime' => array(
-            'pretty_version' => 'v5.4.14',
-            'version' => '5.4.14.0',
-            'reference' => '1c118b253bb3495d81e95a6e3ec6c2766a98a0c4',
+            'pretty_version' => 'v5.4.23',
+            'version' => '5.4.23.0',
+            'reference' => 'ae0a1032a450a3abf305ee44fc55ed423fbf16e3',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/mime',
             'aliases' => array(),
@@ -275,9 +284,9 @@
             'dev_requirement' => true,
         ),
         'topthink/framework' => array(
-            'pretty_version' => 'v6.1.1',
-            'version' => '6.1.1.0',
-            'reference' => '2cb56f3e6f3c479fe90ea5f28d38d3b5ef6c4210',
+            'pretty_version' => 'v6.1.2',
+            'version' => '6.1.2.0',
+            'reference' => '67235be5b919aaaf1de5aed9839f65d8e766aca3',
             'type' => 'library',
             'install_path' => __DIR__ . '/../topthink/framework',
             'aliases' => array(),
@@ -286,25 +295,25 @@
         'topthink/think' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => 'e3cf01d01f242927ac3fd497b0cbc88fad1c9df2',
+            'reference' => 'c7deee9ae9a946ac4af3f530791f720402b7692d',
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'topthink/think-captcha' => array(
-            'pretty_version' => 'v3.0.8',
-            'version' => '3.0.8.0',
-            'reference' => '52fba122c953995bec3013c635025172491ae299',
+            'pretty_version' => 'v3.0.9',
+            'version' => '3.0.9.0',
+            'reference' => 'b1ef360670578214edeebcf824aaf6ab7ee0528b',
             'type' => 'library',
             'install_path' => __DIR__ . '/../topthink/think-captcha',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'topthink/think-filesystem' => array(
-            'pretty_version' => 'v2.0.0',
-            'version' => '2.0.0.0',
-            'reference' => '63e525fd74f451b2df1df060c3194e9b6e724730',
+            'pretty_version' => 'v2.0.2',
+            'version' => '2.0.2.0',
+            'reference' => 'c08503232fcae0c3c7fefae5e6b5c841ffe09f2f',
             'type' => 'library',
             'install_path' => __DIR__ . '/../topthink/think-filesystem',
             'aliases' => array(),
@@ -329,27 +338,27 @@
             'dev_requirement' => false,
         ),
         'topthink/think-multi-app' => array(
-            'pretty_version' => 'v1.0.15',
-            'version' => '1.0.15.0',
-            'reference' => '387e0dac059c20f92cac5da41a871e10829c1c97',
+            'pretty_version' => 'v1.0.16',
+            'version' => '1.0.16.0',
+            'reference' => '07b9183855150455e1f76f8cbe9d77d6d1bc399f',
             'type' => 'library',
             'install_path' => __DIR__ . '/../topthink/think-multi-app',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'topthink/think-orm' => array(
-            'pretty_version' => 'v2.0.54',
-            'version' => '2.0.54.0',
-            'reference' => '97b061b47616301ff29fbd4c35ed9184e1162e4e',
+            'pretty_version' => 'v2.0.61',
+            'version' => '2.0.61.0',
+            'reference' => '10528ebf4a5106b19c3bac9c6deae7a67ff49de6',
             'type' => 'library',
             'install_path' => __DIR__ . '/../topthink/think-orm',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'topthink/think-template' => array(
-            'pretty_version' => 'v2.0.8',
-            'version' => '2.0.8.0',
-            'reference' => 'abfc293f74f9ef5127b5c416310a01fe42e59368',
+            'pretty_version' => 'v2.0.9',
+            'version' => '2.0.9.0',
+            'reference' => '6d25642ae0e306166742fd7073dc7a159e18073c',
             'type' => 'library',
             'install_path' => __DIR__ . '/../topthink/think-template',
             'aliases' => array(),
diff --git a/vendor/doctrine/annotations/README.md b/vendor/doctrine/annotations/README.md
index c2c7eb7..6b8c035 100644
--- a/vendor/doctrine/annotations/README.md
+++ b/vendor/doctrine/annotations/README.md
@@ -1,3 +1,9 @@
+⚠️ PHP 8 introduced
+[attributes](https://www.php.net/manual/en/language.attributes.overview.php),
+which are a native replacement for annotations. As such, this library is
+considered feature complete, and should receive exclusively bugfixes and
+security fixes.
+
 # Doctrine Annotations
 
 [![Build Status](https://github.com/doctrine/annotations/workflows/Continuous%20Integration/badge.svg?label=build)](https://github.com/doctrine/persistence/actions)
diff --git a/vendor/doctrine/annotations/composer.json b/vendor/doctrine/annotations/composer.json
index b4dfbd3..e322d82 100644
--- a/vendor/doctrine/annotations/composer.json
+++ b/vendor/doctrine/annotations/composer.json
@@ -34,17 +34,20 @@
     "require": {
         "php": "^7.1 || ^8.0",
         "ext-tokenizer": "*",
-        "doctrine/lexer": "1.*",
+        "doctrine/lexer": "^1 || ^2",
         "psr/cache": "^1 || ^2 || ^3"
     },
     "require-dev": {
         "doctrine/cache": "^1.11 || ^2.0",
-        "doctrine/coding-standard": "^6.0 || ^8.1",
-        "phpstan/phpstan": "^1.4.10 || ^1.8.0",
-        "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5",
-        "symfony/cache": "^4.4 || ^5.2",
+        "doctrine/coding-standard": "^9 || ^10",
+        "phpstan/phpstan": "~1.4.10 || ^1.8.0",
+        "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+        "symfony/cache": "^4.4 || ^5.4 || ^6",
         "vimeo/psalm": "^4.10"
     },
+    "suggest": {
+        "php": "PHP 8.0 or higher comes with attributes, a native replacement for annotations"
+    },
     "autoload": {
         "psr-4": {
             "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
diff --git a/vendor/doctrine/annotations/docs/en/custom.rst b/vendor/doctrine/annotations/docs/en/custom.rst
index 11fbe1a..e8f79af 100644
--- a/vendor/doctrine/annotations/docs/en/custom.rst
+++ b/vendor/doctrine/annotations/docs/en/custom.rst
@@ -69,7 +69,7 @@ When using the ``@NamedArgumentConstructor`` tag, the first argument of the
 constructor is considered as the default one.
 
 
-Usage with the ``@NamedArgumentContrustor`` tag
+Usage with the ``@NamedArgumentConstructor`` tag
 
 .. code-block:: php
 
diff --git a/vendor/doctrine/annotations/docs/en/index.rst b/vendor/doctrine/annotations/docs/en/index.rst
index 95476c3..7caffb5 100644
--- a/vendor/doctrine/annotations/docs/en/index.rst
+++ b/vendor/doctrine/annotations/docs/en/index.rst
@@ -1,3 +1,12 @@
+Deprecation notice
+==================
+
+PHP 8 introduced `attributes
+<https://www.php.net/manual/en/language.attributes.overview.php>`_,
+which are a native replacement for annotations. As such, this library is
+considered feature complete, and should receive exclusively bugfixes and
+security fixes.
+
 Introduction
 ============
 
diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation.php
index 750270e..9cae3da 100644
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation.php
+++ b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation.php
@@ -18,9 +18,7 @@ class Annotation
      */
     public $value;
 
-    /**
-     * @param array<string, mixed> $data Key-value for properties to be defined in this class.
-     */
+    /** @param array<string, mixed> $data Key-value for properties to be defined in this class. */
     final public function __construct(array $data)
     {
         foreach ($data as $key => $value) {
diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Enum.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Enum.php
index 35d6410..6f24d9f 100644
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Enum.php
+++ b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Enum.php
@@ -34,9 +34,9 @@ final class Enum
     public $literal;
 
     /**
-     * @throws InvalidArgumentException
-     *
      * @phpstan-param array{literal?: mixed[], value: list<scalar>} $values
+     *
+     * @throws InvalidArgumentException
      */
     public function __construct(array $values)
     {
diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/IgnoreAnnotation.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/IgnoreAnnotation.php
index ae60f7d..97a15c2 100644
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/IgnoreAnnotation.php
+++ b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/IgnoreAnnotation.php
@@ -21,9 +21,9 @@ final class IgnoreAnnotation
     public $names;
 
     /**
-     * @throws RuntimeException
-     *
      * @phpstan-param array{value: string|list<string>} $values
+     *
+     * @throws RuntimeException
      */
     public function __construct(array $values)
     {
diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Target.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Target.php
index 7fd75e2..ba1d489 100644
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Target.php
+++ b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Target.php
@@ -56,9 +56,9 @@ final class Target
     public $literal;
 
     /**
-     * @throws InvalidArgumentException
-     *
      * @phpstan-param array{value?: string|list<string>} $values
+     *
+     * @throws InvalidArgumentException
      */
     public function __construct(array $values)
     {
diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationException.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationException.php
index 4d91825..dcdfe4d 100644
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationException.php
+++ b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationException.php
@@ -133,10 +133,9 @@ class AnnotationException extends Exception
      * @param string $annotationName
      * @param string $context
      * @param mixed  $given
+     * @phpstan-param list<string>        $available
      *
      * @return AnnotationException
-     *
-     * @phpstan-param list<string>        $available
      */
     public static function enumeratorError($attributeName, $annotationName, $context, $available, $given)
     {
@@ -150,9 +149,7 @@ class AnnotationException extends Exception
         ));
     }
 
-    /**
-     * @return AnnotationException
-     */
+    /** @return AnnotationException */
     public static function optimizerPlusSaveComments()
     {
         return new self(
@@ -160,9 +157,7 @@ class AnnotationException extends Exception
         );
     }
 
-    /**
-     * @return AnnotationException
-     */
+    /** @return AnnotationException */
     public static function optimizerPlusLoadComments()
     {
         return new self(
diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/CachedReader.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/CachedReader.php
index c036b2d..85dbefa 100644
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/CachedReader.php
+++ b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/CachedReader.php
@@ -38,9 +38,7 @@ final class CachedReader implements Reader
     /** @var int[] */
     private $loadedFilemtimes = [];
 
-    /**
-     * @param bool $debug
-     */
+    /** @param bool $debug */
     public function __construct(Reader $reader, Cache $cache, $debug = false)
     {
         $this->delegate = $reader;
diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/DocLexer.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/DocLexer.php
index f6567c5..dbba525 100644
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/DocLexer.php
+++ b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/DocLexer.php
@@ -15,6 +15,8 @@ use function substr;
 
 /**
  * Simple lexer for docblock annotations.
+ *
+ * @template-extends AbstractLexer<DocLexer::T_*, string>
  */
 final class DocLexer extends AbstractLexer
 {
@@ -39,7 +41,7 @@ final class DocLexer extends AbstractLexer
     public const T_COLON               = 112;
     public const T_MINUS               = 113;
 
-    /** @var array<string, int> */
+    /** @var array<string, self::T*> */
     protected $noCase = [
         '@'  => self::T_AT,
         ','  => self::T_COMMA,
@@ -53,7 +55,7 @@ final class DocLexer extends AbstractLexer
         '\\' => self::T_NAMESPACE_SEPARATOR,
     ];
 
-    /** @var array<string, int> */
+    /** @var array<string, self::T*> */
     protected $withCase = [
         'true'  => self::T_TRUE,
         'false' => self::T_FALSE,
@@ -126,4 +128,16 @@ final class DocLexer extends AbstractLexer
 
         return $type;
     }
+
+    /** @return array{value: int|string, type:self::T_*|null, position:int} */
+    public function peek(): ?array
+    {
+        $token = parent::peek();
+
+        if ($token === null) {
+            return null;
+        }
+
+        return (array) $token;
+    }
 }
diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/DocParser.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/DocParser.php
index 80f307c..5ec150d 100644
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/DocParser.php
+++ b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/DocParser.php
@@ -357,10 +357,10 @@ final class DocParser
      * @param string $input   The docblock string to parse.
      * @param string $context The parsing context.
      *
+     * @phpstan-return list<object> Array of annotations. If no annotations are found, an empty array is returned.
+     *
      * @throws AnnotationException
      * @throws ReflectionException
-     *
-     * @phpstan-return list<object> Array of annotations. If no annotations are found, an empty array is returned.
      */
     public function parse($input, $context = '')
     {
@@ -426,9 +426,9 @@ final class DocParser
      * If any of them matches, this method updates the lookahead token; otherwise
      * a syntax error is raised.
      *
-     * @throws AnnotationException
-     *
      * @phpstan-param list<mixed[]> $tokens
+     *
+     * @throws AnnotationException
      */
     private function matchAny(array $tokens): bool
     {
@@ -613,6 +613,10 @@ final class DocParser
                 $metadata['default_property'] = reset($metadata['properties']);
             } elseif ($metadata['has_named_argument_constructor']) {
                 foreach ($constructor->getParameters() as $parameter) {
+                    if ($parameter->isVariadic()) {
+                        break;
+                    }
+
                     $metadata['constructor_args'][$parameter->getName()] = [
                         'position' => $parameter->getPosition(),
                         'default' => $parameter->isOptional() ? $parameter->getDefaultValue() : null,
@@ -674,10 +678,10 @@ final class DocParser
     /**
      * Annotations ::= Annotation {[ "*" ]* [Annotation]}*
      *
+     * @phpstan-return list<object>
+     *
      * @throws AnnotationException
      * @throws ReflectionException
-     *
-     * @phpstan-return list<object>
      */
     private function Annotations(): array
     {
@@ -942,6 +946,23 @@ EXCEPTION
 
         if (self::$annotationMetadata[$name]['has_named_argument_constructor']) {
             if (PHP_VERSION_ID >= 80000) {
+                foreach ($values as $property => $value) {
+                    if (! isset(self::$annotationMetadata[$name]['constructor_args'][$property])) {
+                        throw AnnotationException::creationError(sprintf(
+                            <<<'EXCEPTION'
+The annotation @%s declared on %s does not have a property named "%s"
+that can be set through its named arguments constructor.
+Available named arguments: %s
+EXCEPTION
+                            ,
+                            $originalName,
+                            $this->context,
+                            $property,
+                            implode(', ', array_keys(self::$annotationMetadata[$name]['constructor_args']))
+                        ));
+                    }
+                }
+
                 return $this->instantiateAnnotiation($originalName, $this->context, $name, $values);
             }
 
@@ -1166,9 +1187,7 @@ EXCEPTION
         return $this->getClassConstantPositionInIdentifier($identifier) === strlen($identifier) - strlen('::class');
     }
 
-    /**
-     * @return int|false
-     */
+    /** @return int|false */
     private function getClassConstantPositionInIdentifier(string $identifier)
     {
         return stripos($identifier, '::class');
@@ -1357,10 +1376,10 @@ EXCEPTION
      * KeyValuePair ::= Key ("=" | ":") PlainValue | Constant
      * Key ::= string | integer | Constant
      *
+     * @phpstan-return array{mixed, mixed}
+     *
      * @throws AnnotationException
      * @throws ReflectionException
-     *
-     * @phpstan-return array{mixed, mixed}
      */
     private function ArrayEntry(): array
     {
diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/TokenParser.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/TokenParser.php
index 9605fb8..69259fc 100644
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/TokenParser.php
+++ b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/TokenParser.php
@@ -46,9 +46,7 @@ class TokenParser
      */
     private $pointer = 0;
 
-    /**
-     * @param string $contents
-     */
+    /** @param string $contents */
     public function __construct($contents)
     {
         $this->tokens = token_get_all($contents);
diff --git a/vendor/doctrine/deprecations/LICENSE b/vendor/doctrine/deprecations/LICENSE
new file mode 100644
index 0000000..156905c
--- /dev/null
+++ b/vendor/doctrine/deprecations/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2020-2021 Doctrine Project
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/vendor/doctrine/deprecations/README.md b/vendor/doctrine/deprecations/README.md
new file mode 100644
index 0000000..22f0cce
--- /dev/null
+++ b/vendor/doctrine/deprecations/README.md
@@ -0,0 +1,154 @@
+# Doctrine Deprecations
+
+A small (side-effect free by default) layer on top of
+`trigger_error(E_USER_DEPRECATED)` or PSR-3 logging.
+
+- no side-effects by default, making it a perfect fit for libraries that don't know how the error handler works they operate under
+- options to avoid having to rely on error handlers global state by using PSR-3 logging
+- deduplicate deprecation messages to avoid excessive triggering and reduce overhead
+
+We recommend to collect Deprecations using a PSR logger instead of relying on
+the global error handler.
+
+## Usage from consumer perspective:
+
+Enable Doctrine deprecations to be sent to a PSR3 logger:
+
+```php
+\Doctrine\Deprecations\Deprecation::enableWithPsrLogger($logger);
+```
+
+Enable Doctrine deprecations to be sent as `@trigger_error($message, E_USER_DEPRECATED)`
+messages.
+
+```php
+\Doctrine\Deprecations\Deprecation::enableWithTriggerError();
+```
+
+If you only want to enable deprecation tracking, without logging or calling `trigger_error` then call:
+
+```php
+\Doctrine\Deprecations\Deprecation::enableTrackingDeprecations();
+```
+
+Tracking is enabled with all three modes and provides access to all triggered
+deprecations and their individual count:
+
+```php
+$deprecations = \Doctrine\Deprecations\Deprecation::getTriggeredDeprecations();
+
+foreach ($deprecations as $identifier => $count) {
+    echo $identifier . " was triggered " . $count . " times\n";
+}
+```
+
+### Suppressing Specific Deprecations
+
+Disable triggering about specific deprecations:
+
+```php
+\Doctrine\Deprecations\Deprecation::ignoreDeprecations("https://link/to/deprecations-description-identifier");
+```
+
+Disable all deprecations from a package
+
+```php
+\Doctrine\Deprecations\Deprecation::ignorePackage("doctrine/orm");
+```
+
+### Other Operations
+
+When used within PHPUnit or other tools that could collect multiple instances of the same deprecations
+the deduplication can be disabled:
+
+```php
+\Doctrine\Deprecations\Deprecation::withoutDeduplication();
+```
+
+Disable deprecation tracking again:
+
+```php
+\Doctrine\Deprecations\Deprecation::disable();
+```
+
+## Usage from a library/producer perspective:
+
+When you want to unconditionally trigger a deprecation even when called
+from the library itself then the `trigger` method is the way to go:
+
+```php
+\Doctrine\Deprecations\Deprecation::trigger(
+    "doctrine/orm",
+    "https://link/to/deprecations-description",
+    "message"
+);
+```
+
+If variable arguments are provided at the end, they are used with `sprintf` on
+the message.
+
+```php
+\Doctrine\Deprecations\Deprecation::trigger(
+    "doctrine/orm",
+    "https://github.com/doctrine/orm/issue/1234",
+    "message %s %d",
+    "foo",
+    1234
+);
+```
+
+When you want to trigger a deprecation only when it is called by a function
+outside of the current package, but not trigger when the package itself is the cause,
+then use:
+
+```php
+\Doctrine\Deprecations\Deprecation::triggerIfCalledFromOutside(
+    "doctrine/orm",
+    "https://link/to/deprecations-description",
+    "message"
+);
+```
+
+Based on the issue link each deprecation message is only triggered once per
+request.
+
+A limited stacktrace is included in the deprecation message to find the
+offending location.
+
+Note: A producer/library should never call `Deprecation::enableWith` methods
+and leave the decision how to handle deprecations to application and
+frameworks.
+
+## Usage in PHPUnit tests
+
+There is a `VerifyDeprecations` trait that you can use to make assertions on
+the occurrence of deprecations within a test.
+
+```php
+use Doctrine\Deprecations\PHPUnit\VerifyDeprecations;
+
+class MyTest extends TestCase
+{
+    use VerifyDeprecations;
+
+    public function testSomethingDeprecation()
+    {
+        $this->expectDeprecationWithIdentifier('https://github.com/doctrine/orm/issue/1234');
+
+        triggerTheCodeWithDeprecation();
+    }
+
+    public function testSomethingDeprecationFixed()
+    {
+        $this->expectNoDeprecationWithIdentifier('https://github.com/doctrine/orm/issue/1234');
+
+        triggerTheCodeWithoutDeprecation();
+    }
+}
+```
+
+## What is a deprecation identifier?
+
+An identifier for deprecations is just a link to any resource, most often a
+Github Issue or Pull Request explaining the deprecation and potentially its
+alternative.
diff --git a/vendor/doctrine/deprecations/composer.json b/vendor/doctrine/deprecations/composer.json
new file mode 100644
index 0000000..c79e38c
--- /dev/null
+++ b/vendor/doctrine/deprecations/composer.json
@@ -0,0 +1,32 @@
+{
+    "name": "doctrine/deprecations",
+    "type": "library",
+    "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.",
+    "homepage": "https://www.doctrine-project.org/",
+    "license": "MIT",
+    "require": {
+        "php": "^7.1|^8.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^7.5|^8.5|^9.5",
+        "psr/log": "^1|^2|^3",
+        "doctrine/coding-standard": "^9"
+    },
+    "suggest": {
+        "psr/log": "Allows logging deprecations via PSR-3 logger implementation"
+    },
+    "autoload": {
+        "psr-4": {"Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations"}
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "DeprecationTests\\": "test_fixtures/src",
+            "Doctrine\\Foo\\": "test_fixtures/vendor/doctrine/foo"
+        }
+    },
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
+    }
+}
diff --git a/vendor/doctrine/deprecations/lib/Doctrine/Deprecations/Deprecation.php b/vendor/doctrine/deprecations/lib/Doctrine/Deprecations/Deprecation.php
new file mode 100644
index 0000000..1029372
--- /dev/null
+++ b/vendor/doctrine/deprecations/lib/Doctrine/Deprecations/Deprecation.php
@@ -0,0 +1,266 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Deprecations;
+
+use Psr\Log\LoggerInterface;
+
+use function array_key_exists;
+use function array_reduce;
+use function debug_backtrace;
+use function sprintf;
+use function strpos;
+use function strrpos;
+use function substr;
+use function trigger_error;
+
+use const DEBUG_BACKTRACE_IGNORE_ARGS;
+use const DIRECTORY_SEPARATOR;
+use const E_USER_DEPRECATED;
+
+/**
+ * Manages Deprecation logging in different ways.
+ *
+ * By default triggered exceptions are not logged.
+ *
+ * To enable different deprecation logging mechanisms you can call the
+ * following methods:
+ *
+ *  - Minimal collection of deprecations via getTriggeredDeprecations()
+ *    \Doctrine\Deprecations\Deprecation::enableTrackingDeprecations();
+ *
+ *  - Uses @trigger_error with E_USER_DEPRECATED
+ *    \Doctrine\Deprecations\Deprecation::enableWithTriggerError();
+ *
+ *  - Sends deprecation messages via a PSR-3 logger
+ *    \Doctrine\Deprecations\Deprecation::enableWithPsrLogger($logger);
+ *
+ * Packages that trigger deprecations should use the `trigger()` or
+ * `triggerIfCalledFromOutside()` methods.
+ */
+class Deprecation
+{
+    private const TYPE_NONE               = 0;
+    private const TYPE_TRACK_DEPRECATIONS = 1;
+    private const TYPE_TRIGGER_ERROR      = 2;
+    private const TYPE_PSR_LOGGER         = 4;
+
+    /** @var int */
+    private static $type = self::TYPE_NONE;
+
+    /** @var LoggerInterface|null */
+    private static $logger;
+
+    /** @var array<string,bool> */
+    private static $ignoredPackages = [];
+
+    /** @var array<string,int> */
+    private static $ignoredLinks = [];
+
+    /** @var bool */
+    private static $deduplication = true;
+
+    /**
+     * Trigger a deprecation for the given package and identfier.
+     *
+     * The link should point to a Github issue or Wiki entry detailing the
+     * deprecation. It is additionally used to de-duplicate the trigger of the
+     * same deprecation during a request.
+     *
+     * @param mixed $args
+     */
+    public static function trigger(string $package, string $link, string $message, ...$args): void
+    {
+        if (self::$type === self::TYPE_NONE) {
+            return;
+        }
+
+        if (array_key_exists($link, self::$ignoredLinks)) {
+            self::$ignoredLinks[$link]++;
+        } else {
+            self::$ignoredLinks[$link] = 1;
+        }
+
+        if (self::$deduplication === true && self::$ignoredLinks[$link] > 1) {
+            return;
+        }
+
+        if (isset(self::$ignoredPackages[$package])) {
+            return;
+        }
+
+        $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
+
+        $message = sprintf($message, ...$args);
+
+        self::delegateTriggerToBackend($message, $backtrace, $link, $package);
+    }
+
+    /**
+     * Trigger a deprecation for the given package and identifier when called from outside.
+     *
+     * "Outside" means we assume that $package is currently installed as a
+     * dependency and the caller is not a file in that package. When $package
+     * is installed as a root package then deprecations triggered from the
+     * tests folder are also considered "outside".
+     *
+     * This deprecation method assumes that you are using Composer to install
+     * the dependency and are using the default /vendor/ folder and not a
+     * Composer plugin to change the install location. The assumption is also
+     * that $package is the exact composer packge name.
+     *
+     * Compared to {@link trigger()} this method causes some overhead when
+     * deprecation tracking is enabled even during deduplication, because it
+     * needs to call {@link debug_backtrace()}
+     *
+     * @param mixed $args
+     */
+    public static function triggerIfCalledFromOutside(string $package, string $link, string $message, ...$args): void
+    {
+        if (self::$type === self::TYPE_NONE) {
+            return;
+        }
+
+        $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
+
+        // first check that the caller is not from a tests folder, in which case we always let deprecations pass
+        if (strpos($backtrace[1]['file'], DIRECTORY_SEPARATOR . 'tests' . DIRECTORY_SEPARATOR) === false) {
+            $path = DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . $package . DIRECTORY_SEPARATOR;
+
+            if (strpos($backtrace[0]['file'], $path) === false) {
+                return;
+            }
+
+            if (strpos($backtrace[1]['file'], $path) !== false) {
+                return;
+            }
+        }
+
+        if (array_key_exists($link, self::$ignoredLinks)) {
+            self::$ignoredLinks[$link]++;
+        } else {
+            self::$ignoredLinks[$link] = 1;
+        }
+
+        if (self::$deduplication === true && self::$ignoredLinks[$link] > 1) {
+            return;
+        }
+
+        if (isset(self::$ignoredPackages[$package])) {
+            return;
+        }
+
+        $message = sprintf($message, ...$args);
+
+        self::delegateTriggerToBackend($message, $backtrace, $link, $package);
+    }
+
+    /**
+     * @param array<mixed> $backtrace
+     */
+    private static function delegateTriggerToBackend(string $message, array $backtrace, string $link, string $package): void
+    {
+        if ((self::$type & self::TYPE_PSR_LOGGER) > 0) {
+            $context = [
+                'file' => $backtrace[0]['file'],
+                'line' => $backtrace[0]['line'],
+                'package' => $package,
+                'link' => $link,
+            ];
+
+            self::$logger->notice($message, $context);
+        }
+
+        if (! ((self::$type & self::TYPE_TRIGGER_ERROR) > 0)) {
+            return;
+        }
+
+        $message .= sprintf(
+            ' (%s:%d called by %s:%d, %s, package %s)',
+            self::basename($backtrace[0]['file']),
+            $backtrace[0]['line'],
+            self::basename($backtrace[1]['file']),
+            $backtrace[1]['line'],
+            $link,
+            $package
+        );
+
+        @trigger_error($message, E_USER_DEPRECATED);
+    }
+
+    /**
+     * A non-local-aware version of PHPs basename function.
+     */
+    private static function basename(string $filename): string
+    {
+        $pos = strrpos($filename, DIRECTORY_SEPARATOR);
+
+        if ($pos === false) {
+            return $filename;
+        }
+
+        return substr($filename, $pos + 1);
+    }
+
+    public static function enableTrackingDeprecations(): void
+    {
+        self::$type |= self::TYPE_TRACK_DEPRECATIONS;
+    }
+
+    public static function enableWithTriggerError(): void
+    {
+        self::$type |= self::TYPE_TRIGGER_ERROR;
+    }
+
+    public static function enableWithPsrLogger(LoggerInterface $logger): void
+    {
+        self::$type  |= self::TYPE_PSR_LOGGER;
+        self::$logger = $logger;
+    }
+
+    public static function withoutDeduplication(): void
+    {
+        self::$deduplication = false;
+    }
+
+    public static function disable(): void
+    {
+        self::$type          = self::TYPE_NONE;
+        self::$logger        = null;
+        self::$deduplication = true;
+
+        foreach (self::$ignoredLinks as $link => $count) {
+            self::$ignoredLinks[$link] = 0;
+        }
+    }
+
+    public static function ignorePackage(string $packageName): void
+    {
+        self::$ignoredPackages[$packageName] = true;
+    }
+
+    public static function ignoreDeprecations(string ...$links): void
+    {
+        foreach ($links as $link) {
+            self::$ignoredLinks[$link] = 0;
+        }
+    }
+
+    public static function getUniqueTriggeredDeprecationsCount(): int
+    {
+        return array_reduce(self::$ignoredLinks, static function (int $carry, int $count) {
+            return $carry + $count;
+        }, 0);
+    }
+
+    /**
+     * Returns each triggered deprecation link identifier and the amount of occurrences.
+     *
+     * @return array<string,int>
+     */
+    public static function getTriggeredDeprecations(): array
+    {
+        return self::$ignoredLinks;
+    }
+}
diff --git a/vendor/doctrine/deprecations/lib/Doctrine/Deprecations/PHPUnit/VerifyDeprecations.php b/vendor/doctrine/deprecations/lib/Doctrine/Deprecations/PHPUnit/VerifyDeprecations.php
new file mode 100644
index 0000000..4c3366a
--- /dev/null
+++ b/vendor/doctrine/deprecations/lib/Doctrine/Deprecations/PHPUnit/VerifyDeprecations.php
@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Deprecations\PHPUnit;
+
+use Doctrine\Deprecations\Deprecation;
+
+use function sprintf;
+
+trait VerifyDeprecations
+{
+    /** @var array<string,int> */
+    private $doctrineDeprecationsExpectations = [];
+
+    /** @var array<string,int> */
+    private $doctrineNoDeprecationsExpectations = [];
+
+    public function expectDeprecationWithIdentifier(string $identifier): void
+    {
+        $this->doctrineDeprecationsExpectations[$identifier] = Deprecation::getTriggeredDeprecations()[$identifier] ?? 0;
+    }
+
+    public function expectNoDeprecationWithIdentifier(string $identifier): void
+    {
+        $this->doctrineNoDeprecationsExpectations[$identifier] = Deprecation::getTriggeredDeprecations()[$identifier] ?? 0;
+    }
+
+    /**
+     * @before
+     */
+    public function enableDeprecationTracking(): void
+    {
+        Deprecation::enableTrackingDeprecations();
+    }
+
+    /**
+     * @after
+     */
+    public function verifyDeprecationsAreTriggered(): void
+    {
+        foreach ($this->doctrineDeprecationsExpectations as $identifier => $expectation) {
+            $actualCount = Deprecation::getTriggeredDeprecations()[$identifier] ?? 0;
+
+            $this->assertTrue(
+                $actualCount > $expectation,
+                sprintf(
+                    "Expected deprecation with identifier '%s' was not triggered by code executed in test.",
+                    $identifier
+                )
+            );
+        }
+
+        foreach ($this->doctrineNoDeprecationsExpectations as $identifier => $expectation) {
+            $actualCount = Deprecation::getTriggeredDeprecations()[$identifier] ?? 0;
+
+            $this->assertTrue(
+                $actualCount === $expectation,
+                sprintf(
+                    "Expected deprecation with identifier '%s' was triggered by code executed in test, but expected not to.",
+                    $identifier
+                )
+            );
+        }
+    }
+}
diff --git a/vendor/doctrine/deprecations/phpcs.xml b/vendor/doctrine/deprecations/phpcs.xml
new file mode 100644
index 0000000..f115e43
--- /dev/null
+++ b/vendor/doctrine/deprecations/phpcs.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<ruleset>
+    <arg name="basepath" value="."/>
+    <arg name="extensions" value="php"/>
+    <arg name="parallel" value="80"/>
+    <arg name="cache" value=".phpcs-cache"/>
+    <arg name="colors"/>
+
+    <!-- Ignore warnings, show progress of the run and show sniff names -->
+    <arg value="nps"/>
+
+    <config name="php_version" value="70100"/>
+
+    <!-- Directories to be checked -->
+    <file>lib</file>
+    <file>tests</file>
+
+    <!-- Include full Doctrine Coding Standard -->
+    <rule ref="Doctrine">
+        <exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingNativeTypeHint" />
+    </rule>
+</ruleset>
diff --git a/vendor/doctrine/lexer/UPGRADE.md b/vendor/doctrine/lexer/UPGRADE.md
new file mode 100644
index 0000000..42b85b3
--- /dev/null
+++ b/vendor/doctrine/lexer/UPGRADE.md
@@ -0,0 +1,14 @@
+Note about upgrading: Doctrine uses static and runtime mechanisms to raise
+awareness about deprecated code.
+
+- Use of `@deprecated` docblock that is detected by IDEs (like PHPStorm) or
+  Static Analysis tools (like Psalm, phpstan)
+- Use of our low-overhead runtime deprecation API, details:
+  https://github.com/doctrine/deprecations/
+
+# Upgrade to 2.0.0
+
+`AbstractLexer::glimpse()` and `AbstractLexer::peek()` now return
+instances of `Doctrine\Common\Lexer\Token`, which is an array-like class
+Using it as an array is deprecated in favor of using properties of that class.
+Using `count()` on it is deprecated with no replacement.
diff --git a/vendor/doctrine/lexer/composer.json b/vendor/doctrine/lexer/composer.json
index c435647..be3013c 100644
--- a/vendor/doctrine/lexer/composer.json
+++ b/vendor/doctrine/lexer/composer.json
@@ -1,7 +1,8 @@
 {
     "name": "doctrine/lexer",
-    "type": "library",
     "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.",
+    "license": "MIT",
+    "type": "library",
     "keywords": [
         "php",
         "parser",
@@ -9,27 +10,41 @@
         "annotations",
         "docblock"
     ],
-    "homepage": "https://www.doctrine-project.org/projects/lexer.html",
-    "license": "MIT",
     "authors": [
-        {"name": "Guilherme Blanco", "email": "guilhermeblanco@gmail.com"},
-        {"name": "Roman Borschel", "email": "roman@code-factory.org"},
-        {"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"}
+        {
+            "name": "Guilherme Blanco",
+            "email": "guilhermeblanco@gmail.com"
+        },
+        {
+            "name": "Roman Borschel",
+            "email": "roman@code-factory.org"
+        },
+        {
+            "name": "Johannes Schmitt",
+            "email": "schmittjoh@gmail.com"
+        }
     ],
+    "homepage": "https://www.doctrine-project.org/projects/lexer.html",
     "require": {
-        "php": "^7.1 || ^8.0"
+        "php": "^7.1 || ^8.0",
+        "doctrine/deprecations": "^1.0"
     },
     "require-dev": {
-        "doctrine/coding-standard": "^9.0",
+        "doctrine/coding-standard": "^9 || ^10",
         "phpstan/phpstan": "^1.3",
         "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-        "vimeo/psalm": "^4.11"
+        "psalm/plugin-phpunit": "^0.18.3",
+        "vimeo/psalm": "^4.11 || ^5.0"
     },
     "autoload": {
-        "psr-4": { "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer" }
+        "psr-4": {
+            "Doctrine\\Common\\Lexer\\": "src"
+        }
     },
     "autoload-dev": {
-        "psr-4": { "Doctrine\\Tests\\": "tests/Doctrine" }
+        "psr-4": {
+            "Doctrine\\Tests\\Common\\Lexer\\": "tests"
+        }
     },
     "config": {
         "allow-plugins": {
diff --git a/vendor/doctrine/lexer/psalm.xml b/vendor/doctrine/lexer/psalm.xml
deleted file mode 100644
index f331e50..0000000
--- a/vendor/doctrine/lexer/psalm.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<psalm
-    errorLevel="5"
-    resolveFromConfigFile="true"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="https://getpsalm.org/schema/config"
-    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
->
-    <projectFiles>
-        <directory name="lib/Doctrine/Common/Lexer" />
-        <ignoreFiles>
-            <directory name="vendor" />
-        </ignoreFiles>
-    </projectFiles>
-</psalm>
diff --git a/vendor/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php b/vendor/doctrine/lexer/src/AbstractLexer.php
similarity index 83%
rename from vendor/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php
rename to vendor/doctrine/lexer/src/AbstractLexer.php
index 7e8a11d..eed4c51 100644
--- a/vendor/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php
+++ b/vendor/doctrine/lexer/src/AbstractLexer.php
@@ -5,9 +5,10 @@ declare(strict_types=1);
 namespace Doctrine\Common\Lexer;
 
 use ReflectionClass;
+use UnitEnum;
 
+use function get_class;
 use function implode;
-use function in_array;
 use function preg_split;
 use function sprintf;
 use function substr;
@@ -19,7 +20,8 @@ use const PREG_SPLIT_OFFSET_CAPTURE;
 /**
  * Base class for writing simple lexers, i.e. for creating small DSLs.
  *
- * @psalm-type Token = array{value: int|string, type:string|int|null, position:int}
+ * @template T of UnitEnum|string|int
+ * @template V of string|int
  */
 abstract class AbstractLexer
 {
@@ -33,14 +35,7 @@ abstract class AbstractLexer
     /**
      * Array of scanned tokens.
      *
-     * Each token is an associative array containing three items:
-     *  - 'value'    : the string value of the token in the input string
-     *  - 'type'     : the type of the token (identifier, numeric, string, input
-     *                 parameter, none)
-     *  - 'position' : the position of the token in the input string
-     *
-     * @var mixed[][]
-     * @psalm-var list<Token>
+     * @var list<Token<T, V>>
      */
     private $tokens = [];
 
@@ -62,7 +57,7 @@ abstract class AbstractLexer
      * The next token in the input.
      *
      * @var mixed[]|null
-     * @psalm-var Token|null
+     * @psalm-var Token<T, V>|null
      */
     public $lookahead;
 
@@ -70,7 +65,7 @@ abstract class AbstractLexer
      * The last matched/seen token.
      *
      * @var mixed[]|null
-     * @psalm-var Token|null
+     * @psalm-var Token<T, V>|null
      */
     public $token;
 
@@ -150,31 +145,37 @@ abstract class AbstractLexer
     /**
      * Checks whether a given token matches the current lookahead.
      *
-     * @param int|string $type
+     * @param T $type
      *
      * @return bool
+     *
+     * @psalm-assert-if-true !=null $this->lookahead
      */
     public function isNextToken($type)
     {
-        return $this->lookahead !== null && $this->lookahead['type'] === $type;
+        return $this->lookahead !== null && $this->lookahead->isA($type);
     }
 
     /**
      * Checks whether any of the given tokens matches the current lookahead.
      *
-     * @param list<int|string> $types
+     * @param list<T> $types
      *
      * @return bool
+     *
+     * @psalm-assert-if-true !=null $this->lookahead
      */
     public function isNextTokenAny(array $types)
     {
-        return $this->lookahead !== null && in_array($this->lookahead['type'], $types, true);
+        return $this->lookahead !== null && $this->lookahead->isA(...$types);
     }
 
     /**
      * Moves to the next token in the input string.
      *
      * @return bool
+     *
+     * @psalm-assert-if-true !null $this->lookahead
      */
     public function moveNext()
     {
@@ -189,13 +190,13 @@ abstract class AbstractLexer
     /**
      * Tells the lexer to skip input tokens until it sees a token with the given value.
      *
-     * @param string $type The token type to skip until.
+     * @param T $type The token type to skip until.
      *
      * @return void
      */
     public function skipUntil($type)
     {
-        while ($this->lookahead !== null && $this->lookahead['type'] !== $type) {
+        while ($this->lookahead !== null && ! $this->lookahead->isA($type)) {
             $this->moveNext();
         }
     }
@@ -203,7 +204,7 @@ abstract class AbstractLexer
     /**
      * Checks if given value is identical to the given token.
      *
-     * @param mixed      $value
+     * @param string     $value
      * @param int|string $token
      *
      * @return bool
@@ -217,7 +218,7 @@ abstract class AbstractLexer
      * Moves the lookahead token forward.
      *
      * @return mixed[]|null The next token or NULL if there are no more tokens ahead.
-     * @psalm-return Token|null
+     * @psalm-return Token<T, V>|null
      */
     public function peek()
     {
@@ -232,7 +233,7 @@ abstract class AbstractLexer
      * Peeks at the next token, returns it and immediately resets the peek.
      *
      * @return mixed[]|null The next token or NULL if there are no more tokens ahead.
-     * @psalm-return Token|null
+     * @psalm-return Token<T, V>|null
      */
     public function glimpse()
     {
@@ -270,26 +271,32 @@ abstract class AbstractLexer
 
         foreach ($matches as $match) {
             // Must remain before 'value' assignment since it can change content
-            $type = $this->getType($match[0]);
+            $firstMatch = $match[0];
+            $type       = $this->getType($firstMatch);
 
-            $this->tokens[] = [
-                'value' => $match[0],
-                'type'  => $type,
-                'position' => $match[1],
-            ];
+            $this->tokens[] = new Token(
+                $firstMatch,
+                $type,
+                $match[1]
+            );
         }
     }
 
     /**
      * Gets the literal for a given token.
      *
-     * @param int|string $token
+     * @param T $token
      *
      * @return int|string
      */
     public function getLiteral($token)
     {
+        if ($token instanceof UnitEnum) {
+            return get_class($token) . '::' . $token->name;
+        }
+
         $className = static::class;
+
         $reflClass = new ReflectionClass($className);
         $constants = $reflClass->getConstants();
 
@@ -331,7 +338,9 @@ abstract class AbstractLexer
      *
      * @param string $value
      *
-     * @return int|string|null
+     * @return T|null
+     *
+     * @param-out V $value
      */
     abstract protected function getType(&$value);
 }
diff --git a/vendor/doctrine/lexer/src/Token.php b/vendor/doctrine/lexer/src/Token.php
new file mode 100644
index 0000000..4fbbf4e
--- /dev/null
+++ b/vendor/doctrine/lexer/src/Token.php
@@ -0,0 +1,145 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Common\Lexer;
+
+use ArrayAccess;
+use Doctrine\Deprecations\Deprecation;
+use ReturnTypeWillChange;
+use UnitEnum;
+
+use function in_array;
+
+/**
+ * @template T of UnitEnum|string|int
+ * @template V of string|int
+ * @implements ArrayAccess<string,mixed>
+ */
+final class Token implements ArrayAccess
+{
+    /**
+     * The string value of the token in the input string
+     *
+     * @readonly
+     * @var V
+     */
+    public $value;
+
+    /**
+     * The type of the token (identifier, numeric, string, input parameter, none)
+     *
+     * @readonly
+     * @var T|null
+     */
+    public $type;
+
+    /**
+     * The position of the token in the input string
+     *
+     * @readonly
+     * @var int
+     */
+    public $position;
+
+    /**
+     * @param V      $value
+     * @param T|null $type
+     */
+    public function __construct($value, $type, int $position)
+    {
+        $this->value    = $value;
+        $this->type     = $type;
+        $this->position = $position;
+    }
+
+    /** @param T ...$types */
+    public function isA(...$types): bool
+    {
+        return in_array($this->type, $types, true);
+    }
+
+    /**
+     * @deprecated Use the value, type or position property instead
+     * {@inheritDoc}
+     */
+    public function offsetExists($offset): bool
+    {
+        Deprecation::trigger(
+            'doctrine/lexer',
+            'https://github.com/doctrine/lexer/pull/79',
+            'Accessing %s properties via ArrayAccess is deprecated, use the value, type or position property instead',
+            self::class
+        );
+
+        return in_array($offset, ['value', 'type', 'position'], true);
+    }
+
+    /**
+     * @deprecated Use the value, type or position property instead
+     * {@inheritDoc}
+     *
+     * @param O $offset
+     *
+     * @return mixed
+     * @psalm-return (
+     *     O is 'value'
+     *     ? V
+     *     : (
+     *         O is 'type'
+     *         ? T|null
+     *         : (
+     *             O is 'position'
+     *             ? int
+     *             : mixed
+     *         )
+     *     )
+     * )
+     *
+     * @template O of array-key
+     */
+    #[ReturnTypeWillChange]
+    public function offsetGet($offset)
+    {
+        Deprecation::trigger(
+            'doctrine/lexer',
+            'https://github.com/doctrine/lexer/pull/79',
+            'Accessing %s properties via ArrayAccess is deprecated, use the value, type or position property instead',
+            self::class
+        );
+
+        return $this->$offset;
+    }
+
+    /**
+     * @deprecated no replacement planned
+     * {@inheritDoc}
+     */
+    public function offsetSet($offset, $value): void
+    {
+        Deprecation::trigger(
+            'doctrine/lexer',
+            'https://github.com/doctrine/lexer/pull/79',
+            'Setting %s properties via ArrayAccess is deprecated',
+            self::class
+        );
+
+        $this->$offset = $value;
+    }
+
+    /**
+     * @deprecated no replacement planned
+     * {@inheritDoc}
+     */
+    public function offsetUnset($offset): void
+    {
+        Deprecation::trigger(
+            'doctrine/lexer',
+            'https://github.com/doctrine/lexer/pull/79',
+            'Setting %s properties via ArrayAccess is deprecated',
+            self::class
+        );
+
+        $this->$offset = null;
+    }
+}
diff --git a/vendor/egulias/email-validator/CHANGELOG.md b/vendor/egulias/email-validator/CHANGELOG.md
index 83fd62e..539917f 100644
--- a/vendor/egulias/email-validator/CHANGELOG.md
+++ b/vendor/egulias/email-validator/CHANGELOG.md
@@ -5,7 +5,7 @@
 * Access to local part and domain part from EmailParser
 * Validations outside of the scope of the RFC will be considered "extra" validations, thus opening the door for adding new; will live in their own folder "extra" (as requested in #248, #195, #183). 
 
-## Breacking changes
+## Breaking changes
 
 * PHP version upgraded to match Symfony's (as of 12/2020).
 * DNSCheckValidation now fails for missing MX records. While the RFC argues that the existence of only A records to be valid, starting in v3 they will be considered invalid.
diff --git a/vendor/egulias/email-validator/LICENSE b/vendor/egulias/email-validator/LICENSE
index 1f0f267..307440d 100644
--- a/vendor/egulias/email-validator/LICENSE
+++ b/vendor/egulias/email-validator/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2021 Eduardo Gulias Davis
+Copyright (c) 2013-2022 Eduardo Gulias Davis
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/egulias/email-validator/composer.json b/vendor/egulias/email-validator/composer.json
index d598d1b..6a273e2 100644
--- a/vendor/egulias/email-validator/composer.json
+++ b/vendor/egulias/email-validator/composer.json
@@ -14,11 +14,10 @@
   },
   "require": {
     "php": ">=7.2",
-    "doctrine/lexer": "^1.2",
+    "doctrine/lexer": "^1.2|^2",
     "symfony/polyfill-intl-idn": "^1.15"
   },
   "require-dev": {
-    "php-coveralls/php-coveralls": "^2.2",
     "phpunit/phpunit": "^8.5.8|^9.3.3",
     "vimeo/psalm": "^4"
   },
diff --git a/vendor/egulias/email-validator/src/EmailLexer.php b/vendor/egulias/email-validator/src/EmailLexer.php
index 7e660b6..6add6bd 100644
--- a/vendor/egulias/email-validator/src/EmailLexer.php
+++ b/vendor/egulias/email-validator/src/EmailLexer.php
@@ -3,58 +3,62 @@
 namespace Egulias\EmailValidator;
 
 use Doctrine\Common\Lexer\AbstractLexer;
+use Doctrine\Common\Lexer\Token;
 
+/**
+ * @extends AbstractLexer<int, string>
+ */
 class EmailLexer extends AbstractLexer
 {
     //ASCII values
-    const S_EMPTY            = null;
-    const C_NUL              = 0;
-    const S_HTAB             = 9;
-    const S_LF               = 10;
-    const S_CR               = 13;
-    const S_SP               = 32;
-    const EXCLAMATION        = 33;
-    const S_DQUOTE           = 34;
-    const NUMBER_SIGN        = 35;
-    const DOLLAR             = 36;
-    const PERCENTAGE         = 37;
-    const AMPERSAND          = 38;
-    const S_SQUOTE           = 39;
-    const S_OPENPARENTHESIS  = 40;
-    const S_CLOSEPARENTHESIS = 41;
-    const ASTERISK           = 42;
-    const S_PLUS             = 43;
-    const S_COMMA            = 44;
-    const S_HYPHEN           = 45;
-    const S_DOT              = 46;
-    const S_SLASH            = 47;
-    const S_COLON            = 58;
-    const S_SEMICOLON        = 59;
-    const S_LOWERTHAN        = 60;
-    const S_EQUAL            = 61;
-    const S_GREATERTHAN      = 62;
-    const QUESTIONMARK       = 63;
-    const S_AT               = 64;
-    const S_OPENBRACKET      = 91;
-    const S_BACKSLASH        = 92;
-    const S_CLOSEBRACKET     = 93;
-    const CARET              = 94;
-    const S_UNDERSCORE       = 95;
-    const S_BACKTICK         = 96;
-    const S_OPENCURLYBRACES  = 123;
-    const S_PIPE             = 124;
-    const S_CLOSECURLYBRACES = 125;
-    const S_TILDE            = 126;
-    const C_DEL              = 127;
-    const INVERT_QUESTIONMARK= 168;
-    const INVERT_EXCLAMATION = 173;
-    const GENERIC            = 300;
-    const S_IPV6TAG          = 301;
-    const INVALID            = 302;
-    const CRLF               = 1310;
-    const S_DOUBLECOLON      = 5858;
-    const ASCII_INVALID_FROM = 127;
-    const ASCII_INVALID_TO   = 199;
+    public const S_EMPTY            = null;
+    public const C_NUL              = 0;
+    public const S_HTAB             = 9;
+    public const S_LF               = 10;
+    public const S_CR               = 13;
+    public const S_SP               = 32;
+    public const EXCLAMATION        = 33;
+    public const S_DQUOTE           = 34;
+    public const NUMBER_SIGN        = 35;
+    public const DOLLAR             = 36;
+    public const PERCENTAGE         = 37;
+    public const AMPERSAND          = 38;
+    public const S_SQUOTE           = 39;
+    public const S_OPENPARENTHESIS  = 40;
+    public const S_CLOSEPARENTHESIS = 41;
+    public const ASTERISK           = 42;
+    public const S_PLUS             = 43;
+    public const S_COMMA            = 44;
+    public const S_HYPHEN           = 45;
+    public const S_DOT              = 46;
+    public const S_SLASH            = 47;
+    public const S_COLON            = 58;
+    public const S_SEMICOLON        = 59;
+    public const S_LOWERTHAN        = 60;
+    public const S_EQUAL            = 61;
+    public const S_GREATERTHAN      = 62;
+    public const QUESTIONMARK       = 63;
+    public const S_AT               = 64;
+    public const S_OPENBRACKET      = 91;
+    public const S_BACKSLASH        = 92;
+    public const S_CLOSEBRACKET     = 93;
+    public const CARET              = 94;
+    public const S_UNDERSCORE       = 95;
+    public const S_BACKTICK         = 96;
+    public const S_OPENCURLYBRACES  = 123;
+    public const S_PIPE             = 124;
+    public const S_CLOSECURLYBRACES = 125;
+    public const S_TILDE            = 126;
+    public const C_DEL              = 127;
+    public const INVERT_QUESTIONMARK= 168;
+    public const INVERT_EXCLAMATION = 173;
+    public const GENERIC            = 300;
+    public const S_IPV6TAG          = 301;
+    public const INVALID            = 302;
+    public const CRLF               = 1310;
+    public const S_DOUBLECOLON      = 5858;
+    public const ASCII_INVALID_FROM = 127;
+    public const ASCII_INVALID_TO   = 199;
 
     /**
      * US-ASCII visible characters not valid for atext (@link http://tools.ietf.org/html/rfc5322#section-3.2.3)
@@ -107,11 +111,11 @@ class EmailLexer extends AbstractLexer
         '¡'    => self::INVERT_EXCLAMATION,
     ];
 
-    const INVALID_CHARS_REGEX = "/[^\p{S}\p{C}\p{Cc}]+/iu";
+    public const INVALID_CHARS_REGEX = "/[^\p{S}\p{C}\p{Cc}]+/iu";
 
-    const VALID_UTF8_REGEX = '/\p{Cc}+/u';
+    public const VALID_UTF8_REGEX = '/\p{Cc}+/u';
 
-    const CATCHABLE_PATTERNS = [
+    public const CATCHABLE_PATTERNS = [
         '[a-zA-Z]+[46]?', //ASCII and domain literal
         '[^\x00-\x7F]',  //UTF-8
         '[0-9]+',
@@ -121,11 +125,11 @@ class EmailLexer extends AbstractLexer
         '.',
     ];
 
-    const NON_CATCHABLE_PATTERNS = [
+    public const NON_CATCHABLE_PATTERNS = [
         '[\xA0-\xff]+',
     ];
 
-    const MODIFIERS = 'iu';
+    public const MODIFIERS = 'iu';
 
     /** @var bool */
     protected $hasInvalidTokens = false;
@@ -140,18 +144,20 @@ class EmailLexer extends AbstractLexer
     /**
      * The last matched/seen token.
      *
-     * @var array
+     * @var array|Token
      *
      * @psalm-suppress NonInvariantDocblockPropertyType
-     * @psalm-var array{value:string, type:null|int, position:int}
-     * @psalm-suppress NonInvariantDocblockPropertyType
+     * @psalm-var array{value:string, type:null|int, position:int}|Token<int, string>
      */
     public $token;
 
     /**
      * The next token in the input.
      *
-     * @var array{position: int, type: int|null|string, value: int|string}|null
+     * @var array|Token|null
+     *
+     * @psalm-suppress NonInvariantDocblockPropertyType
+     * @psalm-var array{position: int, type: int|null|string, value: int|string}|Token<int, string>|null
      */
     public $lookahead;
 
@@ -210,7 +216,9 @@ class EmailLexer extends AbstractLexer
             $this->accumulator .= $this->token['value'];
         }
 
-        $this->previous = $this->token;
+        $this->previous = $this->token instanceof Token
+            ? ['value' => $this->token->value, 'type' => $this->token->type, 'position' => $this->token->position]
+            : $this->token;
         
         if($this->lookahead === null) {
             $this->lookahead = self::$nullToken;
diff --git a/vendor/egulias/email-validator/src/EmailParser.php b/vendor/egulias/email-validator/src/EmailParser.php
index c78f74a..352eae4 100644
--- a/vendor/egulias/email-validator/src/EmailParser.php
+++ b/vendor/egulias/email-validator/src/EmailParser.php
@@ -2,7 +2,6 @@
 
 namespace Egulias\EmailValidator;
 
-use Egulias\EmailValidator\EmailLexer;
 use Egulias\EmailValidator\Result\Result;
 use Egulias\EmailValidator\Parser\LocalPart;
 use Egulias\EmailValidator\Parser\DomainPart;
@@ -13,7 +12,7 @@ use Egulias\EmailValidator\Result\Reason\NoLocalPart;
 
 class EmailParser extends Parser
 {
-    const EMAIL_MAX_LENGTH = 254;
+    public const EMAIL_MAX_LENGTH = 254;
 
     /**
      * @var string
diff --git a/vendor/egulias/email-validator/src/MessageIDParser.php b/vendor/egulias/email-validator/src/MessageIDParser.php
index fe58b9f..b0b6720 100644
--- a/vendor/egulias/email-validator/src/MessageIDParser.php
+++ b/vendor/egulias/email-validator/src/MessageIDParser.php
@@ -2,7 +2,6 @@
 
 namespace Egulias\EmailValidator;
 
-use Egulias\EmailValidator\Parser;
 use Egulias\EmailValidator\Result\Result;
 use Egulias\EmailValidator\Parser\IDLeftPart;
 use Egulias\EmailValidator\Parser\IDRightPart;
@@ -14,7 +13,7 @@ use Egulias\EmailValidator\Result\Reason\NoLocalPart;
 class MessageIDParser extends Parser
 {
 
-    const EMAILID_MAX_LENGTH = 254;
+    public const EMAILID_MAX_LENGTH = 254;
 
     /**
      * @var string
@@ -89,4 +88,4 @@ class MessageIDParser extends Parser
             $this->warnings[EmailTooLong::CODE] = new EmailTooLong();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/vendor/egulias/email-validator/src/Parser/Comment.php b/vendor/egulias/email-validator/src/Parser/Comment.php
index ffa6128..d6f3032 100644
--- a/vendor/egulias/email-validator/src/Parser/Comment.php
+++ b/vendor/egulias/email-validator/src/Parser/Comment.php
@@ -59,7 +59,8 @@ class Comment extends PartParser
 
         if($this->openedParenthesis >= 1) {
             return new InvalidEmail(new UnclosedComment(), $this->lexer->token['value']);
-        } else if ($this->openedParenthesis < 0) {
+        }
+        if ($this->openedParenthesis < 0) {
             return new InvalidEmail(new UnOpenedComment(), $this->lexer->token['value']);
         }
 
@@ -100,4 +101,4 @@ class Comment extends PartParser
             return true;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/vendor/egulias/email-validator/src/Parser/CommentStrategy/CommentStrategy.php b/vendor/egulias/email-validator/src/Parser/CommentStrategy/CommentStrategy.php
index c388efd..410032f 100644
--- a/vendor/egulias/email-validator/src/Parser/CommentStrategy/CommentStrategy.php
+++ b/vendor/egulias/email-validator/src/Parser/CommentStrategy/CommentStrategy.php
@@ -15,4 +15,4 @@ interface CommentStrategy
     public function endOfLoopValidations(EmailLexer $lexer) : Result;
 
     public function getWarnings() : array;
-}
\ No newline at end of file
+}
diff --git a/vendor/egulias/email-validator/src/Parser/CommentStrategy/DomainComment.php b/vendor/egulias/email-validator/src/Parser/CommentStrategy/DomainComment.php
index b34ce29..cbbe3f2 100644
--- a/vendor/egulias/email-validator/src/Parser/CommentStrategy/DomainComment.php
+++ b/vendor/egulias/email-validator/src/Parser/CommentStrategy/DomainComment.php
@@ -34,4 +34,4 @@ class DomainComment implements CommentStrategy
     {
         return [];
     }
-}
\ No newline at end of file
+}
diff --git a/vendor/egulias/email-validator/src/Parser/CommentStrategy/LocalComment.php b/vendor/egulias/email-validator/src/Parser/CommentStrategy/LocalComment.php
index 73bc7b2..e72319a 100644
--- a/vendor/egulias/email-validator/src/Parser/CommentStrategy/LocalComment.php
+++ b/vendor/egulias/email-validator/src/Parser/CommentStrategy/LocalComment.php
@@ -34,4 +34,4 @@ class LocalComment implements CommentStrategy
     {
         return $this->warnings;
     }
-}
\ No newline at end of file
+}
diff --git a/vendor/egulias/email-validator/src/Parser/DomainLiteral.php b/vendor/egulias/email-validator/src/Parser/DomainLiteral.php
index 4e5b8bf..e6d66d0 100644
--- a/vendor/egulias/email-validator/src/Parser/DomainLiteral.php
+++ b/vendor/egulias/email-validator/src/Parser/DomainLiteral.php
@@ -22,9 +22,9 @@ use Egulias\EmailValidator\Warning\DomainLiteral as WarningDomainLiteral;
 
 class DomainLiteral extends PartParser
 {
-    const IPV4_REGEX = '/\\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/';
+    public const IPV4_REGEX = '/\\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/';
 
-    const OBSOLETE_WARNINGS = [
+    public const OBSOLETE_WARNINGS = [
         EmailLexer::INVALID,
         EmailLexer::C_DEL,
         EmailLexer::S_LF,
@@ -208,4 +208,4 @@ class DomainLiteral extends PartParser
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/vendor/egulias/email-validator/src/Parser/DomainPart.php b/vendor/egulias/email-validator/src/Parser/DomainPart.php
index f171740..e1f5b3b 100644
--- a/vendor/egulias/email-validator/src/Parser/DomainPart.php
+++ b/vendor/egulias/email-validator/src/Parser/DomainPart.php
@@ -2,6 +2,7 @@
 
 namespace Egulias\EmailValidator\Parser;
 
+use Doctrine\Common\Lexer\Token;
 use Egulias\EmailValidator\EmailLexer;
 use Egulias\EmailValidator\Warning\TLD;
 use Egulias\EmailValidator\Result\Result;
@@ -24,8 +25,8 @@ use Egulias\EmailValidator\Parser\DomainLiteral as DomainLiteralParser;
 
 class DomainPart extends PartParser
 {
-    const DOMAIN_MAX_LENGTH = 253;
-    const LABEL_MAX_LENGTH = 63;
+    public const DOMAIN_MAX_LENGTH = 253;
+    public const LABEL_MAX_LENGTH = 63;
 
     /**
      * @var string
@@ -212,7 +213,10 @@ class DomainPart extends PartParser
         return new ValidEmail();
     }
 
-    private function checkNotAllowedChars(array $token) : Result
+    /**
+     * @psalm-param array|Token<int, string> $token
+     */
+    private function checkNotAllowedChars($token) : Result
     {
         $notAllowed = [EmailLexer::S_BACKSLASH => true, EmailLexer::S_SLASH=> true];
         if (isset($notAllowed[$token['type']])) {
diff --git a/vendor/egulias/email-validator/src/Parser/DoubleQuote.php b/vendor/egulias/email-validator/src/Parser/DoubleQuote.php
index 8b83273..b32e2b6 100644
--- a/vendor/egulias/email-validator/src/Parser/DoubleQuote.php
+++ b/vendor/egulias/email-validator/src/Parser/DoubleQuote.php
@@ -2,7 +2,6 @@
 namespace Egulias\EmailValidator\Parser;
 
 use Egulias\EmailValidator\EmailLexer;
-use Egulias\EmailValidator\Parser\Parser;
 use Egulias\EmailValidator\Result\ValidEmail;
 use Egulias\EmailValidator\Result\InvalidEmail;
 use Egulias\EmailValidator\Warning\CFWSWithFWS;
@@ -85,4 +84,4 @@ class DoubleQuote extends PartParser
         return new ValidEmail();
     }
 
-}
\ No newline at end of file
+}
diff --git a/vendor/egulias/email-validator/src/Parser/FoldingWhiteSpace.php b/vendor/egulias/email-validator/src/Parser/FoldingWhiteSpace.php
index da17d43..fff6ec3 100644
--- a/vendor/egulias/email-validator/src/Parser/FoldingWhiteSpace.php
+++ b/vendor/egulias/email-validator/src/Parser/FoldingWhiteSpace.php
@@ -15,7 +15,7 @@ use Egulias\EmailValidator\Result\ValidEmail;
 
 class  FoldingWhiteSpace extends PartParser
 {
-    const FWS_TYPES = [
+    public const FWS_TYPES = [
         EmailLexer::S_SP,
         EmailLexer::S_HTAB,
         EmailLexer::S_CR,
@@ -83,4 +83,4 @@ class  FoldingWhiteSpace extends PartParser
 
         return in_array($this->lexer->token['type'], self::FWS_TYPES);
     }
-}
\ No newline at end of file
+}
diff --git a/vendor/egulias/email-validator/src/Parser/IDLeftPart.php b/vendor/egulias/email-validator/src/Parser/IDLeftPart.php
index abb4982..5fd9cdf 100644
--- a/vendor/egulias/email-validator/src/Parser/IDLeftPart.php
+++ b/vendor/egulias/email-validator/src/Parser/IDLeftPart.php
@@ -3,7 +3,6 @@
 namespace Egulias\EmailValidator\Parser;
 
 use Egulias\EmailValidator\Result\Result;
-use Egulias\EmailValidator\Parser\LocalPart;
 use Egulias\EmailValidator\Result\InvalidEmail;
 use Egulias\EmailValidator\Result\Reason\CommentsInIDRight;
 
@@ -13,4 +12,4 @@ class IDLeftPart extends LocalPart
     {
        return new InvalidEmail(new CommentsInIDRight(), $this->lexer->token['value']);
     }
-}
\ No newline at end of file
+}
diff --git a/vendor/egulias/email-validator/src/Parser/IDRightPart.php b/vendor/egulias/email-validator/src/Parser/IDRightPart.php
index 2432562..1a1268f 100644
--- a/vendor/egulias/email-validator/src/Parser/IDRightPart.php
+++ b/vendor/egulias/email-validator/src/Parser/IDRightPart.php
@@ -26,4 +26,4 @@ class IDRightPart extends DomainPart
         }
         return new ValidEmail();
     }
-}
\ No newline at end of file
+}
diff --git a/vendor/egulias/email-validator/src/Parser/LocalPart.php b/vendor/egulias/email-validator/src/Parser/LocalPart.php
index 90f01a5..154521b 100644
--- a/vendor/egulias/email-validator/src/Parser/LocalPart.php
+++ b/vendor/egulias/email-validator/src/Parser/LocalPart.php
@@ -15,7 +15,7 @@ use Egulias\EmailValidator\Parser\CommentStrategy\LocalComment;
 
 class LocalPart extends PartParser
 {
-    const INVALID_TOKENS = [
+    public const INVALID_TOKENS = [
         EmailLexer::S_COMMA => EmailLexer::S_COMMA,
         EmailLexer::S_CLOSEBRACKET => EmailLexer::S_CLOSEBRACKET,
         EmailLexer::S_OPENBRACKET => EmailLexer::S_OPENBRACKET,
@@ -162,4 +162,4 @@ class LocalPart extends PartParser
 
         return new ValidEmail();
     }
-}
\ No newline at end of file
+}
diff --git a/vendor/egulias/email-validator/src/Parser/PartParser.php b/vendor/egulias/email-validator/src/Parser/PartParser.php
index fd65fc5..a75a172 100644
--- a/vendor/egulias/email-validator/src/Parser/PartParser.php
+++ b/vendor/egulias/email-validator/src/Parser/PartParser.php
@@ -60,4 +60,4 @@ abstract class PartParser
             &&
             $this->lexer->token['type'] !== EmailLexer::GENERIC;
     }
-}
\ No newline at end of file
+}
diff --git a/vendor/egulias/email-validator/src/Result/InvalidEmail.php b/vendor/egulias/email-validator/src/Result/InvalidEmail.php
index 3d85e15..180f4d8 100644
--- a/vendor/egulias/email-validator/src/Result/InvalidEmail.php
+++ b/vendor/egulias/email-validator/src/Result/InvalidEmail.php
@@ -6,7 +6,7 @@ use Egulias\EmailValidator\Result\Reason\Reason;
 
 class InvalidEmail implements Result
 {
-    private  $token;
+    private $token;
     /**
      * @var Reason
      */
@@ -43,4 +43,4 @@ class InvalidEmail implements Result
         return $this->reason;
     }
 
-}
\ No newline at end of file
+}
diff --git a/vendor/egulias/email-validator/src/Result/Reason/AtextAfterCFWS.php b/vendor/egulias/email-validator/src/Result/Reason/AtextAfterCFWS.php
index 76015a2..96e2284 100644
--- a/vendor/egulias/email-validator/src/Result/Reason/AtextAfterCFWS.php
+++ b/vendor/egulias/email-validator/src/Result/Reason/AtextAfterCFWS.php
@@ -13,4 +13,4 @@ class AtextAfterCFWS implements Reason
     {
         return 'ATEXT found after CFWS';
     }
-}
\ No newline at end of file
+}
diff --git a/vendor/egulias/email-validator/src/Result/Reason/CRLFAtTheEnd.php b/vendor/egulias/email-validator/src/Result/Reason/CRLFAtTheEnd.php
index a0b66e7..185b9eb 100644
--- a/vendor/egulias/email-validator/src/Result/Reason/CRLFAtTheEnd.php
+++ b/vendor/egulias/email-validator/src/Result/Reason/CRLFAtTheEnd.php
@@ -4,8 +4,8 @@ namespace Egulias\EmailValidator\Result\Reason;
 
 class CRLFAtTheEnd implements Reason
 {
-    const CODE = 149;
-    const REASON = "CRLF at the end";
+    public const CODE = 149;
+    public const REASON = "CRLF at the end";
 
     public function code() : int
     {
diff --git a/vendor/egulias/email-validator/src/Result/Reason/CharNotAllowed.php b/vendor/egulias/email-validator/src/Result/Reason/CharNotAllowed.php
index 45999b3..7840cc7 100644
--- a/vendor/egulias/email-validator/src/Result/Reason/CharNotAllowed.php
+++ b/vendor/egulias/email-validator/src/Result/Reason/CharNotAllowed.php
@@ -13,4 +13,4 @@ class CharNotAllowed implements Reason
     {
         return "Character not allowed";
     }
-}
\ No newline at end of file
+}
diff --git a/vendor/egulias/email-validator/src/Result/Reason/CommaInDomain.php b/vendor/egulias/email-validator/src/Result/Reason/CommaInDomain.php
index 93d3b56..055f145 100644
--- a/vendor/egulias/email-validator/src/Result/Reason/CommaInDomain.php
+++ b/vendor/egulias/email-validator/src/Result/Reason/CommaInDomain.php
@@ -13,4 +13,4 @@ class CommaInDomain implements Reason
     {
         return "Comma ',' is not allowed in domain part";
     }
-}
\ No newline at end of file
+}
diff --git a/vendor/egulias/email-validator/src/Result/Reason/CommentsInIDRight.php b/vendor/egulias/email-validator/src/Result/Reason/CommentsInIDRight.php
index 43a7cf7..6567a11 100644
--- a/vendor/egulias/email-validator/src/Result/Reason/CommentsInIDRight.php
+++ b/vendor/egulias/email-validator/src/Result/Reason/CommentsInIDRight.php
@@ -13,4 +13,4 @@ class CommentsInIDRight implements Reason
     {
         return 'Comments are not allowed in IDRight for message-id';
     }
-}
\ No newline at end of file
+}
diff --git a/vendor/egulias/email-validator/src/Result/Reason/DetailedReason.php b/vendor/egulias/email-validator/src/Result/Reason/DetailedReason.php
index 1751987..8541c92 100644
--- a/vendor/egulias/email-validator/src/Result/Reason/DetailedReason.php
+++ b/vendor/egulias/email-validator/src/Result/Reason/DetailedReason.php
@@ -10,4 +10,4 @@ abstract class DetailedReason implements Reason
     {
         $this->detailedDescription = $details;
     }
-}
\ No newline at end of file
+}
diff --git a/vendor/egulias/email-validator/src/Result/Reason/DomainAcceptsNoMail.php b/vendor/egulias/email-validator/src/Result/Reason/DomainAcceptsNoMail.php
index 55f44bb..bcaefb6 100644
--- a/vendor/egulias/email-validator/src/Result/Reason/DomainAcceptsNoMail.php
+++ b/vendor/egulias/email-validator/src/Result/Reason/DomainAcceptsNoMail.php
@@ -13,4 +13,4 @@ class DomainAcceptsNoMail implements Reason
     {
         return 'Domain accepts no mail (Null MX, RFC7505)';
     }
-}
\ No newline at end of file
+}
diff --git a/vendor/egulias/email-validator/src/Result/Reason/ExceptionFound.php b/vendor/egulias/email-validator/src/Result/Reason/ExceptionFound.php
index 8b1135d..ffed86c 100644
--- a/vendor/egulias/email-validator/src/Result/Reason/ExceptionFound.php
+++ b/vendor/egulias/email-validator/src/Result/Reason/ExceptionFound.php
@@ -23,4 +23,4 @@ class ExceptionFound implements Reason
     {
         return $this->exception->getMessage();
     }
-}
\ No newline at end of file
+}
diff --git a/vendor/egulias/email-validator/src/Result/Reason/ExpectingDomainLiteralClose.php b/vendor/egulias/email-validator/src/Result/Reason/ExpectingDomainLiteralClose.php
index 7deffca..525e7ac 100644
--- a/vendor/egulias/email-validator/src/Result/Reason/ExpectingDomainLiteralClose.php
+++ b/vendor/egulias/email-validator/src/Result/Reason/ExpectingDomainLiteralClose.php
@@ -13,4 +13,4 @@ class ExpectingDomainLiteralClose implements Reason
     {
         return "Closing bracket ']' for domain literal not found";
     }
-}
\ No newline at end of file
+}
diff --git a/vendor/egulias/email-validator/src/Result/Reason/LocalOrReservedDomain.php b/vendor/egulias/email-validator/src/Result/Reason/LocalOrReservedDomain.php
index bc7c5d5..c464767 100644
--- a/vendor/egulias/email-validator/src/Result/Reason/LocalOrReservedDomain.php
+++ b/vendor/egulias/email-validator/src/Result/Reason/LocalOrReservedDomain.php
@@ -13,4 +13,4 @@ class LocalOrReservedDomain implements Reason
     {
         return 'Local, mDNS or reserved domain (RFC2606, RFC6762)';
     }
-}
\ No newline at end of file
+}
diff --git a/vendor/egulias/email-validator/src/Result/Reason/NoDNSRecord.php b/vendor/egulias/email-validator/src/Result/Reason/NoDNSRecord.php
index e217d02..2c966c2 100644
--- a/vendor/egulias/email-validator/src/Result/Reason/NoDNSRecord.php
+++ b/vendor/egulias/email-validator/src/Result/Reason/NoDNSRecord.php
@@ -13,4 +13,4 @@ class NoDNSRecord implements Reason
     {
         return 'No MX or A DSN record was found for this email';
     }
-}
\ No newline at end of file
+}
diff --git a/vendor/egulias/email-validator/src/Result/Reason/Reason.php b/vendor/egulias/email-validator/src/Result/Reason/Reason.php
index e6810b9..786eb9b 100644
--- a/vendor/egulias/email-validator/src/Result/Reason/Reason.php
+++ b/vendor/egulias/email-validator/src/Result/Reason/Reason.php
@@ -13,4 +13,4 @@ interface Reason
      * Short description of the result, human readable.
      */
     public function description() : string;
-}
\ No newline at end of file
+}
diff --git a/vendor/egulias/email-validator/src/Result/Reason/UnOpenedComment.php b/vendor/egulias/email-validator/src/Result/Reason/UnOpenedComment.php
index c76a584..b0a4316 100644
--- a/vendor/egulias/email-validator/src/Result/Reason/UnOpenedComment.php
+++ b/vendor/egulias/email-validator/src/Result/Reason/UnOpenedComment.php
@@ -13,4 +13,4 @@ class UnOpenedComment implements Reason
     {
         return 'Missing opening comment parentheses - https://tools.ietf.org/html/rfc5322#section-3.2.2';
     }
-}
\ No newline at end of file
+}
diff --git a/vendor/egulias/email-validator/src/Result/Reason/UnusualElements.php b/vendor/egulias/email-validator/src/Result/Reason/UnusualElements.php
index 03873dc..861f3bc 100644
--- a/vendor/egulias/email-validator/src/Result/Reason/UnusualElements.php
+++ b/vendor/egulias/email-validator/src/Result/Reason/UnusualElements.php
@@ -23,4 +23,4 @@ class UnusualElements implements Reason
     {
         return 'Unusual element found, wourld render invalid in majority of cases. Element found: ' . $this->element;
     }
-}
\ No newline at end of file
+}
diff --git a/vendor/egulias/email-validator/src/Result/Result.php b/vendor/egulias/email-validator/src/Result/Result.php
index 1e16bcc..fd13e6c 100644
--- a/vendor/egulias/email-validator/src/Result/Result.php
+++ b/vendor/egulias/email-validator/src/Result/Result.php
@@ -24,4 +24,4 @@ interface Result
      * Code for user land to act upon.
      */
     public function code() : int;
-}
\ No newline at end of file
+}
diff --git a/vendor/egulias/email-validator/src/Result/SpoofEmail.php b/vendor/egulias/email-validator/src/Result/SpoofEmail.php
index 9f010de..0ad449b 100644
--- a/vendor/egulias/email-validator/src/Result/SpoofEmail.php
+++ b/vendor/egulias/email-validator/src/Result/SpoofEmail.php
@@ -1,7 +1,6 @@
 <?php
 namespace Egulias\EmailValidator\Result;
 
-use Egulias\EmailValidator\Result\InvalidEmail;
 use Egulias\EmailValidator\Result\Reason\SpoofEmail as ReasonSpoofEmail;
 
 class SpoofEmail extends InvalidEmail
@@ -11,4 +10,4 @@ class SpoofEmail extends InvalidEmail
         $this->reason = new ReasonSpoofEmail();
         parent::__construct($this->reason, '');
     }
-}
\ No newline at end of file
+}
diff --git a/vendor/egulias/email-validator/src/Result/ValidEmail.php b/vendor/egulias/email-validator/src/Result/ValidEmail.php
index 4f3693a..fdc882f 100644
--- a/vendor/egulias/email-validator/src/Result/ValidEmail.php
+++ b/vendor/egulias/email-validator/src/Result/ValidEmail.php
@@ -24,4 +24,4 @@ class ValidEmail implements Result
         return 0;
     }
 
-}
\ No newline at end of file
+}
diff --git a/vendor/egulias/email-validator/src/Validation/DNSCheckValidation.php b/vendor/egulias/email-validator/src/Validation/DNSCheckValidation.php
index 4e0041b..4882b80 100644
--- a/vendor/egulias/email-validator/src/Validation/DNSCheckValidation.php
+++ b/vendor/egulias/email-validator/src/Validation/DNSCheckValidation.php
@@ -2,7 +2,6 @@
 
 namespace Egulias\EmailValidator\Validation;
 
-use Egulias\EmailValidator\Validation\DNSGetRecordWrapper;
 use Egulias\EmailValidator\EmailLexer;
 use Egulias\EmailValidator\Result\InvalidEmail;
 use Egulias\EmailValidator\Result\Reason\DomainAcceptsNoMail;
@@ -22,7 +21,7 @@ class DNSCheckValidation implements EmailValidation
      * Reserved Top Level DNS Names (https://tools.ietf.org/html/rfc2606#section-2),
      * mDNS and private DNS Namespaces (https://tools.ietf.org/html/rfc6762#appendix-G)
      */
-    const RESERVED_DNS_TOP_LEVEL_NAMES = [
+    public const RESERVED_DNS_TOP_LEVEL_NAMES = [
         // Reserved Top Level DNS Names
         'test',
         'example',
@@ -61,7 +60,7 @@ class DNSCheckValidation implements EmailValidation
      */
     private $dnsGetRecord;
 
-    public function __construct(DNSGetRecordWrapper $dnsGetRecord = null)
+    public function __construct(?DNSGetRecordWrapper $dnsGetRecord = null)
     {
         if (!function_exists('idn_to_ascii')) {
             throw new \LogicException(sprintf('The %s class requires the Intl extension.', __CLASS__));
@@ -189,4 +188,4 @@ class DNSCheckValidation implements EmailValidation
 
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/vendor/egulias/email-validator/src/Validation/DNSGetRecordWrapper.php b/vendor/egulias/email-validator/src/Validation/DNSGetRecordWrapper.php
index ec6fe4b..f493c57 100644
--- a/vendor/egulias/email-validator/src/Validation/DNSGetRecordWrapper.php
+++ b/vendor/egulias/email-validator/src/Validation/DNSGetRecordWrapper.php
@@ -25,4 +25,4 @@ class DNSGetRecordWrapper
             restore_error_handler();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/vendor/egulias/email-validator/src/Validation/DNSRecords.php b/vendor/egulias/email-validator/src/Validation/DNSRecords.php
index afda213..b026a2d 100644
--- a/vendor/egulias/email-validator/src/Validation/DNSRecords.php
+++ b/vendor/egulias/email-validator/src/Validation/DNSRecords.php
@@ -32,4 +32,4 @@ class DNSRecords
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/vendor/egulias/email-validator/src/Validation/Exception/EmptyValidationList.php b/vendor/egulias/email-validator/src/Validation/Exception/EmptyValidationList.php
index ee7c41a..4a031b1 100644
--- a/vendor/egulias/email-validator/src/Validation/Exception/EmptyValidationList.php
+++ b/vendor/egulias/email-validator/src/Validation/Exception/EmptyValidationList.php
@@ -9,7 +9,7 @@ class EmptyValidationList extends \InvalidArgumentException
     /**
     * @param int $code
     */
-    public function __construct($code = 0, Exception $previous = null)
+    public function __construct($code = 0, ?Exception $previous = null)
     {
         parent::__construct("Empty validation list is not allowed", $code, $previous);
     }
diff --git a/vendor/egulias/email-validator/src/Validation/MultipleValidationWithAnd.php b/vendor/egulias/email-validator/src/Validation/MultipleValidationWithAnd.php
index 90d4f0d..abafe75 100644
--- a/vendor/egulias/email-validator/src/Validation/MultipleValidationWithAnd.php
+++ b/vendor/egulias/email-validator/src/Validation/MultipleValidationWithAnd.php
@@ -13,13 +13,13 @@ class MultipleValidationWithAnd implements EmailValidation
      * If one of validations fails, the remaining validations will be skipped.
      * This means MultipleErrors will only contain a single error, the first found.
      */
-    const STOP_ON_ERROR = 0;
+    public const STOP_ON_ERROR = 0;
 
     /**
      * All of validations will be invoked even if one of them got failure.
      * So MultipleErrors will contain all causes.
      */
-    const ALLOW_ALL_ERRORS = 1;
+    public const ALLOW_ALL_ERRORS = 1;
 
     /**
      * @var EmailValidation[]
diff --git a/vendor/egulias/email-validator/src/Warning/AddressLiteral.php b/vendor/egulias/email-validator/src/Warning/AddressLiteral.php
index 77e70f7..474ff0e 100644
--- a/vendor/egulias/email-validator/src/Warning/AddressLiteral.php
+++ b/vendor/egulias/email-validator/src/Warning/AddressLiteral.php
@@ -4,7 +4,7 @@ namespace Egulias\EmailValidator\Warning;
 
 class AddressLiteral extends Warning
 {
-    const CODE = 12;
+    public const CODE = 12;
 
     public function __construct()
     {
diff --git a/vendor/egulias/email-validator/src/Warning/CFWSNearAt.php b/vendor/egulias/email-validator/src/Warning/CFWSNearAt.php
index be43bbe..8bac12b 100644
--- a/vendor/egulias/email-validator/src/Warning/CFWSNearAt.php
+++ b/vendor/egulias/email-validator/src/Warning/CFWSNearAt.php
@@ -4,7 +4,7 @@ namespace Egulias\EmailValidator\Warning;
 
 class CFWSNearAt extends Warning
 {
-    const CODE = 49;
+    public const CODE = 49;
 
     public function __construct()
     {
diff --git a/vendor/egulias/email-validator/src/Warning/CFWSWithFWS.php b/vendor/egulias/email-validator/src/Warning/CFWSWithFWS.php
index dea3450..ba57601 100644
--- a/vendor/egulias/email-validator/src/Warning/CFWSWithFWS.php
+++ b/vendor/egulias/email-validator/src/Warning/CFWSWithFWS.php
@@ -4,7 +4,7 @@ namespace Egulias\EmailValidator\Warning;
 
 class CFWSWithFWS extends Warning
 {
-    const CODE = 18;
+    public const CODE = 18;
 
     public function __construct()
     {
diff --git a/vendor/egulias/email-validator/src/Warning/Comment.php b/vendor/egulias/email-validator/src/Warning/Comment.php
index 704c290..6508295 100644
--- a/vendor/egulias/email-validator/src/Warning/Comment.php
+++ b/vendor/egulias/email-validator/src/Warning/Comment.php
@@ -4,7 +4,7 @@ namespace Egulias\EmailValidator\Warning;
 
 class Comment extends Warning
 {
-    const CODE = 17;
+    public const CODE = 17;
 
     public function __construct()
     {
diff --git a/vendor/egulias/email-validator/src/Warning/DeprecatedComment.php b/vendor/egulias/email-validator/src/Warning/DeprecatedComment.php
index ad43bd7..a257807 100644
--- a/vendor/egulias/email-validator/src/Warning/DeprecatedComment.php
+++ b/vendor/egulias/email-validator/src/Warning/DeprecatedComment.php
@@ -4,7 +4,7 @@ namespace Egulias\EmailValidator\Warning;
 
 class DeprecatedComment extends Warning
 {
-    const CODE = 37;
+    public const CODE = 37;
 
     public function __construct()
     {
diff --git a/vendor/egulias/email-validator/src/Warning/DomainLiteral.php b/vendor/egulias/email-validator/src/Warning/DomainLiteral.php
index 6f36b5e..034388c 100644
--- a/vendor/egulias/email-validator/src/Warning/DomainLiteral.php
+++ b/vendor/egulias/email-validator/src/Warning/DomainLiteral.php
@@ -4,7 +4,7 @@ namespace Egulias\EmailValidator\Warning;
 
 class DomainLiteral extends Warning
 {
-    const CODE = 70;
+    public const CODE = 70;
 
     public function __construct()
     {
diff --git a/vendor/egulias/email-validator/src/Warning/EmailTooLong.php b/vendor/egulias/email-validator/src/Warning/EmailTooLong.php
index 497309d..d25ad12 100644
--- a/vendor/egulias/email-validator/src/Warning/EmailTooLong.php
+++ b/vendor/egulias/email-validator/src/Warning/EmailTooLong.php
@@ -6,7 +6,7 @@ use Egulias\EmailValidator\EmailParser;
 
 class EmailTooLong extends Warning
 {
-    const CODE = 66;
+    public const CODE = 66;
 
     public function __construct()
     {
diff --git a/vendor/egulias/email-validator/src/Warning/IPV6BadChar.php b/vendor/egulias/email-validator/src/Warning/IPV6BadChar.php
index ba2fcc0..3ecd5bc 100644
--- a/vendor/egulias/email-validator/src/Warning/IPV6BadChar.php
+++ b/vendor/egulias/email-validator/src/Warning/IPV6BadChar.php
@@ -4,7 +4,7 @@ namespace Egulias\EmailValidator\Warning;
 
 class IPV6BadChar extends Warning
 {
-    const CODE = 74;
+    public const CODE = 74;
 
     public function __construct()
     {
diff --git a/vendor/egulias/email-validator/src/Warning/IPV6ColonEnd.php b/vendor/egulias/email-validator/src/Warning/IPV6ColonEnd.php
index 41afa78..3f0c2f2 100644
--- a/vendor/egulias/email-validator/src/Warning/IPV6ColonEnd.php
+++ b/vendor/egulias/email-validator/src/Warning/IPV6ColonEnd.php
@@ -4,7 +4,7 @@ namespace Egulias\EmailValidator\Warning;
 
 class IPV6ColonEnd extends Warning
 {
-    const CODE = 77;
+    public const CODE = 77;
 
     public function __construct()
     {
diff --git a/vendor/egulias/email-validator/src/Warning/IPV6ColonStart.php b/vendor/egulias/email-validator/src/Warning/IPV6ColonStart.php
index 1bf754e..742fb3b 100644
--- a/vendor/egulias/email-validator/src/Warning/IPV6ColonStart.php
+++ b/vendor/egulias/email-validator/src/Warning/IPV6ColonStart.php
@@ -4,7 +4,7 @@ namespace Egulias\EmailValidator\Warning;
 
 class IPV6ColonStart extends Warning
 {
-    const CODE = 76;
+    public const CODE = 76;
 
     public function __construct()
     {
diff --git a/vendor/egulias/email-validator/src/Warning/IPV6Deprecated.php b/vendor/egulias/email-validator/src/Warning/IPV6Deprecated.php
index d752caa..59c3037 100644
--- a/vendor/egulias/email-validator/src/Warning/IPV6Deprecated.php
+++ b/vendor/egulias/email-validator/src/Warning/IPV6Deprecated.php
@@ -4,7 +4,7 @@ namespace Egulias\EmailValidator\Warning;
 
 class IPV6Deprecated extends Warning
 {
-    const CODE = 13;
+    public const CODE = 13;
 
     public function __construct()
     {
diff --git a/vendor/egulias/email-validator/src/Warning/IPV6DoubleColon.php b/vendor/egulias/email-validator/src/Warning/IPV6DoubleColon.php
index 4f82394..d406602 100644
--- a/vendor/egulias/email-validator/src/Warning/IPV6DoubleColon.php
+++ b/vendor/egulias/email-validator/src/Warning/IPV6DoubleColon.php
@@ -4,7 +4,7 @@ namespace Egulias\EmailValidator\Warning;
 
 class IPV6DoubleColon extends Warning
 {
-    const CODE = 73;
+    public const CODE = 73;
 
     public function __construct()
     {
diff --git a/vendor/egulias/email-validator/src/Warning/IPV6GroupCount.php b/vendor/egulias/email-validator/src/Warning/IPV6GroupCount.php
index a59d317..551bc3a 100644
--- a/vendor/egulias/email-validator/src/Warning/IPV6GroupCount.php
+++ b/vendor/egulias/email-validator/src/Warning/IPV6GroupCount.php
@@ -4,7 +4,7 @@ namespace Egulias\EmailValidator\Warning;
 
 class IPV6GroupCount extends Warning
 {
-    const CODE = 72;
+    public const CODE = 72;
 
     public function __construct()
     {
diff --git a/vendor/egulias/email-validator/src/Warning/IPV6MaxGroups.php b/vendor/egulias/email-validator/src/Warning/IPV6MaxGroups.php
index 936274c..7f8a410 100644
--- a/vendor/egulias/email-validator/src/Warning/IPV6MaxGroups.php
+++ b/vendor/egulias/email-validator/src/Warning/IPV6MaxGroups.php
@@ -4,7 +4,7 @@ namespace Egulias\EmailValidator\Warning;
 
 class IPV6MaxGroups extends Warning
 {
-    const CODE = 75;
+    public const CODE = 75;
 
     public function __construct()
     {
diff --git a/vendor/egulias/email-validator/src/Warning/LocalTooLong.php b/vendor/egulias/email-validator/src/Warning/LocalTooLong.php
index 0d08d8b..b46b874 100644
--- a/vendor/egulias/email-validator/src/Warning/LocalTooLong.php
+++ b/vendor/egulias/email-validator/src/Warning/LocalTooLong.php
@@ -4,8 +4,8 @@ namespace Egulias\EmailValidator\Warning;
 
 class LocalTooLong extends Warning
 {
-    const CODE = 64;
-    const LOCAL_PART_LENGTH = 64;
+    public const CODE = 64;
+    public const LOCAL_PART_LENGTH = 64;
 
     public function __construct()
     {
diff --git a/vendor/egulias/email-validator/src/Warning/NoDNSMXRecord.php b/vendor/egulias/email-validator/src/Warning/NoDNSMXRecord.php
index b3c21a1..bddb96b 100644
--- a/vendor/egulias/email-validator/src/Warning/NoDNSMXRecord.php
+++ b/vendor/egulias/email-validator/src/Warning/NoDNSMXRecord.php
@@ -4,7 +4,7 @@ namespace Egulias\EmailValidator\Warning;
 
 class NoDNSMXRecord extends Warning
 {
-    const CODE = 6;
+    public const CODE = 6;
 
     public function __construct()
     {
diff --git a/vendor/egulias/email-validator/src/Warning/ObsoleteDTEXT.php b/vendor/egulias/email-validator/src/Warning/ObsoleteDTEXT.php
index 10f19e3..412fd49 100644
--- a/vendor/egulias/email-validator/src/Warning/ObsoleteDTEXT.php
+++ b/vendor/egulias/email-validator/src/Warning/ObsoleteDTEXT.php
@@ -4,7 +4,7 @@ namespace Egulias\EmailValidator\Warning;
 
 class ObsoleteDTEXT extends Warning
 {
-    const CODE = 71;
+    public const CODE = 71;
 
     public function __construct()
     {
diff --git a/vendor/egulias/email-validator/src/Warning/QuotedPart.php b/vendor/egulias/email-validator/src/Warning/QuotedPart.php
index 36a4265..afa1f9e 100644
--- a/vendor/egulias/email-validator/src/Warning/QuotedPart.php
+++ b/vendor/egulias/email-validator/src/Warning/QuotedPart.php
@@ -4,7 +4,7 @@ namespace Egulias\EmailValidator\Warning;
 
 class QuotedPart extends Warning
 {
-    const CODE = 36;
+    public const CODE = 36;
 
     /**
      * @param scalar $prevToken
diff --git a/vendor/egulias/email-validator/src/Warning/QuotedString.php b/vendor/egulias/email-validator/src/Warning/QuotedString.php
index 817e4e8..c152ec2 100644
--- a/vendor/egulias/email-validator/src/Warning/QuotedString.php
+++ b/vendor/egulias/email-validator/src/Warning/QuotedString.php
@@ -4,7 +4,7 @@ namespace Egulias\EmailValidator\Warning;
 
 class QuotedString extends Warning
 {
-    const CODE = 11;
+    public const CODE = 11;
 
     /**
      * @param scalar $prevToken
diff --git a/vendor/egulias/email-validator/src/Warning/TLD.php b/vendor/egulias/email-validator/src/Warning/TLD.php
index 2338b9f..10cec28 100644
--- a/vendor/egulias/email-validator/src/Warning/TLD.php
+++ b/vendor/egulias/email-validator/src/Warning/TLD.php
@@ -4,7 +4,7 @@ namespace Egulias\EmailValidator\Warning;
 
 class TLD extends Warning
 {
-    const CODE = 9;
+    public const CODE = 9;
 
     public function __construct()
     {
diff --git a/vendor/egulias/email-validator/src/Warning/Warning.php b/vendor/egulias/email-validator/src/Warning/Warning.php
index a0158a2..8b39d64 100644
--- a/vendor/egulias/email-validator/src/Warning/Warning.php
+++ b/vendor/egulias/email-validator/src/Warning/Warning.php
@@ -4,7 +4,7 @@ namespace Egulias\EmailValidator\Warning;
 
 abstract class Warning
 {
-    const CODE = 0;
+    public const CODE = 0;
 
     /**
      * @var string
diff --git a/vendor/phpmailer/phpmailer/README.md b/vendor/phpmailer/phpmailer/README.md
index 56f971a..3bba826 100644
--- a/vendor/phpmailer/phpmailer/README.md
+++ b/vendor/phpmailer/phpmailer/README.md
@@ -16,7 +16,7 @@
 - Probably the world's most popular code for sending email from PHP!
 - Used by many open-source projects: WordPress, Drupal, 1CRM, SugarCRM, Yii, Joomla! and many more
 - Integrated SMTP support – send without a local mail server
-- Send emails with multiple To, CC, BCC and Reply-to addresses
+- Send emails with multiple To, CC, BCC, and Reply-to addresses
 - Multipart/alternative emails for mail clients that do not read HTML email
 - Add attachments, including inline
 - Support for UTF-8 content and 8bit, base64, binary, and quoted-printable encodings
@@ -25,7 +25,7 @@
 - Protects against header injection attacks
 - Error messages in over 50 languages!
 - DKIM and S/MIME signing support
-- Compatible with PHP 5.5 and later, including PHP 8.1
+- Compatible with PHP 5.5 and later, including PHP 8.2
 - Namespaced to prevent name clashes
 - Much more!
 
@@ -38,7 +38,7 @@ The PHP `mail()` function usually sends via a local mail server, typically front
 
 *Please* don't be tempted to do it yourself – if you don't use PHPMailer, there are many other excellent libraries that
 you should look at before rolling your own. Try [SwiftMailer](https://swiftmailer.symfony.com/)
-, [Laminas/Mail](https://docs.laminas.dev/laminas-mail/), [ZetaComponents](https://github.com/zetacomponents/Mail) etc.
+, [Laminas/Mail](https://docs.laminas.dev/laminas-mail/), [ZetaComponents](https://github.com/zetacomponents/Mail), etc.
 
 ## License
 This software is distributed under the [LGPL 2.1](http://www.gnu.org/licenses/lgpl-2.1.html) license, along with the [GPL Cooperation Commitment](https://gplcc.github.io/gplcc/). Please read [LICENSE](https://github.com/PHPMailer/PHPMailer/blob/master/LICENSE) for information on the software availability and distribution.
@@ -47,7 +47,7 @@ This software is distributed under the [LGPL 2.1](http://www.gnu.org/licenses/lg
 PHPMailer is available on [Packagist](https://packagist.org/packages/phpmailer/phpmailer) (using semantic versioning), and installation via [Composer](https://getcomposer.org) is the recommended way to install PHPMailer. Just add this line to your `composer.json` file:
 
 ```json
-"phpmailer/phpmailer": "^6.5"
+"phpmailer/phpmailer": "^6.7.1"
 ```
 
 or run
@@ -136,14 +136,14 @@ try {
 }
 ```
 
-You'll find plenty to play with in the [examples](https://github.com/PHPMailer/PHPMailer/tree/master/examples) folder, which covers many common scenarios including sending through gmail, building contact forms, sending to mailing lists, and more.
+You'll find plenty to play with in the [examples](https://github.com/PHPMailer/PHPMailer/tree/master/examples) folder, which covers many common scenarios including sending through Gmail, building contact forms, sending to mailing lists, and more.
 
 If you are re-using the instance (e.g. when sending to a mailing list), you may need to clear the recipient list to avoid sending duplicate messages. See [the mailing list example](https://github.com/PHPMailer/PHPMailer/blob/master/examples/mailing_list.phps) for further guidance.
 
 That's it. You should now be ready to use PHPMailer!
 
 ## Localization
-PHPMailer defaults to English, but in the [language](https://github.com/PHPMailer/PHPMailer/tree/master/language/) folder you'll find many translations for PHPMailer error messages that you may encounter. Their filenames contain [ISO 639-1](http://en.wikipedia.org/wiki/ISO_639-1) language code for the translations, for example `fr` for French. To specify a language, you need to tell PHPMailer which one to use, like this:
+PHPMailer defaults to English, but in the [language](https://github.com/PHPMailer/PHPMailer/tree/master/language/) folder, you'll find many translations for PHPMailer error messages that you may encounter. Their filenames contain [ISO 639-1](http://en.wikipedia.org/wiki/ISO_639-1) language code for the translations, for example `fr` for French. To specify a language, you need to tell PHPMailer which one to use, like this:
 
 ```php
 //To load the French version
@@ -178,9 +178,9 @@ Please disclose any vulnerabilities found responsibly – report security issues
 See [SECURITY](https://github.com/PHPMailer/PHPMailer/tree/master/SECURITY.md) and [PHPMailer's security advisories on GitHub](https://github.com/PHPMailer/PHPMailer/security). 
 
 ## Contributing
-Please submit bug reports, suggestions and pull requests to the [GitHub issue tracker](https://github.com/PHPMailer/PHPMailer/issues).
+Please submit bug reports, suggestions, and pull requests to the [GitHub issue tracker](https://github.com/PHPMailer/PHPMailer/issues).
 
-We're particularly interested in fixing edge-cases, expanding test coverage and updating translations.
+We're particularly interested in fixing edge cases, expanding test coverage, and updating translations.
 
 If you found a mistake in the docs, or want to add something, go ahead and amend the wiki – anyone can edit it.
 
@@ -204,7 +204,7 @@ Donations are very welcome, whether in beer 🍺, T-shirts 👕, or cold, hard c
 Available as part of the Tidelift Subscription.
 
 The maintainers of PHPMailer and thousands of other packages are working with Tidelift to deliver commercial
-support and maintenance for the open source packages you use to build your applications. Save time, reduce risk, and
+support and maintenance for the open-source packages you use to build your applications. Save time, reduce risk, and
 improve code health, while paying the maintainers of the exact packages you
 use. [Learn more.](https://tidelift.com/subscription/pkg/packagist-phpmailer-phpmailer?utm_source=packagist-phpmailer-phpmailer&utm_medium=referral&utm_campaign=enterprise&utm_term=repo)
 
@@ -222,9 +222,9 @@ See [changelog](changelog.md).
 ### What's changed since moving from SourceForge?
 - Official successor to the SourceForge and Google Code projects.
 - Test suite.
-- Continuous integration with Github Actions.
+- Continuous integration with GitHub Actions.
 - Composer support.
 - Public development.
 - Additional languages and language strings.
 - CRAM-MD5 authentication support.
-- Preserves full repo history of authors, commits and branches from the original SourceForge project.
+- Preserves full repo history of authors, commits, and branches from the original SourceForge project.
diff --git a/vendor/phpmailer/phpmailer/VERSION b/vendor/phpmailer/phpmailer/VERSION
index a08b5f1..1d42024 100644
--- a/vendor/phpmailer/phpmailer/VERSION
+++ b/vendor/phpmailer/phpmailer/VERSION
@@ -1 +1 @@
-6.6.4
\ No newline at end of file
+6.7.1
\ No newline at end of file
diff --git a/vendor/phpmailer/phpmailer/composer.json b/vendor/phpmailer/phpmailer/composer.json
index 1db6f03..37e3d6e 100644
--- a/vendor/phpmailer/phpmailer/composer.json
+++ b/vendor/phpmailer/phpmailer/composer.json
@@ -37,21 +37,23 @@
         "ext-hash": "*"
     },
     "require-dev": {
-        "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
-        "doctrine/annotations": "^1.2",
+        "dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",
+        "doctrine/annotations": "^1.2.6 || ^1.13.3",
         "php-parallel-lint/php-console-highlighter": "^1.0.0",
         "php-parallel-lint/php-parallel-lint": "^1.3.2",
         "phpcompatibility/php-compatibility": "^9.3.5",
         "roave/security-advisories": "dev-latest",
-        "squizlabs/php_codesniffer": "^3.6.2",
-        "yoast/phpunit-polyfills": "^1.0.0"
+        "squizlabs/php_codesniffer": "^3.7.1",
+        "yoast/phpunit-polyfills": "^1.0.4"
     },
     "suggest": {
         "ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses",
+        "ext-openssl": "Needed for secure SMTP sending and DKIM signing",
+        "greew/oauth2-azure-provider": "Needed for Microsoft Azure XOAUTH2 authentication",
         "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
         "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
         "psr/log": "For optional PSR-3 debug logging",
-        "stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication",
+        "thenetworg/oauth2-azure": "Needed for Microsoft XOAUTH2 authentication",
         "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)"
     },
     "autoload": {
diff --git a/vendor/phpmailer/phpmailer/get_oauth_token.php b/vendor/phpmailer/phpmailer/get_oauth_token.php
index ba66f6c..cda0445 100644
--- a/vendor/phpmailer/phpmailer/get_oauth_token.php
+++ b/vendor/phpmailer/phpmailer/get_oauth_token.php
@@ -44,6 +44,8 @@ use League\OAuth2\Client\Provider\Google;
 use Hayageek\OAuth2\Client\Provider\Yahoo;
 //@see https://github.com/stevenmaguire/oauth2-microsoft
 use Stevenmaguire\OAuth2\Client\Provider\Microsoft;
+//@see https://github.com/greew/oauth2-azure-provider
+use Greew\OAuth2\Client\Provider\Azure;
 
 if (!isset($_GET['code']) && !isset($_POST['provider'])) {
     ?>
@@ -57,11 +59,14 @@ if (!isset($_GET['code']) && !isset($_POST['provider'])) {
     <label for="providerYahoo">Yahoo</label><br>
     <input type="radio" name="provider" value="Microsoft" id="providerMicrosoft">
     <label for="providerMicrosoft">Microsoft</label><br>
+    <input type="radio" name="provider" value="Azure" id="providerAzure">
+    <label for="providerAzure">Azure</label><br>
     <h1>Enter id and secret</h1>
     <p>These details are obtained by setting up an app in your provider's developer console.
     </p>
     <p>ClientId: <input type="text" name="clientId"><p>
     <p>ClientSecret: <input type="text" name="clientSecret"></p>
+    <p>TenantID (only relevant for Azure): <input type="text" name="tenantId"></p>
     <input type="submit" value="Continue">
 </form>
 </body>
@@ -77,18 +82,22 @@ session_start();
 $providerName = '';
 $clientId = '';
 $clientSecret = '';
+$tenantId = '';
 
 if (array_key_exists('provider', $_POST)) {
     $providerName = $_POST['provider'];
     $clientId = $_POST['clientId'];
     $clientSecret = $_POST['clientSecret'];
+    $tenantId = $_POST['tenantId'];
     $_SESSION['provider'] = $providerName;
     $_SESSION['clientId'] = $clientId;
     $_SESSION['clientSecret'] = $clientSecret;
+    $_SESSION['tenantId'] = $tenantId;
 } elseif (array_key_exists('provider', $_SESSION)) {
     $providerName = $_SESSION['provider'];
     $clientId = $_SESSION['clientId'];
     $clientSecret = $_SESSION['clientSecret'];
+    $tenantId = $_SESSION['tenantId'];
 }
 
 //If you don't want to use the built-in form, set your client id and secret here
@@ -130,6 +139,17 @@ switch ($providerName) {
             ]
         ];
         break;
+    case 'Azure':
+        $params['tenantId'] = $tenantId;
+
+        $provider = new Azure($params);
+        $options = [
+            'scope' => [
+                'https://outlook.office.com/SMTP.Send',
+                'offline_access'
+            ]
+        ];
+        break;
 }
 
 if (null === $provider) {
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-da.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-da.php
index 1edba1d..8b7b38a 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-da.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-da.php
@@ -14,16 +14,22 @@ $PHPMAILER_LANG['data_not_accepted']    = 'SMTP fejl: Data blev ikke accepteret.
 $PHPMAILER_LANG['empty_message']        = 'Meddelelsen er uden indhold';
 $PHPMAILER_LANG['encoding']             = 'Ukendt encode-format: ';
 $PHPMAILER_LANG['execute']              = 'Kunne ikke afvikle: ';
+$PHPMAILER_LANG['extension_missing']    = 'Udvidelse mangler: ';
 $PHPMAILER_LANG['file_access']          = 'Kunne ikke tilgå filen: ';
 $PHPMAILER_LANG['file_open']            = 'Fil fejl: Kunne ikke åbne filen: ';
 $PHPMAILER_LANG['from_failed']          = 'Følgende afsenderadresse er forkert: ';
 $PHPMAILER_LANG['instantiate']          = 'Email funktionen kunne ikke initialiseres.';
 $PHPMAILER_LANG['invalid_address']      = 'Udgyldig adresse: ';
+$PHPMAILER_LANG['invalid_header']       = 'Ugyldig header navn eller værdi';
+$PHPMAILER_LANG['invalid_hostentry']    = 'Ugyldig hostentry: ';
+$PHPMAILER_LANG['invalid_host']         = 'Ugyldig vært: ';
 $PHPMAILER_LANG['mailer_not_supported'] = ' mailer understøttes ikke.';
 $PHPMAILER_LANG['provide_address']      = 'Indtast mindst en modtagers email adresse.';
-$PHPMAILER_LANG['recipients_failed']    = 'SMTP fejl: Følgende modtagere er forkerte: ';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP fejl: Følgende modtagere fejlede: ';
 $PHPMAILER_LANG['signing']              = 'Signeringsfejl: ';
+$PHPMAILER_LANG['smtp_code']            = 'SMTP kode: ';
+$PHPMAILER_LANG['smtp_code_ex']         = 'Yderligere SMTP info: ';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() fejlede.';
+$PHPMAILER_LANG['smtp_detail']          = 'Detalje: ';
 $PHPMAILER_LANG['smtp_error']           = 'SMTP server fejl: ';
 $PHPMAILER_LANG['variable_set']         = 'Kunne ikke definere eller nulstille variablen: ';
-$PHPMAILER_LANG['extension_missing']    = 'Udvidelse mangler: ';
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-es.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-es.php
index 6ba7462..6992041 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-es.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-es.php
@@ -4,6 +4,7 @@
  * Spanish PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
  * @author Matt Sturdy <matt.sturdy@gmail.com>
+ * @author Crystopher Glodzienski Cardoso <crystopher.glodzienski@gmail.com>
  */
 
 $PHPMAILER_LANG['authenticate']         = 'Error SMTP: Imposible autentificar.';
@@ -25,3 +26,6 @@ $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() falló.';
 $PHPMAILER_LANG['smtp_error']           = 'Error del servidor SMTP: ';
 $PHPMAILER_LANG['variable_set']         = 'No se pudo configurar la variable: ';
 $PHPMAILER_LANG['extension_missing']    = 'Extensión faltante: ';
+$PHPMAILER_LANG['smtp_code']            = 'Código del servidor SMTP: ';
+$PHPMAILER_LANG['smtp_code_ex']         = 'Información adicional del servidor SMTP: ';
+$PHPMAILER_LANG['invalid_header']       = 'Nombre o valor de encabezado no válido';
diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-pl.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-pl.php
index 23caa71..b0469fd 100644
--- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-pl.php
+++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-pl.php
@@ -9,19 +9,18 @@ $PHPMAILER_LANG['authenticate']         = 'Błąd SMTP: Nie można przeprowadzi
 $PHPMAILER_LANG['connect_host']         = 'Błąd SMTP: Nie można połączyć się z wybranym hostem.';
 $PHPMAILER_LANG['data_not_accepted']    = 'Błąd SMTP: Dane nie zostały przyjęte.';
 $PHPMAILER_LANG['empty_message']        = 'Wiadomość jest pusta.';
-$PHPMAILER_LANG['encoding']             = 'Nieznany sposób kodowania znaków: ';
+$PHPMAILER_LANG['encoding']             = 'Błędny sposób kodowania znaków: ';
 $PHPMAILER_LANG['execute']              = 'Nie można uruchomić: ';
 $PHPMAILER_LANG['file_access']          = 'Brak dostępu do pliku: ';
 $PHPMAILER_LANG['file_open']            = 'Nie można otworzyć pliku: ';
-$PHPMAILER_LANG['from_failed']          = 'Następujący adres Nadawcy jest nieprawidłowy: ';
+$PHPMAILER_LANG['from_failed']          = 'Następujący adres nadawcy jest nieprawidłowy lub nie istnieje: ';
 $PHPMAILER_LANG['instantiate']          = 'Nie można wywołać funkcji mail(). Sprawdź konfigurację serwera.';
-$PHPMAILER_LANG['invalid_address']      = 'Nie można wysłać wiadomości, ' .
-    'następujący adres Odbiorcy jest nieprawidłowy: ';
-$PHPMAILER_LANG['provide_address']      = 'Należy podać prawidłowy adres email Odbiorcy.';
+$PHPMAILER_LANG['invalid_address']      = 'Nie można wysłać wiadomości, ' . 'następujący adres odbiorcy jest nieprawidłowy lub nie istnieje: ';
+$PHPMAILER_LANG['provide_address']      = 'Należy podać prawidłowy adres email odbiorcy.';
 $PHPMAILER_LANG['mailer_not_supported'] = 'Wybrana metoda wysyłki wiadomości nie jest obsługiwana.';
-$PHPMAILER_LANG['recipients_failed']    = 'Błąd SMTP: Następujący odbiorcy są nieprawidłowi: ';
+$PHPMAILER_LANG['recipients_failed']    = 'Błąd SMTP: Następujący odbiorcy są nieprawidłowi lub nie istnieją: ';
 $PHPMAILER_LANG['signing']              = 'Błąd podpisywania wiadomości: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() zakończone niepowodzeniem.';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Wywołanie funkcji SMTP Connect() zostało zakończone niepowodzeniem.';
 $PHPMAILER_LANG['smtp_error']           = 'Błąd SMTP: ';
 $PHPMAILER_LANG['variable_set']         = 'Nie można ustawić lub zmodyfikować zmiennej: ';
 $PHPMAILER_LANG['extension_missing']    = 'Brakujące rozszerzenie: ';
diff --git a/vendor/phpmailer/phpmailer/src/PHPMailer.php b/vendor/phpmailer/phpmailer/src/PHPMailer.php
index 6242454..e14cdbf 100644
--- a/vendor/phpmailer/phpmailer/src/PHPMailer.php
+++ b/vendor/phpmailer/phpmailer/src/PHPMailer.php
@@ -750,7 +750,7 @@ class PHPMailer
      *
      * @var string
      */
-    const VERSION = '6.6.4';
+    const VERSION = '6.7.1';
 
     /**
      * Error severity: message only, continue processing.
@@ -858,7 +858,7 @@ class PHPMailer
     private function mailPassthru($to, $subject, $body, $header, $params)
     {
         //Check overloading of mail function to avoid double-encoding
-        if (ini_get('mbstring.func_overload') & 1) {
+        if ((int)ini_get('mbstring.func_overload') & 1) {
             $subject = $this->secureHeader($subject);
         } else {
             $subject = $this->encodeHeader($this->secureHeader($subject));
@@ -1124,6 +1124,22 @@ class PHPMailer
         return call_user_func_array([$this, 'addAnAddress'], $params);
     }
 
+    /**
+     * Set the boundaries to use for delimiting MIME parts.
+     * If you override this, ensure you set all 3 boundaries to unique values.
+     * The default boundaries include a "=_" sequence which cannot occur in quoted-printable bodies,
+     * as suggested by https://www.rfc-editor.org/rfc/rfc2045#section-6.7
+     *
+     * @return void
+     */
+    public function setBoundaries()
+    {
+        $this->uniqueid = $this->generateId();
+        $this->boundary[1] = 'b1=_' . $this->uniqueid;
+        $this->boundary[2] = 'b2=_' . $this->uniqueid;
+        $this->boundary[3] = 'b3=_' . $this->uniqueid;
+    }
+
     /**
      * Add an address to one of the recipient arrays or to the ReplyTo array.
      * Addresses that have been added already return false, but do not throw exceptions.
@@ -1671,11 +1687,11 @@ class PHPMailer
                     return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
             }
         } catch (Exception $exc) {
-            if ($this->Mailer === 'smtp' && $this->SMTPKeepAlive == true) {
-                $this->smtp->reset();
-            }
             $this->setError($exc->getMessage());
             $this->edebug($exc->getMessage());
+            if ($this->Mailer === 'smtp' && $this->SMTPKeepAlive == true && $this->smtp->connected()) {
+                $this->smtp->reset();
+            }
             if ($this->exceptions) {
                 throw $exc;
             }
@@ -1863,7 +1879,7 @@ class PHPMailer
         if (!static::isPermittedPath($path)) {
             return false;
         }
-        $readable = file_exists($path);
+        $readable = is_file($path);
         //If not a UNC path (expected to start with \\), check read permission, see #2069
         if (strpos($path, '\\\\') !== 0) {
             $readable = $readable && is_readable($path);
@@ -2101,6 +2117,9 @@ class PHPMailer
         $this->smtp->setDebugLevel($this->SMTPDebug);
         $this->smtp->setDebugOutput($this->Debugoutput);
         $this->smtp->setVerp($this->do_verp);
+        if ($this->Host === null) {
+            $this->Host = 'localhost';
+        }
         $hosts = explode(';', $this->Host);
         $lastexception = null;
 
@@ -2791,10 +2810,7 @@ class PHPMailer
     {
         $body = '';
         //Create unique IDs and preset boundaries
-        $this->uniqueid = $this->generateId();
-        $this->boundary[1] = 'b1_' . $this->uniqueid;
-        $this->boundary[2] = 'b2_' . $this->uniqueid;
-        $this->boundary[3] = 'b3_' . $this->uniqueid;
+        $this->setBoundaries();
 
         if ($this->sign_key_file) {
             $body .= $this->getMailMIME() . static::$LE;
@@ -2830,7 +2846,7 @@ class PHPMailer
             $altBodyEncoding = static::ENCODING_QUOTED_PRINTABLE;
         }
         //Use this as a preamble in all multipart message types
-        $mimepre = 'This is a multi-part message in MIME format.' . static::$LE . static::$LE;
+        $mimepre = '';
         switch ($this->message_type) {
             case 'inline':
                 $body .= $mimepre;
@@ -3066,6 +3082,18 @@ class PHPMailer
         return $body;
     }
 
+    /**
+     * Get the boundaries that this message will use
+     * @return array
+     */
+    public function getBoundaries()
+    {
+        if (empty($this->boundary)) {
+            $this->setBoundaries();
+        }
+        return $this->boundary;
+    }
+
     /**
      * Return the start of a message boundary.
      *
@@ -4183,6 +4211,7 @@ class PHPMailer
      * @param string      $name  Custom header name
      * @param string|null $value Header value
      *
+     * @return bool True if a header was set successfully
      * @throws Exception
      */
     public function addCustomHeader($name, $value = null)
@@ -4632,15 +4661,27 @@ class PHPMailer
     }
 
     /**
-     * Remove trailing breaks from a string.
+     * Remove trailing whitespace from a string.
+     *
+     * @param string $text
+     *
+     * @return string The text to remove whitespace from
+     */
+    public static function stripTrailingWSP($text)
+    {
+        return rtrim($text, " \r\n\t");
+    }
+
+    /**
+     * Strip trailing line breaks from a string.
      *
      * @param string $text
      *
      * @return string The text to remove breaks from
      */
-    public static function stripTrailingWSP($text)
+    public static function stripTrailingBreaks($text)
     {
-        return rtrim($text, " \r\n\t");
+        return rtrim($text, "\r\n");
     }
 
     /**
@@ -4806,7 +4847,7 @@ class PHPMailer
         $body = static::normalizeBreaks($body, self::CRLF);
 
         //Reduce multiple trailing line breaks to a single one
-        return static::stripTrailingWSP($body) . self::CRLF;
+        return static::stripTrailingBreaks($body) . self::CRLF;
     }
 
     /**
diff --git a/vendor/phpmailer/phpmailer/src/POP3.php b/vendor/phpmailer/phpmailer/src/POP3.php
index 78e91e4..4ae52fb 100644
--- a/vendor/phpmailer/phpmailer/src/POP3.php
+++ b/vendor/phpmailer/phpmailer/src/POP3.php
@@ -46,7 +46,7 @@ class POP3
      *
      * @var string
      */
-    const VERSION = '6.6.4';
+    const VERSION = '6.7.1';
 
     /**
      * Default POP3 port number.
@@ -337,7 +337,12 @@ class POP3
      */
     public function disconnect()
     {
-        $this->sendString('QUIT');
+        // If could not connect at all, no need to disconnect
+        if ($this->pop_conn === false) {
+            return;
+        }
+
+        $this->sendString('QUIT' . static::LE);
 
         // RFC 1939 shows POP3 server sending a +OK response to the QUIT command.
         // Try to get it.  Ignore any failures here.
diff --git a/vendor/phpmailer/phpmailer/src/SMTP.php b/vendor/phpmailer/phpmailer/src/SMTP.php
index cc1711d..95b0d0b 100644
--- a/vendor/phpmailer/phpmailer/src/SMTP.php
+++ b/vendor/phpmailer/phpmailer/src/SMTP.php
@@ -35,7 +35,7 @@ class SMTP
      *
      * @var string
      */
-    const VERSION = '6.6.4';
+    const VERSION = '6.7.1';
 
     /**
      * SMTP line break constant.
@@ -682,7 +682,6 @@ class SMTP
      */
     public function close()
     {
-        $this->setError('');
         $this->server_caps = null;
         $this->helo_rply = null;
         if (is_resource($this->smtp_conn)) {
diff --git a/vendor/psr/http-message/README.md b/vendor/psr/http-message/README.md
index 2818533..2668be6 100644
--- a/vendor/psr/http-message/README.md
+++ b/vendor/psr/http-message/README.md
@@ -10,4 +10,7 @@ interface that describes a HTTP message. See the specification for more details.
 Usage
 -----
 
-We'll certainly need some stuff in here.
\ No newline at end of file
+Before reading the usage guide we recommend reading the PSR-7 interfaces method list:
+
+* [`PSR-7 Interfaces Method List`](docs/PSR7-Interfaces.md)
+* [`PSR-7 Usage Guide`](docs/PSR7-Usage.md)
\ No newline at end of file
diff --git a/vendor/psr/http-message/composer.json b/vendor/psr/http-message/composer.json
index b0d2937..56e8c0a 100644
--- a/vendor/psr/http-message/composer.json
+++ b/vendor/psr/http-message/composer.json
@@ -11,7 +11,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0"
+        "php": "^7.2 || ^8.0"
     },
     "autoload": {
         "psr-4": {
@@ -20,7 +20,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0.x-dev"
+            "dev-master": "1.1.x-dev"
         }
     }
 }
diff --git a/vendor/psr/http-message/docs/PSR7-Interfaces.md b/vendor/psr/http-message/docs/PSR7-Interfaces.md
new file mode 100644
index 0000000..3a7e7dd
--- /dev/null
+++ b/vendor/psr/http-message/docs/PSR7-Interfaces.md
@@ -0,0 +1,130 @@
+# Interfaces
+
+The purpose of this list is to help in finding the methods when working with PSR-7. This can be considered as a cheatsheet for PSR-7 interfaces.
+
+The interfaces defined in PSR-7 are the following:
+
+| Class Name | Description |
+|---|---|
+| [Psr\Http\Message\MessageInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessagemessageinterface) | Representation of a HTTP message |
+| [Psr\Http\Message\RequestInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessagerequestinterface) | Representation of an outgoing, client-side request. |
+| [Psr\Http\Message\ServerRequestInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageserverrequestinterface) | Representation of an incoming, server-side HTTP request. | 
+| [Psr\Http\Message\ResponseInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageresponseinterface) | Representation of an outgoing, server-side response. |
+| [Psr\Http\Message\StreamInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessagestreaminterface) | Describes a data stream |
+| [Psr\Http\Message\UriInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageuriinterface) | Value object representing a URI. |
+| [Psr\Http\Message\UploadedFileInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageuploadedfileinterface) | Value object representing a file uploaded through an HTTP request. |
+
+## `Psr\Http\Message\MessageInterface` Methods
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getProtocolVersion()`             | Retrieve HTTP protocol version          |  1.0 or 1.1 |
+| `withProtocolVersion($version)`    | Returns new message instance with given HTTP protocol version          |      |
+| `getHeaders()`                     | Retrieve all HTTP Headers               | [Request Header List](https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#Request_fields), [Response Header List](https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#Response_fields)      |
+| `hasHeader($name)`                 | Checks if HTTP Header with given name exists  | |
+| `getHeader($name)`                 | Retrieves a array with the values for a single header | |
+| `getHeaderLine($name)`             | Retrieves a comma-separated string of the values for a single header |  |
+| `withHeader($name, $value)`        | Returns new message instance with given HTTP Header | if the header existed in the original instance, replaces the header value from the original message with the value provided when creating the new instance. |
+| `withAddedHeader($name, $value)`   | Returns new message instance with appended value to given header | If header already exists value will be appended, if not a new header will be created |
+| `withoutHeader($name)`             | Removes HTTP Header with given name| |
+| `getBody()`                        | Retrieves the HTTP Message Body | Returns object implementing `StreamInterface`|
+| `withBody(StreamInterface $body)`  | Returns new message instance with given HTTP Message Body | |
+
+
+## `Psr\Http\Message\RequestInterface` Methods
+
+Same methods as `Psr\Http\Message\MessageInterface`  + the following methods:
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getRequestTarget()`                | Retrieves the message's request target              | origin-form, absolute-form, authority-form, asterisk-form ([RFC7230](https://www.rfc-editor.org/rfc/rfc7230.txt)) |
+| `withRequestTarget($requestTarget)` | Return a new message instance with the specific request-target |      |
+| `getMethod()`                       | Retrieves the HTTP method of the request.  |  GET, HEAD, POST, PUT, DELETE, CONNECT, OPTIONS, TRACE (defined in [RFC7231](https://tools.ietf.org/html/rfc7231)), PATCH (defined in [RFC5789](https://tools.ietf.org/html/rfc5789)) |
+| `withMethod($method)`               | Returns a new message instance with the provided HTTP method  | |
+| `getUri()`                 | Retrieves the URI instance | |
+| `withUri(UriInterface $uri, $preserveHost = false)` | Returns a new message instance with the provided URI |  |
+
+
+## `Psr\Http\Message\ServerRequestInterface` Methods
+
+Same methods as `Psr\Http\Message\RequestInterface`  + the following methods:
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getServerParams() `               | Retrieve server parameters  | Typically derived from `$_SERVER`  |
+| `getCookieParams()`                | Retrieves cookies sent by the client to the server. | Typically derived from `$_COOKIES` |
+| `withCookieParams(array $cookies)` |  Returns a new request instance with the specified cookies      |   | 
+| `withQueryParams(array $query)` | Returns a new request instance with the specified query string arguments  |  |
+| `getUploadedFiles()` | Retrieve normalized file upload data  |  |
+| `withUploadedFiles(array $uploadedFiles)` | Returns a new request instance with the specified uploaded files  |  |
+| `getParsedBody()` | Retrieve any parameters provided in the request body  |  |
+| `withParsedBody($data)` | Returns a new request instance with the specified body parameters  |  |
+| `getAttributes()` | Retrieve attributes derived from the request  |  |
+| `getAttribute($name, $default = null)` | Retrieve a single derived request attribute  |  |
+| `withAttribute($name, $value)` | Returns a new request instance with the specified derived request attribute  |  |
+| `withoutAttribute($name)` | Returns a new request instance that without the specified derived request attribute  |  |
+
+## `Psr\Http\Message\ResponseInterface` Methods:
+
+Same methods as `Psr\Http\Message\MessageInterface`  + the following methods:
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getStatusCode()` | Gets the response status code. | |
+| `withStatus($code, $reasonPhrase = '')` | Returns a new response instance with the specified status code and, optionally, reason phrase. | |
+| `getReasonPhrase()` | Gets the response reason phrase associated with the status code. | |
+
+##  `Psr\Http\Message\StreamInterface` Methods
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `__toString()` | Reads all data from the stream into a string, from the beginning to end. | |
+| `close()` | Closes the stream and any underlying resources. | |
+| `detach()` | Separates any underlying resources from the stream. | |
+| `getSize()` | Get the size of the stream if known. | |
+| `eof()` | Returns true if the stream is at the end of the stream.| |
+| `isSeekable()` |  Returns whether or not the stream is seekable. | |
+| `seek($offset, $whence = SEEK_SET)` | Seek to a position in the stream. | |
+| `rewind()` | Seek to the beginning of the stream. | |
+| `isWritable()` | Returns whether or not the stream is writable. | |
+| `write($string)` | Write data to the stream. | |
+| `isReadable()` | Returns whether or not the stream is readable. | |
+| `read($length)` | Read data from the stream. | |
+| `getContents()` | Returns the remaining contents in a string | |
+| `getMetadata($key = null)()` | Get stream metadata as an associative array or retrieve a specific key. | |
+
+## `Psr\Http\Message\UriInterface` Methods
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getScheme()` | Retrieve the scheme component of the URI. | |
+| `getAuthority()` | Retrieve the authority component of the URI. | |
+| `getUserInfo()` | Retrieve the user information component of the URI. | |
+| `getHost()` | Retrieve the host component of the URI. | |
+| `getPort()` | Retrieve the port component of the URI. | |
+| `getPath()` | Retrieve the path component of the URI. | |
+| `getQuery()` | Retrieve the query string of the URI. | |
+| `getFragment()` | Retrieve the fragment component of the URI. | |
+| `withScheme($scheme)` | Return an instance with the specified scheme. | |
+| `withUserInfo($user, $password = null)` | Return an instance with the specified user information. | |
+| `withHost($host)` | Return an instance with the specified host. | |
+| `withPort($port)` | Return an instance with the specified port. | |
+| `withPath($path)` | Return an instance with the specified path. | |
+| `withQuery($query)` | Return an instance with the specified query string. | |
+| `withFragment($fragment)` | Return an instance with the specified URI fragment. | |
+| `__toString()` | Return the string representation as a URI reference. | |
+
+## `Psr\Http\Message\UploadedFileInterface` Methods
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getStream()` | Retrieve a stream representing the uploaded file. | |
+| `moveTo($targetPath)` | Move the uploaded file to a new location. | |
+| `getSize()` | Retrieve the file size. | |
+| `getError()` | Retrieve the error associated with the uploaded file. | |
+| `getClientFilename()` | Retrieve the filename sent by the client. | |
+| `getClientMediaType()` | Retrieve the media type sent by the client. | |
+
+> `RequestInterface`, `ServerRequestInterface`, `ResponseInterface` extend `MessageInterface`  because the `Request` and the `Response` are `HTTP Messages`.
+> When using `ServerRequestInterface`, both `RequestInterface` and `Psr\Http\Message\MessageInterface` methods are considered.
+
diff --git a/vendor/psr/http-message/docs/PSR7-Usage.md b/vendor/psr/http-message/docs/PSR7-Usage.md
new file mode 100644
index 0000000..b6d048a
--- /dev/null
+++ b/vendor/psr/http-message/docs/PSR7-Usage.md
@@ -0,0 +1,159 @@
+### PSR-7 Usage
+
+All PSR-7 applications comply with these interfaces 
+They were created to establish a standard between middleware implementations.
+
+> `RequestInterface`, `ServerRequestInterface`, `ResponseInterface` extend `MessageInterface`  because the `Request` and the `Response` are `HTTP Messages`.
+> When using `ServerRequestInterface`, both `RequestInterface` and `Psr\Http\Message\MessageInterface` methods are considered.
+
+
+The following examples will illustrate how basic operations are done in PSR-7.
+
+##### Examples
+
+
+For this examples to work (at least) a PSR-7 implementation package is required. (eg: zendframework/zend-diactoros, guzzlehttp/psr7, slim/slim, etc)
+All PSR-7 implementations should have the same behaviour.
+
+The following will be assumed: 
+`$request` is an object of `Psr\Http\Message\RequestInterface` and
+
+`$response` is an object implementing `Psr\Http\Message\RequestInterface`
+
+
+### Working with HTTP Headers
+
+#### Adding headers to response:
+
+```php
+$response->withHeader('My-Custom-Header', 'My Custom Message');
+```
+
+#### Appending values to headers
+
+```php
+$response->withAddedHeader('My-Custom-Header', 'The second message');
+```
+
+#### Checking if header exists:
+
+```php
+$request->hasHeader('My-Custom-Header'); // will return false
+$response->hasHeader('My-Custom-Header'); // will return true
+```
+
+> Note: My-Custom-Header was only added in the Response
+
+#### Getting comma-separated values from a header (also applies to request)
+
+```php
+// getting value from request headers
+$request->getHeaderLine('Content-Type'); // will return: "text/html; charset=UTF-8"
+// getting value from response headers
+$response->getHeaderLine('My-Custom-Header'); // will return:  "My Custom Message; The second message"
+```
+
+#### Getting array of value from a header (also applies to request)
+```php
+// getting value from request headers
+$request->getHeader('Content-Type'); // will return: ["text/html", "charset=UTF-8"]
+// getting value from response headers
+$response->getHeader('My-Custom-Header'); // will return:  ["My Custom Message",  "The second message"]
+```
+
+#### Removing headers from HTTP Messages
+```php
+// removing a header from Request, removing deprecated "Content-MD5" header
+$request->withoutHeader('Content-MD5'); 
+
+// removing a header from Response
+// effect: the browser won't know the size of the stream
+// the browser will download the stream till it ends
+$response->withoutHeader('Content-Length');
+```
+
+### Working with HTTP Message Body
+
+When working with the PSR-7 there are two methods of implementation:
+#### 1. Getting the body separately
+
+> This method makes the body handling easier to understand and is useful when repeatedly calling body methods. (You only call `getBody()` once). Using this method mistakes like `$response->write()` are also prevented.
+
+```php
+$body = $response->getBody();
+// operations on body, eg. read, write, seek
+// ...
+// replacing the old body
+$response->withBody($body); 
+// this last statement is optional as we working with objects
+// in this case the "new" body is same with the "old" one
+// the $body variable has the same value as the one in $request, only the reference is passed
+```
+
+#### 2. Working directly on response
+
+> This method is useful when only performing few operations as the `$request->getBody()` statement fragment is required
+
+```php
+$response->getBody()->write('hello');
+```
+
+### Getting the body contents
+
+The following snippet gets the contents of a stream contents.
+> Note: Streams must be rewinded, if content was written into streams, it will be ignored when calling `getContents()` because the stream pointer is set to the last character, which is `\0` - meaning end of stream.
+```php 
+$body = $response->getBody();
+$body->rewind(); // or $body->seek(0);
+$bodyText = $body->getContents();
+```
+> Note: If `$body->seek(1)` is called before `$body->getContents()`, the first character will be ommited as the starting pointer is set to `1`, not `0`. This is why using `$body->rewind()` is recommended.
+
+### Append to body
+
+```php
+$response->getBody()->write('Hello'); // writing directly
+$body = $request->getBody(); // which is a `StreamInterface`
+$body->write('xxxxx');
+```
+
+### Prepend to body
+Prepending is different when it comes to streams. The content must be copied before writing the content to be prepended.
+The following example will explain the behaviour of streams.
+
+```php
+// assuming our response is initially empty
+$body = $repsonse->getBody();
+// writing the string "abcd"
+$body->write('abcd');
+
+// seeking to start of stream
+$body->seek(0);
+// writing 'ef'
+$body->write('ef'); // at this point the stream contains "efcd"
+```
+
+#### Prepending by rewriting separately
+
+```php
+// assuming our response body stream only contains: "abcd"
+$body = $response->getBody();
+$body->rewind();
+$contents = $body->getContents(); // abcd
+// seeking the stream to beginning
+$body->rewind();
+$body->write('ef'); // stream contains "efcd"
+$body->write($contents); // stream contains "efabcd"
+```
+
+> Note: `getContents()` seeks the stream while reading it, therefore if the second `rewind()` method call was not present the stream would have resulted in `abcdefabcd` because the `write()` method appends to stream if not preceeded by `rewind()` or `seek(0)`.
+
+#### Prepending by using contents as a string
+```php
+$body = $response->getBody();
+$body->rewind();
+$contents = $body->getContents(); // efabcd
+$contents = 'ef'.$contents;
+$body->rewind();
+$body->write($contents);
+```
diff --git a/vendor/psr/http-message/src/MessageInterface.php b/vendor/psr/http-message/src/MessageInterface.php
index dd46e5e..8cdb4ed 100644
--- a/vendor/psr/http-message/src/MessageInterface.php
+++ b/vendor/psr/http-message/src/MessageInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Psr\Http\Message;
 
 /**
@@ -38,7 +40,7 @@ interface MessageInterface
      * @param string $version HTTP protocol version
      * @return static
      */
-    public function withProtocolVersion($version);
+    public function withProtocolVersion(string $version);
 
     /**
      * Retrieves all message header values.
@@ -75,7 +77,7 @@ interface MessageInterface
      *     name using a case-insensitive string comparison. Returns false if
      *     no matching header name is found in the message.
      */
-    public function hasHeader($name);
+    public function hasHeader(string $name);
 
     /**
      * Retrieves a message header value by the given case-insensitive name.
@@ -91,7 +93,7 @@ interface MessageInterface
      *    header. If the header does not appear in the message, this method MUST
      *    return an empty array.
      */
-    public function getHeader($name);
+    public function getHeader(string $name);
 
     /**
      * Retrieves a comma-separated string of the values for a single header.
@@ -112,7 +114,7 @@ interface MessageInterface
      *    concatenated together using a comma. If the header does not appear in
      *    the message, this method MUST return an empty string.
      */
-    public function getHeaderLine($name);
+    public function getHeaderLine(string $name);
 
     /**
      * Return an instance with the provided value replacing the specified header.
@@ -129,7 +131,7 @@ interface MessageInterface
      * @return static
      * @throws \InvalidArgumentException for invalid header names or values.
      */
-    public function withHeader($name, $value);
+    public function withHeader(string $name, $value);
 
     /**
      * Return an instance with the specified header appended with the given value.
@@ -147,7 +149,7 @@ interface MessageInterface
      * @return static
      * @throws \InvalidArgumentException for invalid header names or values.
      */
-    public function withAddedHeader($name, $value);
+    public function withAddedHeader(string $name, $value);
 
     /**
      * Return an instance without the specified header.
@@ -161,7 +163,7 @@ interface MessageInterface
      * @param string $name Case-insensitive header field name to remove.
      * @return static
      */
-    public function withoutHeader($name);
+    public function withoutHeader(string $name);
 
     /**
      * Gets the body of the message.
diff --git a/vendor/psr/http-message/src/RequestInterface.php b/vendor/psr/http-message/src/RequestInterface.php
index a96d4fd..38066df 100644
--- a/vendor/psr/http-message/src/RequestInterface.php
+++ b/vendor/psr/http-message/src/RequestInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Psr\Http\Message;
 
 /**
@@ -55,10 +57,10 @@ interface RequestInterface extends MessageInterface
      *
      * @link http://tools.ietf.org/html/rfc7230#section-5.3 (for the various
      *     request-target forms allowed in request messages)
-     * @param mixed $requestTarget
+     * @param string $requestTarget
      * @return static
      */
-    public function withRequestTarget($requestTarget);
+    public function withRequestTarget(string $requestTarget);
 
     /**
      * Retrieves the HTTP method of the request.
@@ -82,7 +84,7 @@ interface RequestInterface extends MessageInterface
      * @return static
      * @throws \InvalidArgumentException for invalid HTTP methods.
      */
-    public function withMethod($method);
+    public function withMethod(string $method);
 
     /**
      * Retrieves the URI instance.
@@ -125,5 +127,5 @@ interface RequestInterface extends MessageInterface
      * @param bool $preserveHost Preserve the original state of the Host header.
      * @return static
      */
-    public function withUri(UriInterface $uri, $preserveHost = false);
+    public function withUri(UriInterface $uri, bool $preserveHost = false);
 }
diff --git a/vendor/psr/http-message/src/ResponseInterface.php b/vendor/psr/http-message/src/ResponseInterface.php
index c306514..f85ca48 100644
--- a/vendor/psr/http-message/src/ResponseInterface.php
+++ b/vendor/psr/http-message/src/ResponseInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Psr\Http\Message;
 
 /**
@@ -49,7 +51,7 @@ interface ResponseInterface extends MessageInterface
      * @return static
      * @throws \InvalidArgumentException For invalid status code arguments.
      */
-    public function withStatus($code, $reasonPhrase = '');
+    public function withStatus(int $code, string $reasonPhrase = '');
 
     /**
      * Gets the response reason phrase associated with the status code.
diff --git a/vendor/psr/http-message/src/ServerRequestInterface.php b/vendor/psr/http-message/src/ServerRequestInterface.php
index 0251234..5e6d964 100644
--- a/vendor/psr/http-message/src/ServerRequestInterface.php
+++ b/vendor/psr/http-message/src/ServerRequestInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Psr\Http\Message;
 
 /**
@@ -224,7 +226,7 @@ interface ServerRequestInterface extends RequestInterface
      * @param mixed $default Default value to return if the attribute does not exist.
      * @return mixed
      */
-    public function getAttribute($name, $default = null);
+    public function getAttribute(string $name, $default = null);
 
     /**
      * Return an instance with the specified derived request attribute.
@@ -241,7 +243,7 @@ interface ServerRequestInterface extends RequestInterface
      * @param mixed $value The value of the attribute.
      * @return static
      */
-    public function withAttribute($name, $value);
+    public function withAttribute(string $name, $value);
 
     /**
      * Return an instance that removes the specified derived request attribute.
@@ -257,5 +259,5 @@ interface ServerRequestInterface extends RequestInterface
      * @param string $name The attribute name.
      * @return static
      */
-    public function withoutAttribute($name);
+    public function withoutAttribute(string $name);
 }
diff --git a/vendor/psr/http-message/src/StreamInterface.php b/vendor/psr/http-message/src/StreamInterface.php
index f68f391..5924663 100644
--- a/vendor/psr/http-message/src/StreamInterface.php
+++ b/vendor/psr/http-message/src/StreamInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Psr\Http\Message;
 
 /**
@@ -84,7 +86,7 @@ interface StreamInterface
      *     SEEK_END: Set position to end-of-stream plus offset.
      * @throws \RuntimeException on failure.
      */
-    public function seek($offset, $whence = SEEK_SET);
+    public function seek(int $offset, int $whence = SEEK_SET);
 
     /**
      * Seek to the beginning of the stream.
@@ -112,7 +114,7 @@ interface StreamInterface
      * @return int Returns the number of bytes written to the stream.
      * @throws \RuntimeException on failure.
      */
-    public function write($string);
+    public function write(string $string);
 
     /**
      * Returns whether or not the stream is readable.
@@ -131,7 +133,7 @@ interface StreamInterface
      *     if no bytes are available.
      * @throws \RuntimeException if an error occurs.
      */
-    public function read($length);
+    public function read(int $length);
 
     /**
      * Returns the remaining contents in a string
@@ -149,10 +151,10 @@ interface StreamInterface
      * stream_get_meta_data() function.
      *
      * @link http://php.net/manual/en/function.stream-get-meta-data.php
-     * @param string $key Specific metadata to retrieve.
+     * @param string|null $key Specific metadata to retrieve.
      * @return array|mixed|null Returns an associative array if no key is
      *     provided. Returns a specific key value if a key is provided and the
      *     value is found, or null if the key is not found.
      */
-    public function getMetadata($key = null);
+    public function getMetadata(?string $key = null);
 }
diff --git a/vendor/psr/http-message/src/UploadedFileInterface.php b/vendor/psr/http-message/src/UploadedFileInterface.php
index f8a6901..aba6321 100644
--- a/vendor/psr/http-message/src/UploadedFileInterface.php
+++ b/vendor/psr/http-message/src/UploadedFileInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Psr\Http\Message;
 
 /**
@@ -62,7 +64,7 @@ interface UploadedFileInterface
      * @throws \RuntimeException on any error during the move operation, or on
      *     the second or subsequent call to the method.
      */
-    public function moveTo($targetPath);
+    public function moveTo(string $targetPath);
     
     /**
      * Retrieve the file size.
diff --git a/vendor/psr/http-message/src/UriInterface.php b/vendor/psr/http-message/src/UriInterface.php
index 9d7ab9e..d974de0 100644
--- a/vendor/psr/http-message/src/UriInterface.php
+++ b/vendor/psr/http-message/src/UriInterface.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace Psr\Http\Message;
 
 /**
@@ -188,7 +191,7 @@ interface UriInterface
      * @return static A new instance with the specified scheme.
      * @throws \InvalidArgumentException for invalid or unsupported schemes.
      */
-    public function withScheme($scheme);
+    public function withScheme(string $scheme);
 
     /**
      * Return an instance with the specified user information.
@@ -204,7 +207,7 @@ interface UriInterface
      * @param null|string $password The password associated with $user.
      * @return static A new instance with the specified user information.
      */
-    public function withUserInfo($user, $password = null);
+    public function withUserInfo(string $user, ?string $password = null);
 
     /**
      * Return an instance with the specified host.
@@ -218,7 +221,7 @@ interface UriInterface
      * @return static A new instance with the specified host.
      * @throws \InvalidArgumentException for invalid hostnames.
      */
-    public function withHost($host);
+    public function withHost(string $host);
 
     /**
      * Return an instance with the specified port.
@@ -237,7 +240,7 @@ interface UriInterface
      * @return static A new instance with the specified port.
      * @throws \InvalidArgumentException for invalid ports.
      */
-    public function withPort($port);
+    public function withPort(?int $port);
 
     /**
      * Return an instance with the specified path.
@@ -261,7 +264,7 @@ interface UriInterface
      * @return static A new instance with the specified path.
      * @throws \InvalidArgumentException for invalid paths.
      */
-    public function withPath($path);
+    public function withPath(string $path);
 
     /**
      * Return an instance with the specified query string.
@@ -278,7 +281,7 @@ interface UriInterface
      * @return static A new instance with the specified query string.
      * @throws \InvalidArgumentException for invalid query strings.
      */
-    public function withQuery($query);
+    public function withQuery(string $query);
 
     /**
      * Return an instance with the specified URI fragment.
@@ -294,7 +297,7 @@ interface UriInterface
      * @param string $fragment The fragment to use with the new instance.
      * @return static A new instance with the specified fragment.
      */
-    public function withFragment($fragment);
+    public function withFragment(string $fragment);
 
     /**
      * Return the string representation as a URI reference.
diff --git a/vendor/services.php b/vendor/services.php
index 79e877c..c1e83d7 100644
--- a/vendor/services.php
+++ b/vendor/services.php
@@ -1,5 +1,5 @@
 <?php 
-// This file is automatically generated at:2022-11-26 23:54:39
+// This file is automatically generated at:2023-05-05 09:47:16
 declare (strict_types = 1);
 return array (
   0 => 'think\\captcha\\CaptchaService',
diff --git a/vendor/symfony/event-dispatcher/Debug/WrappedListener.php b/vendor/symfony/event-dispatcher/Debug/WrappedListener.php
index 3916716..3c4cc13 100644
--- a/vendor/symfony/event-dispatcher/Debug/WrappedListener.php
+++ b/vendor/symfony/event-dispatcher/Debug/WrappedListener.php
@@ -49,7 +49,7 @@ final class WrappedListener
             $r = new \ReflectionFunction($listener);
             if (str_contains($r->name, '{closure}')) {
                 $this->pretty = $this->name = 'closure';
-            } elseif ($class = $r->getClosureScopeClass()) {
+            } elseif ($class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {
                 $this->name = $class->name;
                 $this->pretty = $this->name.'::'.$r->name;
             } else {
@@ -114,10 +114,12 @@ final class WrappedListener
 
         $e = $this->stopwatch->start($this->name, 'event_listener');
 
-        ($this->optimizedListener ?? $this->listener)($event, $eventName, $dispatcher);
-
-        if ($e->isStarted()) {
-            $e->stop();
+        try {
+            ($this->optimizedListener ?? $this->listener)($event, $eventName, $dispatcher);
+        } finally {
+            if ($e->isStarted()) {
+                $e->stop();
+            }
         }
 
         if ($event instanceof StoppableEventInterface && $event->isPropagationStopped()) {
diff --git a/vendor/symfony/event-dispatcher/DependencyInjection/RegisterListenersPass.php b/vendor/symfony/event-dispatcher/DependencyInjection/RegisterListenersPass.php
index 8eabe7d..f47120d 100644
--- a/vendor/symfony/event-dispatcher/DependencyInjection/RegisterListenersPass.php
+++ b/vendor/symfony/event-dispatcher/DependencyInjection/RegisterListenersPass.php
@@ -122,7 +122,7 @@ class RegisterListenersPass implements CompilerPassInterface
 
                 $dispatcherDefinition = $globalDispatcherDefinition;
                 if (isset($event['dispatcher'])) {
-                    $dispatcherDefinition = $container->getDefinition($event['dispatcher']);
+                    $dispatcherDefinition = $container->findDefinition($event['dispatcher']);
                 }
 
                 $dispatcherDefinition->addMethodCall('addListener', [$event['event'], [new ServiceClosureArgument(new Reference($id)), $event['method']], $priority]);
@@ -161,7 +161,7 @@ class RegisterListenersPass implements CompilerPassInterface
                     continue;
                 }
 
-                $dispatcherDefinitions[$attributes['dispatcher']] = $container->getDefinition($attributes['dispatcher']);
+                $dispatcherDefinitions[$attributes['dispatcher']] = $container->findDefinition($attributes['dispatcher']);
             }
 
             if (!$dispatcherDefinitions) {
diff --git a/vendor/symfony/event-dispatcher/LICENSE b/vendor/symfony/event-dispatcher/LICENSE
index 88bf75b..0138f8f 100644
--- a/vendor/symfony/event-dispatcher/LICENSE
+++ b/vendor/symfony/event-dispatcher/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2022 Fabien Potencier
+Copyright (c) 2004-present Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/symfony/http-foundation/BinaryFileResponse.php b/vendor/symfony/http-foundation/BinaryFileResponse.php
index 6d7b80a..03cf1a2 100644
--- a/vendor/symfony/http-foundation/BinaryFileResponse.php
+++ b/vendor/symfony/http-foundation/BinaryFileResponse.php
@@ -34,7 +34,7 @@ class BinaryFileResponse extends Response
     protected $offset = 0;
     protected $maxlen = -1;
     protected $deleteFileAfterSend = false;
-    protected $chunkSize = 8 * 1024;
+    protected $chunkSize = 16 * 1024;
 
     /**
      * @param \SplFileInfo|string $file               The file to stream
@@ -267,7 +267,7 @@ class BinaryFileResponse extends Response
                 $range = $request->headers->get('Range');
 
                 if (str_starts_with($range, 'bytes=')) {
-                    [$start, $end] = explode('-', substr($range, 6), 2) + [0];
+                    [$start, $end] = explode('-', substr($range, 6), 2) + [1 => 0];
 
                     $end = ('' === $end) ? $fileSize - 1 : (int) $end;
 
@@ -341,14 +341,21 @@ class BinaryFileResponse extends Response
 
             $length = $this->maxlen;
             while ($length && !feof($file)) {
-                $read = ($length > $this->chunkSize) ? $this->chunkSize : $length;
-                $length -= $read;
+                $read = $length > $this->chunkSize || 0 > $length ? $this->chunkSize : $length;
 
-                stream_copy_to_stream($file, $out, $read);
-
-                if (connection_aborted()) {
+                if (false === $data = fread($file, $read)) {
                     break;
                 }
+                while ('' !== $data) {
+                    $read = fwrite($out, $data);
+                    if (false === $read || connection_aborted()) {
+                        break;
+                    }
+                    if (0 < $length) {
+                        $length -= $read;
+                    }
+                    $data = substr($data, $read);
+                }
             }
 
             fclose($out);
diff --git a/vendor/symfony/http-foundation/Cookie.php b/vendor/symfony/http-foundation/Cookie.php
index b4b26c0..9102453 100644
--- a/vendor/symfony/http-foundation/Cookie.php
+++ b/vendor/symfony/http-foundation/Cookie.php
@@ -80,7 +80,7 @@ class Cookie
      * @param string                        $name     The name of the cookie
      * @param string|null                   $value    The value of the cookie
      * @param int|string|\DateTimeInterface $expire   The time the cookie expires
-     * @param string                        $path     The path on the server in which the cookie will be available on
+     * @param string|null                   $path     The path on the server in which the cookie will be available on
      * @param string|null                   $domain   The domain that the cookie is available to
      * @param bool|null                     $secure   Whether the client should send back the cookie only over HTTPS or null to auto-enable this when the request is already using HTTPS
      * @param bool                          $httpOnly Whether the cookie will be made accessible only through the HTTP protocol
diff --git a/vendor/symfony/http-foundation/Exception/SessionNotFoundException.php b/vendor/symfony/http-foundation/Exception/SessionNotFoundException.php
index 9c719aa..94b0cb6 100644
--- a/vendor/symfony/http-foundation/Exception/SessionNotFoundException.php
+++ b/vendor/symfony/http-foundation/Exception/SessionNotFoundException.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\HttpFoundation\Exception;
 
 /**
- * Raised when a session does not exists. This happens in the following cases:
+ * Raised when a session does not exist. This happens in the following cases:
  * - the session is not enabled
  * - attempt to read a session outside a request context (ie. cli script).
  *
diff --git a/vendor/symfony/http-foundation/HeaderUtils.php b/vendor/symfony/http-foundation/HeaderUtils.php
index 1d56be0..46b1e6a 100644
--- a/vendor/symfony/http-foundation/HeaderUtils.php
+++ b/vendor/symfony/http-foundation/HeaderUtils.php
@@ -138,7 +138,7 @@ class HeaderUtils
      * Decodes a quoted string.
      *
      * If passed an unquoted string that matches the "token" construct (as
-     * defined in the HTTP specification), it is passed through verbatimly.
+     * defined in the HTTP specification), it is passed through verbatim.
      */
     public static function unquote(string $s): string
     {
diff --git a/vendor/symfony/http-foundation/IpUtils.php b/vendor/symfony/http-foundation/IpUtils.php
index 24111f1..49d9a9d 100644
--- a/vendor/symfony/http-foundation/IpUtils.php
+++ b/vendor/symfony/http-foundation/IpUtils.php
@@ -73,7 +73,7 @@ class IpUtils
             return false;
         }
 
-        $cacheKey = $requestIp.'-'.$ip;
+        $cacheKey = $requestIp.'-'.$ip.'-v4';
         if (isset(self::$checkedIps[$cacheKey])) {
             return self::$checkedIps[$cacheKey];
         }
@@ -86,7 +86,7 @@ class IpUtils
             [$address, $netmask] = explode('/', $ip, 2);
 
             if ('0' === $netmask) {
-                return self::$checkedIps[$cacheKey] = filter_var($address, \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV4);
+                return self::$checkedIps[$cacheKey] = false !== filter_var($address, \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV4);
             }
 
             if ($netmask < 0 || $netmask > 32) {
@@ -126,7 +126,7 @@ class IpUtils
             return false;
         }
 
-        $cacheKey = $requestIp.'-'.$ip;
+        $cacheKey = $requestIp.'-'.$ip.'-v6';
         if (isset(self::$checkedIps[$cacheKey])) {
             return self::$checkedIps[$cacheKey];
         }
@@ -135,9 +135,18 @@ class IpUtils
             throw new \RuntimeException('Unable to check Ipv6. Check that PHP was not compiled with option "disable-ipv6".');
         }
 
+        // Check to see if we were given a IP4 $requestIp or $ip by mistake
+        if (!filter_var($requestIp, \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV6)) {
+            return self::$checkedIps[$cacheKey] = false;
+        }
+
         if (str_contains($ip, '/')) {
             [$address, $netmask] = explode('/', $ip, 2);
 
+            if (!filter_var($address, \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV6)) {
+                return self::$checkedIps[$cacheKey] = false;
+            }
+
             if ('0' === $netmask) {
                 return (bool) unpack('n*', @inet_pton($address));
             }
@@ -146,6 +155,10 @@ class IpUtils
                 return self::$checkedIps[$cacheKey] = false;
             }
         } else {
+            if (!filter_var($ip, \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV6)) {
+                return self::$checkedIps[$cacheKey] = false;
+            }
+
             $address = $ip;
             $netmask = 128;
         }
diff --git a/vendor/symfony/http-foundation/LICENSE b/vendor/symfony/http-foundation/LICENSE
index 88bf75b..0138f8f 100644
--- a/vendor/symfony/http-foundation/LICENSE
+++ b/vendor/symfony/http-foundation/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2022 Fabien Potencier
+Copyright (c) 2004-present Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/symfony/http-foundation/Request.php b/vendor/symfony/http-foundation/Request.php
index 2bf52ce..28cebad 100644
--- a/vendor/symfony/http-foundation/Request.php
+++ b/vendor/symfony/http-foundation/Request.php
@@ -191,7 +191,7 @@ class Request
     protected $session;
 
     /**
-     * @var string
+     * @var string|null
      */
     protected $locale;
 
@@ -439,12 +439,12 @@ class Request
     /**
      * Clones a request and overrides some of its parameters.
      *
-     * @param array $query      The GET parameters
-     * @param array $request    The POST parameters
-     * @param array $attributes The request attributes (parameters parsed from the PATH_INFO, ...)
-     * @param array $cookies    The COOKIE parameters
-     * @param array $files      The FILES parameters
-     * @param array $server     The SERVER parameters
+     * @param array|null $query      The GET parameters
+     * @param array|null $request    The POST parameters
+     * @param array|null $attributes The request attributes (parameters parsed from the PATH_INFO, ...)
+     * @param array|null $cookies    The COOKIE parameters
+     * @param array|null $files      The FILES parameters
+     * @param array|null $server     The SERVER parameters
      *
      * @return static
      */
@@ -522,10 +522,10 @@ class Request
         $cookies = [];
 
         foreach ($this->cookies as $k => $v) {
-            $cookies[] = $k.'='.$v;
+            $cookies[] = \is_array($v) ? http_build_query([$k => $v], '', '; ', \PHP_QUERY_RFC3986) : "$k=$v";
         }
 
-        if (!empty($cookies)) {
+        if ($cookies) {
             $cookieHeader = 'Cookie: '.implode('; ', $cookies)."\r\n";
         }
 
@@ -1452,7 +1452,7 @@ class Request
      */
     public function getLocale()
     {
-        return null === $this->locale ? $this->defaultLocale : $this->locale;
+        return $this->locale ?? $this->defaultLocale;
     }
 
     /**
@@ -1573,9 +1573,9 @@ class Request
     /**
      * Gets the request body decoded as array, typically from a JSON payload.
      *
-     * @throws JsonException When the body cannot be decoded to an array
-     *
      * @return array
+     *
+     * @throws JsonException When the body cannot be decoded to an array
      */
     public function toArray()
     {
diff --git a/vendor/symfony/http-foundation/Response.php b/vendor/symfony/http-foundation/Response.php
index d5c8cb4..59e974d 100644
--- a/vendor/symfony/http-foundation/Response.php
+++ b/vendor/symfony/http-foundation/Response.php
@@ -774,8 +774,10 @@ class Response
             return (int) $this->headers->getCacheControlDirective('max-age');
         }
 
-        if (null !== $this->getExpires()) {
-            return (int) $this->getExpires()->format('U') - (int) $this->getDate()->format('U');
+        if (null !== $expires = $this->getExpires()) {
+            $maxAge = (int) $expires->format('U') - (int) $this->getDate()->format('U');
+
+            return max($maxAge, 0);
         }
 
         return null;
@@ -819,7 +821,7 @@ class Response
      *
      * It returns null when no freshness information is present in the response.
      *
-     * When the responses TTL is <= 0, the response may not be served from cache without first
+     * When the response's TTL is 0, the response may not be served from cache without first
      * revalidating with the origin.
      *
      * @final
@@ -828,7 +830,7 @@ class Response
     {
         $maxAge = $this->getMaxAge();
 
-        return null !== $maxAge ? $maxAge - $this->getAge() : null;
+        return null !== $maxAge ? max($maxAge - $this->getAge(), 0) : null;
     }
 
     /**
diff --git a/vendor/symfony/http-foundation/Session/SessionInterface.php b/vendor/symfony/http-foundation/Session/SessionInterface.php
index b2f09fd..e673383 100644
--- a/vendor/symfony/http-foundation/Session/SessionInterface.php
+++ b/vendor/symfony/http-foundation/Session/SessionInterface.php
@@ -59,10 +59,10 @@ interface SessionInterface
      * Clears all session attributes and flashes and regenerates the
      * session and deletes the old session from persistence.
      *
-     * @param int $lifetime Sets the cookie lifetime for the session cookie. A null value
-     *                      will leave the system settings unchanged, 0 sets the cookie
-     *                      to expire with browser session. Time is in seconds, and is
-     *                      not a Unix timestamp.
+     * @param int|null $lifetime Sets the cookie lifetime for the session cookie. A null value
+     *                           will leave the system settings unchanged, 0 sets the cookie
+     *                           to expire with browser session. Time is in seconds, and is
+     *                           not a Unix timestamp.
      *
      * @return bool
      */
@@ -72,11 +72,11 @@ interface SessionInterface
      * Migrates the current session to a new session id while maintaining all
      * session attributes.
      *
-     * @param bool $destroy  Whether to delete the old session or leave it to garbage collection
-     * @param int  $lifetime Sets the cookie lifetime for the session cookie. A null value
-     *                       will leave the system settings unchanged, 0 sets the cookie
-     *                       to expire with browser session. Time is in seconds, and is
-     *                       not a Unix timestamp.
+     * @param bool     $destroy  Whether to delete the old session or leave it to garbage collection
+     * @param int|null $lifetime Sets the cookie lifetime for the session cookie. A null value
+     *                           will leave the system settings unchanged, 0 sets the cookie
+     *                           to expire with browser session. Time is in seconds, and is
+     *                           not a Unix timestamp.
      *
      * @return bool
      */
diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php
index 9cb841a..e0ec4d2 100644
--- a/vendor/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php
+++ b/vendor/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php
@@ -77,7 +77,7 @@ class MemcachedSessionHandler extends AbstractSessionHandler
     #[\ReturnTypeWillChange]
     public function updateTimestamp($sessionId, $data)
     {
-        $this->memcached->touch($this->prefix.$sessionId, time() + (int) ($this->ttl ?? \ini_get('session.gc_maxlifetime')));
+        $this->memcached->touch($this->prefix.$sessionId, $this->getCompatibleTtl());
 
         return true;
     }
@@ -87,7 +87,20 @@ class MemcachedSessionHandler extends AbstractSessionHandler
      */
     protected function doWrite(string $sessionId, string $data)
     {
-        return $this->memcached->set($this->prefix.$sessionId, $data, time() + (int) ($this->ttl ?? \ini_get('session.gc_maxlifetime')));
+        return $this->memcached->set($this->prefix.$sessionId, $data, $this->getCompatibleTtl());
+    }
+
+    private function getCompatibleTtl(): int
+    {
+        $ttl = (int) ($this->ttl ?? \ini_get('session.gc_maxlifetime'));
+
+        // If the relative TTL that is used exceeds 30 days, memcached will treat the value as Unix time.
+        // We have to convert it to an absolute Unix time at this point, to make sure the TTL is correct.
+        if ($ttl > 60 * 60 * 24 * 30) {
+            $ttl += time();
+        }
+
+        return $ttl;
     }
 
     /**
diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php
index 1ca4bfe..52a1038 100644
--- a/vendor/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php
+++ b/vendor/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php
@@ -19,9 +19,9 @@ namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
 class NativeFileSessionHandler extends \SessionHandler
 {
     /**
-     * @param string $savePath Path of directory to save session files
-     *                         Default null will leave setting as defined by PHP.
-     *                         '/path', 'N;/path', or 'N;octal-mode;/path
+     * @param string|null $savePath Path of directory to save session files
+     *                              Default null will leave setting as defined by PHP.
+     *                              '/path', 'N;/path', or 'N;octal-mode;/path
      *
      * @see https://php.net/session.configuration#ini.session.save-path for further details.
      *
@@ -49,7 +49,11 @@ class NativeFileSessionHandler extends \SessionHandler
             throw new \RuntimeException(sprintf('Session Storage was not able to create directory "%s".', $baseDir));
         }
 
-        ini_set('session.save_path', $savePath);
-        ini_set('session.save_handler', 'files');
+        if ($savePath !== \ini_get('session.save_path')) {
+            ini_set('session.save_path', $savePath);
+        }
+        if ('files' !== \ini_get('session.save_handler')) {
+            ini_set('session.save_handler', 'files');
+        }
     }
 }
diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php
index 24c9894..2d83020 100644
--- a/vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php
+++ b/vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php
@@ -530,8 +530,8 @@ class PdoSessionHandler extends AbstractSessionHandler
                         return $dsn;
                     }
                 }
-            // If "unix_socket" is not in the query, we continue with the same process as pgsql
-            // no break
+                // If "unix_socket" is not in the query, we continue with the same process as pgsql
+                // no break
             case 'pgsql':
                 $dsn ?? $dsn = 'pgsql:';
 
diff --git a/vendor/symfony/http-foundation/Session/Storage/MetadataBag.php b/vendor/symfony/http-foundation/Session/Storage/MetadataBag.php
index 595a9e2..52d3320 100644
--- a/vendor/symfony/http-foundation/Session/Storage/MetadataBag.php
+++ b/vendor/symfony/http-foundation/Session/Storage/MetadataBag.php
@@ -95,10 +95,10 @@ class MetadataBag implements SessionBagInterface
     /**
      * Stamps a new session's metadata.
      *
-     * @param int $lifetime Sets the cookie lifetime for the session cookie. A null value
-     *                      will leave the system settings unchanged, 0 sets the cookie
-     *                      to expire with browser session. Time is in seconds, and is
-     *                      not a Unix timestamp.
+     * @param int|null $lifetime Sets the cookie lifetime for the session cookie. A null value
+     *                           will leave the system settings unchanged, 0 sets the cookie
+     *                           to expire with browser session. Time is in seconds, and is
+     *                           not a Unix timestamp.
      */
     public function stampNew(int $lifetime = null)
     {
diff --git a/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php b/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php
index a50c827..242478c 100644
--- a/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php
+++ b/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php
@@ -455,9 +455,10 @@ class NativeSessionStorage implements SessionStorageInterface
      */
     public function setSaveHandler($saveHandler = null)
     {
-        if (!$saveHandler instanceof AbstractProxy &&
-            !$saveHandler instanceof \SessionHandlerInterface &&
-            null !== $saveHandler) {
+        if (!$saveHandler instanceof AbstractProxy
+            && !$saveHandler instanceof \SessionHandlerInterface
+            && null !== $saveHandler
+        ) {
             throw new \InvalidArgumentException('Must be instance of AbstractProxy; implement \SessionHandlerInterface; or be null.');
         }
 
diff --git a/vendor/symfony/http-foundation/Session/Storage/SessionStorageInterface.php b/vendor/symfony/http-foundation/Session/Storage/SessionStorageInterface.php
index b7f66e7..7053745 100644
--- a/vendor/symfony/http-foundation/Session/Storage/SessionStorageInterface.php
+++ b/vendor/symfony/http-foundation/Session/Storage/SessionStorageInterface.php
@@ -80,11 +80,11 @@ interface SessionStorageInterface
      * Otherwise session data could get lost again for concurrent requests with the
      * new ID. One result could be that you get logged out after just logging in.
      *
-     * @param bool $destroy  Destroy session when regenerating?
-     * @param int  $lifetime Sets the cookie lifetime for the session cookie. A null value
-     *                       will leave the system settings unchanged, 0 sets the cookie
-     *                       to expire with browser session. Time is in seconds, and is
-     *                       not a Unix timestamp.
+     * @param bool     $destroy  Destroy session when regenerating?
+     * @param int|null $lifetime Sets the cookie lifetime for the session cookie. A null value
+     *                           will leave the system settings unchanged, 0 sets the cookie
+     *                           to expire with browser session. Time is in seconds, and is
+     *                           not a Unix timestamp.
      *
      * @return bool
      *
diff --git a/vendor/symfony/http-foundation/StreamedResponse.php b/vendor/symfony/http-foundation/StreamedResponse.php
index 676cd66..0599bd1 100644
--- a/vendor/symfony/http-foundation/StreamedResponse.php
+++ b/vendor/symfony/http-foundation/StreamedResponse.php
@@ -114,9 +114,9 @@ class StreamedResponse extends Response
     /**
      * {@inheritdoc}
      *
-     * @throws \LogicException when the content is not null
-     *
      * @return $this
+     *
+     * @throws \LogicException when the content is not null
      */
     public function setContent(?string $content)
     {
diff --git a/vendor/symfony/http-foundation/Test/Constraint/ResponseCookieValueSame.php b/vendor/symfony/http-foundation/Test/Constraint/ResponseCookieValueSame.php
index 554e1a1..eb9c26a 100644
--- a/vendor/symfony/http-foundation/Test/Constraint/ResponseCookieValueSame.php
+++ b/vendor/symfony/http-foundation/Test/Constraint/ResponseCookieValueSame.php
@@ -59,7 +59,7 @@ final class ResponseCookieValueSame extends Constraint
             return false;
         }
 
-        return $this->value === $cookie->getValue();
+        return $this->value === (string) $cookie->getValue();
     }
 
     /**
diff --git a/vendor/symfony/mailer/CHANGELOG.md b/vendor/symfony/mailer/CHANGELOG.md
index cc6cd6f..bdeffe4 100644
--- a/vendor/symfony/mailer/CHANGELOG.md
+++ b/vendor/symfony/mailer/CHANGELOG.md
@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+5.4.21
+------
+
+ * [BC BREAK] The following data providers for `TransportFactoryTestCase` are now static:
+  `supportsProvider()`, `createProvider()`, `unsupportedSchemeProvider()`and `incompleteDsnProvider()`
+
 5.4
 ---
 
diff --git a/vendor/symfony/mailer/LICENSE b/vendor/symfony/mailer/LICENSE
index 9c907a4..f37c76b 100644
--- a/vendor/symfony/mailer/LICENSE
+++ b/vendor/symfony/mailer/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2019-2022 Fabien Potencier
+Copyright (c) 2019-present Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/symfony/mailer/Test/TransportFactoryTestCase.php b/vendor/symfony/mailer/Test/TransportFactoryTestCase.php
index c2426a0..121643f 100644
--- a/vendor/symfony/mailer/Test/TransportFactoryTestCase.php
+++ b/vendor/symfony/mailer/Test/TransportFactoryTestCase.php
@@ -37,16 +37,16 @@ abstract class TransportFactoryTestCase extends TestCase
 
     abstract public function getFactory(): TransportFactoryInterface;
 
-    abstract public function supportsProvider(): iterable;
+    abstract public static function supportsProvider(): iterable;
 
-    abstract public function createProvider(): iterable;
+    abstract public static function createProvider(): iterable;
 
-    public function unsupportedSchemeProvider(): iterable
+    public static function unsupportedSchemeProvider(): iterable
     {
         return [];
     }
 
-    public function incompleteDsnProvider(): iterable
+    public static function incompleteDsnProvider(): iterable
     {
         return [];
     }
@@ -102,7 +102,7 @@ abstract class TransportFactoryTestCase extends TestCase
 
     protected function getDispatcher(): EventDispatcherInterface
     {
-        return $this->dispatcher ?? $this->dispatcher = $this->createMock(EventDispatcherInterface::class);
+        return $this->dispatcher ?? $this->dispatcher =  $this->createMock(EventDispatcherInterface::class);
     }
 
     protected function getClient(): HttpClientInterface
diff --git a/vendor/symfony/mailer/Transport/RoundRobinTransport.php b/vendor/symfony/mailer/Transport/RoundRobinTransport.php
index 2f35138..761b57f 100644
--- a/vendor/symfony/mailer/Transport/RoundRobinTransport.php
+++ b/vendor/symfony/mailer/Transport/RoundRobinTransport.php
@@ -48,15 +48,19 @@ class RoundRobinTransport implements TransportInterface
 
     public function send(RawMessage $message, Envelope $envelope = null): ?SentMessage
     {
+        $exception = null;
+
         while ($transport = $this->getNextTransport()) {
             try {
                 return $transport->send($message, $envelope);
             } catch (TransportExceptionInterface $e) {
+                $exception = $exception ?? new TransportException('All transports failed.');
+                $exception->appendDebug(sprintf("Transport \"%s\": %s\n", $transport, $e->getDebug()));
                 $this->deadTransports[$transport] = microtime(true);
             }
         }
 
-        throw new TransportException('All transports failed.');
+        throw $exception ?? new TransportException('No transports found.');
     }
 
     public function __toString(): string
diff --git a/vendor/symfony/mailer/Transport/Smtp/Stream/AbstractStream.php b/vendor/symfony/mailer/Transport/Smtp/Stream/AbstractStream.php
index 28cb616..4cfcd8b 100644
--- a/vendor/symfony/mailer/Transport/Smtp/Stream/AbstractStream.php
+++ b/vendor/symfony/mailer/Transport/Smtp/Stream/AbstractStream.php
@@ -75,7 +75,7 @@ abstract class AbstractStream
         }
 
         $line = fgets($this->out);
-        if ('' === $line) {
+        if ('' === $line || false === $line) {
             $metas = stream_get_meta_data($this->out);
             if ($metas['timed_out']) {
                 throw new TransportException(sprintf('Connection to "%s" timed out.', $this->getReadConnectionDescription()));
diff --git a/vendor/symfony/mailer/Transport/Smtp/Stream/ProcessStream.php b/vendor/symfony/mailer/Transport/Smtp/Stream/ProcessStream.php
index a8a8603..bc721ad 100644
--- a/vendor/symfony/mailer/Transport/Smtp/Stream/ProcessStream.php
+++ b/vendor/symfony/mailer/Transport/Smtp/Stream/ProcessStream.php
@@ -35,7 +35,7 @@ final class ProcessStream extends AbstractStream
         $descriptorSpec = [
             0 => ['pipe', 'r'],
             1 => ['pipe', 'w'],
-            2 => ['pipe', 'w'],
+            2 => ['pipe', '\\' === \DIRECTORY_SEPARATOR ? 'a' : 'w'],
         ];
         $pipes = [];
         $this->stream = proc_open($this->command, $descriptorSpec, $pipes);
diff --git a/vendor/symfony/mailer/composer.json b/vendor/symfony/mailer/composer.json
index 53cf0f5..42416e1 100644
--- a/vendor/symfony/mailer/composer.json
+++ b/vendor/symfony/mailer/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=7.2.5",
-        "egulias/email-validator": "^2.1.10|^3",
+        "egulias/email-validator": "^2.1.10|^3|^4",
         "psr/event-dispatcher": "^1",
         "psr/log": "^1|^2|^3",
         "symfony/deprecation-contracts": "^2.1|^3",
@@ -27,7 +27,7 @@
         "symfony/service-contracts": "^1.1|^2|^3"
     },
     "require-dev": {
-        "symfony/http-client-contracts": "^1.1|^2|^3",
+        "symfony/http-client": "^4.4|^5.0|^6.0",
         "symfony/messenger": "^4.4|^5.0|^6.0"
     },
     "conflict": {
diff --git a/vendor/symfony/mime/FileinfoMimeTypeGuesser.php b/vendor/symfony/mime/FileinfoMimeTypeGuesser.php
index c6c7559..7964aa1 100644
--- a/vendor/symfony/mime/FileinfoMimeTypeGuesser.php
+++ b/vendor/symfony/mime/FileinfoMimeTypeGuesser.php
@@ -24,7 +24,7 @@ class FileinfoMimeTypeGuesser implements MimeTypeGuesserInterface
     private $magicFile;
 
     /**
-     * @param string $magicFile A magic file to use with the finfo instance
+     * @param string|null $magicFile A magic file to use with the finfo instance
      *
      * @see http://www.php.net/manual/en/function.finfo-open.php
      */
diff --git a/vendor/symfony/mime/Header/MailboxListHeader.php b/vendor/symfony/mime/Header/MailboxListHeader.php
index 1d00fdb..ee2a26c 100644
--- a/vendor/symfony/mime/Header/MailboxListHeader.php
+++ b/vendor/symfony/mime/Header/MailboxListHeader.php
@@ -44,9 +44,9 @@ final class MailboxListHeader extends AbstractHeader
     }
 
     /**
-     * @throws RfcComplianceException
-     *
      * @return Address[]
+     *
+     * @throws RfcComplianceException
      */
     public function getBody(): array
     {
@@ -99,9 +99,9 @@ final class MailboxListHeader extends AbstractHeader
     /**
      * Gets the full mailbox list of this Header as an array of valid RFC 2822 strings.
      *
-     * @throws RfcComplianceException
-     *
      * @return string[]
+     *
+     * @throws RfcComplianceException
      */
     public function getAddressStrings(): array
     {
diff --git a/vendor/symfony/mime/LICENSE b/vendor/symfony/mime/LICENSE
index 298be14..4dd83ce 100644
--- a/vendor/symfony/mime/LICENSE
+++ b/vendor/symfony/mime/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2010-2022 Fabien Potencier
+Copyright (c) 2010-present Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/symfony/mime/Part/MessagePart.php b/vendor/symfony/mime/Part/MessagePart.php
index 1b5c23e..00129b4 100644
--- a/vendor/symfony/mime/Part/MessagePart.php
+++ b/vendor/symfony/mime/Part/MessagePart.php
@@ -59,4 +59,17 @@ class MessagePart extends DataPart
     {
         return $this->message->toIterable();
     }
+
+    /**
+     * @return array
+     */
+    public function __sleep()
+    {
+        return ['message'];
+    }
+
+    public function __wakeup()
+    {
+        $this->__construct($this->message);
+    }
 }
diff --git a/vendor/symfony/mime/Part/Multipart/FormDataPart.php b/vendor/symfony/mime/Part/Multipart/FormDataPart.php
index ff6df81..e3c9afc 100644
--- a/vendor/symfony/mime/Part/Multipart/FormDataPart.php
+++ b/vendor/symfony/mime/Part/Multipart/FormDataPart.php
@@ -58,7 +58,7 @@ final class FormDataPart extends AbstractMultipartPart
         $values = [];
 
         $prepare = function ($item, $key, $root = null) use (&$values, &$prepare) {
-            if (\is_int($key) && \is_array($item)) {
+            if (null === $root && \is_int($key) && \is_array($item)) {
                 if (1 !== \count($item)) {
                     throw new InvalidArgumentException(sprintf('Form field values with integer keys can only have one array element, the key being the field name and the value being the field value, %d provided.', \count($item)));
                 }
diff --git a/vendor/symfony/mime/composer.json b/vendor/symfony/mime/composer.json
index ec96dff..5472dea 100644
--- a/vendor/symfony/mime/composer.json
+++ b/vendor/symfony/mime/composer.json
@@ -23,7 +23,7 @@
         "symfony/polyfill-php80": "^1.16"
     },
     "require-dev": {
-        "egulias/email-validator": "^2.1.10|^3.1",
+        "egulias/email-validator": "^2.1.10|^3.1|^4",
         "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
         "symfony/dependency-injection": "^4.4|^5.0|^6.0",
         "symfony/property-access": "^4.4|^5.1|^6.0",
diff --git a/vendor/topthink/framework/README.md b/vendor/topthink/framework/README.md
index 08893cd..dd38e34 100644
--- a/vendor/topthink/framework/README.md
+++ b/vendor/topthink/framework/README.md
@@ -21,7 +21,6 @@ ThinkPHP 6.1
 * 原生多应用支持
 * 系统服务注入支持
 * ORM作为独立组件使用
-* 增加Filesystem
 * 全新的事件系统
 * 模板引擎分离出核心
 * 内部功能中间件化
@@ -34,7 +33,7 @@ ThinkPHP 6.1
 * 统一和精简大量用法
 
 
-> ThinkPHP6.1的运行环境要求PHP7.2.5+，兼容PHP8.1
+> ThinkPHP6.1的运行环境要求PHP7.2.5+，最高兼容PHP8.2
 
 ## 安装
 
diff --git a/vendor/topthink/framework/composer.json b/vendor/topthink/framework/composer.json
index b5cd915..2d9685e 100644
--- a/vendor/topthink/framework/composer.json
+++ b/vendor/topthink/framework/composer.json
@@ -26,7 +26,7 @@
         "psr/container": "~1.0",
         "psr/simple-cache": "^1.0",
         "psr/http-message": "^1.0",
-        "topthink/think-orm": "^2.0",
+        "topthink/think-orm": "^2.0|^3.0",
         "topthink/think-helper": "^3.1.1"
     },
     "require-dev": {
diff --git a/vendor/topthink/framework/src/think/App.php b/vendor/topthink/framework/src/think/App.php
index c7453b6..9f309c0 100644
--- a/vendor/topthink/framework/src/think/App.php
+++ b/vendor/topthink/framework/src/think/App.php
@@ -35,11 +35,10 @@ use think\initializer\RegisterService;
  * @property Cookie     $cookie
  * @property Session    $session
  * @property Validate   $validate
- * @property Filesystem $filesystem
  */
 class App extends Container
 {
-    const VERSION = '6.1.0';
+    const VERSION = '6.1.1';
 
     /**
      * 应用调试模式
diff --git a/vendor/topthink/framework/src/think/Container.php b/vendor/topthink/framework/src/think/Container.php
index 60b4b35..f286c73 100644
--- a/vendor/topthink/framework/src/think/Container.php
+++ b/vendor/topthink/framework/src/think/Container.php
@@ -445,7 +445,9 @@ class Container implements ContainerInterface, ArrayAccess, IteratorAggregate, C
             $lowerName      = Str::snake($name);
             $reflectionType = $param->getType();
 
-            if ($reflectionType && $reflectionType->isBuiltin() === false) {
+            if ($param->isVariadic()) {
+                return array_merge($args, array_values($vars));
+            } elseif ($reflectionType && $reflectionType instanceof \ReflectionNamedType && $reflectionType->isBuiltin() === false) {
                 $args[] = $this->getObjectParam($reflectionType->getName(), $vars);
             } elseif (1 == $type && !empty($vars)) {
                 $args[] = array_shift($vars);
diff --git a/vendor/topthink/framework/src/think/File.php b/vendor/topthink/framework/src/think/File.php
index 087e808..59230b5 100644
--- a/vendor/topthink/framework/src/think/File.php
+++ b/vendor/topthink/framework/src/think/File.php
@@ -30,6 +30,12 @@ class File extends SplFileInfo
 
     protected $hashName;
 
+    /**
+     * 保存的文件后缀
+     * @var string
+     */
+    protected $extension;
+
     public function __construct(string $path, bool $checkPath = true)
     {
         if ($checkPath && !is_file($path)) {
@@ -155,6 +161,16 @@ class File extends SplFileInfo
         return $this->getExtension();
     }
 
+    /**
+     * 指定保存文件的扩展名
+     * @param string $extension
+     * @return void
+     */
+    public function setExtension(string $extension): void
+    {
+        $this->extension = $extension;
+    }
+
     /**
      * 自动生成文件名
      * @access public
@@ -182,6 +198,7 @@ class File extends SplFileInfo
             }
         }
 
-        return $this->hashName . '.' . $this->extension();
+        $extension = $this->extension ?? $this->extension();
+        return $this->hashName . ($extension ? '.' . $extension : '');
     }
 }
diff --git a/vendor/topthink/framework/src/think/console/output/Ask.php b/vendor/topthink/framework/src/think/console/output/Ask.php
index 56821c7..0058d05 100644
--- a/vendor/topthink/framework/src/think/console/output/Ask.php
+++ b/vendor/topthink/framework/src/think/console/output/Ask.php
@@ -295,7 +295,7 @@ class Ask
             $width = max(array_map('strlen', array_keys($this->question->getChoices())));
 
             foreach ($this->question->getChoices() as $key => $value) {
-                $this->output->writeln(sprintf("  [<comment>%-${width}s</comment>] %s", $key, $value));
+                $this->output->writeln(sprintf("  [<comment>%-{$width}s</comment>] %s", $key, $value));
             }
         }
 
diff --git a/vendor/topthink/framework/src/think/console/output/Descriptor.php b/vendor/topthink/framework/src/think/console/output/Descriptor.php
index e4a9e61..84d487c 100644
--- a/vendor/topthink/framework/src/think/console/output/Descriptor.php
+++ b/vendor/topthink/framework/src/think/console/output/Descriptor.php
@@ -219,7 +219,7 @@ class Descriptor
             $width = $this->getColumnWidth($description->getNamespaces());
 
             foreach ($description->getCommands() as $command) {
-                $this->writeText(sprintf("%-${width}s %s", $command->getName(), $command->getDescription()), $options);
+                $this->writeText(sprintf("%-{$width}s %s", $command->getName(), $command->getDescription()), $options);
                 $this->writeText("\n");
             }
         } else {
diff --git a/vendor/topthink/framework/src/think/validate/ValidateRule.php b/vendor/topthink/framework/src/think/validate/ValidateRule.php
index b741f53..18e5ea3 100644
--- a/vendor/topthink/framework/src/think/validate/ValidateRule.php
+++ b/vendor/topthink/framework/src/think/validate/ValidateRule.php
@@ -15,62 +15,62 @@ namespace think\validate;
 /**
  * Class ValidateRule
  * @package think\validate
- * @method ValidateRule confirm(mixed $rule, string $msg = '') static 验证是否和某个字段的值一致
- * @method ValidateRule different(mixed $rule, string $msg = '') static 验证是否和某个字段的值是否不同
- * @method ValidateRule egt(mixed $rule, string $msg = '') static 验证是否大于等于某个值
- * @method ValidateRule gt(mixed $rule, string $msg = '') static 验证是否大于某个值
- * @method ValidateRule elt(mixed $rule, string $msg = '') static 验证是否小于等于某个值
- * @method ValidateRule lt(mixed $rule, string $msg = '') static 验证是否小于某个值
- * @method ValidateRule eg(mixed $rule, string $msg = '') static 验证是否等于某个值
- * @method ValidateRule in(mixed $rule, string $msg = '') static 验证是否在范围内
- * @method ValidateRule notIn(mixed $rule, string $msg = '') static 验证是否不在某个范围
- * @method ValidateRule between(mixed $rule, string $msg = '') static 验证是否在某个区间
- * @method ValidateRule notBetween(mixed $rule, string $msg = '') static 验证是否不在某个区间
- * @method ValidateRule length(mixed $rule, string $msg = '') static 验证数据长度
- * @method ValidateRule max(mixed $rule, string $msg = '') static 验证数据最大长度
- * @method ValidateRule min(mixed $rule, string $msg = '') static 验证数据最小长度
- * @method ValidateRule after(mixed $rule, string $msg = '') static 验证日期
- * @method ValidateRule before(mixed $rule, string $msg = '') static 验证日期
- * @method ValidateRule expire(mixed $rule, string $msg = '') static 验证有效期
- * @method ValidateRule allowIp(mixed $rule, string $msg = '') static 验证IP许可
- * @method ValidateRule denyIp(mixed $rule, string $msg = '') static 验证IP禁用
- * @method ValidateRule regex(mixed $rule, string $msg = '') static 使用正则验证数据
- * @method ValidateRule token(mixed $rule='__token__', string $msg = '') static 验证表单令牌
- * @method ValidateRule is(mixed $rule, string $msg = '') static 验证字段值是否为有效格式
- * @method ValidateRule isRequire(mixed $rule = null, string $msg = '') static 验证字段必须
- * @method ValidateRule isNumber(mixed $rule = null, string $msg = '') static 验证字段值是否为数字
- * @method ValidateRule isArray(mixed $rule = null, string $msg = '') static 验证字段值是否为数组
- * @method ValidateRule isInteger(mixed $rule = null, string $msg = '') static 验证字段值是否为整形
- * @method ValidateRule isFloat(mixed $rule = null, string $msg = '') static 验证字段值是否为浮点数
- * @method ValidateRule isMobile(mixed $rule = null, string $msg = '') static 验证字段值是否为手机
- * @method ValidateRule isIdCard(mixed $rule = null, string $msg = '') static 验证字段值是否为身份证号码
- * @method ValidateRule isChs(mixed $rule = null, string $msg = '') static 验证字段值是否为中文
- * @method ValidateRule isChsDash(mixed $rule = null, string $msg = '') static 验证字段值是否为中文字母及下划线
- * @method ValidateRule isChsAlpha(mixed $rule = null, string $msg = '') static 验证字段值是否为中文和字母
- * @method ValidateRule isChsAlphaNum(mixed $rule = null, string $msg = '') static 验证字段值是否为中文字母和数字
- * @method ValidateRule isDate(mixed $rule = null, string $msg = '') static 验证字段值是否为有效格式
- * @method ValidateRule isBool(mixed $rule = null, string $msg = '') static 验证字段值是否为布尔值
- * @method ValidateRule isAlpha(mixed $rule = null, string $msg = '') static 验证字段值是否为字母
- * @method ValidateRule isAlphaDash(mixed $rule = null, string $msg = '') static 验证字段值是否为字母和下划线
- * @method ValidateRule isAlphaNum(mixed $rule = null, string $msg = '') static 验证字段值是否为字母和数字
- * @method ValidateRule isAccepted(mixed $rule = null, string $msg = '') static 验证字段值是否为yes, on, 或是 1
- * @method ValidateRule isEmail(mixed $rule = null, string $msg = '') static 验证字段值是否为有效邮箱格式
- * @method ValidateRule isUrl(mixed $rule = null, string $msg = '') static 验证字段值是否为有效URL地址
- * @method ValidateRule activeUrl(mixed $rule, string $msg = '') static 验证是否为合格的域名或者IP
- * @method ValidateRule ip(mixed $rule, string $msg = '') static 验证是否有效IP
- * @method ValidateRule fileExt(mixed $rule, string $msg = '') static 验证文件后缀
- * @method ValidateRule fileMime(mixed $rule, string $msg = '') static 验证文件类型
- * @method ValidateRule fileSize(mixed $rule, string $msg = '') static 验证文件大小
- * @method ValidateRule image(mixed $rule, string $msg = '') static 验证图像文件
- * @method ValidateRule method(mixed $rule, string $msg = '') static 验证请求类型
- * @method ValidateRule dateFormat(mixed $rule, string $msg = '') static 验证时间和日期是否符合指定格式
- * @method ValidateRule unique(mixed $rule, string $msg = '') static 验证是否唯一
- * @method ValidateRule behavior(mixed $rule, string $msg = '') static 使用行为类验证
- * @method ValidateRule filter(mixed $rule, string $msg = '') static 使用filter_var方式验证
- * @method ValidateRule requireIf(mixed $rule, string $msg = '') static 验证某个字段等于某个值的时候必须
- * @method ValidateRule requireCallback(mixed $rule, string $msg = '') static 通过回调方法验证某个字段是否必须
- * @method ValidateRule requireWith(mixed $rule, string $msg = '') static 验证某个字段有值的情况下必须
- * @method ValidateRule must(mixed $rule = null, string $msg = '') static 必须验证
+ * @method static ValidateRule confirm(mixed $rule, string $msg = '') 验证是否和某个字段的值一致
+ * @method static ValidateRule different(mixed $rule, string $msg = '') 验证是否和某个字段的值是否不同
+ * @method static ValidateRule egt(mixed $rule, string $msg = '') 验证是否大于等于某个值
+ * @method static ValidateRule gt(mixed $rule, string $msg = '') 验证是否大于某个值
+ * @method static ValidateRule elt(mixed $rule, string $msg = '') 验证是否小于等于某个值
+ * @method static ValidateRule lt(mixed $rule, string $msg = '') 验证是否小于某个值
+ * @method static ValidateRule eg(mixed $rule, string $msg = '') 验证是否等于某个值
+ * @method static ValidateRule in(mixed $rule, string $msg = '') 验证是否在范围内
+ * @method static ValidateRule notIn(mixed $rule, string $msg = '')  验证是否不在某个范围
+ * @method static ValidateRule between(mixed $rule, string $msg = '')  验证是否在某个区间
+ * @method static ValidateRule notBetween(mixed $rule, string $msg = '')  验证是否不在某个区间
+ * @method static ValidateRule length(mixed $rule, string $msg = '')  验证数据长度
+ * @method static ValidateRule max(mixed $rule, string $msg = '')  验证数据最大长度
+ * @method static ValidateRule min(mixed $rule, string $msg = '')  验证数据最小长度
+ * @method static ValidateRule after(mixed $rule, string $msg = '')  验证日期
+ * @method static ValidateRule before(mixed $rule, string $msg = '')  验证日期
+ * @method static ValidateRule expire(mixed $rule, string $msg = '')  验证有效期
+ * @method static ValidateRule allowIp(mixed $rule, string $msg = '')  验证IP许可
+ * @method static ValidateRule denyIp(mixed $rule, string $msg = '')  验证IP禁用
+ * @method static ValidateRule regex(mixed $rule, string $msg = '')  使用正则验证数据
+ * @method static ValidateRule token(mixed $rule='__token__', string $msg = '')  验证表单令牌
+ * @method static ValidateRule is(mixed $rule, string $msg = '')  验证字段值是否为有效格式
+ * @method static ValidateRule isRequire(mixed $rule = null, string $msg = '')  验证字段必须
+ * @method static ValidateRule isNumber(mixed $rule = null, string $msg = '')  验证字段值是否为数字
+ * @method static ValidateRule isArray(mixed $rule = null, string $msg = '')  验证字段值是否为数组
+ * @method static ValidateRule isInteger(mixed $rule = null, string $msg = '')  验证字段值是否为整形
+ * @method static ValidateRule isFloat(mixed $rule = null, string $msg = '')  验证字段值是否为浮点数
+ * @method static ValidateRule isMobile(mixed $rule = null, string $msg = '')  验证字段值是否为手机
+ * @method static ValidateRule isIdCard(mixed $rule = null, string $msg = '')  验证字段值是否为身份证号码
+ * @method static ValidateRule isChs(mixed $rule = null, string $msg = '')  验证字段值是否为中文
+ * @method static ValidateRule isChsDash(mixed $rule = null, string $msg = '')  验证字段值是否为中文字母及下划线
+ * @method static ValidateRule isChsAlpha(mixed $rule = null, string $msg = '')  验证字段值是否为中文和字母
+ * @method static ValidateRule isChsAlphaNum(mixed $rule = null, string $msg = '')  验证字段值是否为中文字母和数字
+ * @method static ValidateRule isDate(mixed $rule = null, string $msg = '')  验证字段值是否为有效格式
+ * @method static ValidateRule isBool(mixed $rule = null, string $msg = '')  验证字段值是否为布尔值
+ * @method static ValidateRule isAlpha(mixed $rule = null, string $msg = '')  验证字段值是否为字母
+ * @method static ValidateRule isAlphaDash(mixed $rule = null, string $msg = '')  验证字段值是否为字母和下划线
+ * @method static ValidateRule isAlphaNum(mixed $rule = null, string $msg = '')  验证字段值是否为字母和数字
+ * @method static ValidateRule isAccepted(mixed $rule = null, string $msg = '')  验证字段值是否为yes, on, 或是 1
+ * @method static ValidateRule isEmail(mixed $rule = null, string $msg = '')  验证字段值是否为有效邮箱格式
+ * @method static ValidateRule isUrl(mixed $rule = null, string $msg = '')  验证字段值是否为有效URL地址
+ * @method static ValidateRule activeUrl(mixed $rule, string $msg = '')  验证是否为合格的域名或者IP
+ * @method static ValidateRule ip(mixed $rule, string $msg = '')  验证是否有效IP
+ * @method static ValidateRule fileExt(mixed $rule, string $msg = '')  验证文件后缀
+ * @method static ValidateRule fileMime(mixed $rule, string $msg = '')  验证文件类型
+ * @method static ValidateRule fileSize(mixed $rule, string $msg = '')  验证文件大小
+ * @method static ValidateRule image(mixed $rule, string $msg = '')  验证图像文件
+ * @method static ValidateRule method(mixed $rule, string $msg = '')  验证请求类型
+ * @method static ValidateRule dateFormat(mixed $rule, string $msg = '')  验证时间和日期是否符合指定格式
+ * @method static ValidateRule unique(mixed $rule, string $msg = '')  验证是否唯一
+ * @method static ValidateRule behavior(mixed $rule, string $msg = '')  使用行为类验证
+ * @method static ValidateRule filter(mixed $rule, string $msg = '')  使用filter_var方式验证
+ * @method static ValidateRule requireIf(mixed $rule, string $msg = '')  验证某个字段等于某个值的时候必须
+ * @method static ValidateRule requireCallback(mixed $rule, string $msg = '')  通过回调方法验证某个字段是否必须
+ * @method static ValidateRule requireWith(mixed $rule, string $msg = '')  验证某个字段有值的情况下必须
+ * @method static ValidateRule must(mixed $rule = null, string $msg = '')  必须验证
  */
 class ValidateRule
 {
diff --git a/vendor/topthink/think-captcha/composer.json b/vendor/topthink/think-captcha/composer.json
index b34e19f..a20b7d0 100644
--- a/vendor/topthink/think-captcha/composer.json
+++ b/vendor/topthink/think-captcha/composer.json
@@ -9,7 +9,7 @@
     ],
     "license": "Apache-2.0",
     "require": {
-        "topthink/framework": "^6.0"
+        "topthink/framework": "^6.0|^8.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/vendor/topthink/think-captcha/src/Captcha.php b/vendor/topthink/think-captcha/src/Captcha.php
index ba6f11c..80844db 100644
--- a/vendor/topthink/think-captcha/src/Captcha.php
+++ b/vendor/topthink/think-captcha/src/Captcha.php
@@ -117,7 +117,7 @@ class Captcha
             }
 
             for ($i = 0; $i < $this->length; $i++) {
-                $bag .= $characters[rand(0, count($characters) - 1)];
+                $bag .= $characters[random_int(0, count($characters) - 1)];
             }
 
             $key = mb_strtolower($bag, 'UTF-8');
@@ -178,11 +178,11 @@ class Captcha
         // 图片高(px)
         $this->imageH || $this->imageH = $this->fontSize * 2.5;
 
-        $this->imageW = intval($this->imageW);
-        $this->imageH = intval($this->imageH);
+        $this->imageW = (int)$this->imageW;
+        $this->imageH = (int)$this->imageH;
 
         // 建立一幅 $this->imageW x $this->imageH 的图像
-        $this->im = imagecreate((int) $this->imageW, (int) $this->imageH);
+        $this->im = imagecreate($this->imageW, $this->imageH);
         // 设置背景
         imagecolorallocate($this->im, $this->bg[0], $this->bg[1], $this->bg[2]);
 
@@ -196,7 +196,7 @@ class Captcha
             $dir  = dir($ttfPath);
             $ttfs = [];
             while (false !== ($file = $dir->read())) {
-                if (substr($file, -4) == '.ttf' || substr($file, -4) == '.otf') {
+                if (substr($file, -4) === '.ttf' || substr($file, -4) === '.otf') {
                     $ttfs[] = $file;
                 }
             }
@@ -228,7 +228,7 @@ class Captcha
             $y     = $this->fontSize + mt_rand(10, 20);
             $angle = $this->math ? 0 : mt_rand(-40, 40);
 
-            imagettftext($this->im, intval($this->fontSize), intval($this->fontSize), intval($x), intval($y), $this->color, $fontttf, $char);
+            imagettftext($this->im, (int)$this->fontSize, $angle, (int)$x, (int)$y, $this->color, $fontttf, $char);
         }
 
         ob_start();
@@ -257,30 +257,30 @@ class Captcha
         $px = $py = 0;
 
         // 曲线前部分
-        $A = mt_rand(1, $this->imageH / 2); // 振幅
-        $b = mt_rand(intval(-$this->imageH / 4), intval($this->imageH / 4)); // Y轴方向偏移量
-        $f = mt_rand(intval(-$this->imageH / 4), intval($this->imageH / 4)); // X轴方向偏移量
-        $T = mt_rand($this->imageH, $this->imageW * 2); // 周期
+        $A = mt_rand(1, (int)($this->imageH / 2)); // 振幅
+        $b = mt_rand((int)(-$this->imageH / 4), (int)($this->imageH / 4)); // Y轴方向偏移量
+        $f = mt_rand((int)(-$this->imageH / 4), (int)($this->imageH / 4)); // X轴方向偏移量
+        $T = mt_rand((int)$this->imageH, (int)$this->imageW * 2); // 周期
         $w = (2 * M_PI) / $T;
 
         $px1 = 0; // 曲线横坐标起始位置
-        $px2 = mt_rand($this->imageW / 2, $this->imageW * 0.8); // 曲线横坐标结束位置
+        $px2 = mt_rand((int)($this->imageW / 2), (int)($this->imageW * 0.8)); // 曲线横坐标结束位置
 
         for ($px = $px1; $px <= $px2; $px = $px + 1) {
             if (0 != $w) {
                 $py = $A * sin($w * $px + $f) + $b + $this->imageH / 2; // y = Asin(ωx+φ) + b
                 $i  = (int) ($this->fontSize / 5);
                 while ($i > 0) {
-                    imagesetpixel($this->im, intval($px + $i), intval($py + $i), $this->color); // 这里(while)循环画像素点比imagettftext和imagestring用字体大小一次画出（不用这while循环）性能要好很多
+                    imagesetpixel($this->im, (int)($px + $i), (int)($py + $i), $this->color); // 这里(while)循环画像素点比imagettftext和imagestring用字体大小一次画出（不用这while循环）性能要好很多
                     $i--;
                 }
             }
         }
 
         // 曲线后部分
-        $A   = mt_rand(1, $this->imageH / 2); // 振幅
-        $f   = mt_rand(intval(-$this->imageH / 4), intval($this->imageH / 4)); // X轴方向偏移量
-        $T   = mt_rand($this->imageH, $this->imageW * 2); // 周期
+        $A   = mt_rand(1, (int)($this->imageH / 2)); // 振幅
+        $f   = mt_rand((int)(-$this->imageH / 4), (int)($this->imageH / 4)); // X轴方向偏移量
+        $T   = mt_rand((int)$this->imageH, (int)$this->imageW * 2); // 周期
         $w   = (2 * M_PI) / $T;
         $b   = $py - $A * sin($w * $px + $f) - $this->imageH / 2;
         $px1 = $px2;
@@ -291,7 +291,7 @@ class Captcha
                 $py = $A * sin($w * $px + $f) + $b + $this->imageH / 2; // y = Asin(ωx+φ) + b
                 $i  = (int) ($this->fontSize / 5);
                 while ($i > 0) {
-                    imagesetpixel($this->im, intval($px + $i), intval($py + $i), $this->color);
+                    imagesetpixel($this->im, (int)($px + $i), (int)($py + $i), $this->color);
                     $i--;
                 }
             }
@@ -310,7 +310,7 @@ class Captcha
             $noiseColor = imagecolorallocate($this->im, mt_rand(150, 225), mt_rand(150, 225), mt_rand(150, 225));
             for ($j = 0; $j < 5; $j++) {
                 // 绘杂点
-                imagestring($this->im, 5, mt_rand(-10, $this->imageW), mt_rand(-10, $this->imageH), $codeSet[mt_rand(0, 29)], $noiseColor);
+                imagestring($this->im, 5, mt_rand(-10, (int)$this->imageW), mt_rand(-10, (int)$this->imageH), $codeSet[mt_rand(0, 29)], $noiseColor);
             }
         }
     }
@@ -337,7 +337,7 @@ class Captcha
         list($width, $height) = @getimagesize($gb);
         // Resample
         $bgImage = @imagecreatefromjpeg($gb);
-        @imagecopyresampled($this->im, $bgImage, 0, 0, 0, 0, $this->imageW, $this->imageH, $width, $height);
+        @imagecopyresampled($this->im, $bgImage, 0, 0, 0, 0, (int)$this->imageW, (int)$this->imageH, $width, $height);
         @imagedestroy($bgImage);
     }
 }
diff --git a/vendor/topthink/think-filesystem/composer.json b/vendor/topthink/think-filesystem/composer.json
index d8a99be..8c4f508 100644
--- a/vendor/topthink/think-filesystem/composer.json
+++ b/vendor/topthink/think-filesystem/composer.json
@@ -20,7 +20,7 @@
         }
     },
     "require": {
-        "topthink/framework": "^6.1",
+        "topthink/framework": "^6.1|^8.0",
         "league/flysystem": "^2.0"
     },
     "require-dev": {
diff --git a/vendor/topthink/think-filesystem/src/filesystem/Driver.php b/vendor/topthink/think-filesystem/src/filesystem/Driver.php
index dfa19bd..e804141 100644
--- a/vendor/topthink/think-filesystem/src/filesystem/Driver.php
+++ b/vendor/topthink/think-filesystem/src/filesystem/Driver.php
@@ -55,7 +55,7 @@ abstract class Driver
     {
         $config = array_intersect_key($this->config, array_flip(['visibility', 'disable_asserts', 'url']));
 
-        return new Filesystem($adapter, count($config) > 0 ? $config : null);
+        return new Filesystem($adapter, $config);
     }
 
     /**
diff --git a/vendor/topthink/think-multi-app/composer.json b/vendor/topthink/think-multi-app/composer.json
index 82606c1..333d9e3 100644
--- a/vendor/topthink/think-multi-app/composer.json
+++ b/vendor/topthink/think-multi-app/composer.json
@@ -10,7 +10,7 @@
     ],
     "require": {
     	"php": ">=7.1.0",
-        "topthink/framework": "^6.0"
+        "topthink/framework": "^6.0|^8.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/vendor/topthink/think-multi-app/src/Service.php b/vendor/topthink/think-multi-app/src/Service.php
index cdc90b4..22b8532 100644
--- a/vendor/topthink/think-multi-app/src/Service.php
+++ b/vendor/topthink/think-multi-app/src/Service.php
@@ -1,32 +1,32 @@
-<?php
-// +----------------------------------------------------------------------
-// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2006-2018 http://thinkphp.cn All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
-// +----------------------------------------------------------------------
-// | Author: liu21st <liu21st@gmail.com>
-// +----------------------------------------------------------------------
-namespace think\app;
-
-use think\Service as BaseService;
-
-class Service extends BaseService
-{
-    public function boot()
-    {
-        $this->app->event->listen('HttpRun', function () {
-            $this->app->middleware->add(MultiApp::class);
-        });
-
-        $this->commands([
-            'build' => command\Build::class,
-            'clear' => command\Clear::class,
-        ]);
-
-        $this->app->bind([
-            'think\route\Url' => Url::class,
-        ]);
-    }
-}
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006-2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+namespace think\app;
+
+use think\Service as BaseService;
+
+class Service extends BaseService
+{
+    public function boot()
+    {
+        $this->app->event->listen('HttpRun', function () {
+            $this->app->middleware->add(MultiApp::class);
+        });
+
+        $this->commands([
+            'build' => command\Build::class,
+            'clear' => command\Clear::class,
+        ]);
+
+        $this->app->bind([
+            'think\route\Url' => Url::class,
+        ]);
+    }
+}
diff --git a/vendor/topthink/think-orm/src/DbManager.php b/vendor/topthink/think-orm/src/DbManager.php
index f223cd2..1c1314e 100644
--- a/vendor/topthink/think-orm/src/DbManager.php
+++ b/vendor/topthink/think-orm/src/DbManager.php
@@ -340,6 +340,16 @@ class DbManager
     {
         return $this->listen;
     }
+    
+    /**
+     * 获取所有连接实列
+     * @access public
+     * @return array
+     */
+    public function getInstance(): array
+    {
+        return $this->instance;
+    }
 
     /**
      * 注册回调方法
diff --git a/vendor/topthink/think-orm/src/Model.php b/vendor/topthink/think-orm/src/Model.php
index 761f780..a8332e9 100644
--- a/vendor/topthink/think-orm/src/Model.php
+++ b/vendor/topthink/think-orm/src/Model.php
@@ -769,16 +769,20 @@ abstract class Model implements JsonSerializable, ArrayAccess, Arrayable, Jsonab
 
             $pk = $this->getPk();
 
-            if (is_string($pk) && $replace) {
-                $auto = true;
-            }
-
             $result = [];
-
             $suffix = $this->getSuffix();
 
             foreach ($dataSet as $key => $data) {
-                if ($this->exists || (!empty($auto) && isset($data[$pk]))) {
+                if ($replace) {
+                    $exists = true;
+                    foreach ((array) $pk as $field) {
+                        if (!isset($data[$field])) {
+                            $exists = false;
+                        }
+                    }
+                }
+
+                if ($replace && !empty($exists)) {
                     $result[$key] = static::update($data, [], [], $suffix);
                 } else {
                     $result[$key] = static::create($data, $this->field, $this->replace, $suffix);
diff --git a/vendor/topthink/think-orm/src/Paginator.php b/vendor/topthink/think-orm/src/Paginator.php
index 2f755ef..eace6ba 100644
--- a/vendor/topthink/think-orm/src/Paginator.php
+++ b/vendor/topthink/think-orm/src/Paginator.php
@@ -377,6 +377,19 @@ abstract class Paginator implements ArrayAccess, Countable, IteratorAggregate, J
         return $this->items;
     }
 
+    /**
+     * 设置数据集
+     *
+     * @param Collection $items
+     * @return $this
+     */
+    public function setCollection(Collection $items)
+    {
+        $this->items = $items;
+
+        return $this;
+    }
+
     public function isEmpty(): bool
     {
         return $this->items->isEmpty();
diff --git a/vendor/topthink/think-orm/src/db/BaseQuery.php b/vendor/topthink/think-orm/src/db/BaseQuery.php
index d05905c..60aa21e 100644
--- a/vendor/topthink/think-orm/src/db/BaseQuery.php
+++ b/vendor/topthink/think-orm/src/db/BaseQuery.php
@@ -770,10 +770,9 @@ abstract class BaseQuery
      * @param mixed             $key    缓存key
      * @param integer|\DateTime $expire 缓存有效期
      * @param string|array      $tag    缓存标签
-     * @param bool              $always 始终缓存
      * @return $this
      */
-    public function cache($key = true, $expire = null, $tag = null, bool $always = false)
+    public function cache($key = true, $expire = null, $tag = null)
     {
         if (false === $key || !$this->getConnection()->getCache()) {
             return $this;
@@ -784,8 +783,7 @@ abstract class BaseQuery
             $key    = true;
         }
 
-        $this->options['cache']        = [$key, $expire, $tag];
-        $this->options['cache_always'] = $always;
+        $this->options['cache']     = [$key, $expire, $tag ?: $this->getTable()];
 
         return $this;
     }
@@ -800,7 +798,23 @@ abstract class BaseQuery
      */
     public function cacheAlways($key = true, $expire = null, $tag = null)
     {
-        return $this->cache($key, $expire, $tag, true);
+        $this->options['cache_always'] = true;
+        return $this->cache($key, $expire, $tag);
+    }
+
+    /**
+     * 强制更新缓存
+     *
+     * @param mixed         $key    缓存key
+     * @param int|\DateTime $expire 缓存有效期
+     * @param string|array  $tag    缓存标签
+     *
+     * @return $this
+     */
+    public function cacheForce($key = true, $expire = null, $tag = null)
+    {
+        $this->options['force_cache'] = true;
+        return $this->cache($key, $expire, $tag);
     }
 
     /**
@@ -1026,6 +1040,23 @@ abstract class BaseQuery
         return $this->connection->insertAll($this, $dataSet, $limit);
     }
 
+    /**
+     * 批量插入记录
+     * @access public
+     * @param array   $keys 键值
+     * @param array   $values 数据
+     * @param integer $limit   每次写入数据限制
+     * @return integer
+     */
+    public function insertAllByKeys(array $keys, array $values, int $limit = 0): int
+    {
+        if (empty($limit) && !empty($this->options['limit']) && is_numeric($this->options['limit'])) {
+            $limit = (int) $this->options['limit'];
+        }
+
+        return $this->connection->insertAllByKeys($this, $keys, $values, $limit);
+    }
+
     /**
      * 通过Select方式插入记录
      * @access public
diff --git a/vendor/topthink/think-orm/src/db/Builder.php b/vendor/topthink/think-orm/src/db/Builder.php
index 938ed4d..2bde77c 100644
--- a/vendor/topthink/think-orm/src/db/Builder.php
+++ b/vendor/topthink/think-orm/src/db/Builder.php
@@ -158,7 +158,8 @@ abstract class Builder
             if (false !== strpos($key, '->')) {
                 [$key, $name]  = explode('->', $key, 2);
                 $item          = $this->parseKey($query, $key);
-                $result[$item] = 'json_set(' . $item . ', \'$.' . $name . '\', ' . $this->parseDataBind($query, $key . '->' . $name, $val, $bind) . ')';
+
+                $result[$item . '->' . $name] = 'json_set(' . $item . ', \'$.' . $name . '\', ' . $this->parseDataBind($query, $key . '->' . $name, $val, $bind) . ')';
             } elseif (false === strpos($key, '.') && !in_array($key, $fields, true)) {
                 if ($options['strict']) {
                     throw new Exception('fields not exists:[' . $key . ']');
@@ -176,7 +177,11 @@ abstract class Builder
                 }
             } elseif (is_scalar($val)) {
                 // 过滤非标量数据
-                $result[$item] = $this->parseDataBind($query, $key, $val, $bind);
+                if (!$query->isAutoBind() && PDO::PARAM_STR == $bind[$key]) {
+                    $val = '\'' . $val . '\'';
+                }
+
+                $result[$item] = !$query->isAutoBind() ? $val : $this->parseDataBind($query, $key, $val, $bind);
             }
         }
 
@@ -761,17 +766,22 @@ abstract class Builder
             if (count($value) === 0) {
                 return 'IN' == $exp ? '0 = 1' : '1 = 1';
             }
-            $array = [];
 
-            foreach ($value as $v) {
-                $name    = $query->bindValue($v, $bindType);
-                $array[] = ':' . $name;
+            if ($query->isAutoBind()) {
+                $array = [];
+                foreach ($value as $v) {
+                    $name       = $query->bindValue($v, $bindType);
+                    $array[]    = ':' . $name;
+                }
+                $value = implode(',', $array);
+            } elseif (PDO::PARAM_STR == $bindType) {
+                $value = '\'' . implode('\',\'', $value) . '\'';
+            } else {
+                $value = implode(',', $value);
             }
 
-            if (count($array) == 1) {
-                return $key . ('IN' == $exp ? ' = ' : ' <> ') . $array[0];
-            } else {
-                $value = implode(',', $array);
+            if (false === strpos($value, ',')) {
+                return $key . ('IN' == $exp ? ' = ' : ' <> ') . $value;
             }
         }
 
@@ -1139,7 +1149,8 @@ abstract class Builder
                 $this->parseComment($query, $options['comment']),
                 $this->parseForce($query, $options['force']),
             ],
-            $this->selectSql);
+            $this->selectSql
+        );
     }
 
     /**
@@ -1171,7 +1182,8 @@ abstract class Builder
                 implode(' , ', $values),
                 $this->parseComment($query, $options['comment']),
             ],
-            $this->insertSql);
+            $this->insertSql
+        );
     }
 
     /**
@@ -1222,9 +1234,57 @@ abstract class Builder
                 implode(' UNION ALL ', $values),
                 $this->parseComment($query, $options['comment']),
             ],
-            $this->insertAllSql);
+            $this->insertAllSql
+        );
     }
 
+    /**
+     * 生成insertall SQL
+     * @access public
+     * @param  Query $query 查询对象
+     * @param  array $keys  字段名
+     * @param  array $datas 数据
+     * @return string
+     */
+    public function insertAllByKeys(Query $query, array $keys, array $datas): string
+    {
+        $options = $query->getOptions();
+
+        // 获取绑定信息
+        $bind   = $query->getFieldsBindType();
+        $fields = [];
+        $values = [];
+
+        foreach ($keys as $field) {
+            $fields[] = $this->parseKey($query, $field);
+        }
+
+        foreach ($datas as $data) {
+            foreach ($data as $key => &$val) {
+                if (!$query->isAutoBind()) {
+                    $val = PDO::PARAM_STR == $bind[$keys[$key]] ? '\'' . $val . '\'' : $val;
+                } else {
+                    $val = $this->parseDataBind($query, $keys[$key], $val, $bind);
+                }
+            }
+
+            $values[] = 'SELECT ' . implode(',', $data);
+        }
+
+        return str_replace(
+            ['%INSERT%', '%TABLE%', '%EXTRA%', '%FIELD%', '%DATA%', '%COMMENT%'],
+            [
+                !empty($options['replace']) ? 'REPLACE' : 'INSERT',
+                $this->parseTable($query, $options['table']),
+                $this->parseExtra($query, $options['extra']),
+                implode(' , ', $fields),
+                implode(' UNION ALL ', $values),
+                $this->parseComment($query, $options['comment']),
+            ],
+            $this->insertAllSql
+        );
+    }
+    
     /**
      * 生成slect insert SQL
      * @access public
@@ -1276,7 +1336,8 @@ abstract class Builder
                 $this->parseLock($query, $options['lock']),
                 $this->parseComment($query, $options['comment']),
             ],
-            $this->updateSql);
+            $this->updateSql
+        );
     }
 
     /**
@@ -1302,6 +1363,7 @@ abstract class Builder
                 $this->parseLock($query, $options['lock']),
                 $this->parseComment($query, $options['comment']),
             ],
-            $this->deleteSql);
+            $this->deleteSql
+        );
     }
 }
diff --git a/vendor/topthink/think-orm/src/db/Connection.php b/vendor/topthink/think-orm/src/db/Connection.php
index aa86ba8..015cf44 100644
--- a/vendor/topthink/think-orm/src/db/Connection.php
+++ b/vendor/topthink/think-orm/src/db/Connection.php
@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\db;
 
diff --git a/vendor/topthink/think-orm/src/db/PDOConnection.php b/vendor/topthink/think-orm/src/db/PDOConnection.php
index 1748d20..8f89fe3 100644
--- a/vendor/topthink/think-orm/src/db/PDOConnection.php
+++ b/vendor/topthink/think-orm/src/db/PDOConnection.php
@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\db;
 
@@ -81,6 +81,8 @@ abstract class PDOConnection extends Connection
         'break_reconnect' => false,
         // 断线标识字符串
         'break_match_str' => [],
+        // 自动参数绑定
+        'auto_param_bind' => true,
     ];
 
     /**
@@ -352,15 +354,13 @@ abstract class PDOConnection extends Connection
         if (!isset($this->info[$schema]) || $force) {
             // 读取字段缓存
             $cacheKey   = $this->getSchemaCacheKey($schema);
-            $cacheField = $this->config['fields_cache'] && !empty($this->cache);
-
-            if ($cacheField && !$force) {
+            if ($this->config['fields_cache'] && !empty($this->cache) && !$force) {
                 $info = $this->cache->get($cacheKey);
             }
 
             if (empty($info)) {
                 $info = $this->getTableFieldsInfo($tableName);
-                if ($cacheField) {
+                if (!empty($this->cache) && ($this->config['fields_cache'] || $force)) {
                     $this->cache->set($cacheKey, $info);
                 }
             }
@@ -622,15 +622,14 @@ abstract class PDOConnection extends Connection
      * @access public
      * @param BaseQuery  $query     查询对象
      * @param string     $sql       sql指令
-     * @param array      $bind      参数绑定
      * @param Model|null $model     模型对象实例
      * @param null       $condition 查询条件
      * @return \Generator
      * @throws DbException
      */
-    public function getCursor(BaseQuery $query, string $sql, array $bind = [], $model = null, $condition = null)
+    public function getCursor(BaseQuery $query, string $sql, $model = null, $condition = null)
     {
-        $this->queryPDOStatement($query, $sql, $bind);
+        $this->queryPDOStatement($query, $sql);
 
         // 返回结果集
         while ($result = $this->PDOStatement->fetch($this->fetchType)) {
@@ -653,7 +652,7 @@ abstract class PDOConnection extends Connection
      */
     public function query(string $sql, array $bind = [], bool $master = false): array
     {
-        return $this->pdoQuery($this->newQuery(), $sql, $bind, $master);
+        return $this->pdoQuery($this->newQuery()->bind($bind), $sql, $master);
     }
 
     /**
@@ -666,7 +665,7 @@ abstract class PDOConnection extends Connection
      */
     public function execute(string $sql, array $bind = []): int
     {
-        return $this->pdoExecute($this->newQuery(), $sql, $bind, true);
+        return $this->pdoExecute($this->newQuery()->bind($bind), $sql, true);
     }
 
     /**
@@ -674,25 +673,27 @@ abstract class PDOConnection extends Connection
      * @access protected
      * @param BaseQuery $query  查询对象
      * @param mixed     $sql    sql指令
-     * @param array     $bind   参数绑定
      * @param bool      $master 主库读取
      * @return array
      * @throws DbException
      */
-    protected function pdoQuery(BaseQuery $query, $sql, array $bind = [], bool $master = null): array
+    protected function pdoQuery(BaseQuery $query, $sql, bool $master = null): array
     {
         // 分析查询表达式
         $query->parseOptions();
+        $bind = $query->getBind();
 
         if ($query->getOptions('cache')) {
             // 检查查询缓存
             $cacheItem = $this->parseCache($query, $query->getOptions('cache'));
-            $key       = $cacheItem->getKey();
+            if (!$query->getOptions('force_cache')) {
+                $key       = $cacheItem->getKey();
 
-            $data = $this->cache->get($key);
+                $data = $this->cache->get($key);
 
-            if (null !== $data) {
-                return $data;
+                if (null !== $data) {
+                    return $data;
+                }
             }
         }
 
@@ -730,11 +731,10 @@ abstract class PDOConnection extends Connection
      */
     public function pdo(BaseQuery $query): PDOStatement
     {
-        $bind = $query->getBind();
         // 生成查询SQL
         $sql = $this->builder->select($query);
 
-        return $this->queryPDOStatement($query, $sql, $bind);
+        return $this->queryPDOStatement($query, $sql);
     }
 
     /**
@@ -806,18 +806,17 @@ abstract class PDOConnection extends Connection
      * @access protected
      * @param BaseQuery $query  查询对象
      * @param string    $sql    sql指令
-     * @param array     $bind   参数绑定
      * @param bool      $origin 是否原生查询
      * @return int
      * @throws DbException
      */
-    protected function pdoExecute(BaseQuery $query, string $sql, array $bind = [], bool $origin = false): int
+    protected function pdoExecute(BaseQuery $query, string $sql, bool $origin = false): int
     {
         if ($origin) {
             $query->parseOptions();
         }
 
-        $this->queryPDOStatement($query->master(true), $sql, $bind);
+        $this->queryPDOStatement($query->master(true), $sql);
 
         if (!$origin && !empty($this->config['deploy']) && !empty($this->config['read_master'])) {
             $this->readMaster = true;
@@ -844,13 +843,13 @@ abstract class PDOConnection extends Connection
     /**
      * @param BaseQuery $query
      * @param string    $sql
-     * @param array     $bind
      * @return PDOStatement
      * @throws DbException
      */
-    protected function queryPDOStatement(BaseQuery $query, string $sql, array $bind = []): PDOStatement
+    protected function queryPDOStatement(BaseQuery $query, string $sql): PDOStatement
     {
         $options   = $query->getOptions();
+        $bind      = $query->getBind();
         $master    = !empty($options['master']) ? true : false;
         $procedure = !empty($options['procedure']) ? true : in_array(strtolower(substr(trim($sql), 0, 4)), ['call', 'exec']);
 
@@ -898,7 +897,7 @@ abstract class PDOConnection extends Connection
         $condition = $options['where']['AND'] ?? null;
 
         // 执行查询操作
-        return $this->getCursor($query, $sql, $query->getBind(), $query->getModel(), $condition);
+        return $this->getCursor($query, $sql, $query->getModel(), $condition);
     }
 
     /**
@@ -938,7 +937,7 @@ abstract class PDOConnection extends Connection
         $sql = $this->builder->insert($query);
 
         // 执行操作
-        $result = '' == $sql ? 0 : $this->pdoExecute($query, $sql, $query->getBind());
+        $result = '' == $sql ? 0 : $this->pdoExecute($query, $sql);
 
         if ($result) {
             $sequence  = $options['sequence'] ?? null;
@@ -977,13 +976,12 @@ abstract class PDOConnection extends Connection
      */
     public function insertAll(BaseQuery $query, array $dataSet = [], int $limit = 0): int
     {
+        $query->parseOptions();
+
         if (!is_array(reset($dataSet))) {
             return 0;
         }
 
-        $options = $query->parseOptions();
-        $replace = !empty($options['replace']);
-
         if (0 === $limit && count($dataSet) >= 5000) {
             $limit = 1000;
         }
@@ -997,8 +995,8 @@ abstract class PDOConnection extends Connection
                 $count = 0;
 
                 foreach ($array as $item) {
-                    $sql = $this->builder->insertAll($query, $item, $replace);
-                    $count += $this->pdoExecute($query, $sql, $query->getBind());
+                    $sql = $this->builder->insertAll($query, $item);
+                    $count += $this->pdoExecute($query, $sql);
                 }
 
                 // 提交事务
@@ -1011,9 +1009,56 @@ abstract class PDOConnection extends Connection
             return $count;
         }
 
-        $sql = $this->builder->insertAll($query, $dataSet, $replace);
+        $sql = $this->builder->insertAll($query, $dataSet);
 
-        return $this->pdoExecute($query, $sql, $query->getBind());
+        return $this->pdoExecute($query, $sql);
+    }
+
+    /**
+     * 批量插入记录
+     * @access public
+     * @param BaseQuery $query   查询对象
+     * @param array     $keys 键值
+     * @param array     $values 数据
+     * @param integer   $limit   每次写入数据限制
+     * @return integer
+     * @throws \Exception
+     * @throws \Throwable
+     */
+    public function insertAllByKeys(BaseQuery $query, array $keys, array $values, int $limit = 0): int
+    {
+        $query->parseOptions();
+
+        if (0 === $limit && count($values) >= 5000) {
+            $limit = 1000;
+        }
+
+        if ($limit) {
+            // 分批写入 自动启动事务支持
+            $this->startTrans();
+
+            try {
+                $array = array_chunk($values, $limit, true);
+                $count = 0;
+
+                foreach ($array as $item) {
+                    $sql = $this->builder->insertAllByKeys($query, $keys, $item);
+                    $count += $this->pdoExecute($query, $sql);
+                }
+
+                // 提交事务
+                $this->commit();
+            } catch (\Exception | \Throwable $e) {
+                $this->rollback();
+                throw $e;
+            }
+
+            return $count;
+        }
+
+        $sql = $this->builder->insertAllByKeys($query, $keys, $values);
+
+        return $this->pdoExecute($query, $sql);
     }
 
     /**
@@ -1032,7 +1077,7 @@ abstract class PDOConnection extends Connection
 
         $sql = $this->builder->selectInsert($query, $fields, $table);
 
-        return $this->pdoExecute($query, $sql, $query->getBind());
+        return $this->pdoExecute($query, $sql);
     }
 
     /**
@@ -1050,7 +1095,7 @@ abstract class PDOConnection extends Connection
         $sql = $this->builder->update($query);
 
         // 执行操作
-        $result = '' == $sql ? 0 : $this->pdoExecute($query, $sql, $query->getBind());
+        $result = '' == $sql ? 0 : $this->pdoExecute($query, $sql);
 
         if ($result) {
             $this->db->trigger('after_update', $query);
@@ -1075,7 +1120,7 @@ abstract class PDOConnection extends Connection
         $sql = $this->builder->delete($query);
 
         // 执行操作
-        $result = $this->pdoExecute($query, $sql, $query->getBind());
+        $result = $this->pdoExecute($query, $sql);
 
         if ($result) {
             $this->db->trigger('after_delete', $query);
@@ -1109,10 +1154,13 @@ abstract class PDOConnection extends Connection
 
         if (!empty($options['cache'])) {
             $cacheItem = $this->parseCache($query, $options['cache'], 'value');
-            $key       = $cacheItem->getKey();
 
-            if ($this->cache->has($key)) {
-                return $this->cache->get($key);
+            if (!$query->getOptions('force_cache')) {
+                $key       = $cacheItem->getKey();
+
+                if ($this->cache->has($key)) {
+                    return $this->cache->get($key);
+                }
             }
         }
 
@@ -1185,13 +1233,13 @@ abstract class PDOConnection extends Connection
             $key = null;
         }
 
-        if (\is_string($column)) {
-            $column = \trim($column);
+        if (is_string($column)) {
+            $column = trim($column);
             if ('*' !== $column) {
-                $column = \array_map('\trim', \explode(',', $column));
+                $column = array_map('trim', explode(',', $column));
             }
-        } elseif (\is_array($column)) {
-            if (\in_array('*', $column)) {
+        } elseif (is_array($column)) {
+            if (in_array('*', $column)) {
                 $column = '*';
             }
         } else {
@@ -1199,7 +1247,7 @@ abstract class PDOConnection extends Connection
         }
 
         $field = $column;
-        if ('*' !== $column && $key && !\in_array($key, $column)) {
+        if ('*' !== $column && $key && !in_array($key, $column)) {
             $field[] = $key;
         }
 
@@ -1208,10 +1256,12 @@ abstract class PDOConnection extends Connection
         if (!empty($options['cache'])) {
             // 判断查询缓存
             $cacheItem = $this->parseCache($query, $options['cache'], 'column');
-            $name      = $cacheItem->getKey();
+            if (!$query->getOptions('force_cache')) {
+                $name      = $cacheItem->getKey();
 
-            if ($this->cache->has($name)) {
-                return $this->cache->get($name);
+                if ($this->cache->has($name)) {
+                    return $this->cache->get($name);
+                }
             }
         }
 
@@ -1234,19 +1284,23 @@ abstract class PDOConnection extends Connection
 
         if (empty($resultSet)) {
             $result = [];
-        } elseif ('*' !== $column && \count($column) === 1) {
-            $column = \array_shift($column);
-            if (\strpos($column, ' ')) {
-                $column = \substr(\strrchr(\trim($column), ' '), 1);
+        } elseif ('*' !== $column && count($column) === 1) {
+            $column = array_shift($column);
+            if (strpos($column, ' ')) {
+                $column = substr(strrchr(trim($column), ' '), 1);
             }
 
-            if (\strpos($column, '.')) {
-                [$alias, $column] = \explode('.', $column);
+            if (strpos($column, '.')) {
+                [$alias, $column] = explode('.', $column);
             }
 
-            $result = \array_column($resultSet, $column, $key);
+            if (strpos($column, '->')) {
+                $column = $this->builder->parseKey($query, $column);
+            }
+
+            $result = array_column($resultSet, $column, $key);
         } elseif ($key) {
-            $result = \array_column($resultSet, null, $key);
+            $result = array_column($resultSet, null, $key);
         } else {
             $result = $resultSet;
         }
@@ -1281,8 +1335,8 @@ abstract class PDOConnection extends Connection
 
             // 判断占位符
             $sql = is_numeric($key) ?
-            substr_replace($sql, $value, strpos($sql, '?'), 1) :
-            substr_replace($sql, $value, strpos($sql, ':' . $key), strlen(':' . $key));
+                substr_replace($sql, $value, strpos($sql, '?'), 1) :
+                substr_replace($sql, $value, strpos($sql, ':' . $key), strlen(':' . $key));
         }
 
         return rtrim($sql);
@@ -1541,17 +1595,16 @@ abstract class PDOConnection extends Connection
      * @access public
      * @param BaseQuery $query    查询对象
      * @param array     $sqlArray SQL批处理指令
-     * @param array     $bind     参数绑定
      * @return bool
      */
-    public function batchQuery(BaseQuery $query, array $sqlArray = [], array $bind = []): bool
+    public function batchQuery(BaseQuery $query, array $sqlArray = []): bool
     {
         // 自动启动事务支持
         $this->startTrans();
 
         try {
             foreach ($sqlArray as $sql) {
-                $this->pdoExecute($query, $sql, $bind);
+                $this->pdoExecute($query, $sql);
             }
             // 提交事务
             $this->commit();
@@ -1644,7 +1697,7 @@ abstract class PDOConnection extends Connection
         $pk = $query->getAutoInc();
 
         if ($pk) {
-            $type = $this->getFieldBindType($pk);
+            $type = $this->getFieldsBind($query->getTable())[$pk];
 
             if (PDO::PARAM_INT == $type) {
                 $insertId = (int) $insertId;
@@ -1758,6 +1811,17 @@ abstract class PDOConnection extends Connection
         return $this->connect($dbConfig, $r, $r == $m ? false : $dbMaster);
     }
 
+    /**
+     * 获取数据库的唯一标识
+     * @access public
+     * @param string $suffix 标识后缀
+     * @return string
+     */
+    public function getUniqueXid(string $suffix = ''): string
+    {
+        return $this->config['hostname'] . '_' . $this->config['database'] . $suffix;
+    }
+
     /**
      * 执行数据库Xa事务
      * @access public
@@ -1783,7 +1847,7 @@ abstract class PDOConnection extends Connection
                 $dbs[$key] = $db;
             }
 
-            $db->startTransXa($xid);
+            $db->startTransXa($db->getUniqueXid('_' . $xid) );
         }
 
         try {
@@ -1793,17 +1857,17 @@ abstract class PDOConnection extends Connection
             }
 
             foreach ($dbs as $db) {
-                $db->prepareXa($xid);
+                $db->prepareXa($db->getUniqueXid('_' . $xid));
             }
 
             foreach ($dbs as $db) {
-                $db->commitXa($xid);
+                $db->commitXa($db->getUniqueXid('_' . $xid) );
             }
 
             return $result;
         } catch (\Exception | \Throwable $e) {
             foreach ($dbs as $db) {
-                $db->rollbackXa($xid);
+                $db->rollbackXa($db->getUniqueXid('_' . $xid) );
             }
             throw $e;
         }
@@ -1816,7 +1880,8 @@ abstract class PDOConnection extends Connection
      * @return void
      */
     public function startTransXa(string $xid): void
-    {}
+    {
+    }
 
     /**
      * 预编译XA事务
@@ -1825,7 +1890,8 @@ abstract class PDOConnection extends Connection
      * @return void
      */
     public function prepareXa(string $xid): void
-    {}
+    {
+    }
 
     /**
      * 提交XA事务
@@ -1834,7 +1900,8 @@ abstract class PDOConnection extends Connection
      * @return void
      */
     public function commitXa(string $xid): void
-    {}
+    {
+    }
 
     /**
      * 回滚XA事务
@@ -1843,5 +1910,6 @@ abstract class PDOConnection extends Connection
      * @return void
      */
     public function rollbackXa(string $xid): void
-    {}
+    {
+    }
 }
diff --git a/vendor/topthink/think-orm/src/db/Query.php b/vendor/topthink/think-orm/src/db/Query.php
index aa96123..35e66bc 100644
--- a/vendor/topthink/think-orm/src/db/Query.php
+++ b/vendor/topthink/think-orm/src/db/Query.php
@@ -13,7 +13,6 @@ declare (strict_types = 1);
 namespace think\db;
 
 use PDOStatement;
-use think\helper\Str;
 
 /**
  * PDO数据查询类
diff --git a/vendor/topthink/think-orm/src/db/builder/Mongo.php b/vendor/topthink/think-orm/src/db/builder/Mongo.php
index 823156b..85ee551 100644
--- a/vendor/topthink/think-orm/src/db/builder/Mongo.php
+++ b/vendor/topthink/think-orm/src/db/builder/Mongo.php
@@ -111,8 +111,6 @@ class Mongo
                 $result[$item] = $val;
             } elseif (isset($val[0]) && 'exp' == $val[0]) {
                 $result[$item] = $val[1];
-            } elseif (is_null($val)) {
-                $result[$item] = 'NULL';
             } else {
                 $result[$item] = $this->parseValue($query, $val, $key);
             }
diff --git a/vendor/topthink/think-orm/src/db/builder/Mysql.php b/vendor/topthink/think-orm/src/db/builder/Mysql.php
index 136b0de..7dda33a 100644
--- a/vendor/topthink/think-orm/src/db/builder/Mysql.php
+++ b/vendor/topthink/think-orm/src/db/builder/Mysql.php
@@ -12,6 +12,7 @@ declare (strict_types = 1);
 
 namespace think\db\builder;
 
+use PDO;
 use think\db\Builder;
 use think\db\exception\DbException as Exception;
 use think\db\Query;
@@ -101,7 +102,8 @@ class Mysql extends Builder
                 $this->parseComment($query, $options['comment']),
                 $this->parseForce($query, $options['force']),
             ],
-            $this->selectSql);
+            $this->selectSql
+        );
     }
 
     /**
@@ -136,7 +138,8 @@ class Mysql extends Builder
                 $this->parseDuplicate($query, $options['duplicate']),
                 $this->parseComment($query, $options['comment']),
             ],
-            $this->insertSql);
+            $this->insertSql
+        );
     }
 
     /**
@@ -144,10 +147,9 @@ class Mysql extends Builder
      * @access public
      * @param  Query     $query   查询对象
      * @param  array     $dataSet 数据集
-     * @param  bool      $replace 是否replace
      * @return string
      */
-    public function insertAll(Query $query, array $dataSet, bool $replace = false): string
+    public function insertAll(Query $query, array $dataSet): string
     {
         $options = $query->getOptions();
 
@@ -181,7 +183,7 @@ class Mysql extends Builder
         return str_replace(
             ['%INSERT%', '%EXTRA%', '%TABLE%', '%PARTITION%', '%FIELD%', '%DATA%', '%DUPLICATE%', '%COMMENT%'],
             [
-                $replace ? 'REPLACE' : 'INSERT',
+                !empty($options['replace']) ? 'REPLACE' : 'INSERT',
                 $this->parseExtra($query, $options['extra']),
                 $this->parseTable($query, $options['table']),
                 $this->parsePartition($query, $options['partition']),
@@ -190,7 +192,56 @@ class Mysql extends Builder
                 $this->parseDuplicate($query, $options['duplicate']),
                 $this->parseComment($query, $options['comment']),
             ],
-            $this->insertAllSql);
+            $this->insertAllSql
+        );
+    }
+
+    /**
+     * 生成insertall SQL
+     * @access public
+     * @param  Query    $query   查询对象
+     * @param  array    $keys 键值
+     * @param  array    $values 数据
+     * @return string
+     */
+    public function insertAllByKeys(Query $query, array $keys, array $datas): string
+    {
+        $options = $query->getOptions();
+
+        // 获取绑定信息
+        $bind   = $query->getFieldsBindType();
+        $fields = [];
+        $values = [];
+
+        foreach ($keys as $field) {
+            $fields[] = $this->parseKey($query, $field);
+        }
+
+        foreach ($datas as $data) {
+            foreach ($data as $key => &$val) {
+                if (!$query->isAutoBind()) {
+                    $val = PDO::PARAM_STR == $bind[$keys[$key]] ? '\'' . $val . '\'' : $val;
+                } else {
+                    $val = $this->parseDataBind($query, $keys[$key], $val, $bind);
+                }
+            }
+            $values[] = '( ' . implode(',', $data) . ' )';
+        }
+
+        return str_replace(
+            ['%INSERT%', '%EXTRA%', '%TABLE%', '%PARTITION%', '%FIELD%', '%DATA%', '%DUPLICATE%', '%COMMENT%'],
+            [
+                !empty($options['replace']) ? 'REPLACE' : 'INSERT',
+                $this->parseExtra($query, $options['extra']),
+                $this->parseTable($query, $options['table']),
+                $this->parsePartition($query, $options['partition']),
+                implode(' , ', $fields),
+                implode(' , ', $values),
+                $this->parseDuplicate($query, $options['duplicate']),
+                $this->parseComment($query, $options['comment']),
+            ],
+            $this->insertAllSql
+        );
     }
 
     /**
@@ -208,9 +259,10 @@ class Mysql extends Builder
         if (empty($data)) {
             return '';
         }
+
         $set = [];
         foreach ($data as $key => $val) {
-            $set[] = $key . ' = ' . $val;
+            $set[] = (strpos($key, '->') ? strstr($key, '->', true) : $key) . ' = ' . $val;
         }
 
         return str_replace(
@@ -227,7 +279,8 @@ class Mysql extends Builder
                 $this->parseLock($query, $options['lock']),
                 $this->parseComment($query, $options['comment']),
             ],
-            $this->updateSql);
+            $this->updateSql
+        );
     }
 
     /**
@@ -254,7 +307,8 @@ class Mysql extends Builder
                 $this->parseLock($query, $options['lock']),
                 $this->parseComment($query, $options['comment']),
             ],
-            $this->deleteSql);
+            $this->deleteSql
+        );
     }
 
     /**
diff --git a/vendor/topthink/think-orm/src/db/concern/AggregateQuery.php b/vendor/topthink/think-orm/src/db/concern/AggregateQuery.php
index 0eab363..d137d05 100644
--- a/vendor/topthink/think-orm/src/db/concern/AggregateQuery.php
+++ b/vendor/topthink/think-orm/src/db/concern/AggregateQuery.php
@@ -49,12 +49,21 @@ trait AggregateQuery
             }
 
             $options = $this->getOptions();
-            $subSql  = $this->options($options)
+            if (isset($options['cache'])) {
+                $cache = $options['cache'];
+                unset($options['cache']);
+            }
+
+            $subSql = $this->options($options)
                 ->field('count(' . $field . ') AS think_count')
                 ->bind($this->bind)
                 ->buildSql();
 
-            $query = $this->newQuery()->table([$subSql => '_group_count_']);
+            $query = $this->newQuery();
+            if (isset($cache)) {
+                $query->setOption('cache', $cache);
+            }
+            $query->table([$subSql => '_group_count_']);
 
             $count = $query->aggregate('COUNT', '*');
         } else {
diff --git a/vendor/topthink/think-orm/src/db/concern/JoinAndViewQuery.php b/vendor/topthink/think-orm/src/db/concern/JoinAndViewQuery.php
index c33d1ed..2828949 100644
--- a/vendor/topthink/think-orm/src/db/concern/JoinAndViewQuery.php
+++ b/vendor/topthink/think-orm/src/db/concern/JoinAndViewQuery.php
@@ -13,7 +13,6 @@ declare (strict_types = 1);
 namespace think\db\concern;
 
 use think\db\Raw;
-use think\helper\Str;
 
 /**
  * JOIN和VIEW查询
diff --git a/vendor/topthink/think-orm/src/db/concern/ModelRelationQuery.php b/vendor/topthink/think-orm/src/db/concern/ModelRelationQuery.php
index 0015a24..cabd65b 100644
--- a/vendor/topthink/think-orm/src/db/concern/ModelRelationQuery.php
+++ b/vendor/topthink/think-orm/src/db/concern/ModelRelationQuery.php
@@ -559,23 +559,4 @@ trait ModelRelationQuery
         $result->refreshOrigin();
     }
 
-    /**
-     * 查询软删除数据
-     * @access public
-     * @return Query
-     */
-    public function withTrashed()
-    {
-        return $this->model ? $this->model->queryWithTrashed() : $this;
-    }
-
-    /**
-     * 只查询软删除数据
-     * @access public
-     * @return Query
-     */
-    public function onlyTrashed()
-    {
-        return $this->model ? $this->model->queryOnlyTrashed() : $this;
-    }
 }
diff --git a/vendor/topthink/think-orm/src/db/concern/ParamsBind.php b/vendor/topthink/think-orm/src/db/concern/ParamsBind.php
index 296e221..88293fa 100644
--- a/vendor/topthink/think-orm/src/db/concern/ParamsBind.php
+++ b/vendor/topthink/think-orm/src/db/concern/ParamsBind.php
@@ -64,6 +64,33 @@ trait ParamsBind
         return isset($this->bind[$key]);
     }
 
+    /**
+     * 设置自动参数绑定
+     * @access public
+     * @param bool $bind 是否自动参数绑定
+     * @return $this
+     */
+    public function autoBind(bool $bind)
+    {
+        $this->options['auto_bind'] = $bind;
+        return $this;
+    }
+
+    /**
+     * 检测是否开启自动参数绑定
+     * @access public
+     * @return bool
+     */
+    public function isAutoBind(): bool
+    {
+        $autoBind = $this->getConfig('auto_param_bind');
+        if (null !== $this->getOptions('auto_bind')) {
+            $autoBind = $this->getOptions('auto_bind');
+        }
+
+        return (bool) $autoBind;
+    }
+
     /**
      * 参数绑定
      * @access public
diff --git a/vendor/topthink/think-orm/src/db/concern/WhereQuery.php b/vendor/topthink/think-orm/src/db/concern/WhereQuery.php
index 5f2ed47..f1b49db 100644
--- a/vendor/topthink/think-orm/src/db/concern/WhereQuery.php
+++ b/vendor/topthink/think-orm/src/db/concern/WhereQuery.php
@@ -455,18 +455,15 @@ trait WhereQuery
      */
     protected function parseArrayWhereItems(array $field, string $logic)
     {
-        if (key($field) !== 0) {
-            $where = [];
-            foreach ($field as $key => $val) {
-                if ($val instanceof Raw) {
-                    $where[] = [$key, 'exp', $val];
-                } else {
-                    $where[] = is_null($val) ? [$key, 'NULL', ''] : [$key, is_array($val) ? 'IN' : '=', $val];
-                }
+        $where = [];
+        foreach ($field as $key => $val) {
+            if (is_int($key)) {
+                $where[] = $val;
+            } elseif ($val instanceof Raw) {
+                $where[] = [$key, 'exp', $val];
+            } else {
+                $where[] = is_null($val) ? [$key, 'NULL', ''] : [$key, is_array($val) ? 'IN' : '=', $val];
             }
-        } else {
-            // 数组批量查询
-            $where = $field;
         }
 
         if (!empty($where)) {
diff --git a/vendor/topthink/think-orm/src/db/connector/Sqlsrv.php b/vendor/topthink/think-orm/src/db/connector/Sqlsrv.php
index aee3343..835605d 100644
--- a/vendor/topthink/think-orm/src/db/connector/Sqlsrv.php
+++ b/vendor/topthink/think-orm/src/db/connector/Sqlsrv.php
@@ -60,7 +60,7 @@ class Sqlsrv extends PDOConnection
     public function getFields(string $tableName): array
     {
         [$tableName] = explode(' ', $tableName);
-        strpos($tableName,'.') && $tableName = substr($tableName,strpos($tableName,'.') + 1);
+        strpos($tableName, '.') && $tableName = substr($tableName, strpos($tableName, '.') + 1);
         $sql = "SELECT   column_name,   data_type,   column_default,   is_nullable
         FROM    information_schema.tables AS t
         JOIN    information_schema.columns AS c
diff --git a/vendor/topthink/think-orm/src/model/Relation.php b/vendor/topthink/think-orm/src/model/Relation.php
index 3aa22be..7bb6d9f 100644
--- a/vendor/topthink/think-orm/src/model/Relation.php
+++ b/vendor/topthink/think-orm/src/model/Relation.php
@@ -67,12 +67,6 @@ abstract class Relation
      */
     protected $selfRelation = false;
 
-    /**
-     * 关联数据数量限制
-     * @var int
-     */
-    protected $withLimit;
-
     /**
      * 关联数据字段限制
      * @var array
@@ -200,18 +194,6 @@ abstract class Relation
         }
     }
 
-    /**
-     * 限制关联数据的数量
-     * @access public
-     * @param  int $limit 关联数量限制
-     * @return $this
-     */
-    public function withLimit(int $limit)
-    {
-        $this->withLimit = $limit;
-        return $this;
-    }
-
     /**
      * 限制关联数据的字段
      * @access public
@@ -244,6 +226,18 @@ abstract class Relation
         return $this;
     }
 
+    /**
+     * 限制关联数据的数量
+     * @access public
+     * @param  int $limit 关联数量限制
+     * @return $this
+     */
+    public function withLimit(int $limit)
+    {
+        $this->query->limit($limit);
+        return $this;
+    }
+
     /**
      * 设置关联数据不存在的时候默认值
      * @access public
@@ -281,14 +275,15 @@ abstract class Relation
      * @access protected
      * @return mixed
      */
-    protected function getClosureType(Closure $closure)
+    protected function getClosureType(Closure $closure, $query = null)
     {
         $reflect = new ReflectionFunction($closure);
         $params  = $reflect->getParameters();
 
         if (!empty($params)) {
-            $type = $params[0]->getType();
-            return is_null($type) || Relation::class == $type->getName() ? $this : $this->query;
+            $type  = $params[0]->getType();
+            $query = $query ?: $this->query;
+            return is_null($type) || Relation::class == $type->getName() ? $this : $query;
         }
 
         return $this;
diff --git a/vendor/topthink/think-orm/src/model/concern/Attribute.php b/vendor/topthink/think-orm/src/model/concern/Attribute.php
index 897d327..4359a4c 100644
--- a/vendor/topthink/think-orm/src/model/concern/Attribute.php
+++ b/vendor/topthink/think-orm/src/model/concern/Attribute.php
@@ -15,7 +15,6 @@ namespace think\model\concern;
 use InvalidArgumentException;
 use think\db\Raw;
 use think\helper\Str;
-use think\Model;
 use think\model\Relation;
 
 /**
@@ -383,7 +382,9 @@ trait Attribute
         } elseif (isset($this->type[$name])) {
             // 类型转换
             $value = $this->writeTransform($value, $this->type[$name]);
-        } elseif (array_key_exists($name, $this->origin) && is_object($value) && method_exists($value, '__toString')) {
+        } elseif ($this->isRelationAttr($name)) {
+            $this->relation[$name] = $value;
+        } elseif ((array_key_exists($name, $this->origin) || empty($this->origin)) && is_object($value) && method_exists($value, '__toString')) {
             // 对象类型
             $value = $value->__toString();
         }
@@ -446,6 +447,7 @@ trait Attribute
                 break;
             case 'array':
                 $value = (array) $value;
+                // no break
             case 'json':
                 $option = !empty($param) ? (int) $param : JSON_UNESCAPED_UNICODE;
                 $value  = json_encode($value, $option);
diff --git a/vendor/topthink/think-orm/src/model/concern/Conversion.php b/vendor/topthink/think-orm/src/model/concern/Conversion.php
index b584ba9..136a90f 100644
--- a/vendor/topthink/think-orm/src/model/concern/Conversion.php
+++ b/vendor/topthink/think-orm/src/model/concern/Conversion.php
@@ -204,52 +204,55 @@ trait Conversion
      */
     public function toArray(): array
     {
-        $item       = [];
+        $item = $visible = $hidden = [];
         $hasVisible = false;
 
         foreach ($this->visible as $key => $val) {
             if (is_string($val)) {
                 if (strpos($val, '.')) {
-                    [$relation, $name]          = explode('.', $val);
-                    $this->visible[$relation][] = $name;
+                    [$relation, $name] = explode('.', $val);
+                    $visible[$relation][] = $name;
                 } else {
-                    $this->visible[$val] = true;
-                    $hasVisible          = true;
+                    $visible[$val] = true;
+                    $hasVisible = true;
                 }
-                unset($this->visible[$key]);
             }
         }
 
         foreach ($this->hidden as $key => $val) {
             if (is_string($val)) {
                 if (strpos($val, '.')) {
-                    [$relation, $name]         = explode('.', $val);
-                    $this->hidden[$relation][] = $name;
+                    [$relation, $name] = explode('.', $val);
+                    $hidden[$relation][] = $name;
                 } else {
-                    $this->hidden[$val] = true;
+                    $hidden[$val] = true;
                 }
-                unset($this->hidden[$key]);
             }
         }
 
+        // 追加属性（必须定义获取器）
+        foreach ($this->append as $key => $name) {
+            $this->appendAttrToArray($item, $key, $name, $visible, $hidden);
+        }
+
         // 合并关联数据
         $data = array_merge($this->data, $this->relation);
 
         foreach ($data as $key => $val) {
             if ($val instanceof Model || $val instanceof ModelCollection) {
                 // 关联模型对象
-                if (isset($this->visible[$key]) && is_array($this->visible[$key])) {
-                    $val->visible($this->visible[$key]);
-                } elseif (isset($this->hidden[$key]) && is_array($this->hidden[$key])) {
-                    $val->hidden($this->hidden[$key]);
+                if (isset($visible[$key]) && is_array($visible[$key])) {
+                    $val->visible($visible[$key]);
+                } elseif (isset($hidden[$key]) && is_array($hidden[$key])) {
+                    $val->hidden($hidden[$key], true);
                 }
                 // 关联模型对象
-                if (!isset($this->hidden[$key]) || true !== $this->hidden[$key]) {
+                if (!isset($hidden[$key]) || true !== $hidden[$key]) {
                     $item[$key] = $val->toArray();
                 }
-            } elseif (isset($this->visible[$key])) {
+            } elseif (isset($visible[$key])) {
                 $item[$key] = $this->getAttr($key);
-            } elseif (!isset($this->hidden[$key]) && !$hasVisible) {
+            } elseif (!isset($hidden[$key]) && !$hasVisible) {
                 $item[$key] = $this->getAttr($key);
             }
 
@@ -261,11 +264,6 @@ trait Conversion
             }
         }
 
-        // 追加属性（必须定义获取器）
-        foreach ($this->append as $key => $name) {
-            $this->appendAttrToArray($item, $key, $name);
-        }
-
         if ($this->convertNameToCamel) {
             foreach ($item as $key => $val) {
                 $name = Str::camel($key);
@@ -279,27 +277,38 @@ trait Conversion
         return $item;
     }
 
-    protected function appendAttrToArray(array &$item, $key, $name)
+    protected function appendAttrToArray(array &$item, $key, $name, array $visible, array $hidden)
     {
         if (is_array($name)) {
-            // 追加关联对象属性
-            $relation   = $this->getRelation($key, true);
-            $item[$key] = $relation ? $relation->append($name)
-                ->toArray() : [];
+            // 批量追加关联对象属性
+            $relation   = $this->getRelationWith($key, $hidden, $visible);
+            $item[$key] = $relation ? $relation->append($name)->toArray() : [];
         } elseif (strpos($name, '.')) {
-            [$key, $attr] = explode('.', $name);
-            // 追加关联对象属性
-            $relation   = $this->getRelation($key, true);
-            $item[$key] = $relation ? $relation->append([$attr])
-                ->toArray() : [];
+            // 追加单个关联对象属性
+            [$key, $attr]   = explode('.', $name);
+            $relation       = $this->getRelationWith($key, $hidden, $visible);
+            $item[$key]     = $relation ? $relation->append([$attr])->toArray() : [];
         } else {
-            $value       = $this->getAttr($name);
-            $item[$name] = $value;
+            $value          = $this->getAttr($name);
+            $item[$name]    = $value;
 
             $this->getBindAttrValue($name, $value, $item);
         }
     }
 
+    protected function getRelationWith(string $key, array $hidden, array $visible)
+    {
+        $relation   = $this->getRelation($key, true);
+        if ($relation) {
+            if (isset($visible[$key])) {
+                $relation->visible($visible[$key]);
+            } elseif (isset($hidden[$key])) {
+                $relation->hidden($hidden[$key]);
+            }
+        }
+        return $relation;
+    }
+
     protected function getBindAttrValue(string $name, $value, array &$item = [])
     {
         $relation = $this->isRelationAttr($name);
diff --git a/vendor/topthink/think-orm/src/model/concern/RelationShip.php b/vendor/topthink/think-orm/src/model/concern/RelationShip.php
index 8faadf4..37b8af8 100644
--- a/vendor/topthink/think-orm/src/model/concern/RelationShip.php
+++ b/vendor/topthink/think-orm/src/model/concern/RelationShip.php
@@ -346,7 +346,7 @@ trait RelationShip
      */
     public function bindAttr(string $relation, array $attrs = [])
     {
-        $relation = $this->getRelation($relation);
+        $relation = $this->getRelation($relation, true);
 
         foreach ($attrs as $key => $attr) {
             $key   = is_numeric($key) ? $attr : $key;
@@ -735,7 +735,9 @@ trait RelationShip
     protected function getRelationData(Relation $modelRelation)
     {
         if ($this->parent && !$modelRelation->isSelfRelation()
-            && get_class($this->parent) == get_class($modelRelation->getModel())) {
+            && get_class($this->parent) == get_class($modelRelation->getModel())
+            && $modelRelation instanceof OneToOne
+        ) {
             return $this->parent;
         }
 
diff --git a/vendor/topthink/think-orm/src/model/concern/SoftDelete.php b/vendor/topthink/think-orm/src/model/concern/SoftDelete.php
index 117f1ef..b7b1092 100644
--- a/vendor/topthink/think-orm/src/model/concern/SoftDelete.php
+++ b/vendor/topthink/think-orm/src/model/concern/SoftDelete.php
@@ -18,14 +18,18 @@ use think\Model;
 /**
  * 数据软删除
  * @mixin Model
+ * @method $this withTrashed()
+ * @method $this onlyTrashed()
  */
 trait SoftDelete
 {
-    /**
-     * 是否包含软删除数据
-     * @var bool
-     */
-    protected $withTrashed = false;
+
+    public function db($scope = []): Query
+    {
+        $query = parent::db($scope);
+        $this->withNoTrashed($query);
+        return $query;
+    }
 
     /**
      * 判断当前实例是否被软删除
@@ -43,74 +47,18 @@ trait SoftDelete
         return false;
     }
 
-    /**
-     * 查询软删除数据
-     * @access public
-     * @return Query
-     */
-    public static function withTrashed(): Query
+    public function scopeWithTrashed(Query $query)
     {
-        $model = new static();
-
-        return $model->withTrashedData(true)->db();
+        $query->removeOption('soft_delete');
     }
 
-    /**
-     * 查询软删除数据
-     * @access public
-     * @return Query
-     */
-    public function queryWithTrashed(): Query
-    {
-        return $this->withTrashedData(true)->db();
-    }
-
-    /**
-     * 是否包含软删除数据
-     * @access protected
-     * @param  bool $withTrashed 是否包含软删除数据
-     * @return $this
-     */
-    protected function withTrashedData(bool $withTrashed)
-    {
-        $this->withTrashed = $withTrashed;
-        return $this;
-    }
-
-    /**
-     * 只查询软删除数据
-     * @access public
-     * @return Query
-     */
-    public static function onlyTrashed(): Query
-    {
-        $model = new static();
-        $field = $model->getDeleteTimeField(true);
-
-        if ($field) {
-            return $model
-                ->db()
-                ->useSoftDelete($field, $model->getWithTrashedExp());
-        }
-
-        return $model->db();
-    }
-
-    /**
-     * 只查询软删除数据
-     * @access public
-     * @return Query
-     */
-    public function queryOnlyTrashed(): Query
+    public function scopeOnlyTrashed(Query $query)
     {
         $field = $this->getDeleteTimeField(true);
 
         if ($field) {
-            return $this->db()
-                ->useSoftDelete($field, $this->getWithTrashedExp());
+            $query->useSoftDelete($field, $this->getWithTrashedExp());
         }
-
-        return $this->db();
     }
 
     /**
@@ -139,9 +87,9 @@ trait SoftDelete
 
         if ($name && !$force) {
             // 软删除
-            $this->set($name, $this->autoWriteTimestamp($name));
+            $this->set($name, $this->autoWriteTimestamp());
 
-            $result = $this->exists()->withEvent(false)->save();
+            $this->exists()->withEvent(false)->save();
 
             $this->withEvent(true);
         } else {
@@ -149,7 +97,7 @@ trait SoftDelete
             $where = $this->getWhere();
 
             // 删除当前模型数据
-            $result = $this->db()
+            $this->db()
                 ->where($where)
                 ->removeOption('soft_delete')
                 ->delete();
@@ -172,8 +120,8 @@ trait SoftDelete
     /**
      * 删除记录
      * @access public
-     * @param  mixed $data 主键列表 支持闭包查询条件
-     * @param  bool  $force 是否强制删除
+     * @param mixed $data 主键列表 支持闭包查询条件
+     * @param bool $force 是否强制删除
      * @return bool
      */
     public static function destroy($data, bool $force = false): bool
@@ -182,18 +130,20 @@ trait SoftDelete
         if (empty($data) && 0 !== $data) {
             return false;
         }
-        // 仅当强制删除时包含软删除数据
         $model = (new static());
-        if ($force) {
-            $model->withTrashedData(true);
-        }
+
         $query = $model->db(false);
 
+        // 仅当强制删除时包含软删除数据
+        if ($force) {
+            $query->removeOption('soft_delete');
+        }
+
         if (is_array($data) && key($data) !== 0) {
             $query->where($data);
             $data = null;
         } elseif ($data instanceof \Closure) {
-            call_user_func_array($data, [ & $query]);
+            call_user_func_array($data, [&$query]);
             $data = null;
         } elseif (is_null($data)) {
             return false;
@@ -202,6 +152,7 @@ trait SoftDelete
         $resultSet = $query->select($data);
 
         foreach ($resultSet as $result) {
+            /** @var Model $result */
             $result->force($force)->delete();
         }
 
@@ -211,7 +162,7 @@ trait SoftDelete
     /**
      * 恢复被软删除的记录
      * @access public
-     * @param  array $where 更新条件
+     * @param array $where 更新条件
      * @return bool
      */
     public function restore($where = []): bool
@@ -243,7 +194,7 @@ trait SoftDelete
     /**
      * 获取软删除字段
      * @access protected
-     * @param  bool  $read 是否查询操作 写操作的时候会自动去掉表别名
+     * @param bool $read 是否查询操作 写操作的时候会自动去掉表别名
      * @return string|false
      */
     protected function getDeleteTimeField(bool $read = false)
@@ -269,7 +220,7 @@ trait SoftDelete
     /**
      * 查询的时候默认排除软删除数据
      * @access protected
-     * @param  Query  $query
+     * @param Query $query
      * @return void
      */
     protected function withNoTrashed(Query $query): void
diff --git a/vendor/topthink/think-orm/src/model/concern/TimeStamp.php b/vendor/topthink/think-orm/src/model/concern/TimeStamp.php
index 2492e06..9440c3e 100644
--- a/vendor/topthink/think-orm/src/model/concern/TimeStamp.php
+++ b/vendor/topthink/think-orm/src/model/concern/TimeStamp.php
@@ -179,7 +179,7 @@ trait TimeStamp
     protected function formatDateTime($format, $time = 'now', bool $timestamp = false)
     {
         if (empty($time)) {
-            return;
+            return $time;
         }
 
         if (false === $format) {
diff --git a/vendor/topthink/think-orm/src/model/relation/BelongsTo.php b/vendor/topthink/think-orm/src/model/relation/BelongsTo.php
index dd54f52..dfac254 100644
--- a/vendor/topthink/think-orm/src/model/relation/BelongsTo.php
+++ b/vendor/topthink/think-orm/src/model/relation/BelongsTo.php
@@ -14,7 +14,6 @@ namespace think\model\relation;
 
 use Closure;
 use think\db\BaseQuery as Query;
-use think\helper\Str;
 use think\Model;
 
 /**
@@ -241,7 +240,7 @@ class BelongsTo extends OneToOne
                 if (!empty($this->bindAttr)) {
                     // 绑定关联属性
                     $this->bindAttr($result, $relationModel);
-                    $result->hidden([$relation]);
+                    $result->hidden([$relation], true);
                 }
             }
         }
@@ -283,7 +282,7 @@ class BelongsTo extends OneToOne
         if (!empty($this->bindAttr)) {
             // 绑定关联属性
             $this->bindAttr($result, $relationModel);
-            $result->hidden([$relation]);
+            $result->hidden([$relation], true);
         }
     }
 
diff --git a/vendor/topthink/think-orm/src/model/relation/BelongsToMany.php b/vendor/topthink/think-orm/src/model/relation/BelongsToMany.php
index 6049f01..8c74f34 100644
--- a/vendor/topthink/think-orm/src/model/relation/BelongsToMany.php
+++ b/vendor/topthink/think-orm/src/model/relation/BelongsToMany.php
@@ -346,6 +346,11 @@ class BelongsToMany extends Relation
             $closure($this->getClosureType($closure));
         }
 
+        $withLimit = $this->query->getOptions('limit');
+        if ($withLimit) {
+            $this->query->removeOption('limit');
+        }
+
         // 预载入关联查询 支持嵌套预载入
         $list = $this->belongsToManyQuery($this->foreignKey, $this->localKey, $where)
             ->with($subRelation)
@@ -353,12 +358,12 @@ class BelongsToMany extends Relation
             ->select();
 
         // 组装模型数据
-        $data = [];
+        $data      = [];
         foreach ($list as $set) {
             $pivot = $this->matchPivot($set);
             $key   = $pivot[$this->localKey];
 
-            if ($this->withLimit && isset($data[$key]) && count($data[$key]) >= $this->withLimit) {
+            if ($withLimit && isset($data[$key]) && count($data[$key]) >= $withLimit) {
                 continue;
             }
 
@@ -389,10 +394,6 @@ class BelongsToMany extends Relation
 
             $fields = $this->getQueryFields($tableName);
 
-            if ($this->withLimit) {
-                $this->query->limit($this->withLimit);
-            }
-
             $this->query
                 ->field($fields)
                 ->tableField(true, $table, 'pivot', 'pivot__')
diff --git a/vendor/topthink/think-orm/src/model/relation/HasMany.php b/vendor/topthink/think-orm/src/model/relation/HasMany.php
index 77d9e4d..4624955 100644
--- a/vendor/topthink/think-orm/src/model/relation/HasMany.php
+++ b/vendor/topthink/think-orm/src/model/relation/HasMany.php
@@ -15,7 +15,6 @@ namespace think\model\relation;
 use Closure;
 use think\Collection;
 use think\db\BaseQuery as Query;
-use think\helper\Str;
 use think\Model;
 use think\model\Relation;
 
@@ -58,10 +57,6 @@ class HasMany extends Relation
             $closure($this->getClosureType($closure));
         }
 
-        if ($this->withLimit) {
-            $this->query->limit($this->withLimit);
-        }
-
         return $this->query
             ->where($this->foreignKey, $this->parent->{$this->localKey})
             ->relation($subRelation)
@@ -210,6 +205,11 @@ class HasMany extends Relation
             $this->query->withoutField($this->withoutField);
         }
 
+        $withLimit = $this->query->getOptions('limit');
+        if ($withLimit) {
+            $this->query->removeOption('limit');
+        }
+
         $list = $this->query
             ->where($where)
             ->cache($cache[0] ?? false, $cache[1] ?? null, $cache[2] ?? null)
@@ -217,12 +217,12 @@ class HasMany extends Relation
             ->select();
 
         // 组装模型数据
-        $data = [];
-
+        $data      = [];
+        
         foreach ($list as $set) {
             $key = $set->$foreignKey;
 
-            if ($this->withLimit && isset($data[$key]) && count($data[$key]) >= $this->withLimit) {
+            if ($withLimit && isset($data[$key]) && count($data[$key]) >= $withLimit) {
                 continue;
             }
 
@@ -241,6 +241,10 @@ class HasMany extends Relation
      */
     public function save($data, bool $replace = true)
     {
+        if ($data instanceof Model) {
+            $data = $data->getData();
+        }
+
         $model = $this->make();
 
         return $model->replace($replace)->save($data) ? $model : false;
diff --git a/vendor/topthink/think-orm/src/model/relation/HasManyThrough.php b/vendor/topthink/think-orm/src/model/relation/HasManyThrough.php
index fc62026..4f14399 100644
--- a/vendor/topthink/think-orm/src/model/relation/HasManyThrough.php
+++ b/vendor/topthink/think-orm/src/model/relation/HasManyThrough.php
@@ -79,10 +79,6 @@ class HasManyThrough extends Relation
 
         $this->baseQuery();
 
-        if ($this->withLimit) {
-            $this->query->limit($this->withLimit);
-        }
-
         return $this->query->relation($subRelation)
             ->select()
             ->setParent(clone $this->parent);
@@ -264,19 +260,24 @@ class HasManyThrough extends Relation
             $throughKey = Str::snake(class_basename($this->model)) . "." . $this->throughKey;
         }
 
+        $withLimit = $this->query->getOptions('limit');
+        if ($withLimit) {
+            $this->query->removeOption('limit');
+        }
+
         $list = $this->query
             ->where($throughKey, 'in', $keys)
             ->cache($cache[0] ?? false, $cache[1] ?? null, $cache[2] ?? null)
             ->select();
 
         // 组装模型数据
-        $data = [];
-        $keys = $throughList->column($this->foreignKey, $this->throughPk);
+        $data  = [];
+        $keys  = $throughList->column($this->foreignKey, $this->throughPk);
 
         foreach ($list as $set) {
             $key = $keys[$set->{$this->throughKey}];
 
-            if ($this->withLimit && isset($data[$key]) && count($data[$key]) >= $this->withLimit) {
+            if ($withLimit && isset($data[$key]) && count($data[$key]) >= $withLimit) {
                 continue;
             }
 
diff --git a/vendor/topthink/think-orm/src/model/relation/HasOne.php b/vendor/topthink/think-orm/src/model/relation/HasOne.php
index 43f220c..b941f6e 100644
--- a/vendor/topthink/think-orm/src/model/relation/HasOne.php
+++ b/vendor/topthink/think-orm/src/model/relation/HasOne.php
@@ -14,7 +14,6 @@ namespace think\model\relation;
 
 use Closure;
 use think\db\BaseQuery as Query;
-use think\helper\Str;
 use think\Model;
 
 /**
@@ -240,7 +239,7 @@ class HasOne extends OneToOne
                 if (!empty($this->bindAttr)) {
                     // 绑定关联属性
                     $this->bindAttr($result, $relationModel);
-                    $result->hidden([$relation]);
+                    $result->hidden([$relation], true);
                 }
             }
         }
@@ -282,7 +281,7 @@ class HasOne extends OneToOne
         if (!empty($this->bindAttr)) {
             // 绑定关联属性
             $this->bindAttr($result, $relationModel);
-            $result->hidden([$relation]);
+            $result->hidden([$relation], true);
         }
     }
 
diff --git a/vendor/topthink/think-orm/src/model/relation/HasOneThrough.php b/vendor/topthink/think-orm/src/model/relation/HasOneThrough.php
index 0278533..2734c13 100644
--- a/vendor/topthink/think-orm/src/model/relation/HasOneThrough.php
+++ b/vendor/topthink/think-orm/src/model/relation/HasOneThrough.php
@@ -12,7 +12,6 @@
 namespace think\model\relation;
 
 use Closure;
-use think\helper\Str;
 use think\Model;
 
 /**
diff --git a/vendor/topthink/think-orm/src/model/relation/MorphMany.php b/vendor/topthink/think-orm/src/model/relation/MorphMany.php
index 39209ae..ed0dd40 100644
--- a/vendor/topthink/think-orm/src/model/relation/MorphMany.php
+++ b/vendor/topthink/think-orm/src/model/relation/MorphMany.php
@@ -15,7 +15,6 @@ use Closure;
 use think\Collection;
 use think\db\BaseQuery as Query;
 use think\db\exception\DbException as Exception;
-use think\helper\Str;
 use think\Model;
 use think\model\Relation;
 
@@ -77,10 +76,6 @@ class MorphMany extends Relation
 
         $this->baseQuery();
 
-        if ($this->withLimit) {
-            $this->query->limit($this->withLimit);
-        }
-
         return $this->query->relation($subRelation)
             ->select()
             ->setParent(clone $this->parent);
@@ -258,6 +253,11 @@ class MorphMany extends Relation
             $closure($this->getClosureType($closure));
         }
 
+        $withLimit = $this->query->getOptions('limit');
+        if ($withLimit) {
+            $this->query->removeOption('limit');
+        }
+
         $list = $this->query
             ->where($where)
             ->with($subRelation)
@@ -266,11 +266,11 @@ class MorphMany extends Relation
         $morphKey = $this->morphKey;
 
         // 组装模型数据
-        $data = [];
+        $data      = [];
         foreach ($list as $set) {
             $key = $set->$morphKey;
 
-            if ($this->withLimit && isset($data[$key]) && count($data[$key]) >= $this->withLimit) {
+            if ($withLimit && isset($data[$key]) && count($data[$key]) >= $withLimit) {
                 continue;
             }
 
@@ -289,6 +289,10 @@ class MorphMany extends Relation
      */
     public function save($data, bool $replace = true)
     {
+        if ($data instanceof Model) {
+            $data = $data->getData();
+        }
+                
         $model = $this->make();
 
         return $model->replace($replace)->save($data) ? $model : false;
diff --git a/vendor/topthink/think-orm/src/model/relation/MorphOne.php b/vendor/topthink/think-orm/src/model/relation/MorphOne.php
index 788dd29..d63966f 100644
--- a/vendor/topthink/think-orm/src/model/relation/MorphOne.php
+++ b/vendor/topthink/think-orm/src/model/relation/MorphOne.php
@@ -14,7 +14,6 @@ namespace think\model\relation;
 use Closure;
 use think\db\BaseQuery as Query;
 use think\db\exception\DbException as Exception;
-use think\helper\Str;
 use think\Model;
 use think\model\Relation;
 
@@ -260,6 +259,10 @@ class MorphOne extends Relation
      */
     public function save($data, bool $replace = true)
     {
+        if ($data instanceof Model) {
+            $data = $data->getData();
+        }
+
         $model = $this->make();
         return $model->replace($replace)->save($data) ? $model : false;
     }
diff --git a/vendor/topthink/think-orm/src/model/relation/MorphTo.php b/vendor/topthink/think-orm/src/model/relation/MorphTo.php
index f53fe4f..d24c082 100644
--- a/vendor/topthink/think-orm/src/model/relation/MorphTo.php
+++ b/vendor/topthink/think-orm/src/model/relation/MorphTo.php
@@ -13,6 +13,7 @@ namespace think\model\relation;
 
 use Closure;
 use think\db\exception\DbException as Exception;
+use think\db\Query;
 use think\helper\Str;
 use think\Model;
 use think\model\Relation;
@@ -46,14 +47,16 @@ class MorphTo extends Relation
      */
     protected $relation;
 
+    protected $queryCaller = [];
+
     /**
      * 架构函数
      * @access public
-     * @param  Model  $parent    上级模型对象
-     * @param  string $morphType 多态字段名
-     * @param  string $morphKey  外键名
-     * @param  array  $alias     多态别名定义
-     * @param  string $relation  关联名
+     * @param Model $parent 上级模型对象
+     * @param string $morphType 多态字段名
+     * @param string $morphKey 外键名
+     * @param array $alias 多态别名定义
+     * @param  ?string $relation 关联名
      */
     public function __construct(Model $parent, string $morphType, string $morphKey, array $alias = [], string $relation = null)
     {
@@ -80,8 +83,8 @@ class MorphTo extends Relation
     /**
      * 延迟获取关联数据
      * @access public
-     * @param  array   $subRelation 子关联名
-     * @param  Closure $closure     闭包查询条件
+     * @param array $subRelation 子关联名
+     * @param ?Closure $closure 闭包查询条件
      * @return Model
      */
     public function getRelation(array $subRelation = [], Closure $closure = null)
@@ -95,7 +98,7 @@ class MorphTo extends Relation
         // 主键数据
         $pk = $this->parent->$morphKey;
 
-        $relationModel = (new $model)->relation($subRelation)->find($pk);
+        $relationModel = $this->buildQuery((new $model)->relation($subRelation))->find($pk);
 
         if ($relationModel) {
             $relationModel->setParent(clone $this->parent);
@@ -107,11 +110,11 @@ class MorphTo extends Relation
     /**
      * 根据关联条件查询当前模型
      * @access public
-     * @param  string  $operator 比较操作符
-     * @param  integer $count    个数
-     * @param  string  $id       关联表的统计字段
-     * @param  string  $joinType JOIN类型
-     * @param  Query   $query    Query对象
+     * @param string $operator 比较操作符
+     * @param integer $count 个数
+     * @param string $id 关联表的统计字段
+     * @param string $joinType JOIN类型
+     * @param Query $query Query对象
      * @return Query
      */
     public function has(string $operator = '>=', int $count = 1, string $id = '*', string $joinType = '', Query $query = null)
@@ -122,22 +125,46 @@ class MorphTo extends Relation
     /**
      * 根据关联条件查询当前模型
      * @access public
-     * @param  mixed  $where 查询条件（数组或者闭包）
-     * @param  mixed  $fields 字段
-     * @param  string $joinType JOIN类型
-     * @param  Query  $query    Query对象
+     * @param mixed $where 查询条件（数组或者闭包）
+     * @param mixed $fields 字段
+     * @param string $joinType JOIN类型
+     * @param  ?Query $query Query对象
      * @return Query
      */
     public function hasWhere($where = [], $fields = null, string $joinType = '', Query $query = null)
     {
-        throw new Exception('relation not support: hasWhere');
+        $alias = class_basename($this->parent);
+
+        $types = $this->parent->distinct()->column($this->morphType);
+
+        $query = $query ?: $this->parent->db();
+
+        return $query->alias($alias)
+            ->where(function (Query $query) use ($types, $where, $alias) {
+                foreach ($types as $type) {
+                    if ($type) {
+                        $query->whereExists(function (Query $query) use ($type, $where, $alias) {
+                            $class = $this->parseModel($type);
+                            /** @var Model $model */
+                            $model = new $class();
+
+                            $table = $model->getTable();
+                            $query
+                                ->table($table)
+                                ->where($alias . '.' . $this->morphType, $type)
+                                ->whereRaw("`{$alias}`.`{$this->morphKey}`=`{$table}`.`{$model->getPk()}`")
+                                ->where($where);
+                        }, 'OR');
+                    }
+                }
+            });
     }
 
     /**
      * 解析模型的完整命名空间
      * @access protected
-     * @param  string $model 模型名（或者完整类名）
-     * @return string
+     * @param string $model 模型名（或者完整类名）
+     * @return Model
      */
     protected function parseModel(string $model): string
     {
@@ -158,7 +185,7 @@ class MorphTo extends Relation
     /**
      * 设置多态别名
      * @access public
-     * @param  array $alias 别名定义
+     * @param array $alias 别名定义
      * @return $this
      */
     public function setAlias(array $alias)
@@ -173,7 +200,7 @@ class MorphTo extends Relation
      * @access public
      * @return $this
      */
-    public function removeOption()
+    public function removeOption(string $option = '')
     {
         return $this;
     }
@@ -181,11 +208,11 @@ class MorphTo extends Relation
     /**
      * 预载入关联查询
      * @access public
-     * @param  array   $resultSet   数据集
-     * @param  string  $relation    当前关联名
-     * @param  array   $subRelation 子关联名
-     * @param  Closure $closure     闭包
-     * @param  array   $cache       关联缓存
+     * @param array $resultSet 数据集
+     * @param string $relation 当前关联名
+     * @param array $subRelation 子关联名
+     * @param  ?Closure $closure 闭包
+     * @param array $cache 关联缓存
      * @return void
      * @throws Exception
      */
@@ -211,8 +238,8 @@ class MorphTo extends Relation
                 if (!\is_null($closure)) {
                     $obj = $closure($obj);
                 }
-                $pk    = $obj->getPk();
-                $list  = $obj->with($subRelation)
+                $pk   = $obj->getPk();
+                $list = $obj->with($subRelation)
                     ->cache($cache[0] ?? false, $cache[1] ?? null, $cache[2] ?? null)
                     ->select($val);
                 $data = [];
@@ -242,11 +269,11 @@ class MorphTo extends Relation
     /**
      * 预载入关联查询
      * @access public
-     * @param  Model   $result      数据对象
-     * @param  string  $relation    当前关联名
-     * @param  array   $subRelation 子关联名
-     * @param  Closure $closure     闭包
-     * @param  array   $cache       关联缓存
+     * @param Model $result 数据对象
+     * @param string $relation 当前关联名
+     * @param array $subRelation 子关联名
+     * @param  ?Closure $closure 闭包
+     * @param array $cache 关联缓存
      * @return void
      */
     public function eagerlyResult(Model $result, string $relation, array $subRelation = [], Closure $closure = null, array $cache = []): void
@@ -260,36 +287,42 @@ class MorphTo extends Relation
     /**
      * 关联统计
      * @access public
-     * @param  Model   $result  数据对象
-     * @param  Closure $closure 闭包
-     * @param  string  $aggregate 聚合查询方法
-     * @param  string  $field 字段
+     * @param Model $result 数据对象
+     * @param  ?Closure $closure 闭包
+     * @param string $aggregate 聚合查询方法
+     * @param string $field 字段
      * @return integer
      */
     public function relationCount(Model $result, Closure $closure = null, string $aggregate = 'count', string $field = '*')
-    {}
+    {
+    }
 
     /**
      * 多态MorphTo 关联模型预查询
      * @access protected
-     * @param  string $model       关联模型对象
-     * @param  string $relation    关联名
-     * @param  Model  $result
-     * @param  array  $subRelation 子关联
-     * @param  array  $cache       关联缓存
+     * @param string $model 关联模型对象
+     * @param string $relation 关联名
+     * @param Model $result
+     * @param array $subRelation 子关联
+     * @param array $cache 关联缓存
      * @return void
      */
     protected function eagerlyMorphToOne(string $model, string $relation, Model $result, array $subRelation = [], array $cache = []): void
     {
         // 预载入关联查询 支持嵌套预载入
-        $pk   = $this->parent->{$this->morphKey};
-        $data = (new $model)->with($subRelation)
-            ->cache($cache[0] ?? false, $cache[1] ?? null, $cache[2] ?? null)
-            ->find($pk);
+        $pk = $this->parent->{$this->morphKey};
 
-        if ($data) {
-            $data->setParent(clone $result);
-            $data->exists(true);
+        $data = null;
+
+        if (\class_exists($model)) {
+            $data = (new $model)->with($subRelation)
+                ->cache($cache[0] ?? false, $cache[1] ?? null, $cache[2] ?? null)
+                ->find($pk);
+
+            if ($data) {
+                $data->setParent(clone $result);
+                $data->exists(true);
+            }
         }
 
         $result->setRelation($relation, $data ?: null);
@@ -298,8 +331,8 @@ class MorphTo extends Relation
     /**
      * 添加关联数据
      * @access public
-     * @param  Model  $model  关联模型对象
-     * @param  string $type   多态类型
+     * @param Model $model 关联模型对象
+     * @param string $type 多态类型
      * @return Model
      */
     public function associate(Model $model, string $type = ''): Model
@@ -332,4 +365,18 @@ class MorphTo extends Relation
         return $this->parent->setRelation($this->relation, null);
     }
 
+    protected function buildQuery(Query $query)
+    {
+        foreach ($this->queryCaller as $caller) {
+            call_user_func_array([$query, $caller[0]], $caller[1]);
+        }
+
+        return $query;
+    }
+
+    public function __call($method, $args)
+    {
+        $this->queryCaller[] = [$method, $args];
+        return $this;
+    }
 }
diff --git a/vendor/topthink/think-orm/src/model/relation/MorphToMany.php b/vendor/topthink/think-orm/src/model/relation/MorphToMany.php
index c566488..c9d8583 100644
--- a/vendor/topthink/think-orm/src/model/relation/MorphToMany.php
+++ b/vendor/topthink/think-orm/src/model/relation/MorphToMany.php
@@ -216,12 +216,7 @@ class MorphToMany extends BelongsToMany
         }
 
         $fields = $this->getQueryFields($tableName);
-
-        if ($this->withLimit) {
-            $this->query->limit($this->withLimit);
-        }
-
-        $query = $this->query
+        $query  = $this->query
             ->field($fields)
             ->tableField(true, $table, 'pivot', 'pivot__');
 
@@ -249,6 +244,11 @@ class MorphToMany extends BelongsToMany
             $closure($this->getClosureType($closure));
         }
 
+        $withLimit = $this->query->getOptions('limit');
+        if ($withLimit) {
+            $this->query->removeOption('limit');
+        }
+
         // 预载入关联查询 支持嵌套预载入
         $list = $this->belongsToManyQuery($this->foreignKey, $this->localKey, $where)
             ->with($subRelation)
@@ -256,7 +256,7 @@ class MorphToMany extends BelongsToMany
             ->select();
 
         // 组装模型数据
-        $data = [];
+        $data      = [];
         foreach ($list as $set) {
             $pivot = [];
             foreach ($set->getData() as $key => $val) {
@@ -271,7 +271,7 @@ class MorphToMany extends BelongsToMany
 
             $key = $pivot[$this->localKey];
 
-            if ($this->withLimit && isset($data[$key]) && count($data[$key]) >= $this->withLimit) {
+            if ($withLimit && isset($data[$key]) && count($data[$key]) >= $withLimit) {
                 continue;
             }
 
@@ -300,10 +300,10 @@ class MorphToMany extends BelongsToMany
                 $model = new $this->model;
                 $id    = $model->insertGetId($data);
             }
-        } else if (is_numeric($data) || is_string($data)) {
+        } elseif (is_numeric($data) || is_string($data)) {
             // 根据关联表主键直接写入中间表
             $id = $data;
-        } else if ($data instanceof Model) {
+        } elseif ($data instanceof Model) {
             // 根据关联表主键直接写入中间表
             $id = $data->getKey();
         }
@@ -371,10 +371,10 @@ class MorphToMany extends BelongsToMany
     {
         if (is_array($data)) {
             $id = $data;
-        } else if (is_numeric($data) || is_string($data)) {
+        } elseif (is_numeric($data) || is_string($data)) {
             // 根据关联表主键直接写入中间表
             $id = $data;
-        } else if ($data instanceof Model) {
+        } elseif ($data instanceof Model) {
             // 根据关联表主键直接写入中间表
             $id = $data->getKey();
         }
@@ -441,7 +441,7 @@ class MorphToMany extends BelongsToMany
             if (!in_array($id, $current)) {
                 $this->attach($id, $attributes);
                 $changes['attached'][] = $id;
-            } else if (count($attributes) > 0 && $this->attach($id, $attributes)) {
+            } elseif (count($attributes) > 0 && $this->attach($id, $attributes)) {
                 $changes['updated'][] = $id;
             }
         }
@@ -481,7 +481,7 @@ class MorphToMany extends BelongsToMany
     {
         if (is_array($map)) {
             static::$morphMap = $merge && static::$morphMap
-                ? $map + static::$morphMap : $map;
+            ? $map + static::$morphMap : $map;
         }
 
         return static::$morphMap;
diff --git a/vendor/topthink/think-orm/src/model/relation/OneToOne.php b/vendor/topthink/think-orm/src/model/relation/OneToOne.php
index ba51753..d62692a 100644
--- a/vendor/topthink/think-orm/src/model/relation/OneToOne.php
+++ b/vendor/topthink/think-orm/src/model/relation/OneToOne.php
@@ -91,14 +91,28 @@ abstract class OneToOne extends Relation
         $query->via($joinAlias);
 
         if ($this instanceof BelongsTo) {
-            $joinOn = $name . '.' . $this->foreignKey . '=' . $joinAlias . '.' . $this->localKey;
+
+            $foreignKeyExp = $this->foreignKey;
+
+            if (strpos($foreignKeyExp, '.') === false) {
+                $foreignKeyExp = $name . '.' . $this->foreignKey;
+            }
+
+            $joinOn = $foreignKeyExp . '=' . $joinAlias . '.' . $this->localKey;
         } else {
-            $joinOn = $name . '.' . $this->localKey . '=' . $joinAlias . '.' . $this->foreignKey;
+
+            $foreignKeyExp = $this->foreignKey;
+
+            if (strpos($foreignKeyExp, '.') === false) {
+                $foreignKeyExp = $joinAlias . '.' . $this->foreignKey;
+            }
+
+            $joinOn = $name . '.' . $this->localKey . '=' . $foreignKeyExp;
         }
 
         if ($closure) {
             // 执行闭包查询
-            $closure($this->getClosureType($closure));
+            $closure($this->getClosureType($closure, $query));
 
             // 使用withField指定获取关联的字段
             if ($this->withField) {
@@ -187,6 +201,10 @@ abstract class OneToOne extends Relation
      */
     public function save($data, bool $replace = true)
     {
+        if ($data instanceof Model) {
+            $data = $data->getData();
+        }
+
         $model = $this->make();
 
         return $model->replace($replace)->save($data) ? $model : false;
@@ -209,7 +227,6 @@ abstract class OneToOne extends Relation
         return new $this->model($data);
     }
 
-
     /**
      * 绑定关联表的属性到父模型属性
      * @access public
diff --git a/vendor/topthink/think-orm/stubs/load_stubs.php b/vendor/topthink/think-orm/stubs/load_stubs.php
index 5854cda..734507e 100644
--- a/vendor/topthink/think-orm/stubs/load_stubs.php
+++ b/vendor/topthink/think-orm/stubs/load_stubs.php
@@ -6,4 +6,4 @@ if (!\class_exists('think\Exception')) {
 
 if (!\class_exists('think\Facade')) {
     require __DIR__ . '/Facade.php';
-}
\ No newline at end of file
+}
diff --git a/vendor/topthink/think-template/src/Template.php b/vendor/topthink/think-template/src/Template.php
index 0feca8e..befa114 100644
--- a/vendor/topthink/think-template/src/Template.php
+++ b/vendor/topthink/think-template/src/Template.php
@@ -245,7 +245,7 @@ class Template
 
             // 页面缓存
             ob_start();
-            if (PHP_VERSION > 8.0) {
+            if (version_compare(PHP_VERSION, '8.0', '>=')) {
                 ob_implicit_flush(false);
             } else {
                 ob_implicit_flush(0);