ComposerUpdate

vendor/autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitf558cbe483e15d25595ae80d3fb20e9e::getLoader();
+return ComposerAutoloaderInitb7e6ef67068b48e5175bce380d4bfe2f::getLoader();

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;

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);
     }

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": {

vendor/zoujingli/think-library/composer.json

@@ -22,5 +22,11 @@
     "psr-4": {
       "library\\": "src"
     }
+  },
+  "repositories": {
+    "packagist": {
+      "type": "composer",
+      "url": "https://mirrors.aliyun.com/composer"
+    }
   }
 }

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 = [])
     {

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);
     }
 
 }

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('数据保存失败, 请稍候再试!');

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);
     }
 }

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)) {