Optimize Filters

element-code · Aug 2, 2021 · 18d1d6d · 18d1d6d
1 parent 3eb533e
commit 18d1d6d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 20 deletions.
diff --git a/system/Filters/CSRF.php b/system/Filters/CSRF.php
@@ -11,9 +11,7 @@
 
 namespace CodeIgniter\Filters;
 
-use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RequestInterface;
-use CodeIgniter\HTTP\Response;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\Security\Exceptions\SecurityException;
 use Config\Services;
@@ -37,8 +35,7 @@ class CSRF implements FilterInterface
      * sent back to the client, allowing for error pages,
      * redirects, etc.
      *
-     * @param IncomingRequest|RequestInterface $request
-     * @param array|null                       $arguments
+     * @param array|null $arguments
      *
      * @throws SecurityException
      *
@@ -66,9 +63,7 @@ public function before(RequestInterface $request, $arguments = null)
     /**
      * We don't have anything to do here.
      *
-     * @param IncomingRequest|RequestInterface $request
-     * @param Response|ResponseInterface       $response
-     * @param array|null                       $arguments
+     * @param array|null $arguments
      *
      * @return mixed
      */

diff --git a/system/Filters/DebugToolbar.php b/system/Filters/DebugToolbar.php
@@ -11,9 +11,7 @@
 
 namespace CodeIgniter\Filters;
 
-use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RequestInterface;
-use CodeIgniter\HTTP\Response;
 use CodeIgniter\HTTP\ResponseInterface;
 use Config\Services;
 
@@ -25,8 +23,7 @@ class DebugToolbar implements FilterInterface
     /**
      * We don't need to do anything here.
      *
-     * @param IncomingRequest|RequestInterface $request
-     * @param array|null                       $arguments
+     * @param array|null $arguments
      *
      * @return void
      */
@@ -38,9 +35,7 @@ public function before(RequestInterface $request, $arguments = null)
      * If the debug flag is set (CI_DEBUG) then collect performance
      * and debug information and display it in a toolbar.
      *
-     * @param IncomingRequest|RequestInterface $request
-     * @param Response|ResponseInterface       $response
-     * @param array|null                       $arguments
+     * @param array|null $arguments
      *
      * @return void
      */

diff --git a/system/Filters/Honeypot.php b/system/Filters/Honeypot.php
@@ -22,17 +22,18 @@
 class Honeypot implements FilterInterface
 {
     /**
-     * Checks if Honeypot field is empty; if not
-     * then the requester is a bot
+     * Checks if Honeypot field is empty, if not then the
+     * requester is a bot
      *
      * @param array|null $arguments
      *
+     * @throws HoneypotException
+     *
      * @return void
      */
     public function before(RequestInterface $request, $arguments = null)
     {
-        $honeypot = Services::honeypot(new \Config\Honeypot());
-        if ($honeypot->hasContent($request)) {
+        if (Services::honeypot()->hasContent($request)) {
             throw HoneypotException::isBot();
         }
     }
@@ -46,7 +47,6 @@ public function before(RequestInterface $request, $arguments = null)
      */
     public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
     {
-        $honeypot = Services::honeypot(new \Config\Honeypot());
-        $honeypot->attachHoneypot($response);
+        Services::honeypot()->attachHoneypot($response);
     }
 }