Revert to Request & Response interfaces

Author: jim-parry

application/Filters/Honeypot.php

@@ -3,8 +3,8 @@
 namespace App\Filters;
 
 use CodeIgniter\Filters\FilterInterface;
-use CodeIgniter\HTTP\IncomingRequest;
-use CodeIgniter\HTTP\Response;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
 use Config\Services;
 use CodeIgniter\Honeypot\Exceptions\HoneypotException;
 use CodeIgniter\Honeypot\Honeypot;
@@ -16,11 +16,11 @@ class Honeypot implements FilterInterface
 	 * Checks if Honeypot field is empty; if not
 	 * then the requester is a bot
 	 *
-	 * @param CodeIgniter\HTTP\IncomingRequest $request
+	 * @param CodeIgniter\HTTP\RequestInterface $request
 	 *
 	 * @return mixed
 	 */
-	public function before(IncomingRequest $request)
+	public function before(RequestInterface $request)
 	{
 		$honeypot = new Honeypot(new \Config\Honeypot());
 		if ($honeypot->hasContent($request))
@@ -32,11 +32,11 @@ public function before(IncomingRequest $request)
 	/**
 	 * Attach a honypot to the current response.
 	 *
-	 * @param CodeIgniter\HTTP\IncomingRequest $request
-	 * @param CodeIgniter\HTTP\Response $response
+	 * @param CodeIgniter\HTTP\RequestInterface $request
+	 * @param CodeIgniter\HTTP\ResponseInterface $response
 	 * @return mixed
 	 */
-	public function after(IncomingRequest $request, Response $response)
+	public function after(RequestInterface $request, ResponseInterface $response)
 	{
 		$honeypot = new Honeypot(new \Config\Honeypot());
 		$honeypot->attachHoneypot($response);

system/Honeypot/Honeypot.php

@@ -38,8 +38,8 @@
  * @filesource
  */
 use CodeIgniter\Config\BaseConfig;
-use CodeIgniter\HTTP\IncomingRequest;
-use CodeIgniter\HTTP\Response;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\Honeypot\Exceptions\HoneypotException;
 
 class Honeypot
@@ -77,20 +77,20 @@ function __construct(BaseConfig $config)
 	/**
 	 * Checks the request if honeypot field has data.
 	 *
-	 * @param \CodeIgniter\HTTP\IncomingRequest $request
+	 * @param \CodeIgniter\HTTP\RequestInterface $request
 	 * 
 	 */
-	public function hasContent(IncomingRequest $request)
+	public function hasContent(RequestInterface $request)
 	{
 		return ( ! empty($request->getPost($this->config->name))) ? true : false;
 	}
 
 	/**
 	 * Attaches Honeypot template to response.
 	 *
-	 * @param \CodeIgniter\HTTP\Response $response
+	 * @param \CodeIgniter\HTTP\ResponseInterface $response
 	 */
-	public function attachHoneypot(Response $response)
+	public function attachHoneypot(ResponseInterface $response)
 	{
 		$prep_field = $this->prepareTemplate($this->config->template);
 

user_guide_src/source/libraries/honeypot.rst

@@ -5,7 +5,7 @@ Honeypot Class
 The Honeypot Class makes it possible to determine when a Bot makes a request to a CodeIgniter4 application,
 if it's enabled in ``Application\Config\Filters.php`` file. This is done by attaching form fields to any form,
 and this form field is hidden from a human but accessible to a Bot. When data is entered into the field ,it's 
-assumed the request is coming from a Bot, and you can thro a ``HoneypotException``.
+assumed the request is coming from a Bot, and you can throw a ``HoneypotException``.
 
 .. contents::
     :local: