test/hyperf
1
0
Fork 0
mirror of https://gitee.com/hyperf/hyperf.git synced 2024-12-04 20:58:13 +08:00
Code Issues Actions 16 Packages Projects Releases Wiki Activity

Fixed gen:model generate morphTo relation annotate, and relation method used where

Browse Source
This commit is contained in:
weskiller 2020-06-30 19:19:42 +08:00
parent 0e6e12b11d
commit 6d5e9f4239
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/database/src/Commands/Ast/ModelUpdateVisitor.php
View File

@ -28,7 +28,6 @@ use Hyperf\Database\Model\Relations\MorphMany;
use Hyperf\Database\Model\Relations\MorphOne;
use Hyperf\Database\Model\Relations\MorphTo;
use Hyperf\Database\Model\Relations\MorphToMany;
use Hyperf\Database\Model\Relations\Relation;
use Hyperf\Utils\Str;
use PhpParser\Comment\Doc;
use PhpParser\Node;
@ -38,6 +37,7 @@ use Roave\BetterReflection\Reflection\ReflectionClass;
use Roave\BetterReflection\Reflection\ReflectionMethod;
use Roave\BetterReflection\Reflector\ClassReflector;
use Roave\BetterReflection\TypesFinder\FindReturnType;
use RuntimeException;
class ModelUpdateVisitor extends NodeVisitorAbstract
{
@ -263,12 +263,18 @@ class ModelUpdateVisitor extends NodeVisitorAbstract
&& isset($expr->args[0])
&& $expr->args[0] instanceof Node\Arg
) {
$loop = 0;
while($expr->var instanceof Node\Expr\MethodCall) {
if($loop > 32) {
throw new RuntimeException("max loop reached!");
}
$loop ++;
$expr = $expr->var;
}
$name = $expr->name->name;
if (array_key_exists($name, self::RELATION_METHODS)) {
if ($expr->args[0]->value instanceof Node\Expr\ClassConstFetch) {
$related = $expr->args[0]->value->class->toCodeString();
} else {
$related = (string) ($expr->args[0]->value);
}
if (strpos($name, 'Many') !== false) {
@ -276,7 +282,7 @@ class ModelUpdateVisitor extends NodeVisitorAbstract
$this->setProperty($method->getName(), [$this->getCollectionClass($related), $related . '[]'], true);
} elseif ($name === 'morphTo') {
// Model isn't specified because relation is polymorphic
$this->setProperty($method->getName(), [Model::class], true);
$this->setProperty($method->getName(), ['\\' . Model::class], true);
} else {
// Single model is returned
$this->setProperty($method->getName(), [$related], true);