Refactor for #732

This commit is contained in:
James Cole 2017-08-04 15:48:26 +02:00
parent 5d10a19bfa
commit 194fe178c0
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
4 changed files with 8 additions and 10 deletions

View File

@ -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;

View File

@ -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
{

View File

@ -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
{

View File

@ -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);
}