chore: merge with origin

Author: Ni Nelli

src/Generators/ModelGenerator.php

@@ -85,6 +85,8 @@ public function prepareRelatedModels(): void
                 // TODO: use ronasit/larabuilder instead regexp
                 $fixedContent = preg_replace('/\}$/', "\n    {$newRelation}\n}", $content);
 
+                $this->insertImport($fixedContent, 'Illuminate\Database\Eloquent\Relations\\' . Str::ucfirst($types[$type]));
+
                 $this->insertPropertyAnnotation($fixedContent, $this->getRelationType($this->model, $types[$type]), $relationName);
 
                 $this->saveClass('models', $relation, $fixedContent);
@@ -157,11 +159,13 @@ protected function getImportedRelations(): array
     {
         $result = [];
 
-        foreach ($this->relations as $relations) {
+        foreach ($this->relations as $relationType => $relations) {
             foreach ($relations as $relation) {
                 if ($this->shouldImportRelation($relation)) {
                     $result[] = $this->generateClassNamespace($relation);
                 }
+
+                $result[] = 'Illuminate\Database\Eloquent\Relations\\' . Str::ucfirst($relationType);
             }
         }
 

stubs/relation.blade.php

@@ -1,4 +1,4 @@
-    public function {{ $name }}()
+    public function {{ $name }}(): {{ Str::ucfirst($type) }}
     {
         return $this->{{ $type }}({{ $entity }}::class);
     }

tests/fixtures/ModelGeneratorTest/comment_relation_model.php

@@ -2,6 +2,7 @@
 
 namespace RonasIT\Support\Tests\Support\Models;
 
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Model;
 use RonasIT\Support\Traits\ModelTrait;
 
@@ -26,7 +27,7 @@ public function some_relation()
     {
     }
 
-    public function post()
+    public function post(): BelongsTo
     {
         return $this->belongsTo(Post::class);
     }

tests/fixtures/ModelGeneratorTest/new_model.php

@@ -4,6 +4,8 @@
 
 use Illuminate\Database\Eloquent\Model;
 use RonasIT\Support\Traits\ModelTrait;
+use Illuminate\Database\Eloquent\Relations\HasOne;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Collection;
 
@@ -56,12 +58,12 @@ class Post extends Model
         'meta' => 'array',
     ];
 
-    public function comment()
+    public function comment(): HasOne
     {
         return $this->hasOne(Comment::class);
     }
 
-    public function users()
+    public function users(): HasMany
     {
         return $this->hasMany(User::class);
     }

tests/fixtures/ModelGeneratorTest/new_model_with_many_relations.php

@@ -5,6 +5,8 @@
 use Illuminate\Database\Eloquent\Model;
 use RonasIT\Support\Traits\ModelTrait;
 use App\Models\User;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Collection;
 
 /**
@@ -19,12 +21,12 @@ class Post extends Model
 
     protected $hidden = ['pivot'];
 
-    public function users()
+    public function users(): HasMany
     {
         return $this->hasMany(User::class);
     }
 
-    public function users()
+    public function users(): BelongsToMany
     {
         return $this->belongsToMany(User::class);
     }

tests/fixtures/ModelGeneratorTest/new_model_with_subfolers_relations.php

@@ -5,6 +5,7 @@
 use Illuminate\Database\Eloquent\Model;
 use RonasIT\Support\Traits\ModelTrait;
 use App\Models\Forum\Author;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Collection;
 
 /**
@@ -21,7 +22,7 @@ class Post extends Model
 
     protected $hidden = ['pivot'];
 
-    public function authors()
+    public function authors(): HasMany
     {
         return $this->hasMany(Author::class);
     }

tests/fixtures/ModelGeneratorTest/new_subfolders_model.php

@@ -5,7 +5,9 @@
 use Illuminate\Database\Eloquent\Model;
 use RonasIT\Support\Traits\ModelTrait;
 use App\Models\Comment;
+use Illuminate\Database\Eloquent\Relations\HasOne;
 use App\Models\User;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Collection;
 
@@ -58,12 +60,12 @@ class Post extends Model
         'meta' => 'array',
     ];
 
-    public function comment()
+    public function comment(): HasOne
     {
         return $this->hasOne(Comment::class);
     }
 
-    public function users()
+    public function users(): HasMany
     {
         return $this->hasMany(User::class);
     }

tests/fixtures/ModelGeneratorTest/related_model_with_property.php

@@ -3,6 +3,7 @@
 namespace RonasIT\Support\Tests\Support\Models;
 
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Model;
 use RonasIT\Support\Traits\ModelTrait;
 
@@ -27,7 +28,7 @@ public function some_relation()
     {
     }
 
-    public function categories()
+    public function categories(): BelongsToMany
     {
         return $this->belongsToMany(Category::class);
     }