From 6343647abc0aa4536bd5406c19eec8dd929c08c7 Mon Sep 17 00:00:00 2001
From: neznaika0 <ozornick.ks@gmail.com>
Date: Thu, 9 Jan 2025 20:49:14 +0300
Subject: [PATCH 1/3] refactor: Fix phpstan codeigniter.modelArgumentInstanceOf

---
 system/RESTful/BaseResource.php                          | 9 +++++----
 tests/system/CommonFunctionsTest.php                     | 2 +-
 .../codeigniter.modelArgumentInstanceof.neon             | 7 +------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/system/RESTful/BaseResource.php b/system/RESTful/BaseResource.php
index f2e171c8319e..a4168c1ac0b3 100644
--- a/system/RESTful/BaseResource.php
+++ b/system/RESTful/BaseResource.php
@@ -18,6 +18,7 @@
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
+use CodeIgniter\Model;
 use Psr\Log\LoggerInterface;
 
 abstract class BaseResource extends Controller
@@ -30,12 +31,12 @@ abstract class BaseResource extends Controller
     protected $request;
 
     /**
-     * @var string|null The model that holding this resource's data
+     * @var class-string<Model>|string|null The model that holding this resource's data
      */
     protected $modelName;
 
     /**
-     * @var object|null The model that holding this resource's data
+     * @var Model|object|null The model that holding this resource's data
      */
     protected $model;
 
@@ -55,7 +56,7 @@ public function initController(RequestInterface $request, ResponseInterface $res
      * Set or change the model this controller is bound to.
      * Given either the name or the object, determine the other.
      *
-     * @param object|string|null $which
+     * @param class-string<Model>|Model|object|string|null $which
      *
      * @return void
      */
@@ -63,7 +64,7 @@ public function setModel($which = null)
     {
         if ($which !== null) {
             $this->model     = is_object($which) ? $which : null;
-            $this->modelName = is_object($which) ? null : $which;
+            $this->modelName = is_object($which) ? '' : $which;
         }
 
         if (empty($this->model) && ! empty($this->modelName) && class_exists($this->modelName)) {
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index f87a1f44860c..277091b92faf 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -400,7 +400,7 @@ public function testCSRFMeta(): void
 
     public function testModelNotExists(): void
     {
-        $this->assertNull(model(UnexsistenceClass::class)); // @phpstan-ignore class.notFound
+        $this->assertNull(model(UnexsistenceClass::class)); // @phpstan-ignore class.notFound, codeigniter.modelArgumentInstanceof
     }
 
     public function testModelExistsBasename(): void
diff --git a/utils/phpstan-baseline/codeigniter.modelArgumentInstanceof.neon b/utils/phpstan-baseline/codeigniter.modelArgumentInstanceof.neon
index 8d709df14603..d29e43b3aef8 100644
--- a/utils/phpstan-baseline/codeigniter.modelArgumentInstanceof.neon
+++ b/utils/phpstan-baseline/codeigniter.modelArgumentInstanceof.neon
@@ -1,4 +1,4 @@
-# total 2 errors
+# total 1 error
 
 parameters:
     ignoreErrors:
@@ -6,8 +6,3 @@ parameters:
             message: '#^Argument \#1 \$name \(class\-string\) passed to function model does not extend CodeIgniter\\\\Model\.$#'
             count: 1
             path: ../../system/RESTful/BaseResource.php
-
-        -
-            message: '#^Argument \#1 \$name \(''CodeIgniter\\\\UnexsistenceClass''\) passed to function model does not extend CodeIgniter\\\\Model\.$#'
-            count: 1
-            path: ../../tests/system/CommonFunctionsTest.php

From daaabb5b4aff00e70a49329b4ff4c8ae85559857 Mon Sep 17 00:00:00 2001
From: neznaika0 <ozornick.ks@gmail.com>
Date: Sat, 1 Feb 2025 18:03:35 +0300
Subject: [PATCH 2/3] fix: Add Model in deptrac.yaml

---
 deptrac.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/deptrac.yaml b/deptrac.yaml
index 178de9a74fd7..f05983b686cb 100644
--- a/deptrac.yaml
+++ b/deptrac.yaml
@@ -218,6 +218,7 @@ parameters:
     RESTful:
       - +API
       - +Controller
+      - +Model
     Router:
       - HTTP
     Security:

From 406c85e9d7b05558b7646d5dfab5206a2990ca16 Mon Sep 17 00:00:00 2001
From: neznaika0 <ozornick.ks@gmail.com>
Date: Fri, 7 Mar 2025 11:03:29 +0300
Subject: [PATCH 3/3] fix: Revert null value for $modelName

---
 system/RESTful/BaseResource.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/RESTful/BaseResource.php b/system/RESTful/BaseResource.php
index a4168c1ac0b3..51a7fbc619c5 100644
--- a/system/RESTful/BaseResource.php
+++ b/system/RESTful/BaseResource.php
@@ -64,7 +64,7 @@ public function setModel($which = null)
     {
         if ($which !== null) {
             $this->model     = is_object($which) ? $which : null;
-            $this->modelName = is_object($which) ? '' : $which;
+            $this->modelName = is_object($which) ? null : $which;
         }
 
         if (empty($this->model) && ! empty($this->modelName) && class_exists($this->modelName)) {