From 1666d59e57496e7865898d605bd54be8744131f4 Mon Sep 17 00:00:00 2001 From: Anyon Date: Wed, 9 May 2018 15:16:54 +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_real.php | 14 +++++++------- vendor/composer/autoload_static.php | 8 ++++---- vendor/composer/installed.json | 8 ++++---- vendor/zoujingli/wechat-developer/WeChat/Pay.php | 6 +++--- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/vendor/autoload.php b/vendor/autoload.php index f61fd5b49..11af676cc 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit718a8d9567dd1edbcfc83169e7de8f66::getLoader(); +return ComposerAutoloaderInit7ecf5ded1a6830a1c375fe7293886da9::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index d609ea5cd..e9e991e87 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit718a8d9567dd1edbcfc83169e7de8f66 +class ComposerAutoloaderInit7ecf5ded1a6830a1c375fe7293886da9 { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInit718a8d9567dd1edbcfc83169e7de8f66 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit718a8d9567dd1edbcfc83169e7de8f66', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit7ecf5ded1a6830a1c375fe7293886da9', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit718a8d9567dd1edbcfc83169e7de8f66', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit7ecf5ded1a6830a1c375fe7293886da9', '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\ComposerStaticInit718a8d9567dd1edbcfc83169e7de8f66::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit7ecf5ded1a6830a1c375fe7293886da9::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInit718a8d9567dd1edbcfc83169e7de8f66 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit718a8d9567dd1edbcfc83169e7de8f66::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit7ecf5ded1a6830a1c375fe7293886da9::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire718a8d9567dd1edbcfc83169e7de8f66($fileIdentifier, $file); + composerRequire7ecf5ded1a6830a1c375fe7293886da9($fileIdentifier, $file); } return $loader; } } -function composerRequire718a8d9567dd1edbcfc83169e7de8f66($fileIdentifier, $file) +function composerRequire7ecf5ded1a6830a1c375fe7293886da9($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 eb00295a8..131da8600 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit718a8d9567dd1edbcfc83169e7de8f66 +class ComposerStaticInit7ecf5ded1a6830a1c375fe7293886da9 { public static $files = array ( '1cfd2761b63b0a29ed23657ea394cb2d' => __DIR__ . '/..' . '/topthink/think-captcha/src/helper.php', @@ -275,9 +275,9 @@ class ComposerStaticInit718a8d9567dd1edbcfc83169e7de8f66 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit718a8d9567dd1edbcfc83169e7de8f66::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit718a8d9567dd1edbcfc83169e7de8f66::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit718a8d9567dd1edbcfc83169e7de8f66::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit7ecf5ded1a6830a1c375fe7293886da9::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit7ecf5ded1a6830a1c375fe7293886da9::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit7ecf5ded1a6830a1c375fe7293886da9::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 110a4ca97..e601ce3ca 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -85,12 +85,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/WeChatDeveloper.git", - "reference": "011e4608726fa83cb495dfa1f4d4f56c154ada21" + "reference": "e72fb2f166ee1a3b4889845cd932a1ab9d2005ee" }, "dist": { "type": "zip", - "url": "https://files.phpcomposer.com/files/zoujingli/WeChatDeveloper/011e4608726fa83cb495dfa1f4d4f56c154ada21.zip", - "reference": "011e4608726fa83cb495dfa1f4d4f56c154ada21", + "url": "https://files.phpcomposer.com/files/zoujingli/WeChatDeveloper/e72fb2f166ee1a3b4889845cd932a1ab9d2005ee.zip", + "reference": "e72fb2f166ee1a3b4889845cd932a1ab9d2005ee", "shasum": "" }, "require": { @@ -98,7 +98,7 @@ "ext-openssl": "*", "php": ">=5.4" }, - "time": "2018-05-09T04:22:21+00:00", + "time": "2018-05-09T05:38:00+00:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/vendor/zoujingli/wechat-developer/WeChat/Pay.php b/vendor/zoujingli/wechat-developer/WeChat/Pay.php index fddcf1c0a..b57d43b6a 100644 --- a/vendor/zoujingli/wechat-developer/WeChat/Pay.php +++ b/vendor/zoujingli/wechat-developer/WeChat/Pay.php @@ -299,13 +299,13 @@ class Pay { $option = []; if ($isCert) { + $option['ssl_cer'] = $this->config->get('ssl_cer'); + $option['ssl_key'] = $this->config->get('ssl_key'); foreach (['ssl_cer', 'ssl_key'] as $key) { - if (empty($option[$key])) { + if (empty($option[$key]) || !file_exists($option[$key])) { throw new InvalidArgumentException("Missing Config -- [{$key}]", '0'); } } - $option['ssl_cer'] = $this->config->get('ssl_cer'); - $option['ssl_key'] = $this->config->get('ssl_key'); } $params = $this->params->merge($data); $needSignType && ($params['sign_type'] = strtoupper($signType));