diff --git a/composer.lock b/composer.lock index 31d2262f6..c92910fe3 100644 --- a/composer.lock +++ b/composer.lock @@ -783,12 +783,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "e561d021e18776a9851646236e6af556c77eec6a" + "reference": "397b530b37fc26f3fe6fa6c9730f2f013b53b734" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/e561d021e18776a9851646236e6af556c77eec6a", - "reference": "e561d021e18776a9851646236e6af556c77eec6a", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/397b530b37fc26f3fe6fa6c9730f2f013b53b734", + "reference": "397b530b37fc26f3fe6fa6c9730f2f013b53b734", "shasum": "", "mirrors": [ { @@ -832,7 +832,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://framework.thinkadmin.top", - "time": "2019-11-09T08:03:23+00:00" + "time": "2019-11-09T08:17:20+00:00" } ], "packages-dev": [], diff --git a/vendor/autoload.php b/vendor/autoload.php index cfa6b03af..173cb894c 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInitb8e4029a37bf108c1da00ff988d7544f::getLoader(); +return ComposerAutoloaderInit2989e522f6b5791430f792353154d986::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index fb889ef4a..489eae174 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitb8e4029a37bf108c1da00ff988d7544f +class ComposerAutoloaderInit2989e522f6b5791430f792353154d986 { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInitb8e4029a37bf108c1da00ff988d7544f return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitb8e4029a37bf108c1da00ff988d7544f', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit2989e522f6b5791430f792353154d986', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInitb8e4029a37bf108c1da00ff988d7544f', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit2989e522f6b5791430f792353154d986', '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\ComposerStaticInitb8e4029a37bf108c1da00ff988d7544f::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit2989e522f6b5791430f792353154d986::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInitb8e4029a37bf108c1da00ff988d7544f $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInitb8e4029a37bf108c1da00ff988d7544f::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit2989e522f6b5791430f792353154d986::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequireb8e4029a37bf108c1da00ff988d7544f($fileIdentifier, $file); + composerRequire2989e522f6b5791430f792353154d986($fileIdentifier, $file); } return $loader; } } -function composerRequireb8e4029a37bf108c1da00ff988d7544f($fileIdentifier, $file) +function composerRequire2989e522f6b5791430f792353154d986($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 4dd0adc26..0f01a368c 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInitb8e4029a37bf108c1da00ff988d7544f +class ComposerStaticInit2989e522f6b5791430f792353154d986 { public static $files = array ( '9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php', @@ -470,9 +470,9 @@ class ComposerStaticInitb8e4029a37bf108c1da00ff988d7544f public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitb8e4029a37bf108c1da00ff988d7544f::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitb8e4029a37bf108c1da00ff988d7544f::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInitb8e4029a37bf108c1da00ff988d7544f::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit2989e522f6b5791430f792353154d986::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit2989e522f6b5791430f792353154d986::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit2989e522f6b5791430f792353154d986::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index ac1301f78..2d7f20ac1 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -805,12 +805,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "e561d021e18776a9851646236e6af556c77eec6a" + "reference": "397b530b37fc26f3fe6fa6c9730f2f013b53b734" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/e561d021e18776a9851646236e6af556c77eec6a", - "reference": "e561d021e18776a9851646236e6af556c77eec6a", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/397b530b37fc26f3fe6fa6c9730f2f013b53b734", + "reference": "397b530b37fc26f3fe6fa6c9730f2f013b53b734", "shasum": "", "mirrors": [ { @@ -826,7 +826,7 @@ "ext-json": "*", "topthink/framework": "^6.0" }, - "time": "2019-11-09T08:03:23+00:00", + "time": "2019-11-09T08:17:20+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index 0f4a2b881..6bb973a0e 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/zoujingli/think-library/src/Service.php b/vendor/zoujingli/think-library/src/Service.php index b756515d5..42d9ef8a3 100644 --- a/vendor/zoujingli/think-library/src/Service.php +++ b/vendor/zoujingli/think-library/src/Service.php @@ -34,7 +34,7 @@ abstract class Service * 实例缓存 * @var $this */ - protected static $cache; + protected static $cache = []; /** * Service constructor. @@ -52,7 +52,7 @@ abstract class Service protected function init() { } - + /** * 静态实例对象 * @param App $app diff --git a/vendor/zoujingli/think-library/src/extend/bin/font.ttf b/vendor/zoujingli/think-library/src/extend/bin/font.ttf deleted file mode 100644 index 54a14ed1c..000000000 Binary files a/vendor/zoujingli/think-library/src/extend/bin/font.ttf and /dev/null differ