Fixed bug that the relation comments cannot be created by gen:model…

…. (#6561)



Co-authored-by: 李铭昕 <715557344@qq.com>

src/Commands/Ast/ModelUpdateVisitor.php

@@ -277,8 +277,11 @@ protected function initPropertiesFromMethods()
                 continue;
             }
 
-            $return = end($methodStmt->stmts);
-            if ($return instanceof Node\Stmt\Return_) {
+            foreach ($methodStmt->stmts as $return) {
+                if (! $return instanceof Node\Stmt\Return_) {
+                    continue;
+                }
+
                 $expr = $return->expr;
                 if (
                     $expr instanceof Node\Expr\MethodCall
@@ -310,6 +313,7 @@ protected function initPropertiesFromMethods()
                         }
                     }
                 }
+                break;
             }
         }
 

tests/GenModelTest.php

@@ -140,6 +140,7 @@ public function testGenModelWithEnum()
  * @property \\HyperfTest\\Database\\Stubs\\Model\\Gender \$gender 
  * @property \\Carbon\\Carbon \$created_at 
  * @property \\Carbon\\Carbon \$updated_at 
+ * @property-read null|Book \$book 
  */
 class UserEnum extends Model
 {
@@ -155,6 +156,12 @@ class UserEnum extends Model
      * The attributes that should be cast to native types.
      */
     protected array \$casts = ['id' => 'integer', 'gender' => Gender::class, 'created_at' => 'datetime', 'updated_at' => 'datetime'];
+    public function book()
+    {
+        var_dump(1);
+        return \$this->hasOne(Book::class, 'user_id', 'id');
+        // ignore
+    }
 }", $code);
     }
 

tests/Stubs/Model/UserEnum.php

@@ -34,4 +34,10 @@ class UserEnum extends Model
      * The attributes that should be cast to native types.
      */
     protected array $casts = ['id' => 'integer', 'gender' => Gender::class, 'created_at' => 'datetime', 'updated_at' => 'datetime'];
+
+    public function book()
+    {
+        var_dump(1);
+        return $this->hasOne(Book::class, 'user_id', 'id'); // ignore
+    }
 }