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

改进Model类的toArray方法 支持关联模型输出数组

Browse Source
This commit is contained in:
thinkphp
2016-04-20 21:33:24 +08:00
parent 87a128f231
commit a5505c000c
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
library/think/Model.php
View File

@@ -119,7 +119,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
// JsonSerializable
public function jsonSerialize()
{
return $this->data;
return $this->toArray();
}
// ArrayAccess
@@ -178,7 +178,21 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
*/
public function toArray()
{
return !empty($this->data) ? $this->data : [];
$item = [];
foreach ($this->data as $key => $val) {
if ($val instanceof Model) {
$item[$key] = $val->toArray();
} elseif (is_array($val) && $val[0] instanceof Model) {
$data = [];
foreach ($val as $k => $value) {
$data[$k] = $value->toArray();
}
$item[$key] = $data;
} elseif (is_scalar($val)) {
$item[$key] = $val;
}
}
return !empty($item) ? $item : [];
}
/**
@@ -912,7 +926,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
public function __toString()
{
return json_encode($this->data);
return json_encode($this->toArray());
}
/**