From 4401ca19aa14080a81b9249ec28d3a1ab676703e Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sat, 13 Feb 2021 18:50:08 +0700
Subject: [PATCH 1/2] [Docblock] Alternative IDE reference for Request and
 Response in controller

---
 system/Controller.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/system/Controller.php b/system/Controller.php
index 3707557dfa4a..88165d230859 100644
--- a/system/Controller.php
+++ b/system/Controller.php
@@ -11,8 +11,13 @@
 
 namespace CodeIgniter;
 
+use CodeIgniter\HTTP\CLIRequest;
+use CodeIgniter\HTTP\DownloadResponse;
 use CodeIgniter\HTTP\Exceptions\HTTPException;
+use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\Response;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\Validation\Exceptions\ValidationException;
 use CodeIgniter\Validation\Validation;
@@ -34,14 +39,16 @@ class Controller
 	/**
 	 * Instance of the main Request object.
 	 *
-	 * @var RequestInterface
+	 * @phpstan-ignore-next-line
+	 * @var                      RequestInterface&CLIRequest&IncomingRequest
 	 */
 	protected $request;
 
 	/**
 	 * Instance of the main response object.
 	 *
-	 * @var ResponseInterface
+	 * @phpstan-ignore-next-line
+	 * @var                      ResponseInterface&RedirectResponse&DownloadResponse
 	 */
 	protected $response;
 

From ddce8bb166c645aa817135c933685ac78a9f4e6f Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sat, 13 Feb 2021 18:55:36 +0700
Subject: [PATCH 2/2] rollback Response doc

---
 system/Controller.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/system/Controller.php b/system/Controller.php
index 88165d230859..6584980f9d2b 100644
--- a/system/Controller.php
+++ b/system/Controller.php
@@ -12,12 +12,9 @@
 namespace CodeIgniter;
 
 use CodeIgniter\HTTP\CLIRequest;
-use CodeIgniter\HTTP\DownloadResponse;
 use CodeIgniter\HTTP\Exceptions\HTTPException;
 use CodeIgniter\HTTP\IncomingRequest;
-use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\RequestInterface;
-use CodeIgniter\HTTP\Response;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\Validation\Exceptions\ValidationException;
 use CodeIgniter\Validation\Validation;
@@ -47,8 +44,7 @@ class Controller
 	/**
 	 * Instance of the main response object.
 	 *
-	 * @phpstan-ignore-next-line
-	 * @var                      ResponseInterface&RedirectResponse&DownloadResponse
+	 * @var ResponseInterface
 	 */
 	protected $response;