mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-01 12:42:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

改进属性过滤输出

Browse Source
This commit is contained in:
yunwuxin
2016-07-11 11:35:41 +08:00
parent e1406b969b
commit 6349adf19d
3 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
library/think/Collection.php
View File

@@ -40,10 +40,10 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria
return empty($this->items);
}
public function toArray($allow = [])
public function toArray()
{
return array_map(function ($value) use ($allow) {
return ($value instanceof Model || $value instanceof self) ? $value->toArray($allow) : $value;
return array_map(function ($value) {
return ($value instanceof Model || $value instanceof self) ? $value->toArray() : $value;
}, $this->items);
}
@@ -344,13 +344,12 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria
/**
* 转换当前数据集为JSON字符串
* @access public
* @param array $allow 允许输出的属性列表
* @param integer $options json参数
* @return string
*/
public function toJson($allow = [], $options = JSON_UNESCAPED_UNICODE)
public function toJson($options = JSON_UNESCAPED_UNICODE)
{
return json_encode($this->toArray($allow), $options);
return json_encode($this->toArray(), $options);
}
public function __toString()