ComposerUpdate

This commit is contained in:
邹景立 2021-03-19 10:20:59 +08:00
parent 8340e87a46
commit 311dde78b5
3 changed files with 15 additions and 8 deletions

View File

@ -834,12 +834,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "6ff84d044d7fa50c24736ac10a4d93384abe21c7" "reference": "fdd8a98cc3538fecdea82378615ac65774100c62"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/6ff84d044d7fa50c24736ac10a4d93384abe21c7", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/fdd8a98cc3538fecdea82378615ac65774100c62",
"reference": "6ff84d044d7fa50c24736ac10a4d93384abe21c7", "reference": "fdd8a98cc3538fecdea82378615ac65774100c62",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -856,7 +856,7 @@
"ext-mbstring": "*", "ext-mbstring": "*",
"topthink/framework": "^6.0" "topthink/framework": "^6.0"
}, },
"time": "2021-03-17T06:18:21+00:00", "time": "2021-03-19T02:16:27+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:2021-03-19 10:08:31 // This file is automatically generated at:2021-03-19 10:20:45
declare (strict_types = 1); declare (strict_types = 1);
return array ( return array (
0 => 'think\\admin\\Library', 0 => 'think\\admin\\Library',

View File

@ -27,10 +27,11 @@ if (!function_exists('p')) {
* @param mixed $data 输出的数据 * @param mixed $data 输出的数据
* @param boolean $new 强制替换文件 * @param boolean $new 强制替换文件
* @param null|string $file 保存文件名称 * @param null|string $file 保存文件名称
* @return false|int
*/ */
function p($data, $new = false, $file = null) function p($data, $new = false, $file = null)
{ {
SystemService::instance()->putDebug($data, $new, $file); return SystemService::instance()->putDebug($data, $new, $file);
} }
} }
if (!function_exists('auth')) { if (!function_exists('auth')) {
@ -154,7 +155,10 @@ if (!function_exists('str2arr')) {
$text = trim($text, $separ); $text = trim($text, $separ);
$data = strlen($text) ? explode($separ, $text) : []; $data = strlen($text) ? explode($separ, $text) : [];
if (is_array($allow)) foreach ($data as $key => $item) { if (is_array($allow)) foreach ($data as $key => $item) {
if (!in_array($item, $allow) || $item === '') unset($data[$key]); if (!in_array($item, $allow)) unset($data[$key]);
}
foreach ($data as $key => $item) {
if ($item === '') unset($data[$key]);
} }
return $data; return $data;
} }
@ -170,7 +174,10 @@ if (!function_exists('arr2str')) {
function arr2str(array $data, string $separ = ',', ?array $allow = null): string function arr2str(array $data, string $separ = ',', ?array $allow = null): string
{ {
if (is_array($allow)) foreach ($data as $key => $item) { if (is_array($allow)) foreach ($data as $key => $item) {
if (!in_array($item, $allow) || $item === '') unset($data[$key]); if (!in_array($item, $allow)) unset($data[$key]);
}
foreach ($data as $key => $item) {
if ($item === '') unset($data[$key]);
} }
return $separ . join($separ, $data) . $separ; return $separ . join($separ, $data) . $separ;
} }