From 9bf9963ee3d6eb27f7a90d9da594d992f11dc680 Mon Sep 17 00:00:00 2001 From: Anyon Date: Fri, 19 Jun 2020 11:48:11 +0800 Subject: [PATCH] ComposerUpdate --- composer.lock | 8 ++++---- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 14 +++++++------- vendor/composer/autoload_static.php | 8 ++++---- vendor/composer/installed.json | 8 ++++---- vendor/services.php | 2 +- .../think-library/src/command/Install.php | 4 ++-- .../zoujingli/think-library/src/command/Queue.php | 2 +- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/composer.lock b/composer.lock index 75ec8b8d4..0442fa9d1 100644 --- a/composer.lock +++ b/composer.lock @@ -929,12 +929,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "b4b544f9e3ee8e5e3ed218f14eb442371a1de58c" + "reference": "3f1bb860cc95d7c15bb561b14ef21d295f5a8b7b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/b4b544f9e3ee8e5e3ed218f14eb442371a1de58c", - "reference": "b4b544f9e3ee8e5e3ed218f14eb442371a1de58c", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/3f1bb860cc95d7c15bb561b14ef21d295f5a8b7b", + "reference": "3f1bb860cc95d7c15bb561b14ef21d295f5a8b7b", "shasum": "", "mirrors": [ { @@ -978,7 +978,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://framework.thinkadmin.top", - "time": "2020-06-18T04:01:24+00:00" + "time": "2020-06-19T03:39:45+00:00" }, { "name": "zoujingli/wechat-developer", diff --git a/vendor/autoload.php b/vendor/autoload.php index 6e2f5f1e7..8bcae7cdf 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInitf41e9df38a61a147f539b835fbd021f0::getLoader(); +return ComposerAutoloaderInitb911c14a0826c73d9f097343fd33a252::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 353738d8b..3fb248bde 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitf41e9df38a61a147f539b835fbd021f0 +class ComposerAutoloaderInitb911c14a0826c73d9f097343fd33a252 { private static $loader; @@ -22,15 +22,15 @@ class ComposerAutoloaderInitf41e9df38a61a147f539b835fbd021f0 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitf41e9df38a61a147f539b835fbd021f0', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitb911c14a0826c73d9f097343fd33a252', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInitf41e9df38a61a147f539b835fbd021f0', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitb911c14a0826c73d9f097343fd33a252', '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\ComposerStaticInitf41e9df38a61a147f539b835fbd021f0::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitb911c14a0826c73d9f097343fd33a252::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -51,19 +51,19 @@ class ComposerAutoloaderInitf41e9df38a61a147f539b835fbd021f0 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInitf41e9df38a61a147f539b835fbd021f0::$files; + $includeFiles = Composer\Autoload\ComposerStaticInitb911c14a0826c73d9f097343fd33a252::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequiref41e9df38a61a147f539b835fbd021f0($fileIdentifier, $file); + composerRequireb911c14a0826c73d9f097343fd33a252($fileIdentifier, $file); } return $loader; } } -function composerRequiref41e9df38a61a147f539b835fbd021f0($fileIdentifier, $file) +function composerRequireb911c14a0826c73d9f097343fd33a252($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 7e3d564fd..d0c2a2ed5 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInitf41e9df38a61a147f539b835fbd021f0 +class ComposerStaticInitb911c14a0826c73d9f097343fd33a252 { public static $files = array ( '9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php', @@ -629,9 +629,9 @@ class ComposerStaticInitf41e9df38a61a147f539b835fbd021f0 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitf41e9df38a61a147f539b835fbd021f0::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitf41e9df38a61a147f539b835fbd021f0::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInitf41e9df38a61a147f539b835fbd021f0::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitb911c14a0826c73d9f097343fd33a252::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitb911c14a0826c73d9f097343fd33a252::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitb911c14a0826c73d9f097343fd33a252::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 3ff52730f..5833076bc 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -955,12 +955,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "b4b544f9e3ee8e5e3ed218f14eb442371a1de58c" + "reference": "3f1bb860cc95d7c15bb561b14ef21d295f5a8b7b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/b4b544f9e3ee8e5e3ed218f14eb442371a1de58c", - "reference": "b4b544f9e3ee8e5e3ed218f14eb442371a1de58c", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/3f1bb860cc95d7c15bb561b14ef21d295f5a8b7b", + "reference": "3f1bb860cc95d7c15bb561b14ef21d295f5a8b7b", "shasum": "", "mirrors": [ { @@ -976,7 +976,7 @@ "ext-json": "*", "topthink/framework": "^6.0" }, - "time": "2020-06-18T04:01:24+00:00", + "time": "2020-06-19T03:39:45+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index 5b020c0a0..84b83e350 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/zoujingli/think-library/src/command/Install.php b/vendor/zoujingli/think-library/src/command/Install.php index d56eef292..32c8a5ae9 100644 --- a/vendor/zoujingli/think-library/src/command/Install.php +++ b/vendor/zoujingli/think-library/src/command/Install.php @@ -104,8 +104,8 @@ class Install extends Command } [$this->installFile(), $this->installData()]; } elseif (isset($this->bind[$this->name])) { - $this->rules = empty($this->bind[$this->name]['rules']) ? [] : $this->bind[$this->name]['rules']; - $this->ignore = empty($this->bind[$this->name]['ignore']) ? [] : $this->bind[$this->name]['ignore']; + $this->rules = $this->bind[$this->name]['rules'] ?? []; + $this->ignore = $this->bind[$this->name]['ignore'] ?? []; [$this->installFile(), $this->installData()]; } else { $this->output->writeln("The specified module {$this->name} is not configured with installation rules"); diff --git a/vendor/zoujingli/think-library/src/command/Queue.php b/vendor/zoujingli/think-library/src/command/Queue.php index 0a8db646c..11d31d117 100644 --- a/vendor/zoujingli/think-library/src/command/Queue.php +++ b/vendor/zoujingli/think-library/src/command/Queue.php @@ -335,7 +335,7 @@ class Queue extends Command if (isset($this->queue->record['loops_time']) && $this->queue->record['loops_time'] > 0) { try { $this->queue->initialize($this->code)->reset($this->queue->record['loops_time']); - } catch (\Exception|\Error $exception) { + } catch (\Exception|\Error|\Throwable $exception) { $this->app->log->error("Queue {$this->queue->record['code']} Loops Failed. {$exception->getMessage()}"); } }