Increase PHPStan level

composer.json

@@ -22,6 +22,7 @@
         "mockery/mockery": "^1.6",
         "orchestra/testbench": "^9.0",
         "phpstan/phpstan": "^1.10",
+        "phpstan/phpstan-mockery": "^1.1",
         "phpunit/phpunit": "^11.0",
         "staudenmeir/eloquent-json-relations": "^1.11",
         "staudenmeir/laravel-adjacency-list": "^1.21"

phpstan.neon.dist

@@ -1,9 +1,12 @@
 includes:
     - ./vendor/larastan/larastan/extension.neon
+    - ./vendor/phpstan/phpstan-mockery/extension.neon
 parameters:
-    level: 1
+    level: 2
     paths:
         - src
         - tests
     ignoreErrors:
+        - '#Call to an undefined method .+::getQualifiedDeletedAtColumn\(\)#'
+        - '#Call to an undefined method .+::withTrashed\(\)#'
         - '#Unsafe usage of new static\(\).#'

src/Eloquent/Relations/Traits/RetrievesIntermediateTables.php

@@ -51,7 +51,10 @@ public function withPivot(
         ?callable $postProcessor = null
     ) {
         if ($columns === ['*']) {
-            $columns = $this->query->getConnection()->getSchemaBuilder()->getColumnListing($table);
+            /** @var \Illuminate\Database\Connection $connection */
+            $connection = $this->query->getConnection();
+
+            $columns = $connection->getSchemaBuilder()->getColumnListing($table);
         }
 
         $accessor = $accessor ?: $table;

src/HasManyDeep.php

@@ -18,6 +18,7 @@
 
 /**
  * @template TRelatedModel of \Illuminate\Database\Eloquent\Model
+ *
  * @extends \Illuminate\Database\Eloquent\Relations\HasManyThrough<TRelatedModel>
  */
 class HasManyDeep extends HasManyThrough implements ConcatenableRelation

src/HasOneDeep.php

@@ -8,7 +8,8 @@
 
 /**
  * @template TRelatedModel of \Illuminate\Database\Eloquent\Model
- * @extends \Illuminate\Database\Eloquent\Relations\HasOneThrough<TRelatedModel>
+ *
+ * @extends \Staudenmeir\EloquentHasManyDeep\HasManyDeep<TRelatedModel>
  */
 class HasOneDeep extends HasManyDeep
 {

tests/Concatenation/EloquentJsonRelations/Models/Project.php

@@ -6,6 +6,9 @@
 use Staudenmeir\EloquentHasManyDeep\HasRelationships;
 use Staudenmeir\EloquentJsonRelations\JsonKey;
 
+/**
+ * @property-read \Illuminate\Database\Eloquent\Relations\Pivot $pivot
+ */
 class Project extends Model
 {
     use HasRelationships;

tests/Concatenation/EloquentJsonRelations/Models/Role.php

@@ -7,6 +7,9 @@
 use Staudenmeir\EloquentHasManyDeep\HasRelationships;
 use Staudenmeir\EloquentJsonRelations\JsonKey;
 
+/**
+ * @property-read \Illuminate\Database\Eloquent\Relations\Pivot $pivot
+ */
 class Role extends Model
 {
     use HasRelationships;

tests/Concatenation/LaravelAdjacencyList/Models/User.php

@@ -10,6 +10,10 @@
 use Staudenmeir\EloquentHasManyDeep\HasTableAlias;
 use Staudenmeir\LaravelAdjacencyList\Eloquent\HasRecursiveRelationships;
 
+/**
+ * @property-read \Tests\Concatenation\LaravelAdjacencyList\Models\Post $ancestorPost
+ * @property-read \Tests\Concatenation\LaravelAdjacencyList\Models\Post $descendantPost
+ */
 class User extends Model
 {
     use HasRelationships;

tests/HasManyDeepTest.php

@@ -161,6 +161,7 @@ public function testExistenceQueryForThroughSelfRelationWithoutAliasTrait()
 
     public function testWithTrashed()
     {
+        /** @var \Tests\Models\User $user */
         $user = Comment::find(33)->user()
             ->withTrashed()
             ->first();
@@ -181,6 +182,7 @@ public function testWithTrashedIntermediateAndWithCount()
     {
         $country = Country::withCount('commentsWithTrashedUsers as count')->first();
 
+        // @phpstan-ignore property.notFound
         $this->assertEquals(3, $country->count);
     }
 }

tests/Models/Comment.php

@@ -8,6 +8,12 @@
 use Staudenmeir\EloquentHasManyDeep\HasOneDeep;
 use Staudenmeir\EloquentHasManyDeep\HasTableAlias;
 
+/**
+ * @property-read \Tests\Models\Country|null $country
+ * @property-read \Tests\Models\Country|null $countryWithCustomThroughTable
+ * @property-read \Tests\Models\Post|null $post
+ * @property-read \Tests\Models\Post|null $rootPost
+ */
 class Comment extends Model
 {
     use HasTableAlias;

tests/Models/Country.php

@@ -7,6 +7,11 @@
 use Staudenmeir\EloquentHasManyDeep\HasManyDeep;
 use Staudenmeir\EloquentHasManyDeep\HasOneDeep;
 
+/**
+ * @property-read \Tests\Models\Comment|null $comment
+ * @property-read \Tests\Models\Comment|null $commentFromRelations
+ * @property-read \Tests\Models\Comment|null $commentFromRelationsWithConstraints
+ */
 class Country extends Model
 {
     public function comment(): HasOneDeep

tests/Models/Permission.php

@@ -5,6 +5,10 @@
 use Staudenmeir\EloquentHasManyDeep\HasManyDeep;
 use Staudenmeir\EloquentHasManyDeep\HasRelationships;
 
+/**
+ * @property-read \Illuminate\Database\Eloquent\Relations\Pivot $pivot
+ * @property-read \Illuminate\Database\Eloquent\Relations\Pivot $role_user
+ */
 class Permission extends Model
 {
     use HasRelationships;

tests/Models/Post.php

@@ -7,6 +7,9 @@
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Staudenmeir\EloquentHasManyDeep\HasManyDeep;
 
+/**
+ * @property-read \Tests\Models\User|null $user
+ */
 class Post extends Model
 {
     public function comments(): HasMany