diff --git a/system/API/ResponseTrait.php b/system/API/ResponseTrait.php
index 318af4b28bea..3be8e8955d3c 100644
--- a/system/API/ResponseTrait.php
+++ b/system/API/ResponseTrait.php
@@ -15,8 +15,8 @@
 
 use CodeIgniter\Format\Format;
 use CodeIgniter\Format\FormatterInterface;
+use CodeIgniter\HTTP\CLIRequest;
 use CodeIgniter\HTTP\IncomingRequest;
-use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 
 /**
@@ -24,10 +24,10 @@
  * consistent HTTP responses under a variety of common
  * situations when working as an API.
  *
- * @property RequestInterface  $request
- * @property ResponseInterface $response
- * @property bool              $stringAsHtml Whether to treat string data as HTML in JSON response.
- *                                           Setting `true` is only for backward compatibility.
+ * @property CLIRequest|IncomingRequest $request
+ * @property ResponseInterface          $response
+ * @property bool                       $stringAsHtml Whether to treat string data as HTML in JSON response.
+ *                                                    Setting `true` is only for backward compatibility.
  */
 trait ResponseTrait
 {
diff --git a/system/Debug/BaseExceptionHandler.php b/system/Debug/BaseExceptionHandler.php
index 3966b2ee1bae..b9180a98bd59 100644
--- a/system/Debug/BaseExceptionHandler.php
+++ b/system/Debug/BaseExceptionHandler.php
@@ -13,6 +13,8 @@
 
 namespace CodeIgniter\Debug;
 
+use CodeIgniter\HTTP\CLIRequest;
+use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 use Config\Exceptions as ExceptionsConfig;
@@ -54,6 +56,8 @@ public function __construct(ExceptionsConfig $config)
     /**
      * The main entry point into the handler.
      *
+     * @param CLIRequest|IncomingRequest $request
+     *
      * @return void
      */
     abstract public function handle(
diff --git a/system/Debug/ExceptionHandler.php b/system/Debug/ExceptionHandler.php
index 68ab5feb768e..76d5e0f2e504 100644
--- a/system/Debug/ExceptionHandler.php
+++ b/system/Debug/ExceptionHandler.php
@@ -15,6 +15,7 @@
 
 use CodeIgniter\API\ResponseTrait;
 use CodeIgniter\Exceptions\PageNotFoundException;
+use CodeIgniter\HTTP\CLIRequest;
 use CodeIgniter\HTTP\Exceptions\HTTPException;
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RequestInterface;
@@ -41,6 +42,8 @@ final class ExceptionHandler extends BaseExceptionHandler implements ExceptionHa
 
     /**
      * Determines the correct way to display the error.
+     *
+     * @param CLIRequest|IncomingRequest $request
      */
     public function handle(
         Throwable $exception,
diff --git a/system/Debug/ExceptionHandlerInterface.php b/system/Debug/ExceptionHandlerInterface.php
index 05915c638f36..7f91b3c5152d 100644
--- a/system/Debug/ExceptionHandlerInterface.php
+++ b/system/Debug/ExceptionHandlerInterface.php
@@ -13,6 +13,8 @@
 
 namespace CodeIgniter\Debug;
 
+use CodeIgniter\HTTP\CLIRequest;
+use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 use Throwable;
@@ -21,6 +23,8 @@ interface ExceptionHandlerInterface
 {
     /**
      * Determines the correct way to display the error.
+     *
+     * @param CLIRequest|IncomingRequest $request
      */
     public function handle(
         Throwable $exception,