mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-09-02 21:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

修正聚合模型 以及模型方法和属性同名的BUG

Browse Source
This commit is contained in:
thinkphp
2017-04-19 14:24:44 +08:00
parent 628b37aab1
commit 77dbb1315b
2 changed files with 40 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
library/think/Model.php
View File

@@ -1083,11 +1083,14 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
{
$relation = Loader::parseName($attr, 1, false);
if (method_exists($this, $relation) && $this->$relation() instanceof Relation) {
return $relation;
} else {
return false;
if (method_exists($this, $relation)) {
$reflect = new \ReflectionMethod($this, $relation);
if (0 == $reflect->getNumberOfParameters() && $this->$relation() instanceof Relation) {
return $relation;
}
}
return false;
}
/**
@@ -1522,9 +1525,6 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
*/
public static function scope($name)
{
if ($name instanceof Query) {
return $name;
}
$model = new static();
$query = $model->db();
$params = func_get_args();
@@ -1542,7 +1542,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
}
}
}
return $query;
return $model;
}
/**
@@ -1937,7 +1937,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
array_unshift($args, $query);
call_user_func_array([$model, $method], $args);
return $query;
return $model;
} else {
return call_user_func_array([$query, $method], $args);
}