From 671922bc2306040860d6dada4efdf6039975102e Mon Sep 17 00:00:00 2001 From: Anyon Date: Tue, 7 Aug 2018 10:00:58 +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 --- composer.json | 34 +-- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 14 +- vendor/composer/autoload_static.php | 8 +- vendor/composer/installed.json | 330 ++++++++++++++-------------- 5 files changed, 186 insertions(+), 202 deletions(-) diff --git a/composer.json b/composer.json index fe874e8b6..f8df18dad 100644 --- a/composer.json +++ b/composer.json @@ -1,39 +1,23 @@ { "type": "project", "name": "zoujingli/thinkadmin", + "license": "MIT", + "keywords": ["thinkphp", "thinkadmin"], "homepage": "http://demo.thinkadmin.top", "description": "ThinkAdmin Developer CMF", - "keywords": [ - "thinkphp", - "thinkadmin" - ], - "license": "MIT", - "authors": [ - { - "name": "Anyon", - "email": "zoujingli@qq.com" - } - ], + "authors": [{"name": "Anyon", "email": "zoujingli@qq.com"}], + "extra": {"think-path": "thinkphp"}, + "config": {"preferred-install": "dist"}, + "autoload": {"psr-4": {"app\\": "application"}}, "require": { "php": ">=5.6.0", "qiniu/php-sdk": "^7.2", "endroid/qr-code": "^1.9", - "topthink/framework": "5.1.*", + "topthink/framework": "^5.1", + "zoujingli/ip2region": "^1.0", "aliyuncs/oss-sdk-php": "^2.2", "topthink/think-captcha": "^2.0", - "zoujingli/ip2region": "dev-master", - "zoujingli/weopen-developer": "dev-master" - }, - "autoload": { - "psr-4": { - "app\\": "application" - } - }, - "extra": { - "think-path": "thinkphp" - }, - "config": { - "preferred-install": "dist" + "zoujingli/weopen-developer": "^1.1" }, "repositories": { "packagist": { diff --git a/vendor/autoload.php b/vendor/autoload.php index ed8579556..48d601fd1 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit2151fec9fdcca855dbe23b45bae24bbf::getLoader(); +return ComposerAutoloaderInit34c8d072f64c076dff5462b5ee996f97::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index bcd32ed30..0f74e8801 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit2151fec9fdcca855dbe23b45bae24bbf +class ComposerAutoloaderInit34c8d072f64c076dff5462b5ee996f97 { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInit2151fec9fdcca855dbe23b45bae24bbf return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit2151fec9fdcca855dbe23b45bae24bbf', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit34c8d072f64c076dff5462b5ee996f97', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit2151fec9fdcca855dbe23b45bae24bbf', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit34c8d072f64c076dff5462b5ee996f97', '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\ComposerStaticInit2151fec9fdcca855dbe23b45bae24bbf::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit34c8d072f64c076dff5462b5ee996f97::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInit2151fec9fdcca855dbe23b45bae24bbf $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit2151fec9fdcca855dbe23b45bae24bbf::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit34c8d072f64c076dff5462b5ee996f97::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire2151fec9fdcca855dbe23b45bae24bbf($fileIdentifier, $file); + composerRequire34c8d072f64c076dff5462b5ee996f97($fileIdentifier, $file); } return $loader; } } -function composerRequire2151fec9fdcca855dbe23b45bae24bbf($fileIdentifier, $file) +function composerRequire34c8d072f64c076dff5462b5ee996f97($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 19b257e01..b1ec69939 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit2151fec9fdcca855dbe23b45bae24bbf +class ComposerStaticInit34c8d072f64c076dff5462b5ee996f97 { public static $files = array ( '1cfd2761b63b0a29ed23657ea394cb2d' => __DIR__ . '/..' . '/topthink/think-captcha/src/helper.php', @@ -303,9 +303,9 @@ class ComposerStaticInit2151fec9fdcca855dbe23b45bae24bbf public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit2151fec9fdcca855dbe23b45bae24bbf::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit2151fec9fdcca855dbe23b45bae24bbf::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit2151fec9fdcca855dbe23b45bae24bbf::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit34c8d072f64c076dff5462b5ee996f97::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit34c8d072f64c076dff5462b5ee996f97::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit34c8d072f64c076dff5462b5ee996f97::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 454d0a026..89e3468cf 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -48,171 +48,6 @@ } ] }, - { - "name": "zoujingli/ip2region", - "version": "dev-master", - "version_normalized": "9999999-dev", - "source": { - "type": "git", - "url": "https://github.com/zoujingli/ip2region.git", - "reference": "0a55d6c1ab6b4cbaa204824557aa950aaaefda0e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ip2region/zipball/0a55d6c1ab6b4cbaa204824557aa950aaaefda0e", - "reference": "0a55d6c1ab6b4cbaa204824557aa950aaaefda0e", - "shasum": "", - "mirrors": [ - { - "url": "https://dl.laravel-china.org/%package%/%reference%.%type%", - "preferred": true - } - ] - }, - "require": { - "php": ">=5.3" - }, - "time": "2018-06-01T02:21:05+00:00", - "type": "library", - "installation-source": "dist", - "autoload": { - "classmap": [ - "Ip2Region.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "Anyon", - "email": "zoujingli@qq.com", - "homepage": "http://ctolog.com" - } - ], - "description": "Ip2Region for PHP", - "homepage": "https://github.com/zoujingli/Ip2Region", - "keywords": [ - "Ip2Region" - ] - }, - { - "name": "zoujingli/wechat-developer", - "version": "v1.1.13", - "version_normalized": "1.1.13.0", - "source": { - "type": "git", - "url": "https://github.com/zoujingli/WeChatDeveloper.git", - "reference": "39682a047e5c8f9c66107924dfed4e2080e97eb4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/39682a047e5c8f9c66107924dfed4e2080e97eb4", - "reference": "39682a047e5c8f9c66107924dfed4e2080e97eb4", - "shasum": "", - "mirrors": [ - { - "url": "https://dl.laravel-china.org/%package%/%reference%.%type%", - "preferred": true - } - ] - }, - "require": { - "ext-curl": "*", - "ext-openssl": "*", - "php": ">=5.4" - }, - "time": "2018-07-11T02:02:41+00:00", - "type": "library", - "installation-source": "dist", - "autoload": { - "classmap": [ - "We.php" - ], - "psr-4": { - "WePay\\": "WePay", - "WeChat\\": "WeChat", - "WeMini\\": "WeMini" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Anyon", - "email": "zoujingli@qq.com", - "homepage": "http://ctolog.com" - } - ], - "description": "WeChat platform and WeChat payment development tools", - "homepage": "https://github.com/zoujingli/WeChatDeveloper", - "keywords": [ - "WeChatDeveloper", - "WeMini", - "wechat", - "wechatpay", - "wepay" - ] - }, - { - "name": "zoujingli/weopen-developer", - "version": "dev-master", - "version_normalized": "9999999-dev", - "source": { - "type": "git", - "url": "https://github.com/zoujingli/WeOpenDeveloper.git", - "reference": "32aa04ad346790cd6ac7672c888e22e15cb007fe" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zoujingli/WeOpenDeveloper/zipball/32aa04ad346790cd6ac7672c888e22e15cb007fe", - "reference": "32aa04ad346790cd6ac7672c888e22e15cb007fe", - "shasum": "", - "mirrors": [ - { - "url": "https://dl.laravel-china.org/%package%/%reference%.%type%", - "preferred": true - } - ] - }, - "require": { - "ext-curl": "*", - "ext-openssl": "*", - "php": ">=5.4", - "zoujingli/wechat-developer": "^1.0" - }, - "time": "2018-06-14T08:11:03+00:00", - "type": "library", - "installation-source": "dist", - "autoload": { - "psr-4": { - "WeOpen\\": "WeOpen", - "WeChat\\": "WeChat", - "WeMini\\": "WeMini" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Anyon", - "email": "zoujingli@qq.com", - "homepage": "http://ctolog.com" - } - ], - "description": "WeChat Open development of SDK", - "homepage": "https://github.com/zoujingli/WeOpenDeveloper", - "keywords": [ - "WeChatOpen", - "WeChatOpenDeveloper", - "wechat" - ] - }, { "name": "topthink/framework", "version": "v5.1.21", @@ -508,6 +343,55 @@ "symfony" ] }, + { + "name": "zoujingli/ip2region", + "version": "v1.0.4", + "version_normalized": "1.0.4.0", + "source": { + "type": "git", + "url": "https://github.com/zoujingli/ip2region.git", + "reference": "0a55d6c1ab6b4cbaa204824557aa950aaaefda0e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zoujingli/ip2region/zipball/0a55d6c1ab6b4cbaa204824557aa950aaaefda0e", + "reference": "0a55d6c1ab6b4cbaa204824557aa950aaaefda0e", + "shasum": "", + "mirrors": [ + { + "url": "https://dl.laravel-china.org/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "php": ">=5.3" + }, + "time": "2018-06-01T02:21:05+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "classmap": [ + "Ip2Region.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Anyon", + "email": "zoujingli@qq.com", + "homepage": "http://ctolog.com" + } + ], + "description": "Ip2Region for PHP", + "homepage": "https://github.com/zoujingli/Ip2Region", + "keywords": [ + "Ip2Region" + ] + }, { "name": "aliyuncs/oss-sdk-php", "version": "v2.3.0", @@ -556,5 +440,121 @@ ], "description": "Aliyun OSS SDK for PHP", "homepage": "http://www.aliyun.com/product/oss/" + }, + { + "name": "zoujingli/wechat-developer", + "version": "v1.1.13", + "version_normalized": "1.1.13.0", + "source": { + "type": "git", + "url": "https://github.com/zoujingli/WeChatDeveloper.git", + "reference": "39682a047e5c8f9c66107924dfed4e2080e97eb4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/39682a047e5c8f9c66107924dfed4e2080e97eb4", + "reference": "39682a047e5c8f9c66107924dfed4e2080e97eb4", + "shasum": "", + "mirrors": [ + { + "url": "https://dl.laravel-china.org/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "ext-curl": "*", + "ext-openssl": "*", + "php": ">=5.4" + }, + "time": "2018-07-11T02:02:41+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "classmap": [ + "We.php" + ], + "psr-4": { + "WePay\\": "WePay", + "WeChat\\": "WeChat", + "WeMini\\": "WeMini" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Anyon", + "email": "zoujingli@qq.com", + "homepage": "http://ctolog.com" + } + ], + "description": "WeChat platform and WeChat payment development tools", + "homepage": "https://github.com/zoujingli/WeChatDeveloper", + "keywords": [ + "WeChatDeveloper", + "WeMini", + "wechat", + "wechatpay", + "wepay" + ] + }, + { + "name": "zoujingli/weopen-developer", + "version": "v1.1.3", + "version_normalized": "1.1.3.0", + "source": { + "type": "git", + "url": "https://github.com/zoujingli/WeOpenDeveloper.git", + "reference": "32aa04ad346790cd6ac7672c888e22e15cb007fe" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zoujingli/WeOpenDeveloper/zipball/32aa04ad346790cd6ac7672c888e22e15cb007fe", + "reference": "32aa04ad346790cd6ac7672c888e22e15cb007fe", + "shasum": "", + "mirrors": [ + { + "url": "https://dl.laravel-china.org/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "ext-curl": "*", + "ext-openssl": "*", + "php": ">=5.4", + "zoujingli/wechat-developer": "^1.0" + }, + "time": "2018-06-14T08:11:03+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-4": { + "WeOpen\\": "WeOpen", + "WeChat\\": "WeChat", + "WeMini\\": "WeMini" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Anyon", + "email": "zoujingli@qq.com", + "homepage": "http://ctolog.com" + } + ], + "description": "WeChat Open development of SDK", + "homepage": "https://github.com/zoujingli/WeOpenDeveloper", + "keywords": [ + "WeChatOpen", + "WeChatOpenDeveloper", + "wechat" + ] } ]