Merge pull request #6910 from kenjis/fix-controller-request-type

fix: $request type in BaseController and BaseResource
codeigniter4 · Dec 7, 2022 · b395a84 · b395a84
2 parents 9be490d + 738ec56
commit b395a84
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php
@@ -3,6 +3,8 @@
 namespace App\Controllers;
 
 use CodeIgniter\Controller;
+use CodeIgniter\HTTP\CLIRequest;
+use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 use Psr\Log\LoggerInterface;
@@ -22,7 +24,7 @@ abstract class BaseController extends Controller
     /**
      * Instance of the main Request object.
      *
-     * @var RequestInterface
+     * @var CLIRequest|IncomingRequest
      */
     protected $request;
 

diff --git a/system/RESTful/BaseResource.php b/system/RESTful/BaseResource.php
@@ -12,12 +12,21 @@
 namespace CodeIgniter\RESTful;
 
 use CodeIgniter\Controller;
+use CodeIgniter\HTTP\CLIRequest;
+use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 use Psr\Log\LoggerInterface;
 
 abstract class BaseResource extends Controller
 {
+    /**
+     * Instance of the main Request object.
+     *
+     * @var CLIRequest|IncomingRequest
+     */
+    protected $request;
+
     /**
      * @var string|null The model that holding this resource's data
      */
@@ -34,6 +43,7 @@ abstract class BaseResource extends Controller
     public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
     {
         parent::initController($request, $response, $logger);
+
         $this->setModel($this->modelName);
     }