From 194fe178c0299771a52b8f6804af3d7cd6df29d9 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 4 Aug 2017 15:48:26 +0200
Subject: [PATCH] Refactor for #732

---
 app/Providers/FireflyServiceProvider.php            | 4 ++--
 app/{Support => Services}/Password/PwndVerifier.php | 4 ++--
 app/{Support => Services}/Password/Verifier.php     | 4 ++--
 app/Validation/FireflyValidator.php                 | 6 ++----
 4 files changed, 8 insertions(+), 10 deletions(-)
 rename app/{Support => Services}/Password/PwndVerifier.php (93%)
 rename app/{Support => Services}/Password/Verifier.php (86%)

diff --git a/app/Providers/FireflyServiceProvider.php b/app/Providers/FireflyServiceProvider.php
index d6918d0d57..a2b6429f20 100644
--- a/app/Providers/FireflyServiceProvider.php
+++ b/app/Providers/FireflyServiceProvider.php
@@ -35,12 +35,12 @@ use FireflyIII\Helpers\Report\ReportHelper;
 use FireflyIII\Helpers\Report\ReportHelperInterface;
 use FireflyIII\Repositories\User\UserRepository;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
+use FireflyIII\Services\Password\PwndVerifier;
+use FireflyIII\Services\Password\Verifier;
 use FireflyIII\Support\Amount;
 use FireflyIII\Support\ExpandedForm;
 use FireflyIII\Support\FireflyConfig;
 use FireflyIII\Support\Navigation;
-use FireflyIII\Support\Password\PwndVerifier;
-use FireflyIII\Support\Password\Verifier;
 use FireflyIII\Support\Preferences;
 use FireflyIII\Support\Steam;
 use FireflyIII\Support\Twig\AmountFormat;
diff --git a/app/Support/Password/PwndVerifier.php b/app/Services/Password/PwndVerifier.php
similarity index 93%
rename from app/Support/Password/PwndVerifier.php
rename to app/Services/Password/PwndVerifier.php
index d991d9f38e..71ca5948fd 100644
--- a/app/Support/Password/PwndVerifier.php
+++ b/app/Services/Password/PwndVerifier.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Support\Password;
+namespace FireflyIII\Services\Password;
 
 use Log;
 use Requests;
@@ -18,7 +18,7 @@ use Requests_Exception;
 /**
  * Class PwndVerifier
  *
- * @package FireflyIII\Support\Password
+ * @package FireflyIII\Services\Password
  */
 class PwndVerifier implements Verifier
 {
diff --git a/app/Support/Password/Verifier.php b/app/Services/Password/Verifier.php
similarity index 86%
rename from app/Support/Password/Verifier.php
rename to app/Services/Password/Verifier.php
index 1f8603ead2..446a67b813 100644
--- a/app/Support/Password/Verifier.php
+++ b/app/Services/Password/Verifier.php
@@ -9,12 +9,12 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Support\Password;
+namespace FireflyIII\Services\Password;
 
 /**
  * Interface Verifier
  *
- * @package FireflyIII\Support\Password
+ * @package FireflyIII\Services\Password
  */
 interface Verifier
 {
diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php
index 172de2f2ef..a5ec19c29e 100644
--- a/app/Validation/FireflyValidator.php
+++ b/app/Validation/FireflyValidator.php
@@ -24,15 +24,12 @@ use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Rules\Triggers\TriggerInterface;
-use FireflyIII\Support\Password\Verifier;
+use FireflyIII\Services\Password\Verifier;
 use FireflyIII\User;
 use Google2FA;
 use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Contracts\Translation\Translator;
 use Illuminate\Validation\Validator;
-use Log;
-use Requests;
-use Requests_Exception;
 
 /**
  * Class FireflyValidator
@@ -293,6 +290,7 @@ class FireflyValidator extends Validator
         }
         /** @var Verifier $service */
         $service = app(Verifier::class);
+
         return $service->validPassword($value);
     }