From 491adc1393f1e73e3e3288e72264473baa79c0b5 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Sun, 27 Sep 2020 10:57:31 +0800
Subject: [PATCH] ComposerUpdate

---
 vendor/composer/ClassLoader.php                           | 2 +-
 vendor/composer/installed.json                            | 8 ++++----
 vendor/services.php                                       | 2 +-
 vendor/zoujingli/think-library/src/Controller.php         | 4 ++--
 vendor/zoujingli/think-library/src/Library.php            | 2 +-
 .../zoujingli/think-library/src/helper/ValidateHelper.php | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
index 03b9bb9c4..fce8549f0 100644
--- a/vendor/composer/ClassLoader.php
+++ b/vendor/composer/ClassLoader.php
@@ -60,7 +60,7 @@ class ClassLoader
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
+            return call_user_func_array('array_merge', $this->prefixesPsr0);
         }
 
         return array();
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index e85be132c..2f5586424 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -963,12 +963,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/zoujingli/ThinkLibrary.git",
-            "reference": "29a8fb78d72450b961b5204e33c4efe2b3bbe907"
+            "reference": "670baa69b68333030bf6abb551e32cebb737eeed"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/29a8fb78d72450b961b5204e33c4efe2b3bbe907",
-            "reference": "29a8fb78d72450b961b5204e33c4efe2b3bbe907",
+            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/670baa69b68333030bf6abb551e32cebb737eeed",
+            "reference": "670baa69b68333030bf6abb551e32cebb737eeed",
             "shasum": "",
             "mirrors": [
                 {
@@ -985,7 +985,7 @@
             "ext-mbstring": "*",
             "topthink/framework": "^6.0"
         },
-        "time": "2020-09-26T03:41:34+00:00",
+        "time": "2020-09-27T02:22:50+00:00",
         "type": "library",
         "extra": {
             "think": {
diff --git a/vendor/services.php b/vendor/services.php
index b42ff2694..9cd4e4309 100644
--- a/vendor/services.php
+++ b/vendor/services.php
@@ -1,5 +1,5 @@
 <?php 
-// This file is automatically generated at:2020-09-26 12:12:31
+// This file is automatically generated at:2020-09-27 10:57:15
 declare (strict_types = 1);
 return array (
   0 => 'think\\admin\\Library',
diff --git a/vendor/zoujingli/think-library/src/Controller.php b/vendor/zoujingli/think-library/src/Controller.php
index 822fc0fca..ce5c0e474 100644
--- a/vendor/zoujingli/think-library/src/Controller.php
+++ b/vendor/zoujingli/think-library/src/Controller.php
@@ -236,10 +236,10 @@ abstract class Controller extends \stdClass
     /**
      * 快捷输入并验证（ 支持 规则 # 别名 ）
      * @param array $rules 验证规则（ 验证信息数组 ）
-     * @param string $type 输入方式 ( post. 或 get. )
+     * @param string|array $type 输入方式 ( post. 或 get. )
      * @return array
      */
-    protected function _vali(array $rules, string $type = '')
+    protected function _vali(array $rules, $type = '')
     {
         return ValidateHelper::instance()->init($rules, $type);
     }
diff --git a/vendor/zoujingli/think-library/src/Library.php b/vendor/zoujingli/think-library/src/Library.php
index dfc48c420..a7d1468f8 100644
--- a/vendor/zoujingli/think-library/src/Library.php
+++ b/vendor/zoujingli/think-library/src/Library.php
@@ -41,7 +41,7 @@ class Library extends Service
     /**
      * 扩展库版本号
      */
-    const VERSION = '6.0.14';
+    const VERSION = '6.0.15';
 
     /**
      * 启动服务
diff --git a/vendor/zoujingli/think-library/src/helper/ValidateHelper.php b/vendor/zoujingli/think-library/src/helper/ValidateHelper.php
index eb3ced0cf..5a40b1466 100644
--- a/vendor/zoujingli/think-library/src/helper/ValidateHelper.php
+++ b/vendor/zoujingli/think-library/src/helper/ValidateHelper.php
@@ -40,7 +40,7 @@ class ValidateHelper extends Helper
      *  region.value => value // 固定字段数值内容
      *  更多规则参照 ThinkPHP 官方的验证类
      */
-    public function init(array $rules, string $input = '', ?callable $callable = null): array
+    public function init(array $rules, $input = '', ?callable $callable = null): array
     {
         if (is_string($input)) {
             $type = trim($input, '.') ?: 'request';