From 011c1a13d611d62aaaede7bc95d7ab9f551718e4 Mon Sep 17 00:00:00 2001 From: Anyon Date: Tue, 26 Nov 2019 10:53:01 +0800 Subject: [PATCH] ComposerUpdate --- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 14 ++++----- vendor/composer/autoload_static.php | 8 ++--- vendor/composer/installed.json | 8 ++--- vendor/zoujingli/think-library/composer.json | 6 ++++ .../think-library/src/Controller.php | 4 ++- vendor/zoujingli/think-library/src/Helper.php | 7 ++--- .../think-library/src/helper/FormHelper.php | 30 ++++++++++++++----- .../think-library/src/helper/QueryHelper.php | 12 ++++---- .../think-library/src/helper/SaveHelper.php | 14 ++++----- 10 files changed, 63 insertions(+), 42 deletions(-) diff --git a/vendor/autoload.php b/vendor/autoload.php index 87908c07d..f0ae2e4d2 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInitf558cbe483e15d25595ae80d3fb20e9e::getLoader(); +return ComposerAutoloaderInitb7e6ef67068b48e5175bce380d4bfe2f::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 52235366f..6a3e92f87 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitf558cbe483e15d25595ae80d3fb20e9e +class ComposerAutoloaderInitb7e6ef67068b48e5175bce380d4bfe2f { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInitf558cbe483e15d25595ae80d3fb20e9e return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitf558cbe483e15d25595ae80d3fb20e9e', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitb7e6ef67068b48e5175bce380d4bfe2f', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInitf558cbe483e15d25595ae80d3fb20e9e', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitb7e6ef67068b48e5175bce380d4bfe2f', '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\ComposerStaticInitf558cbe483e15d25595ae80d3fb20e9e::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitb7e6ef67068b48e5175bce380d4bfe2f::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInitf558cbe483e15d25595ae80d3fb20e9e $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInitf558cbe483e15d25595ae80d3fb20e9e::$files; + $includeFiles = Composer\Autoload\ComposerStaticInitb7e6ef67068b48e5175bce380d4bfe2f::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequiref558cbe483e15d25595ae80d3fb20e9e($fileIdentifier, $file); + composerRequireb7e6ef67068b48e5175bce380d4bfe2f($fileIdentifier, $file); } return $loader; } } -function composerRequiref558cbe483e15d25595ae80d3fb20e9e($fileIdentifier, $file) +function composerRequireb7e6ef67068b48e5175bce380d4bfe2f($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 09f2aed70..cbaf4421e 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInitf558cbe483e15d25595ae80d3fb20e9e +class ComposerStaticInitb7e6ef67068b48e5175bce380d4bfe2f { public static $files = array ( '841780ea2e1d6545ea3a253239d59c05' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/functions.php', @@ -366,9 +366,9 @@ class ComposerStaticInitf558cbe483e15d25595ae80d3fb20e9e public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitf558cbe483e15d25595ae80d3fb20e9e::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitf558cbe483e15d25595ae80d3fb20e9e::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInitf558cbe483e15d25595ae80d3fb20e9e::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitb7e6ef67068b48e5175bce380d4bfe2f::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitb7e6ef67068b48e5175bce380d4bfe2f::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitb7e6ef67068b48e5175bce380d4bfe2f::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 910966a21..50b7fefb6 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -502,12 +502,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "c76003332a6c0277186507429baca6dfea6f9d15" + "reference": "10b94d3b9dc3b0bea5e5c759b7f00a3fc057280b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/c76003332a6c0277186507429baca6dfea6f9d15", - "reference": "c76003332a6c0277186507429baca6dfea6f9d15", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/10b94d3b9dc3b0bea5e5c759b7f00a3fc057280b", + "reference": "10b94d3b9dc3b0bea5e5c759b7f00a3fc057280b", "shasum": "", "mirrors": [ { @@ -527,7 +527,7 @@ "qiniu/php-sdk": "^7.2", "topthink/framework": "5.1.*" }, - "time": "2019-11-25T10:59:35+00:00", + "time": "2019-11-26T02:19:03+00:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/vendor/zoujingli/think-library/composer.json b/vendor/zoujingli/think-library/composer.json index 0d122a6f3..9a60c4aaa 100644 --- a/vendor/zoujingli/think-library/composer.json +++ b/vendor/zoujingli/think-library/composer.json @@ -22,5 +22,11 @@ "psr-4": { "library\\": "src" } + }, + "repositories": { + "packagist": { + "type": "composer", + "url": "https://mirrors.aliyun.com/composer" + } } } diff --git a/vendor/zoujingli/think-library/src/Controller.php b/vendor/zoujingli/think-library/src/Controller.php index ae1608aea..254a53ffe 100644 --- a/vendor/zoujingli/think-library/src/Controller.php +++ b/vendor/zoujingli/think-library/src/Controller.php @@ -238,9 +238,11 @@ abstract class Controller extends \stdClass * @param array $where 额外更新条件 * @param array $data 表单扩展数据 * @return array|boolean + * @throws \think\Exception * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException + * @throws \think\exception\DbException + * @throws \think\exception\PDOException */ protected function _form($dbQuery, $tpl = '', $pkField = '', $where = [], $data = []) { diff --git a/vendor/zoujingli/think-library/src/Helper.php b/vendor/zoujingli/think-library/src/Helper.php index 810228c2b..707d3c128 100644 --- a/vendor/zoujingli/think-library/src/Helper.php +++ b/vendor/zoujingli/think-library/src/Helper.php @@ -67,12 +67,11 @@ abstract class Helper /** * 实例对象反射 - * @param array $args 额外参数 - * @return $this + * @return static */ - public static function instance(array $args = []) + public static function instance() { - return Container::getInstance()->invokeClass(static::class, $args); + return Container::getInstance()->invokeClass(static::class); } } \ No newline at end of file diff --git a/vendor/zoujingli/think-library/src/helper/FormHelper.php b/vendor/zoujingli/think-library/src/helper/FormHelper.php index 7f87ced88..9dccaf729 100644 --- a/vendor/zoujingli/think-library/src/helper/FormHelper.php +++ b/vendor/zoujingli/think-library/src/helper/FormHelper.php @@ -35,13 +35,25 @@ class FormHelper extends Helper * 数据对象主键名称 * @var string */ - protected $pkField; + protected $field; /** * 数据对象主键值 * @var string */ - protected $pkValue; + protected $value; + + /** + * 模板数据 + * @var array + */ + protected $data; + + /** + * 模板名称 + * @var string + */ + protected $template; /** * 逻辑器初始化 @@ -51,20 +63,22 @@ class FormHelper extends Helper * @param array $where 额外更新条件 * @param array $data 表单扩展数据 * @return array|boolean + * @throws \think\Exception * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException + * @throws \think\exception\DbException + * @throws \think\exception\PDOException */ public function init($dbQuery, $template = '', $field = '', $where = [], $data = []) { $this->query = $this->buildQuery($dbQuery); list($this->template, $this->where, $this->data) = [$template, $where, $data]; - $this->pkField = empty($field) ? ($this->query->getPk() ? $this->query->getPk() : 'id') : $field;; - $this->pkValue = input($this->pkField, isset($data[$this->pkField]) ? $data[$this->pkField] : null); + $this->field = empty($field) ? ($this->query->getPk() ? $this->query->getPk() : 'id') : $field;; + $this->value = input($this->field, isset($data[$this->field]) ? $data[$this->field] : null); // GET请求, 获取数据并显示表单页面 if ($this->app->request->isGet()) { - if ($this->pkValue !== null) { - $where = [$this->pkField => $this->pkValue]; + if ($this->value !== null) { + $where = [$this->field => $this->value]; $data = (array)$this->query->where($where)->where($this->where)->find(); } $data = array_merge($data, $this->data); @@ -77,7 +91,7 @@ class FormHelper extends Helper if ($this->app->request->isPost()) { $data = array_merge($this->app->request->post(), $this->data); if (false !== $this->controller->callback('_form_filter', $data, $this->where)) { - $result = data_save($this->query, $data, $this->pkField, $this->where); + $result = data_save($this->query, $data, $this->field, $this->where); if (false !== $this->controller->callback('_form_result', $result, $data)) { if ($result !== false) $this->controller->success('恭喜, 数据保存成功!', ''); $this->controller->error('数据保存失败, 请稍候再试!'); diff --git a/vendor/zoujingli/think-library/src/helper/QueryHelper.php b/vendor/zoujingli/think-library/src/helper/QueryHelper.php index f9b1b1b33..e4fb5246f 100644 --- a/vendor/zoujingli/think-library/src/helper/QueryHelper.php +++ b/vendor/zoujingli/think-library/src/helper/QueryHelper.php @@ -21,8 +21,8 @@ use think\db\Query; /** * Class QueryHelper * @package library\helper - * @see think\db\Query - * @mixin think\db\Query + * @see \think\db\Query + * @mixin \think\db\Query */ class QueryHelper extends Helper { @@ -209,8 +209,8 @@ class QueryHelper extends Helper /** * 实例化分页管理器 - * @param boolean $isPage 是否启用分页 - * @param boolean $isDisplay 是否渲染模板 + * @param boolean $page 是否启用分页 + * @param boolean $display 是否渲染模板 * @param boolean $total 集合分页记录数 * @param integer $limit 集合每页记录数 * @return mixed @@ -220,8 +220,8 @@ class QueryHelper extends Helper * @throws \think\exception\DbException * @throws \think\exception\PDOException */ - public function page($isPage = true, $isDisplay = true, $total = false, $limit = 0) + public function page($page = true, $display = true, $total = false, $limit = 0) { - return PageHelper::instance()->init($this->query, $isPage, $isDisplay, $total, $limit); + return PageHelper::instance()->init($this->query, $page, $display, $total, $limit); } } \ No newline at end of file diff --git a/vendor/zoujingli/think-library/src/helper/SaveHelper.php b/vendor/zoujingli/think-library/src/helper/SaveHelper.php index 600ec4a7f..fd4be3726 100644 --- a/vendor/zoujingli/think-library/src/helper/SaveHelper.php +++ b/vendor/zoujingli/think-library/src/helper/SaveHelper.php @@ -40,13 +40,13 @@ class SaveHelper extends Helper * 数据对象主键名称 * @var array|string */ - protected $pkField; + protected $field; /** * 数据对象主键值 * @var string */ - protected $pkValue; + protected $value; /** * 逻辑器初始化 @@ -63,12 +63,12 @@ class SaveHelper extends Helper $this->where = $where; $this->query = $this->buildQuery($dbQuery); $this->data = empty($data) ? $this->app->request->post() : $data; - $this->pkField = empty($field) ? $this->query->getPk() : $field; - $this->pkValue = $this->app->request->post($this->pkField, null); + $this->field = empty($field) ? $this->query->getPk() : $field; + $this->value = $this->app->request->post($this->field, null); // 主键限制处理 - if (!isset($this->where[$this->pkField]) && is_string($this->pkValue)) { - $this->query->whereIn($this->pkField, explode(',', $this->pkValue)); - if (isset($this->data)) unset($this->data[$this->pkField]); + if (!isset($this->where[$this->field]) && is_string($this->value)) { + $this->query->whereIn($this->field, explode(',', $this->value)); + if (isset($this->data)) unset($this->data[$this->field]); } // 前置回调处理 if (false === $this->controller->callback('_save_filter', $this->query, $this->data)) {