ComposerUpdate

This commit is contained in:
Anyon 2020-09-27 10:57:31 +08:00
parent 748dcb1f73
commit 491adc1393
6 changed files with 10 additions and 10 deletions

View File

@ -60,7 +60,7 @@ class ClassLoader
public function getPrefixes() public function getPrefixes()
{ {
if (!empty($this->prefixesPsr0)) { 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(); return array();

View File

@ -963,12 +963,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "29a8fb78d72450b961b5204e33c4efe2b3bbe907" "reference": "670baa69b68333030bf6abb551e32cebb737eeed"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/29a8fb78d72450b961b5204e33c4efe2b3bbe907", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/670baa69b68333030bf6abb551e32cebb737eeed",
"reference": "29a8fb78d72450b961b5204e33c4efe2b3bbe907", "reference": "670baa69b68333030bf6abb551e32cebb737eeed",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -985,7 +985,7 @@
"ext-mbstring": "*", "ext-mbstring": "*",
"topthink/framework": "^6.0" "topthink/framework": "^6.0"
}, },
"time": "2020-09-26T03:41:34+00:00", "time": "2020-09-27T02:22:50+00:00",
"type": "library", "type": "library",
"extra": { "extra": {
"think": { "think": {

2
vendor/services.php vendored
View File

@ -1,5 +1,5 @@
<?php <?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); declare (strict_types = 1);
return array ( return array (
0 => 'think\\admin\\Library', 0 => 'think\\admin\\Library',

View File

@ -236,10 +236,10 @@ abstract class Controller extends \stdClass
/** /**
* 快捷输入并验证( 支持 规则 # 别名 * 快捷输入并验证( 支持 规则 # 别名
* @param array $rules 验证规则( 验证信息数组 * @param array $rules 验证规则( 验证信息数组
* @param string $type 输入方式 ( post. get. ) * @param string|array $type 输入方式 ( post. get. )
* @return array * @return array
*/ */
protected function _vali(array $rules, string $type = '') protected function _vali(array $rules, $type = '')
{ {
return ValidateHelper::instance()->init($rules, $type); return ValidateHelper::instance()->init($rules, $type);
} }

View File

@ -41,7 +41,7 @@ class Library extends Service
/** /**
* 扩展库版本号 * 扩展库版本号
*/ */
const VERSION = '6.0.14'; const VERSION = '6.0.15';
/** /**
* 启动服务 * 启动服务

View File

@ -40,7 +40,7 @@ class ValidateHelper extends Helper
* region.value => value // 固定字段数值内容 * region.value => value // 固定字段数值内容
* 更多规则参照 ThinkPHP 官方的验证类 * 更多规则参照 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)) { if (is_string($input)) {
$type = trim($input, '.') ?: 'request'; $type = trim($input, '.') ?: 'request';