Improve static analysis

composer.json

@@ -18,10 +18,8 @@
     },
     "require-dev": {
         "barryvdh/laravel-ide-helper": "^3.0",
-        "larastan/larastan": "^2.9",
         "orchestra/testbench": "^9.0",
-        "phpstan/phpstan-mockery": "^1.1",
-        "phpstan/phpstan-phpunit": "^1.4",
+        "phpstan/phpstan": "^1.12",
         "phpunit/phpunit": "^11.0"
     },
     "autoload": {

phpstan.neon.dist

@@ -1,10 +1,4 @@
-includes:
-    - ./vendor/larastan/larastan/extension.neon
-    - ./vendor/phpstan/phpstan-mockery/extension.neon
-    - ./vendor/phpstan/phpstan-phpunit/extension.neon
-    - ./vendor/phpstan/phpstan-phpunit/rules.neon
 parameters:
-    level: max
+    level: 9
     paths:
         - src
-        - tests

src/IdeHelper/BelongsToThroughRelationsHook.php

@@ -43,7 +43,7 @@ public function run(ModelsCommand $command, Model $model): void
     }
 
     /**
-     * @param \Illuminate\Database\Eloquent\Relations\Relation<\Illuminate\Database\Eloquent\Model> $relationship
+     * @param \Illuminate\Database\Eloquent\Relations\Relation<*,*, *> $relationship
      */
     protected function addRelationship(ModelsCommand $command, ReflectionMethod $method, Relation $relationship): void
     {

src/IdeHelperServiceProvider.php

@@ -11,7 +11,7 @@ class IdeHelperServiceProvider extends ServiceProvider implements DeferrableProv
 {
     public function register(): void
     {
-        /** @var \Illuminate\Contracts\Config\Repository $config */
+        /** @var \Illuminate\Config\Repository $config */
         $config = $this->app->get('config');
 
         $config->set(
@@ -24,7 +24,7 @@ public function register(): void
     }
 
     /**
-     * @return class-string<\Illuminate\Console\Command>[]
+     * @return list<class-string<\Illuminate\Console\Command>>
      */
     public function provides(): array
     {

src/Relations/BelongsToThrough.php

@@ -10,13 +10,12 @@
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Expression;
 use Illuminate\Support\Str;
-use RuntimeException;
 
 /**
  * @template TRelatedModel of \Illuminate\Database\Eloquent\Model
  * @template TDeclaringModel of \Illuminate\Database\Eloquent\Model
- *
- * @extends \Illuminate\Database\Eloquent\Relations\Relation<TRelatedModel>
+
+ * @extends \Illuminate\Database\Eloquent\Relations\Relation<TRelatedModel, TDeclaringModel, ?TRelatedModel>
  */
 class BelongsToThrough extends Relation
 {
@@ -253,7 +252,12 @@ public function first($columns = ['*'])
         return $this->query->first($columns);
     }
 
-    /** @inheritDoc */
+    /**
+     * Execute the query as a "select" statement.
+     *
+     * @param list<string> $columns
+     * @return \Illuminate\Database\Eloquent\Collection<int, TRelatedModel>
+     */
     public function get($columns = ['*'])
     {
         $columns = $this->query->getQuery()->columns ? [] : $columns;

tests/IdeHelper/Models/Comment.php

@@ -10,9 +10,6 @@ class Comment extends Model
 {
     use BelongsToThroughTrait;
 
-    /**
-     * @return \Znck\Eloquent\Relations\BelongsToThrough<\Tests\IdeHelper\Models\Country, $this>
-     */
     public function country(): BelongsToThroughRelation
     {
         return $this->belongsToThrough(Country::class, [User::class, Post::class]);

tests/Models/Comment.php

@@ -5,26 +5,15 @@
 use Znck\Eloquent\Relations\BelongsToThrough;
 use Znck\Eloquent\Traits\HasTableAlias;
 
-/**
- * @property int $id
- *
- * @property-read \Tests\Models\Country|null $country
- */
 class Comment extends Model
 {
     use HasTableAlias;
 
-    /**
-     * @return \Znck\Eloquent\Relations\BelongsToThrough<\Tests\Models\Country, $this>
-     */
     public function country(): BelongsToThrough
     {
         return $this->belongsToThrough(Country::class, [User::class, Post::class])->withDefault();
     }
 
-    /**
-     * @return \Znck\Eloquent\Relations\BelongsToThrough<\Tests\Models\Country, $this>
-     */
     public function countryWithCustomForeignKeys(): BelongsToThrough
     {
         return $this->belongsToThrough(
@@ -36,35 +25,21 @@ public function countryWithCustomForeignKeys(): BelongsToThrough
         );
     }
 
-    /**
-     * @return \Znck\Eloquent\Relations\BelongsToThrough<\Tests\Models\Country, $this>
-     */
     public function countryWithTrashedUser(): BelongsToThrough
     {
-        /* @phpstan-ignore return.type */
         return $this->country()->withTrashed(['users.deleted_at']);
     }
 
-    /**
-     * @return \Znck\Eloquent\Relations\BelongsToThrough<\Tests\Models\Country, $this>
-     */
     public function countryWithPrefix(): BelongsToThrough
     {
         return $this->belongsToThrough(Country::class, [User::class, Post::class], null, 'custom_');
     }
 
-    /**
-     * @return \Znck\Eloquent\Relations\BelongsToThrough<self, $this>
-     */
     public function grandparent(): BelongsToThrough
     {
-        /* @phpstan-ignore argument.type */
         return $this->belongsToThrough(self::class, self::class.' as alias', null, '', [self::class => 'parent_id']);
     }
 
-    /**
-     * @return \Znck\Eloquent\Relations\BelongsToThrough<\Tests\Models\User, $this>
-     */
     public function user(): BelongsToThrough
     {
         return $this->belongsToThrough(User::class, Post::class);

tests/Models/Country.php

@@ -2,9 +2,6 @@
 
 namespace Tests\Models;
 
-/**
- * @property int $id
- */
 class Country extends Model
 {
     //

tests/Models/CustomerAddress.php

@@ -6,9 +6,6 @@
 
 class CustomerAddress extends Model
 {
-    /**
-     * @return \Znck\Eloquent\Relations\BelongsToThrough<\Tests\Models\VendorCustomer, $this>
-     */
     public function vendorCustomer(): BelongsToThrough
     {
         return $this->belongsToThrough(

tests/TestCase.php

@@ -35,12 +35,7 @@ protected function setUp(): void
         $this->seed();
     }
 
-    /**
-     * Migrate the database.
-     *
-     * @return void
-     */
-    protected function migrate()
+    protected function migrate(): void
     {
         DB::schema()->create('countries', function (Blueprint $table) {
             $table->increments('id');
@@ -80,12 +75,7 @@ protected function migrate()
         });
     }
 
-    /**
-     * Seed the database.
-     *
-     * @return void
-     */
-    protected function seed()
+    protected function seed(): void
     {
         Model::unguard();