完善

Author: yunwuxin

README.md

@@ -0,0 +1,28 @@
+## ThinkPHP6 自动生成用于IDE提示的注释
+
+### 安装
+
+~~~
+composer require topthink/think-ide-helper
+~~~
+
+### 1.模型注释
+
+~~~
+//所有模型
+php think ide-helper:model
+
+//指定模型
+php think ide-helper:model app\\model\\User app\\model\\Post
+~~~
+
+#### 可选参数
+~~~
+--dir="models" [-D] 指定自动搜索模型的目录,相对于应用基础目录的路径，可指定多个，默认为app/model
+
+--ignore="app\\model\\User,app\\model\\Post" [-I] 忽略的模型，可指定多个
+
+--overwrite [-O] 强制覆盖已有的属性注释
+
+--reset [-R] 重置模型的所有的注释
+~~~

src/ModelGenerator.php

@@ -24,15 +24,18 @@
 use think\helper\Arr;
 use think\helper\Str;
 use think\Model;
+use think\model\Collection;
 use think\model\Relation;
 use think\model\relation\BelongsTo;
 use think\model\relation\BelongsToMany;
 use think\model\relation\HasMany;
 use think\model\relation\HasManyThrough;
 use think\model\relation\HasOne;
+use think\model\relation\HasOneThrough;
 use think\model\relation\MorphMany;
 use think\model\relation\MorphOne;
 use think\model\relation\MorphTo;
+use think\model\relation\MorphToMany;
 use Throwable;
 
 class ModelGenerator
@@ -98,12 +101,12 @@ public function addProperty($name, $type = null, $read = null, $write = null, $c
         }
     }
 
-    public function addMethod($name, $return = 'mixed', $arguments = [], $type = 'static')
+    public function addMethod($name, $return = 'mixed', $arguments = [], $static = true)
     {
         $methods = array_change_key_case($this->methods, CASE_LOWER);
         if (!isset($methods[strtolower($name)])) {
             $this->methods[$name]              = [];
-            $this->methods[$name]['type']      = $type;
+            $this->methods[$name]['static']    = $static ? 'static' : '';
             $this->methods[$name]['arguments'] = $arguments;
             $this->methods[$name]['return']    = $return;
         }
@@ -129,7 +132,7 @@ public function generate()
             return;
         }
 
-        $this->model = new ($this->class);
+        $this->model = new $this->class;
 
         $this->getPropertiesFromTable();
         $this->getPropertiesFromMethods();
@@ -307,7 +310,7 @@ protected function getPropertiesFromMethods()
                         if ($return instanceof Relation) {
 
                             $name = Str::snake($methodName);
-                            if ($return instanceof HasOne || $return instanceof BelongsTo || $return instanceof MorphOne) {
+                            if ($return instanceof HasOne || $return instanceof BelongsTo || $return instanceof MorphOne || $return instanceof HasOneThrough) {
                                 $this->addProperty($name, "\\" . get_class($return->getModel()), true, null);
                             }
 
@@ -318,6 +321,10 @@ protected function getPropertiesFromMethods()
                             if ($return instanceof MorphTo || $return instanceof MorphMany) {
                                 $this->addProperty($name, "mixed", true, null);
                             }
+
+                            if ($return instanceof MorphToMany) {
+                                $this->addProperty($name, "\\" . Collection::class, true, null);
+                            }
                         }
                     } catch (Exception $e) {
                     } catch (Throwable $e) {
@@ -405,7 +412,7 @@ protected function createPhpDocs()
 
             $arguments = implode(', ', $method['arguments']);
 
-            $tags[] = $tagFactory->create("@method {$method['type']} {$method['return']} {$name}({$arguments})", $context);
+            $tags[] = $tagFactory->create("@method {$method['static']} {$method['return']} {$name}({$arguments})", $context);
         }
 
         $tags = $this->sortTags($tags);