From 30077757bdf99f360ce529c600118ea2037a4347 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Mon, 5 Dec 2016 12:12:33 +0800
Subject: [PATCH] =?UTF-8?q?Model=E7=B1=BB=E5=A2=9E=E5=8A=A0toCollection?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=20=E7=94=A8=E4=BA=8E=E8=BD=AC=E6=8D=A2?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E5=AF=B9=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Model.php | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/library/think/Model.php b/library/think/Model.php
index 0a3a35f5..6a6841a6 100644
--- a/library/think/Model.php
+++ b/library/think/Model.php
@@ -13,6 +13,7 @@ namespace think;
 
 use InvalidArgumentException;
 use think\Cache;
+use think\Collection;
 use think\Config;
 use think\Db;
 use think\db\Query;
@@ -565,6 +566,17 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
         return json_encode($this->toArray(), $options);
     }
 
+    /**
+     * 转换当前模型数据集为数据集对象
+     * @access public
+     * @param array|Collection   $collection 数据集
+     * @return Collection
+     */
+    public function toCollection($collection)
+    {
+        return new Collection($collection);
+    }
+
     /**
      * 获取模型对象的主键
      * @access public
@@ -1200,6 +1212,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
      * @access public
      * @param array     $resultSet 数据集
      * @param string    $relation 关联名
+     * @param string    $class 数据集对象名 为空表示数组
      * @return array
      */
     public function eagerlyResultSet(&$resultSet, $relation, $class = '')
@@ -1224,6 +1237,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
      * @access public
      * @param Model     $result 数据对象
      * @param string    $relation 关联名
+     * @param string    $class 数据集对象名 为空表示数组
      * @return Model
      */
     public function eagerlyResult(&$result, $relation, $class = '')
@@ -1252,7 +1266,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
      * @param string $localKey 关联主键
      * @param array  $alias 别名定义
      * @param string $joinType JOIN类型
-     * @return Relation
+     * @return HasOne
      */
     public function hasOne($model, $foreignKey = '', $localKey = '', $alias = [], $joinType = 'INNER')
     {
@@ -1271,7 +1285,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
      * @param string $otherKey 关联主键
      * @param array  $alias 别名定义
      * @param string $joinType JOIN类型
-     * @return Relation
+     * @return BelongsTo
      */
     public function belongsTo($model, $foreignKey = '', $otherKey = '', $alias = [], $joinType = 'INNER')
     {
@@ -1289,7 +1303,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
      * @param string $foreignKey 关联外键
      * @param string $localKey 关联主键
      * @param array  $alias 别名定义
-     * @return Relation
+     * @return HasMany
      */
     public function hasMany($model, $foreignKey = '', $localKey = '', $alias = [])
     {
@@ -1309,7 +1323,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
      * @param string $throughKey 关联外键
      * @param string $localKey 关联主键
      * @param array  $alias 别名定义
-     * @return Relation
+     * @return HasManyThrough
      */
     public function hasManyThrough($model, $through, $foreignKey = '', $throughKey = '', $localKey = '', $alias = [])
     {
@@ -1331,7 +1345,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
      * @param string $foreignKey 关联外键
      * @param string $localKey 当前模型关联键
      * @param array  $alias 别名定义
-     * @return Relation
+     * @return BelongsToMany
      */
     public function belongsToMany($model, $table = '', $foreignKey = '', $localKey = '', $alias = [])
     {
@@ -1347,10 +1361,10 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
     /**
      * MORPH  MANY 关联定义
      * @access public
-     * @param string $model 模型名
-     * @param string|array $morph 多态字段信息
-     * @param string $type 多态类型
-     * @return Relation
+     * @param string        $model 模型名
+     * @param string|array  $morph 多态字段信息
+     * @param string        $type 多态类型
+     * @return MorphMany
      */
     public function morphMany($model, $morph = null, $type = '')
     {
@@ -1375,7 +1389,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
      * @access public
      * @param string|array  $morph 多态字段信息
      * @param array         $alias 多态别名定义
-     * @return Relation
+     * @return MorphTo
      */
     public function morphTo($morph = null, $alias = [])
     {