diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php index 4063ad1fd05a..122db5f9a9f2 100644 --- 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 index 65ad21251a3d..108c63ce9be6 100644 --- 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); }