Increase PHPStan level

staudenmeir · Aug 28, 2024 · 46c24fa · 46c24fa
1 parent eeb9916
commit 46c24fa
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 17 deletions.
diff --git a/composer.json b/composer.json
@@ -15,6 +15,7 @@
     },
     "require-dev": {
         "barryvdh/laravel-ide-helper": "^3.0",
+        "larastan/larastan": "^2.9",
         "orchestra/testbench": "^9.0",
         "phpstan/phpstan": "^1.10",
         "phpunit/phpunit": "^11.0",

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -1,7 +1,11 @@
+includes:
+    - ./vendor/larastan/larastan/extension.neon
 parameters:
-    level: 0
+    level: 1
     paths:
         - src
         - tests
     ignoreErrors:
+        - "#Called 'first' on Laravel collection, but could have been retrieved as a query.#"
+        - '#Call to private method take\(\) of parent class Illuminate\\Database\\Eloquent\\Relations\\BelongsTo#'
         - '#Unsafe usage of new static\(\).#'
diff --git a/src/HasJsonRelationships.php b/src/HasJsonRelationships.php
@@ -423,7 +423,7 @@ protected function addHasManyThroughJsonPivotRelationship(
             /** @var \Staudenmeir\EloquentJsonRelations\Relations\HasManyJson $hasManyJson */
             $hasManyJson = $relationships[0];
 
-            $postGetCallback = function (Collection $models) use ($hasManyJson, $relationships) {
+            $postGetCallback = function (Collection $models) use ($hasManyJson) {
                 if (isset($models[0]->laravel_through_key)) {
                     $hasManyJson->hydratePivotRelation(
                         $models,
@@ -440,7 +440,7 @@ protected function addHasManyThroughJsonPivotRelationship(
             }
 
             $hasManyThroughJson->withCustomEagerMatchingCallback(
-                function (array $models, Collection $results, string $relation) use ($hasManyJson, $hasManyThroughJson) {
+                function (array $models, Collection $results, string $relation) use ($hasManyJson) {
                     foreach ($models as $model) {
                         $hasManyJson->hydratePivotRelation(
                             $model->$relation,

diff --git a/tests/BelongsToJsonTest.php b/tests/BelongsToJsonTest.php
@@ -39,12 +39,12 @@ public function testLazyLoadingWithObjects(string $relation)
 
     public function testEmptyLazyLoading()
     {
-        DB::enableQueryLog();
+        DB::connection()->enableQueryLog();
 
         $roles = (new User())->roles;
 
         $this->assertInstanceOf(Collection::class, $roles);
-        $this->assertEmpty(DB::getQueryLog());
+        $this->assertEmpty(DB::connection()->getQueryLog());
     }
 
     public function testFirst()

diff --git a/tests/CompositeKeys/BelongsToJsonTest.php b/tests/CompositeKeys/BelongsToJsonTest.php
@@ -26,12 +26,12 @@ public function testLazyLoadingWithObjects()
 
     public function testEmptyLazyLoading()
     {
-        DB::enableQueryLog();
+        DB::connection()->enableQueryLog();
 
         $tasks = (new Employee())->tasks;
 
         $this->assertInstanceOf(Collection::class, $tasks);
-        $this->assertEmpty(DB::getQueryLog());
+        $this->assertEmpty(DB::connection()->getQueryLog());
     }
 
     public function testEagerLoading()

diff --git a/tests/CompositeKeys/HasManyJsonTest.php b/tests/CompositeKeys/HasManyJsonTest.php
@@ -30,12 +30,12 @@ public function testLazyLoadingWithObjects()
 
     public function testEmptyLazyLoading()
     {
-        DB::enableQueryLog();
+        DB::connection()->enableQueryLog();
 
         $employees = (new Task())->employees;
 
         $this->assertInstanceOf(Collection::class, $employees);
-        $this->assertEmpty(DB::getQueryLog());
+        $this->assertEmpty(DB::connection()->getQueryLog());
     }
 
     public function testEagerLoading()

diff --git a/tests/CompositeKeys/HasOneJsonTest.php b/tests/CompositeKeys/HasOneJsonTest.php
@@ -29,12 +29,12 @@ public function testLazyLoadingWithObjects()
 
     public function testEmptyLazyLoading()
     {
-        DB::enableQueryLog();
+        DB::connection()->enableQueryLog();
 
         $employee = (new Task())->employee;
 
         $this->assertNull($employee);
-        $this->assertEmpty(DB::getQueryLog());
+        $this->assertEmpty(DB::connection()->getQueryLog());
     }
 
     public function testEagerLoading()

diff --git a/tests/Concatenation/HasManyThroughJsonTest.php b/tests/Concatenation/HasManyThroughJsonTest.php
@@ -64,12 +64,12 @@ public function testEmptyLazyLoading()
 
     public function testEmptyLazyLoadingWithReverseRelationship()
     {
-        DB::enableQueryLog();
+        DB::connection()->enableQueryLog();
 
         $roles = (new Project())->roles;
 
         $this->assertInstanceOf(Collection::class, $roles);
-        $this->assertEmpty(DB::getQueryLog());
+        $this->assertEmpty(DB::connection()->getQueryLog());
     }
 
     public function testEagerLoading()

diff --git a/tests/HasManyJsonTest.php b/tests/HasManyJsonTest.php
@@ -39,12 +39,12 @@ public function testLazyLoadingWithObjects(string $relation)
 
     public function testEmptyLazyLoading()
     {
-        DB::enableQueryLog();
+        DB::connection()->enableQueryLog();
 
         $users = (new Role())->users;
 
         $this->assertInstanceOf(Collection::class, $users);
-        $this->assertEmpty(DB::getQueryLog());
+        $this->assertEmpty(DB::connection()->getQueryLog());
     }
 
     public function testFirst()

diff --git a/tests/HasOneJsonTest.php b/tests/HasOneJsonTest.php
@@ -36,12 +36,12 @@ public function testLazyLoadingWithObjects(string $relation)
 
     public function testEmptyLazyLoading()
     {
-        DB::enableQueryLog();
+        DB::connection()->enableQueryLog();
 
         $user = (new Role())->user;
 
         $this->assertNull($user);
-        $this->assertEmpty(DB::getQueryLog());
+        $this->assertEmpty(DB::connection()->getQueryLog());
     }
 
     public function testLazyLoadingWithDefault()