D10 and D11 updates

Merged D10 and D11 patches to ensure most up to date compatibility. This branch should allow full usage on either D10 or D11 sites.

src/EventSubscriber/FirewallSubscriber.php

@@ -2,10 +2,10 @@
 
 namespace Drupal\restrict_by_ip\EventSubscriber;
 
+use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\restrict_by_ip\LoginFirewallInterface;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 
 /**
  * Triggers the restrict by IP login firewall.
@@ -51,11 +51,13 @@ class FirewallSubscriber implements EventSubscriberInterface {
   /**
    * This method is called whenever the kernel.request event is dispatched.
    *
-   * @param \Symfony\Component\HttpKernel\Event\GetResponseEvent $event
+   * @param \Symfony\Component\HttpKernel\Event\RequestEvent $event
    *   The event.
    */
-  public function loginFirewall(GetResponseEvent $event) {
-    $this->loginFirewall->execute($this->currentUser);
+  public function loginFirewall(RequestEvent $event) {
+    if ($response = $this->loginFirewall->execute($this->currentUser)) {
+      $event->setResponse($response);
+    }
   }
 
 }