kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-23 14:26:58 +00:00
Code Issues Projects Releases Wiki Activity

Various small optimisations [skip ci]

Browse Source
This commit is contained in:
James Cole
2017-01-05 10:06:46 +01:00
parent a872cf7061
commit 4538ef3cf9
6 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/Http/Controllers/ProfileController.php
View File

@@ -13,6 +13,7 @@ declare(strict_types = 1);
namespace FireflyIII\Http\Controllers;
use FireflyIII\Exceptions\ValidationException;
use FireflyIII\Http\Requests\DeleteAccountFormRequest;
use FireflyIII\Http\Requests\ProfileFormRequest;
use FireflyIII\Repositories\User\UserRepositoryInterface;
@@ -114,9 +115,11 @@ class ProfileController extends Controller
return redirect(route('profile.change-password'));
}
$result = $this->validatePassword($request->get('current_password'), $request->get('new_password'));
if (!($result === true)) {
Session::flash('error', $result);
try {
$this->validatePassword($request->get('current_password'), $request->get('new_password'));
} catch (ValidationException $e) {
Session::flash('error', $e->getMessage());
return redirect(route('profile.change-password'));
}
@@ -163,16 +166,16 @@ class ProfileController extends Controller
}
/**
*
* @param string $old
* @param string $new1
* @param string $new
*
* @return string|bool
* @return bool
* @throws ValidationException
*/
protected function validatePassword(string $old, string $new1)
protected function validatePassword(string $old, string $new): bool
{
if ($new1 == $old) {
return trans('firefly.should_change');
if ($new === $old) {
throw new ValidationException(strval(trans('firefly.should_change')));
}
return true;