Restrict PHPStan version, further analysis fixes

wintercms · Mar 2, 2023 · 6c32cf1 · 6c32cf1
1 parent 2f4a532
commit 6c32cf1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -57,7 +57,7 @@
         "php-parallel-lint/php-parallel-lint": "^1.0",
         "meyfa/phpunit-assert-gd": "^2.0.0|^3.0.0",
         "dms/phpunit-arraysubset-asserts": "^0.1.0|^0.2.1",
-        "nunomaduro/larastan": "^2.0.1",
+        "nunomaduro/larastan": "~2.2.9",
         "orchestra/testbench": "^7.1.0"
     },
     "suggest": {

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -755,16 +755,6 @@ parameters:
 			count: 1
 			path: src/Extension/Extendable.php
 
-		-
-			message: "#^Parameter \\#3 \\$replacement of method Illuminate\\\\Support\\\\Collection\\<int\\<0, 1\\>,Illuminate\\\\Support\\\\Collection\\<\\(int\\|string\\), mixed\\>\\>\\:\\:splice\\(\\) expects array\\<Illuminate\\\\Support\\\\Collection\\<\\(int\\|string\\), mixed\\>\\>, array\\{array\\} given\\.$#"
-			count: 1
-			path: src/Foundation/Application.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between array\\|null and false will always evaluate to false\\.$#"
-			count: 1
-			path: src/Foundation/Exception/Handler.php
-
 		-
 			message: "#^Conditional return type uses subject type TCacheValue which is not part of PHPDoc @template tags\\.$#"
 			count: 1

diff --git a/src/Foundation/Application.php b/src/Foundation/Application.php
@@ -312,7 +312,7 @@ public function make($abstract, array $parameters = [])
      */
     public function before($callback)
     {
-        $this['router']->before($callback);
+        $this->make('router')->before($callback);
     }
 
     /**
@@ -323,7 +323,7 @@ public function before($callback)
      */
     public function after($callback)
     {
-        $this['router']->after($callback);
+        $this->make('router')->after($callback);
     }
 
     /**