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

Various code cleanup.

Browse Source
This commit is contained in:
James Cole
2018-03-11 16:24:07 +01:00
parent 5a7b1ba292
commit b12872e5de
40 changed files with 114 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Account/ReconcileController.php
View File

@@ -244,12 +244,12 @@ class ReconcileController extends Controller
/**
* @param ReconciliationStoreRequest $request
* @param JournalRepositoryInterface $repository
* @param Account $account
* @param Carbon $start
* @param Carbon $end
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @throws FireflyException
*/
public function submit(ReconciliationStoreRequest $request, JournalRepositoryInterface $repository, Account $account, Carbon $start, Carbon $end)
{

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

@@ -128,9 +128,8 @@ class AccountController extends Controller
}
/**
* @param Request $request
* @param AccountRepositoryInterface $repository
* @param Account $account
* @param Request $request
* @param Account $account
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
@@ -152,15 +151,16 @@ class AccountController extends Controller
/**
* Edit an account.
*
* @param Request $request
* @param Account $account
* @param Request $request
* @param Account $account
*
* @param AccountRepositoryInterface $repository
*
* @return View
*
* @SuppressWarnings(PHPMD.CyclomaticComplexity) // long and complex but not that excessively so.
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*
* @return View
*
* @throws FireflyException
*/
public function edit(Request $request, Account $account, AccountRepositoryInterface $repository)
{
@@ -277,16 +277,16 @@ class AccountController extends Controller
/**
* Show an account.
*
* @param Request $request
* @param Account $account
* @param string $moment
*
* @param Request $request
* @param Account $account
* @param Carbon|null $start
* @param Carbon|null $end
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View
*
* @throws FireflyException
* @SuppressWarnings(PHPMD.CyclomaticComplexity) // long and complex but not that excessively so.
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*
* @throws FireflyException
*/
public function show(Request $request, Account $account, Carbon $start = null, Carbon $end = null)
{
@@ -365,9 +365,8 @@ class AccountController extends Controller
}
/**
* @param AccountFormRequest $request
* @param AccountRepositoryInterface $repository
* @param Account $account
* @param AccountFormRequest $request
* @param Account $account
*
* @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
@@ -410,8 +409,9 @@ class AccountController extends Controller
* and for each period, the amount of money spent and earned. This is a complex operation which is cached for
* performance reasons.
*
* @param Account $account the account involved
* @param Account $account the account involved
*
* @param Carbon|null $date
* @return Collection
*
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)

6
app/Http/Controllers/BudgetController.php
View File

@@ -167,6 +167,7 @@ class BudgetController extends Controller
}
/**
* @param Request $request
* @param string|null $moment
*
* @return View
@@ -545,8 +546,9 @@ class BudgetController extends Controller
}
/**
* @param Carbon $start
* @param Carbon $end
* @param Request $request
* @param Carbon $start
* @param Carbon $end
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/

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

@@ -424,6 +424,8 @@ class CategoryController extends Controller
/**
* @param Category $category
*
* @param Carbon $date
*
* @return Collection
*/
private function getPeriodOverview(Category $category, Carbon $date): Collection

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

@@ -299,6 +299,8 @@ class AccountController extends Controller
* @param Account $account
* @param Carbon $start
*
* @param Carbon $end
*
* @return \Illuminate\Http\JsonResponse
*/
public function period(Account $account, Carbon $start, Carbon $end)

4
app/Http/Controllers/Json/BoxController.php
View File

@@ -198,7 +198,9 @@ class BoxController extends Controller
}
/**
* @param AccountRepositoryInterface $repository
* @param AccountRepositoryInterface $repository
*
* @param CurrencyRepositoryInterface $currencyRepos
*
* @return \Illuminate\Http\JsonResponse
*/

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

@@ -59,7 +59,9 @@ class PiggyBankController extends Controller
/**
* Add money to piggy bank.
*
* @param PiggyBank $piggyBank
* @param PiggyBank $piggyBank
*
* @param PiggyBankRepositoryInterface $repository
*
* @return View
*/
@@ -78,8 +80,9 @@ class PiggyBankController extends Controller
/**
* Add money to piggy bank (for mobile devices).
*
* @param PiggyBank $piggyBank
* @param PiggyBank $piggyBank
*
* @param PiggyBankRepositoryInterface $repository
* @return View
*/
public function addMobile(PiggyBank $piggyBank, PiggyBankRepositoryInterface $repository)
@@ -180,6 +183,7 @@ class PiggyBankController extends Controller
}
/**
* @param Request $request
* @param PiggyBankRepositoryInterface $piggyRepository
*
* @return View

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

@@ -170,6 +170,8 @@ class ProfileController extends Controller
}
/**
* @param UserRepositoryInterface $repository
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function enable2FA(UserRepositoryInterface $repository)

1
app/Http/Controllers/Transaction/BulkController.php
View File

@@ -66,6 +66,7 @@ class BulkController extends Controller
}
/**
* @param Request $request
* @param Collection $journals
*
* @return View

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

@@ -238,7 +238,9 @@ class SingleController extends Controller
}
/**
* @param TransactionJournal $journal
* @param TransactionJournal $journal
*
* @param JournalRepositoryInterface $repository
*
* @return mixed
*/

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

@@ -37,7 +37,6 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalTaskerInterface;
use FireflyIII\Transformers\TransactionTransformer;
use Illuminate\Http\Request;
use Illuminate\Support\Collection;
@@ -65,8 +64,6 @@ class SplitController extends Controller
private $currencies;
/** @var JournalRepositoryInterface */
private $repository;
/** @var JournalTaskerInterface */
private $tasker;
/**
*
@@ -80,7 +77,6 @@ class SplitController extends Controller
function ($request, $next) {
$this->accounts = app(AccountRepositoryInterface::class);
$this->budgets = app(BudgetRepositoryInterface::class);
$this->tasker = app(JournalTaskerInterface::class);
$this->attachments = app(AttachmentHelperInterface::class);
$this->currencies = app(CurrencyRepositoryInterface::class);
$this->repository = app(JournalRepositoryInterface::class);

10
app/Http/Controllers/TransactionController.php
View File

@@ -30,7 +30,6 @@ use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalTaskerInterface;
use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use FireflyIII\Transformers\TransactionTransformer;
@@ -71,7 +70,6 @@ class TransactionController extends Controller
*
* @return View
*
* @throws FireflyException
*/
public function index(Request $request, JournalRepositoryInterface $repository, string $what, string $moment = '')
{
@@ -176,13 +174,13 @@ class TransactionController extends Controller
/**
* @param TransactionJournal $journal
* @param JournalTaskerInterface $tasker
* @param JournalRepositoryInterface $repository
* @param LinkTypeRepositoryInterface $linkTypeRepository
*
* @throws FireflyException
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View
* @throws FireflyException
*/
public function show(TransactionJournal $journal, JournalTaskerInterface $tasker, LinkTypeRepositoryInterface $linkTypeRepository)
public function show(TransactionJournal $journal, JournalRepositoryInterface $repository, LinkTypeRepositoryInterface $linkTypeRepository)
{
if ($this->isOpeningBalance($journal)) {
return $this->redirectToAccount($journal);
@@ -208,7 +206,7 @@ class TransactionController extends Controller
$transactions[] = $transformer->transform($transaction);
}
$events = $tasker->getPiggyBankEvents($journal);
$events = $repository->getPiggyBankEvents($journal);
$what = strtolower($transactionType);
$subTitle = trans('firefly.' . $what) . ' "' . $journal->description . '"';