Issue #2928007: Support external Flood

src/Commands/FloodUnblockCommands.php

@@ -2,8 +2,9 @@
 
 namespace Drupal\flood_control\Commands;
 
+use Drupal\flood_control\FloodUnblockManagerInterface;
 use Drush\Commands\DrushCommands;
-use Drupal\flood_control\FloodUnblockManager;
+use Drupal\flood_control\FloodUnblockManagerDatabase;
 
 /**
  * Flood unblock. module's Drush 9 commands.
@@ -13,17 +14,17 @@ class FloodUnblockCommands extends DrushCommands {
   /**
    * The FloodUnblockManager service.
    *
-   * @var \Drupal\flood_control\FloodUnblockManager
+   * @var \Drupal\flood_control\FloodUnblockManagerInterface
    */
   private $manager;
 
   /**
    * FloodUnblockCommands constructor.
    *
-   * @param \Drupal\flood_control\FloodUnblockManager $manager
+   * @param \Drupal\flood_control\FloodUnblockManagerInterface $manager
    *   The FloodUnblockManager service.
    */
-  public function __construct(FloodUnblockManager $manager) {
+  public function __construct(FloodUnblockManagerInterface $manager) {
     $this->manager = $manager;
   }
 
@@ -41,7 +42,7 @@ class FloodUnblockCommands extends DrushCommands {
     foreach ($events as $key => $event) {
       $fids = $this->manager->getEventIds($key, $ip);
       foreach ($fids as $fid) {
-        $this->manager->floodUnblockClearEvent($fid);
+        $this->manager->floodUnblockClearEvent($key, $fid);
       }
     }
     $this->output()->writeln("Cleared the events for IP address $ip");
@@ -58,7 +59,7 @@ class FloodUnblockCommands extends DrushCommands {
     foreach ($events as $key => $event) {
       $fids = $this->manager->getEventIds($key);
       foreach ($fids as $fid) {
-        $this->manager->floodUnblockClearEvent($fid);
+        $this->manager->floodUnblockClearEvent($key, $fid);
       }
       $label = $event['label'];
       $this->output()->writeln("Cleared the ${label} events");