From 001ef4fe1cbaad71cae5efc6e6042e303ad67f31 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Wed, 28 Dec 2016 10:08:34 +0100
Subject: [PATCH] Removed deprecated event and handlers. (store ip addresses)

---
 app/Handlers/Events/UserEventHandler.php | 39 ------------------------
 app/Providers/EventServiceProvider.php   |  5 ---
 2 files changed, 44 deletions(-)

diff --git a/app/Handlers/Events/UserEventHandler.php b/app/Handlers/Events/UserEventHandler.php
index 916748ea94..6ebc3fa8b3 100644
--- a/app/Handlers/Events/UserEventHandler.php
+++ b/app/Handlers/Events/UserEventHandler.php
@@ -19,7 +19,6 @@ use FireflyIII\Events\ConfirmedUser;
 use FireflyIII\Events\RegisteredUser;
 use FireflyIII\Events\RequestedNewPassword;
 use FireflyIII\Events\ResentConfirmation;
-use FireflyIII\Models\Configuration;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Mail\Message;
@@ -36,8 +35,6 @@ use Swift_TransportException;
  *
  * The method name reflects what is being done. This is in the present tense.
  *
- * @SuppressWarnings(PHPMD.TooManyPublicMethods) // some of these methods will disappear soon.
- *
  * @package FireflyIII\Handlers\Events
  */
 class UserEventHandler
@@ -164,42 +161,6 @@ class UserEventHandler
         return true;
     }
 
-    /**
-     * When the user is confirmed, this method stores the IP address of the user
-     * as a preference. Since this preference cannot be edited, it is effectively hidden
-     * from the user yet stored conveniently.
-     *
-     * @param ConfirmedUser $event
-     *
-     * @deprecated
-     *
-     * @return bool
-     */
-    public function storeConfirmationIpAddress(ConfirmedUser $event): bool
-    {
-        Preferences::setForUser($event->user, 'confirmation_ip_address', $event->ipAddress);
-
-        return true;
-    }
-
-    /**
-     * This message stores the users IP address on registration, in much the same
-     * fashion as the previous method.
-     *
-     * @param RegisteredUser $event
-     *
-     * @deprecated
-     *
-     * @return bool
-     */
-    public function storeRegistrationIpAddress(RegisteredUser $event): bool
-    {
-        Preferences::setForUser($event->user, 'registration_ip_address', $event->ipAddress);
-
-        return true;
-
-    }
-
     /**
      * @param User   $user
      * @param string $ipAddress
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 6755c90101..79292ba723 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -37,16 +37,11 @@ class EventServiceProvider extends ServiceProvider
     protected $listen
         = [
             // new event handlers:
-            'FireflyIII\Events\ConfirmedUser' => // is a User related event.
-                [
-                    'FireflyIII\Handlers\Events\UserEventHandler@storeConfirmationIpAddress',
-                ],
             'FireflyIII\Events\RegisteredUser'       => // is a User related event.
                 [
                     'FireflyIII\Handlers\Events\UserEventHandler@sendRegistrationMail',
                     'FireflyIII\Handlers\Events\UserEventHandler@attachUserRole',
                     'FireflyIII\Handlers\Events\UserEventHandler@sendConfirmationMessage',
-                    'FireflyIII\Handlers\Events\UserEventHandler@storeRegistrationIpAddress',
                 ],
             'FireflyIII\Events\RequestedNewPassword' => [ // is a User related event.
                                                           'FireflyIII\Handlers\Events\UserEventHandler@sendNewPassword',