Merge pull request #438 from hooklife/bugfix3

修改架构函数为构造方法
2026-07-01 20:52:48 +08:00 · 2017-02-13 15:09:16 +08:00
parent 59c6ec2dce 21834f797d
commit d4c9a933e6
31 changed files with 31 additions and 31 deletions
--- a/library/think/Controller.php
+++ b/library/think/Controller.php
@@ -40,7 +40,7 @@ class Controller
    protected $beforeActionList = [];

    /**
-     * 架构函数
+     * 构造方法
     * @param Request $request Request对象
     * @access public
     */
--- a/library/think/Model.php
+++ b/library/think/Model.php
@@ -109,7 +109,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
    protected static $initialized = [];

    /**
-     * 架构函数
+     * 构造方法
     * @access public
     * @param array|object $data 数据
     */
--- a/library/think/Request.php
+++ b/library/think/Request.php
@@ -120,7 +120,7 @@ class Request
    protected $isCheckCache;

    /**
-     * 架构函数
+     * 构造函数
     * @access protected
     * @param array $options 参数
     */
--- a/library/think/Response.php
+++ b/library/think/Response.php
@@ -40,7 +40,7 @@ class Response
    protected $content = null;

    /**
-     * 架构函数
+     * 构造函数
     * @access   public
     * @param mixed $data    输出数据
     * @param int   $code
--- a/library/think/Template.php
+++ b/library/think/Template.php
@@ -57,7 +57,7 @@ class Template
    protected $storage;

    /**
-     * 架构函数
+     * 构造函数
     * @access public
     */
    public function __construct(array $config = [])
--- a/library/think/Validate.php
+++ b/library/think/Validate.php
@@ -102,7 +102,7 @@ class Validate
    protected $batch = false;

    /**
-     * 架构函数
+     * 构造函数
     * @access public
     * @param array $rules 验证规则
     * @param array $message 验证提示信息
--- a/library/think/View.php
+++ b/library/think/View.php
@@ -25,7 +25,7 @@ class View
    protected $replace = [];

    /**
-     * 架构函数
+     * 构造函数
     * @access public
     * @param array $engine  模板引擎参数
     * @param array $replace  字符串替换参数
--- a/library/think/cache/driver/File.php
+++ b/library/think/cache/driver/File.php
@@ -28,7 +28,7 @@ class File extends Driver
    ];

    /**
-     * 架构函数
+     * 构造函数
     * @param array $options
     */
    public function __construct($options = [])
--- a/library/think/cache/driver/Lite.php
+++ b/library/think/cache/driver/Lite.php
@@ -26,7 +26,7 @@ class Lite extends Driver
    ];

    /**
-     * 架构函数
+     * 构造函数
     * @access public
     *
     * @param array $options
--- a/library/think/cache/driver/Memcache.php
+++ b/library/think/cache/driver/Memcache.php
@@ -25,7 +25,7 @@ class Memcache extends Driver
    ];

    /**
-     * 架构函数
+     * 构造函数
     * @param array $options 缓存参数
     * @access public
     * @throws \BadFunctionCallException
--- a/library/think/cache/driver/Memcached.php
+++ b/library/think/cache/driver/Memcached.php
@@ -27,7 +27,7 @@ class Memcached extends Driver
    ];

    /**
-     * 架构函数
+     * 构造函数
     * @param array $options 缓存参数
     * @access public
     */
--- a/library/think/cache/driver/Redis.php
+++ b/library/think/cache/driver/Redis.php
@@ -34,7 +34,7 @@ class Redis extends Driver
    ];

    /**
-     * 架构函数
+     * 构造函数
     * @param array $options 缓存参数
     * @access public
     */
--- a/library/think/cache/driver/Sqlite.php
+++ b/library/think/cache/driver/Sqlite.php
@@ -28,7 +28,7 @@ class Sqlite extends Driver
    ];

    /**
-     * 架构函数
+     * 构造函数
     * @param array $options 缓存参数
     * @throws \BadFunctionCallException
     * @access public
--- a/library/think/cache/driver/Wincache.php
+++ b/library/think/cache/driver/Wincache.php
@@ -25,7 +25,7 @@ class Wincache extends Driver
    ];

    /**
-     * 架构函数
+     * 构造函数
     * @param array $options 缓存参数
     * @throws \BadFunctionCallException
     * @access public
--- a/library/think/cache/driver/Xcache.php
+++ b/library/think/cache/driver/Xcache.php
@@ -25,7 +25,7 @@ class Xcache extends Driver
    ];

    /**
-     * 架构函数
+     * 构造函数
     * @param array $options 缓存参数
     * @access public
     * @throws \BadFunctionCallException
--- a/library/think/controller/Rest.php
+++ b/library/think/controller/Rest.php
@@ -32,7 +32,7 @@ abstract class Rest
    ];

    /**
-     * 架构函数 取得模板对象实例
+     * 构造函数 取得模板对象实例
     * @access public
     */
    public function __construct()
