refactor: fix codeigniter.modelArgumentType errors (#9533)

paulbalandan · web-flow · commit 8c6da9376b0f · 2025-04-20T14:19:01.000+08:00
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -43,6 +43,8 @@ parameters:
     codeigniter:
         additionalServices:
             - AfterAutoloadModule\Config\Services
+        additionalModelNamespaces:
+            - 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
@@ -1,17 +1,7 @@
-# total 3 errors
+# total 1 error
 
 parameters:
     ignoreErrors:
-        -
-            message: '#^Parameter \#1 \$name of function model expects a valid class string, string given\.$#'
-            count: 1
-            path: ../../system/Test/Fabricator.php
-
-        -
-            message: '#^Parameter \#1 \$name of function model expects a valid class string, ''JobModel'' given\.$#'
-            count: 1
-            path: ../../tests/system/CommonFunctionsTest.php
-
         -
             message: '#^Parameter \#1 \$name of function model expects a valid class string, ''CodeIgniter\\\\Shield\\\\Models\\\\UserModel'' given\.$#'
             count: 1
diff --git a/utils/phpstan-baseline/loader.neon b/utils/phpstan-baseline/loader.neon
@@ -1,4 +1,4 @@
-# total 3373 errors
+# total 3371 errors
 includes:
     - argument.type.neon
     - assign.propertyType.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`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# total 3373 errors`
	`1`	`+# total 3371 errors`
`2`	`2`	`includes:`
`3`	`3`	`- argument.type.neon`
`4`	`4`	`- assign.propertyType.neon`