From 9777bdbd96d1c4ed9da078c7a1c3ec42817930ba Mon Sep 17 00:00:00 2001 From: Anyon Date: Fri, 2 Aug 2019 16:30:27 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]ComposerUpdate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 14 +++++++------- vendor/composer/autoload_static.php | 8 ++++---- vendor/composer/installed.json | 8 ++++---- vendor/zoujingli/think-library/src/tools/Data.php | 10 ++++++---- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/vendor/autoload.php b/vendor/autoload.php index 9f94e3420..0eb4191be 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit0fb64a24b8fcf6c274d9f346ead546e5::getLoader(); +return ComposerAutoloaderInitbf3d7bafba7856774655ae55ece6c5ec::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 361a57236..4605da595 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit0fb64a24b8fcf6c274d9f346ead546e5 +class ComposerAutoloaderInitbf3d7bafba7856774655ae55ece6c5ec { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInit0fb64a24b8fcf6c274d9f346ead546e5 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit0fb64a24b8fcf6c274d9f346ead546e5', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitbf3d7bafba7856774655ae55ece6c5ec', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit0fb64a24b8fcf6c274d9f346ead546e5', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitbf3d7bafba7856774655ae55ece6c5ec', 'loadClassLoader')); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); if ($useStaticLoader) { require_once __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit0fb64a24b8fcf6c274d9f346ead546e5::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitbf3d7bafba7856774655ae55ece6c5ec::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInit0fb64a24b8fcf6c274d9f346ead546e5 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit0fb64a24b8fcf6c274d9f346ead546e5::$files; + $includeFiles = Composer\Autoload\ComposerStaticInitbf3d7bafba7856774655ae55ece6c5ec::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire0fb64a24b8fcf6c274d9f346ead546e5($fileIdentifier, $file); + composerRequirebf3d7bafba7856774655ae55ece6c5ec($fileIdentifier, $file); } return $loader; } } -function composerRequire0fb64a24b8fcf6c274d9f346ead546e5($fileIdentifier, $file) +function composerRequirebf3d7bafba7856774655ae55ece6c5ec($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index eea2c823f..01089bb38 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit0fb64a24b8fcf6c274d9f346ead546e5 +class ComposerStaticInitbf3d7bafba7856774655ae55ece6c5ec { public static $files = array ( '841780ea2e1d6545ea3a253239d59c05' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/functions.php', @@ -347,9 +347,9 @@ class ComposerStaticInit0fb64a24b8fcf6c274d9f346ead546e5 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit0fb64a24b8fcf6c274d9f346ead546e5::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit0fb64a24b8fcf6c274d9f346ead546e5::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit0fb64a24b8fcf6c274d9f346ead546e5::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitbf3d7bafba7856774655ae55ece6c5ec::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitbf3d7bafba7856774655ae55ece6c5ec::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitbf3d7bafba7856774655ae55ece6c5ec::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index d03299bf4..6313bfcfc 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -502,12 +502,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "24bcdb7c64369f75501241317b8f5c980d074aad" + "reference": "9c9b21c523851afd100c4122d57940eedc3d1451" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/24bcdb7c64369f75501241317b8f5c980d074aad", - "reference": "24bcdb7c64369f75501241317b8f5c980d074aad", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/9c9b21c523851afd100c4122d57940eedc3d1451", + "reference": "9c9b21c523851afd100c4122d57940eedc3d1451", "shasum": "", "mirrors": [ { @@ -526,7 +526,7 @@ "qiniu/php-sdk": "^7.2", "topthink/framework": "5.1.*" }, - "time": "2019-08-01T01:56:59+00:00", + "time": "2019-08-02T08:24:02+00:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/vendor/zoujingli/think-library/src/tools/Data.php b/vendor/zoujingli/think-library/src/tools/Data.php index f58420d4b..85397aa2b 100644 --- a/vendor/zoujingli/think-library/src/tools/Data.php +++ b/vendor/zoujingli/think-library/src/tools/Data.php @@ -62,12 +62,14 @@ class Data */ public static function batchSave($dbQuery, $data, $key = 'id', $where = []) { - list($case, $_data) = [[], []]; - foreach ($data as $row) foreach ($row as $k => $v) $case[$k][] = "WHEN '{$row[$key]}' THEN '{$v}'"; + list($case, $input) = [[], []]; + foreach ($data as $row) foreach ($row as $key => $value) { + $case[$key][] = "WHEN '{$row[$key]}' THEN '{$value}'"; + } if (isset($case[$key])) unset($case[$key]); $db = is_string($dbQuery) ? Db::name($dbQuery) : $dbQuery; - foreach ($case as $k => $v) $_data[$k] = $db->raw("CASE `{$key}` " . join(' ', $v) . ' END'); - return $db->whereIn($key, array_unique(array_column($data, $key)))->where($where)->update($_data) !== false; + foreach ($case as $key => $value) $input[$key] = $db->raw("CASE `{$key}` " . join(' ', $value) . ' END'); + return $db->whereIn($key, array_unique(array_column($data, $key)))->where($where)->update($input) !== false; } /**