--- a/library/think/controller/Yar.php
+++ b/library/think/controller/Yar.php
@@ -18,7 +18,7 @@ abstract class Yar
 {

    /**
-     * 架构函数
+     * 构造函数
     * @access public
     */
    public function __construct()
--- a/library/think/db/Builder.php
+++ b/library/think/db/Builder.php
@@ -32,7 +32,7 @@ abstract class Builder
    protected $deleteSql    = 'DELETE FROM %TABLE% %USING% %JOIN% %WHERE% %ORDER%%LIMIT% %LOCK%%COMMENT%';

    /**
-     * 架构函数
+     * 构造函数
     * @access public
     * @param Connection    $connection 数据库连接对象实例
     * @param Query         $query      数据库查询对象实例
--- a/library/think/db/Connection.php
+++ b/library/think/db/Connection.php
@@ -125,7 +125,7 @@ abstract class Connection
    protected $bind = [];

    /**
-     * 架构函数 读取数据库配置信息
+     * 构造函数 读取数据库配置信息
     * @access public
     * @param array $config 数据库配置数组
     */
--- a/library/think/db/Query.php
+++ b/library/think/db/Query.php
@@ -54,7 +54,7 @@ class Query
    private static $event = [];

    /**
-     * 架构函数
+     * 构造函数
     * @access public
     * @param Connection $connection 数据库对象实例
     * @param string     $model      模型名
--- a/library/think/log/driver/Socket.php
+++ b/library/think/log/driver/Socket.php
@@ -43,7 +43,7 @@ class Socket
    protected $allowForceClientIds = []; //配置强制推送且被授权的client_id

    /**
-     * 架构函数
+     * 构造函数
     * @param array $config 缓存参数
     * @access public
     */
--- a/library/think/model/Merge.php
+++ b/library/think/model/Merge.php
@@ -22,7 +22,7 @@ class Merge extends Model
    protected $mapFields     = []; //  需要处理的模型映射字段，避免混淆 array( id => 'user.id'  )

    /**
-     * 架构函数
+     * 构造函数
     * @access public
     * @param array|object $data 数据
     */
--- a/library/think/model/Pivot.php
+++ b/library/think/model/Pivot.php
@@ -17,7 +17,7 @@ class Pivot extends Model
 {

    /**
-     * 架构函数
+     * 构造函数
     * @access public
     * @param array|object $data 数据
     * @param string $table 中间数据表名
--- a/library/think/model/relation/BelongsTo.php
+++ b/library/think/model/relation/BelongsTo.php
@@ -17,7 +17,7 @@ use think\Model;
 class BelongsTo extends OneToOne
 {
    /**
-     * 架构函数
+     * 构造函数
     * @access public
     * @param Model  $parent 上级模型对象
     * @param string $model 模型名
--- a/library/think/model/relation/BelongsToMany.php
+++ b/library/think/model/relation/BelongsToMany.php
@@ -24,7 +24,7 @@ class BelongsToMany extends Relation
    protected $middle;

    /**
-     * 架构函数
+     * 构造函数
     * @access public
     * @param Model  $parent     上级模型对象
     * @param string $model      模型名
--- a/library/think/model/relation/HasMany.php
+++ b/library/think/model/relation/HasMany.php
@@ -20,7 +20,7 @@ use think\model\Relation;
 class HasMany extends Relation
 {
    /**
-     * 架构函数
+     * 构造函数
     * @access public
     * @param Model  $parent     上级模型对象
     * @param string $model      模型名
--- a/library/think/model/relation/HasManyThrough.php
+++ b/library/think/model/relation/HasManyThrough.php
@@ -26,7 +26,7 @@ class HasManyThrough extends Relation
    protected $through;

    /**
-     * 架构函数
+     * 构造函数
     * @access   public
     * @param Model  $parent     上级模型对象
     * @param string $model      模型名
--- a/library/think/model/relation/HasOne.php
+++ b/library/think/model/relation/HasOne.php
@@ -18,7 +18,7 @@ use think\Model;
 class HasOne extends OneToOne
 {
    /**
-     * 架构函数
+     * 构造函数
     * @access public
     * @param Model  $parent     上级模型对象
     * @param string $model      模型名
--- a/library/think/model/relation/MorphMany.php
+++ b/library/think/model/relation/MorphMany.php
@@ -27,7 +27,7 @@ class MorphMany extends Relation
    protected $type;

    /**
-     * 架构函数
+     * 构造函数
     * @access public
     * @param Model  $parent    上级模型对象
     * @param string $model     模型名
--- a/library/think/model/relation/MorphTo.php
+++ b/library/think/model/relation/MorphTo.php
@@ -25,7 +25,7 @@ class MorphTo extends Relation
    protected $alias;

    /**
-     * 架构函数
+     * 构造函数
     * @access public
     * @param Model  $parent    上级模型对象
     * @param string $morphType 多态字段名
--- a/library/think/template/TagLib.php
+++ b/library/think/template/TagLib.php
@@ -68,7 +68,7 @@ class TagLib
    protected $comparison = [' nheq ' => ' !== ', ' heq ' => ' === ', ' neq ' => ' != ', ' eq ' => ' == ', ' egt ' => ' >= ', ' gt ' => ' > ', ' elt ' => ' <= ', ' lt ' => ' < '];

    /**
-     * 架构函数
+     * 构造函数
     * @access public
     * @param \stdClass $template 模板引擎对象
     */