ComposerUpdate

This commit is contained in:
Anyon 2020-06-19 11:48:11 +08:00
parent b76d867c61
commit 9bf9963ee3
8 changed files with 24 additions and 24 deletions

8
composer.lock generated
View File

@ -929,12 +929,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "b4b544f9e3ee8e5e3ed218f14eb442371a1de58c" "reference": "3f1bb860cc95d7c15bb561b14ef21d295f5a8b7b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/b4b544f9e3ee8e5e3ed218f14eb442371a1de58c", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/3f1bb860cc95d7c15bb561b14ef21d295f5a8b7b",
"reference": "b4b544f9e3ee8e5e3ed218f14eb442371a1de58c", "reference": "3f1bb860cc95d7c15bb561b14ef21d295f5a8b7b",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -978,7 +978,7 @@
], ],
"description": "ThinkPHP v6.0 Development Library", "description": "ThinkPHP v6.0 Development Library",
"homepage": "http://framework.thinkadmin.top", "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", "name": "zoujingli/wechat-developer",

2
vendor/autoload.php vendored
View File

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php'; require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInitf41e9df38a61a147f539b835fbd021f0::getLoader(); return ComposerAutoloaderInitb911c14a0826c73d9f097343fd33a252::getLoader();

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer // autoload_real.php @generated by Composer
class ComposerAutoloaderInitf41e9df38a61a147f539b835fbd021f0 class ComposerAutoloaderInitb911c14a0826c73d9f097343fd33a252
{ {
private static $loader; private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInitf41e9df38a61a147f539b835fbd021f0
return self::$loader; 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(); 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()); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) { if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php'; require_once __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitf41e9df38a61a147f539b835fbd021f0::getInitializer($loader)); call_user_func(\Composer\Autoload\ComposerStaticInitb911c14a0826c73d9f097343fd33a252::getInitializer($loader));
} else { } else {
$map = require __DIR__ . '/autoload_namespaces.php'; $map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) { foreach ($map as $namespace => $path) {
@ -51,19 +51,19 @@ class ComposerAutoloaderInitf41e9df38a61a147f539b835fbd021f0
$loader->register(true); $loader->register(true);
if ($useStaticLoader) { if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInitf41e9df38a61a147f539b835fbd021f0::$files; $includeFiles = Composer\Autoload\ComposerStaticInitb911c14a0826c73d9f097343fd33a252::$files;
} else { } else {
$includeFiles = require __DIR__ . '/autoload_files.php'; $includeFiles = require __DIR__ . '/autoload_files.php';
} }
foreach ($includeFiles as $fileIdentifier => $file) { foreach ($includeFiles as $fileIdentifier => $file) {
composerRequiref41e9df38a61a147f539b835fbd021f0($fileIdentifier, $file); composerRequireb911c14a0826c73d9f097343fd33a252($fileIdentifier, $file);
} }
return $loader; return $loader;
} }
} }
function composerRequiref41e9df38a61a147f539b835fbd021f0($fileIdentifier, $file) function composerRequireb911c14a0826c73d9f097343fd33a252($fileIdentifier, $file)
{ {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file; require $file;

View File

@ -4,7 +4,7 @@
namespace Composer\Autoload; namespace Composer\Autoload;
class ComposerStaticInitf41e9df38a61a147f539b835fbd021f0 class ComposerStaticInitb911c14a0826c73d9f097343fd33a252
{ {
public static $files = array ( public static $files = array (
'9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php', '9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php',
@ -629,9 +629,9 @@ class ComposerStaticInitf41e9df38a61a147f539b835fbd021f0
public static function getInitializer(ClassLoader $loader) public static function getInitializer(ClassLoader $loader)
{ {
return \Closure::bind(function () use ($loader) { return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitf41e9df38a61a147f539b835fbd021f0::$prefixLengthsPsr4; $loader->prefixLengthsPsr4 = ComposerStaticInitb911c14a0826c73d9f097343fd33a252::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitf41e9df38a61a147f539b835fbd021f0::$prefixDirsPsr4; $loader->prefixDirsPsr4 = ComposerStaticInitb911c14a0826c73d9f097343fd33a252::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitf41e9df38a61a147f539b835fbd021f0::$classMap; $loader->classMap = ComposerStaticInitb911c14a0826c73d9f097343fd33a252::$classMap;
}, null, ClassLoader::class); }, null, ClassLoader::class);
} }

View File

@ -955,12 +955,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "b4b544f9e3ee8e5e3ed218f14eb442371a1de58c" "reference": "3f1bb860cc95d7c15bb561b14ef21d295f5a8b7b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/b4b544f9e3ee8e5e3ed218f14eb442371a1de58c", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/3f1bb860cc95d7c15bb561b14ef21d295f5a8b7b",
"reference": "b4b544f9e3ee8e5e3ed218f14eb442371a1de58c", "reference": "3f1bb860cc95d7c15bb561b14ef21d295f5a8b7b",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -976,7 +976,7 @@
"ext-json": "*", "ext-json": "*",
"topthink/framework": "^6.0" "topthink/framework": "^6.0"
}, },
"time": "2020-06-18T04:01:24+00:00", "time": "2020-06-19T03:39:45+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-06-19 10:18:45 // This file is automatically generated at:2020-06-19 11:47:46
declare (strict_types = 1); declare (strict_types = 1);
return array ( return array (
0 => 'think\\app\\Service', 0 => 'think\\app\\Service',

View File

@ -104,8 +104,8 @@ class Install extends Command
} }
[$this->installFile(), $this->installData()]; [$this->installFile(), $this->installData()];
} elseif (isset($this->bind[$this->name])) { } elseif (isset($this->bind[$this->name])) {
$this->rules = empty($this->bind[$this->name]['rules']) ? [] : $this->bind[$this->name]['rules']; $this->rules = $this->bind[$this->name]['rules'] ?? [];
$this->ignore = empty($this->bind[$this->name]['ignore']) ? [] : $this->bind[$this->name]['ignore']; $this->ignore = $this->bind[$this->name]['ignore'] ?? [];
[$this->installFile(), $this->installData()]; [$this->installFile(), $this->installData()];
} else { } else {
$this->output->writeln("The specified module {$this->name} is not configured with installation rules"); $this->output->writeln("The specified module {$this->name} is not configured with installation rules");

View File

@ -335,7 +335,7 @@ class Queue extends Command
if (isset($this->queue->record['loops_time']) && $this->queue->record['loops_time'] > 0) { if (isset($this->queue->record['loops_time']) && $this->queue->record['loops_time'] > 0) {
try { try {
$this->queue->initialize($this->code)->reset($this->queue->record['loops_time']); $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()}"); $this->app->log->error("Queue {$this->queue->record['code']} Loops Failed. {$exception->getMessage()}");
} }
} }