From 2a1aff4a8fd423cec368a54e4b50fe0183f57c81 Mon Sep 17 00:00:00 2001 From: Anyon Date: Wed, 9 May 2018 12:27: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 --- vendor/autoload.php | 2 +- vendor/composer/autoload_classmap.php | 1 + vendor/composer/autoload_real.php | 14 +++++++------- vendor/composer/autoload_static.php | 9 +++++---- vendor/composer/installed.json | 12 ++++++------ .../WeChat/Contracts/BasicWeChat.php | 2 +- vendor/zoujingli/wechat-developer/WeChat/Pay.php | 2 +- 7 files changed, 22 insertions(+), 20 deletions(-) diff --git a/vendor/autoload.php b/vendor/autoload.php index ce8975bef..f61fd5b49 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInitf5974243cd36d6c47ccc2deac6411e2c::getLoader(); +return ComposerAutoloaderInit718a8d9567dd1edbcfc83169e7de8f66::getLoader(); diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 282038a30..76df8b0d8 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -165,6 +165,7 @@ return array( 'app\\store\\controller\\wechat\\Demo' => $baseDir . '/application/store/controller/wechat/Demo.php', 'app\\store\\controller\\wechat\\Index' => $baseDir . '/application/store/controller/wechat/Index.php', 'app\\store\\service\\GoodsService' => $baseDir . '/application/store/service/GoodsService.php', + 'app\\store\\service\\MemberService' => $baseDir . '/application/store/service/MemberService.php', 'app\\store\\service\\OrderService' => $baseDir . '/application/store/service/OrderService.php', 'app\\wechat\\controller\\Config' => $baseDir . '/application/wechat/controller/Config.php', 'app\\wechat\\controller\\Fans' => $baseDir . '/application/wechat/controller/Fans.php', diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 359d7ba98..d609ea5cd 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitf5974243cd36d6c47ccc2deac6411e2c +class ComposerAutoloaderInit718a8d9567dd1edbcfc83169e7de8f66 { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInitf5974243cd36d6c47ccc2deac6411e2c return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitf5974243cd36d6c47ccc2deac6411e2c', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit718a8d9567dd1edbcfc83169e7de8f66', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInitf5974243cd36d6c47ccc2deac6411e2c', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit718a8d9567dd1edbcfc83169e7de8f66', '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\ComposerStaticInitf5974243cd36d6c47ccc2deac6411e2c::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit718a8d9567dd1edbcfc83169e7de8f66::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInitf5974243cd36d6c47ccc2deac6411e2c $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInitf5974243cd36d6c47ccc2deac6411e2c::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit718a8d9567dd1edbcfc83169e7de8f66::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequiref5974243cd36d6c47ccc2deac6411e2c($fileIdentifier, $file); + composerRequire718a8d9567dd1edbcfc83169e7de8f66($fileIdentifier, $file); } return $loader; } } -function composerRequiref5974243cd36d6c47ccc2deac6411e2c($fileIdentifier, $file) +function composerRequire718a8d9567dd1edbcfc83169e7de8f66($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 46f8a648e..eb00295a8 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInitf5974243cd36d6c47ccc2deac6411e2c +class ComposerStaticInit718a8d9567dd1edbcfc83169e7de8f66 { public static $files = array ( '1cfd2761b63b0a29ed23657ea394cb2d' => __DIR__ . '/..' . '/topthink/think-captcha/src/helper.php', @@ -248,6 +248,7 @@ class ComposerStaticInitf5974243cd36d6c47ccc2deac6411e2c 'app\\store\\controller\\wechat\\Demo' => __DIR__ . '/../..' . '/application/store/controller/wechat/Demo.php', 'app\\store\\controller\\wechat\\Index' => __DIR__ . '/../..' . '/application/store/controller/wechat/Index.php', 'app\\store\\service\\GoodsService' => __DIR__ . '/../..' . '/application/store/service/GoodsService.php', + 'app\\store\\service\\MemberService' => __DIR__ . '/../..' . '/application/store/service/MemberService.php', 'app\\store\\service\\OrderService' => __DIR__ . '/../..' . '/application/store/service/OrderService.php', 'app\\wechat\\controller\\Config' => __DIR__ . '/../..' . '/application/wechat/controller/Config.php', 'app\\wechat\\controller\\Fans' => __DIR__ . '/../..' . '/application/wechat/controller/Fans.php', @@ -274,9 +275,9 @@ class ComposerStaticInitf5974243cd36d6c47ccc2deac6411e2c public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitf5974243cd36d6c47ccc2deac6411e2c::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitf5974243cd36d6c47ccc2deac6411e2c::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInitf5974243cd36d6c47ccc2deac6411e2c::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit718a8d9567dd1edbcfc83169e7de8f66::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit718a8d9567dd1edbcfc83169e7de8f66::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit718a8d9567dd1edbcfc83169e7de8f66::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index e9e437143..110a4ca97 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -80,17 +80,17 @@ }, { "name": "zoujingli/wechat-developer", - "version": "v1.1.3", - "version_normalized": "1.1.3.0", + "version": "v1.1.4", + "version_normalized": "1.1.4.0", "source": { "type": "git", "url": "https://github.com/zoujingli/WeChatDeveloper.git", - "reference": "4b1112e8d4723ce5e6ef0d6eee41a02e588b60ab" + "reference": "011e4608726fa83cb495dfa1f4d4f56c154ada21" }, "dist": { "type": "zip", - "url": "https://files.phpcomposer.com/files/zoujingli/WeChatDeveloper/4b1112e8d4723ce5e6ef0d6eee41a02e588b60ab.zip", - "reference": "4b1112e8d4723ce5e6ef0d6eee41a02e588b60ab", + "url": "https://files.phpcomposer.com/files/zoujingli/WeChatDeveloper/011e4608726fa83cb495dfa1f4d4f56c154ada21.zip", + "reference": "011e4608726fa83cb495dfa1f4d4f56c154ada21", "shasum": "" }, "require": { @@ -98,7 +98,7 @@ "ext-openssl": "*", "php": ">=5.4" }, - "time": "2018-05-03T07:30:54+00:00", + "time": "2018-05-09T04:22:21+00:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicWeChat.php b/vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicWeChat.php index 1af8ceb22..83c9a3d1f 100644 --- a/vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicWeChat.php +++ b/vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicWeChat.php @@ -105,7 +105,7 @@ class BasicWeChat if (!empty($result['access_token'])) { Tools::setCache($cache, $result['access_token'], 7000); } - return $result['access_token']; + return $this->access_token = $result['access_token']; } /** diff --git a/vendor/zoujingli/wechat-developer/WeChat/Pay.php b/vendor/zoujingli/wechat-developer/WeChat/Pay.php index 5b4c6dfff..fddcf1c0a 100644 --- a/vendor/zoujingli/wechat-developer/WeChat/Pay.php +++ b/vendor/zoujingli/wechat-developer/WeChat/Pay.php @@ -300,7 +300,7 @@ class Pay $option = []; if ($isCert) { foreach (['ssl_cer', 'ssl_key'] as $key) { - if (empty($options[$key])) { + if (empty($option[$key])) { throw new InvalidArgumentException("Missing Config -- [{$key}]", '0'); } }