Merge pull request #18 from samsonasik/bump-phpstan-2

Bump to PHPStan 2
samsonasik · Nov 20, 2024 · e2d0473 · e2d0473
2 parents 1a9821c + 30b8bad
commit e2d0473
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
     "require-dev": {
         "codeigniter/coding-standard": "^1.7.15",
         "codeigniter4/framework": "^4.5.1",
-        "phpstan/phpstan": "^1.10.67",
+        "phpstan/phpstan": "^2.0",
         "phpunit/phpunit": "^10.5.20",
         "rector/rector": "dev-main"
     },

diff --git a/phpstan.neon b/phpstan.neon
@@ -2,14 +2,17 @@ parameters:
     bootstrapFiles:
         - bootstrap.php
     inferPrivatePropertyTypeFromConstructor: true
-    checkMissingIterableValueType: false
     excludePaths:
         - src/Config/*
         - src/Database/*
         - src/Views/*
     ignoreErrors:
         - '#Access to protected property [a-zA-Z0-9\\_]+Model::\$returnType.#'
-        - '#Call to an undefined static method Config\\Services::albumRepository\(\)#'
-        - '#Call to an undefined static method Config\\Services::trackRepository\(\)#'
-        - '#Call to an undefined static method Config\\Services::albumTrackSummary\(\)#'
         - '#Call to an undefined method CodeIgniter\\Model::get\(\)#'
+
+        -
+            identifier: missingType.iterableValue
+
+        -
+            identifier: method.nonObject
+            path: src/Infrastructure/Persistence/Track/SQLTrackRepository.php
diff --git a/src/Controllers/Album.php b/src/Controllers/Album.php
@@ -11,14 +11,14 @@
 
 namespace Album\Controllers;
 
+use Album\Config\Services;
 use Album\Domain\Album\AlbumRepository;
 use Album\Domain\Exception\RecordNotFoundException;
 use Album\Models\AlbumModel;
 use App\Controllers\BaseController;
 use CodeIgniter\Exceptions\PageNotFoundException;
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RedirectResponse;
-use Config\Services;
 
 final class Album extends BaseController
 {

diff --git a/src/Controllers/AlbumTrackSummary.php b/src/Controllers/AlbumTrackSummary.php
@@ -11,10 +11,10 @@
 
 namespace Album\Controllers;
 
+use Album\Config\Services;
 use Album\Domain\AlbumTrackSummary\AlbumTrackSummaryRepository;
 use Album\Models\AlbumModel;
 use App\Controllers\BaseController;
-use Config\Services;
 
 final class AlbumTrackSummary extends BaseController
 {

diff --git a/src/Controllers/Track.php b/src/Controllers/Track.php
@@ -11,6 +11,7 @@
 
 namespace Album\Controllers;
 
+use Album\Config\Services;
 use Album\Domain\Album\AlbumRepository;
 use Album\Domain\Exception\DuplicatedRecordException;
 use Album\Domain\Exception\RecordNotFoundException;
@@ -20,7 +21,6 @@
 use CodeIgniter\Exceptions\PageNotFoundException;
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RedirectResponse;
-use Config\Services;
 
 final class Track extends BaseController
 {

diff --git a/src/Domain/Album/Album.php b/src/Domain/Album/Album.php
@@ -21,7 +21,7 @@
 final class Album extends Entity
 {
     /**
-     * @var array<string, null>|list<string>
+     * @var array<string, mixed>
      */
     protected $attributes = [
         'id'     => null,

diff --git a/src/Domain/Track/Track.php b/src/Domain/Track/Track.php
@@ -22,7 +22,7 @@
 final class Track extends Entity
 {
     /**
-     * @var array<string, null>|list<string>
+     * @var array<string, mixed>
      */
     protected $attributes = [
         'id'       => null,