From 252592476599a8a3bc3e1c720e303b972857bab2 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sat, 13 Feb 2021 23:35:21 +0700 Subject: [PATCH 1/3] Add &CLIRequest to request property in BaseController --- app/Controllers/BaseController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php index 8508853669dd..8a98080d6679 100644 --- a/app/Controllers/BaseController.php +++ b/app/Controllers/BaseController.php @@ -3,6 +3,7 @@ namespace App\Controllers; use CodeIgniter\Controller; +use CodeIgniter\HTTP\CLIRequest; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\RequestInterface; use CodeIgniter\HTTP\ResponseInterface; @@ -24,7 +25,7 @@ class BaseController extends Controller /** * Instance of the main Request object. * - * @var IncomingRequest + * @var IncomingRequest&CLIRequest */ protected $request; From 7116e4145b797f622272aabaa2171ac7339f1aba Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sat, 13 Feb 2021 23:38:41 +0700 Subject: [PATCH 2/3] ignore next line --- app/Controllers/BaseController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php index 8a98080d6679..a50012d0807b 100644 --- a/app/Controllers/BaseController.php +++ b/app/Controllers/BaseController.php @@ -25,7 +25,8 @@ class BaseController extends Controller /** * Instance of the main Request object. * - * @var IncomingRequest&CLIRequest + * @phpstan-ignore-next-line + * @var IncomingRequest&CLIRequest */ protected $request; From 4f29383534a3bfcb337fe727f7950ebc04ecaec7 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sat, 13 Feb 2021 23:57:59 +0700 Subject: [PATCH 3/3] use @var IncomingRequest|CLIRequest --- app/Controllers/BaseController.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php index a50012d0807b..5a1946b8693e 100644 --- a/app/Controllers/BaseController.php +++ b/app/Controllers/BaseController.php @@ -25,8 +25,7 @@ class BaseController extends Controller /** * Instance of the main Request object. * - * @phpstan-ignore-next-line - * @var IncomingRequest&CLIRequest + * @var IncomingRequest|CLIRequest */ protected $request;