IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-28 18:01:26 -06:00
Code Issues Packages 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
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
6 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/AccountController.php
View File

@ -65,7 +65,7 @@ class AccountController extends Controller
/**
* @param string $what
*
* @return View
* @return \Illuminate\View\View|\Illuminate\Contracts\View\Factory|View
*/
public function create(string $what = 'asset')
{

5
app/Http/Controllers/AttachmentController.php
View File

@ -88,10 +88,11 @@ class AttachmentController extends Controller
}
/**
* @param Attachment $attachment
* @param AttachmentRepositoryInterface $repository
* @param Attachment $attachment
*
* @return mixed
* @throws FireflyException
*
*/
public function download(AttachmentRepositoryInterface $repository, Attachment $attachment)
{

2
app/Http/Controllers/PiggyBankController.php
View File

@ -414,7 +414,7 @@ class PiggyBankController extends Controller
* @param PiggyBankFormRequest $request
* @param PiggyBank $piggyBank
*
* @return $this
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function update(PiggyBankRepositoryInterface $repository, PiggyBankFormRequest $request, PiggyBank $piggyBank)
{

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;

9
app/Support/Navigation.php
View File

@ -129,12 +129,11 @@ class Navigation
}
/**
* @param \Carbon\Carbon $theCurrentEnd
* @param string $repeatFreq
* @param \Carbon\Carbon|null $maxDate
*
* @param \Carbon\Carbon $theCurrentEnd
* @param $repeatFreq
* @param \Carbon\Carbon $maxDate
*
* @return \Carbon\Carbon
* @return Carbon
*/
public function endOfX(Carbon $theCurrentEnd, string $repeatFreq, Carbon $maxDate = null): Carbon
{

2
app/Support/Preferences.php
View File

@ -85,7 +85,7 @@ class Preferences
/**
* @param \FireflyIII\User $user
* @param string $name
* @param string $default
* @param null|string $default
*
* @return \FireflyIII\Models\Preference|null
*/