refcator: fix codeigniter.modelArgumentType errors

paulbalandan · paulbalandan · commit 02408bfc729b · 2025-04-19T02:57:58.000+08:00
diff --git a/composer.json b/composer.json
@@ -18,6 +18,7 @@
     },
     "require-dev": {
         "codeigniter/phpstan-codeigniter": "1.x-dev",
+        "codeigniter4/shield": "^1.1",
         "fakerphp/faker": "^1.24",
         "kint-php/kint": "^6.0",
         "mikey179/vfsstream": "^1.6.12",
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -43,6 +43,9 @@ parameters:
     codeigniter:
         additionalServices:
             - AfterAutoloadModule\Config\Services
+        additionalModelNamespaces:
+            - CodeIgniter\Shield\Models
+            - Tests\Support\Models
         checkArgumentTypeOfModel: false
     shipmonkBaselinePerIdentifier:
         directory: %currentWorkingDirectory%
diff --git a/system/Test/Fabricator.php b/system/Test/Fabricator.php
@@ -119,8 +119,7 @@ class Fabricator
      */
     public function __construct($model, ?array $formatters = null, ?string $locale = null)
     {
-        if (is_string($model)) {
-            // Create a new model instance
+        if (is_string($model) && class_exists($model)) {
             $model = model($model, false);
         }
 
diff --git a/utils/phpstan-baseline/codeigniter.modelArgumentType.neon b/utils/phpstan-baseline/codeigniter.modelArgumentType.neon
diff --git a/utils/phpstan-baseline/loader.neon b/utils/phpstan-baseline/loader.neon
@@ -1,10 +1,9 @@
-# total 3511 errors
+# total 3508 errors
 includes:
     - argument.type.neon
     - assign.propertyType.neon
     - codeigniter.cacheHandlerInstance.neon
     - codeigniter.getReassignArray.neon
-    - codeigniter.modelArgumentType.neon
     - codeigniter.superglobalAccess.neon
     - codeigniter.superglobalAccessAssign.neon
     - codeigniter.unknownServiceMethod.neon

Original file line number	Diff line number	Diff line change
`@@ -119,8 +119,7 @@ class Fabricator`
`119`	`119`	`*/`
`120`	`120`	`public function __construct($model, ?array $formatters = null, ?string $locale = null)`
`121`	`121`	`{`
`122`		`- if (is_string($model)) {`
`123`		`- // Create a new model instance`
	`122`	`+ if (is_string($model) && class_exists($model)) {`
`124`	`123`	`$model = model($model, false);`
`125`	`124`	`}`
`126`	`125`