gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-10 04:21:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various code cleanup [skip ci]

Browse Source
This commit is contained in:
James Cole
2016-10-22 09:39:31 +02:00
parent 12a6a61100
commit 5d9b68c3e7
9 changed files with 26 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,12 +114,11 @@ class AccountController extends Controller
}
/**
* @param ARI $repository
* @param Account $account
*
* @return View
*/
public function edit(ARI $repository, Account $account)
public function edit(Account $account)
{
$what = config('firefly.shortNamesByFullName')[$account->accountType->type];

8
app/Http/Controllers/Admin/UserController.php
View File

@@ -86,10 +86,10 @@ class UserController extends Controller
*/
public function show(UserRepositoryInterface $repository, User $user)
{
$title = strval(trans('firefly.administration'));
$mainTitleIcon = 'fa-hand-spock-o';
$subTitle = strval(trans('firefly.single_user_administration', ['email' => $user->email]));
$subTitleIcon = 'fa-user';
$title = strval(trans('firefly.administration'));
$mainTitleIcon = 'fa-hand-spock-o';
$subTitle = strval(trans('firefly.single_user_administration', ['email' => $user->email]));
$subTitleIcon = 'fa-user';
// get IP info:
$defaultIp = '0.0.0.0';

2
app/Http/Controllers/Auth/ConfirmationController.php
View File

@@ -13,8 +13,8 @@ declare(strict_types = 1);
namespace FireflyIII\Http\Controllers\Auth;
use FireflyIII\Events\ResentConfirmation;
use FireflyIII\Events\ConfirmedUser;
use FireflyIII\Events\ResentConfirmation;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use Illuminate\Http\Request;

2
app/Http/Controllers/Auth/ResetPasswordController.php
View File

@@ -41,6 +41,8 @@ class ResetPasswordController extends Controller
*/
public function __construct()
{
parent::__construct();
$this->middleware('guest');
}
}

7
app/Http/Controllers/Transaction/SingleController.php
View File

@@ -284,10 +284,11 @@ class SingleController extends Controller
}
/**
* @param JournalFormRequest $request
* @param TransactionJournal $journal
* @param JournalFormRequest $request
* @param JournalRepositoryInterface $repository
* @param TransactionJournal $journal
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function update(JournalFormRequest $request, JournalRepositoryInterface $repository, TransactionJournal $journal)
{

7
app/Http/Controllers/Transaction/SplitController.php
View File

@@ -126,7 +126,7 @@ class SplitController extends Controller
*/
public function update(Request $request, JournalRepositoryInterface $repository, TransactionJournal $journal)
{
$data = $this->arrayFromInput($request, $journal);
$data = $this->arrayFromInput($request);
$journal = $repository->updateSplitJournal($journal, $data);
// save attachments:
@@ -158,18 +158,17 @@ class SplitController extends Controller
/**
* @param Request $request
* @param TransactionJournal $journal
*
* @return array
*/
private function arrayFromInput(Request $request, TransactionJournal $journal): array
private function arrayFromInput(Request $request): array
{
$array = [
'journal_description' => $request->get('journal_description'),
'journal_source_account_id' => $request->get('journal_source_account_id'),
'journal_source_account_name' => $request->get('journal_source_account_name'),
'journal_destination_account_id' => $request->get('journal_destination_account_id'),
'currency_id' => $request->get('currency_id'),
'currency_id' => $request->get('currency_id'),
'what' => $request->get('what'),
'date' => $request->get('date'),
// all custom fields: