IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup.

Browse Source 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
This commit is contained in:
James Cole
2016-08-26 09:30:52 +02:00
parent d0c6afc3a9
commit a9444ac702
60 changed files with 165 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,7 @@ class AccountController extends Controller
/**
* @param string $what
*
* @return \Illuminate\View\View
* @return View
*/
public function create(string $what = 'asset')
{
@@ -116,7 +116,7 @@ class AccountController extends Controller
* @param ARI $repository
* @param Account $account
*
* @return \Illuminate\View\View
* @return View
*/
public function edit(ARI $repository, Account $account)
{
@@ -172,7 +172,9 @@ class AccountController extends Controller
$subTitleIcon = config('firefly.subIconsByIdentifier.' . $what);
$types = config('firefly.accountTypesByIdentifier.' . $what);
$accounts = $crud->getAccountsByType($types);
/** @var Carbon $start */
$start = clone session('start', Carbon::now()->startOfMonth());
/** @var Carbon $end */
$end = clone session('end', Carbon::now()->endOfMonth());
$start->subDay();
@@ -196,7 +198,7 @@ class AccountController extends Controller
* @param ARI $repository
* @param Account $account
*
* @return \Illuminate\View\View
* @return View
*/
public function show(ARI $repository, Account $account)
{
@@ -204,7 +206,9 @@ class AccountController extends Controller
$subTitleIcon = config('firefly.subIconsByIdentifier.' . $account->accountType->type);
$subTitle = $account->name;
$range = Preferences::get('viewRange', '1M')->data;
/** @var Carbon $start */
$start = session('start', Navigation::startOfPeriod(new Carbon, $range));
/** @var Carbon $end */
$end = session('end', Navigation::endOfPeriod(new Carbon, $range));
$page = intval(Input::get('page'));
$pageSize = Preferences::get('transactionPageSize', 50)->data;
@@ -287,7 +291,7 @@ class AccountController extends Controller
* @param AccountFormRequest $request
* @param AccountCrudInterface $crud
*
* @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function store(AccountFormRequest $request, AccountCrudInterface $crud)
{
@@ -335,7 +339,7 @@ class AccountController extends Controller
* @param AccountCrudInterface $crud
* @param Account $account
*
* @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function update(AccountFormRequest $request, AccountCrudInterface $crud, Account $account)
{

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

@@ -47,7 +47,7 @@ class AttachmentController extends Controller
/**
* @param Attachment $attachment
*
* @return \Illuminate\View\View
* @return View
*/
public function delete(Attachment $attachment)
{
@@ -116,7 +116,7 @@ class AttachmentController extends Controller
/**
* @param Attachment $attachment
*
* @return \Illuminate\View\View
* @return View
*/
public function edit(Attachment $attachment)
{

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

@@ -223,7 +223,7 @@ class AuthController extends Controller
* @param \Illuminate\Http\Request $request
* @param string $message
*
* @return \Illuminate\Http\Response
* @return \Illuminate\Http\RedirectResponse
*/
protected function sendFailedLoginResponse(Request $request, string $message)
{

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

@@ -68,6 +68,8 @@ class ConfirmationController extends Controller
/**
* @param Request $request
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function resendConfirmation(Request $request)
{

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

@@ -55,7 +55,7 @@ class PasswordController extends Controller
*
* @param \Illuminate\Http\Request $request
*
* @return \Illuminate\Http\Response
* @return \Symfony\Component\HttpFoundation\Response
*/
public function sendResetLinkEmail(Request $request)
{

14
app/Http/Controllers/BillController.php
View File

@@ -41,7 +41,7 @@ class BillController extends Controller
}
/**
* @return \Illuminate\View\View
* @return View
*/
public function create()
{
@@ -66,7 +66,7 @@ class BillController extends Controller
/**
* @param Bill $bill
*
* @return \Illuminate\View\View
* @return View
*/
public function delete(Bill $bill)
{
@@ -99,7 +99,7 @@ class BillController extends Controller
/**
* @param Bill $bill
*
* @return \Illuminate\View\View
* @return View
*/
public function edit(Bill $bill)
{
@@ -123,11 +123,13 @@ class BillController extends Controller
/**
* @param BillRepositoryInterface $repository
*
* @return \Illuminate\View\View
* @return View
*/
public function index(BillRepositoryInterface $repository)
{
/** @var Carbon $start */
$start = session('start');
/** @var Carbon $end */
$end = session('end');
$bills = $repository->getBills();
@@ -187,7 +189,7 @@ class BillController extends Controller
* @param BillRepositoryInterface $repository
* @param Bill $bill
*
* @return \Illuminate\View\View
* @return View
*/
public function show(BillRepositoryInterface $repository, Bill $bill)
{
@@ -195,7 +197,7 @@ class BillController extends Controller
$date = session('start');
$year = $date->year;
$page = intval(Input::get('page')) == 0 ? 1 : intval(Input::get('page'));
$pageSize = Preferences::get('transactionPageSize', 50)->data;
$pageSize = intval(Preferences::get('transactionPageSize', 50)->data);
$journals = $repository->getJournals($bill, $page, $pageSize);
$yearAverage = $repository->getYearAverage($bill, $date);
$overallAverage = $repository->getOverallAverage($bill);

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

@@ -82,7 +82,7 @@ class BudgetController extends Controller
}
/**
* @return \Illuminate\View\View
* @return View
*/
public function create()
{
@@ -101,7 +101,7 @@ class BudgetController extends Controller
/**
* @param Budget $budget
*
* @return \Illuminate\View\View
* @return View
*/
public function delete(Budget $budget)
{
@@ -138,7 +138,7 @@ class BudgetController extends Controller
/**
* @param Budget $budget
*
* @return \Illuminate\View\View
* @return View
*/
public function edit(Budget $budget)
{
@@ -237,7 +237,7 @@ class BudgetController extends Controller
/**
* @param BudgetRepositoryInterface $repository
*
* @return \Illuminate\View\View
* @return View
*/
public function noBudget(BudgetRepositoryInterface $repository)
{
@@ -411,7 +411,7 @@ class BudgetController extends Controller
}
/**
* @return \Illuminate\View\View
* @return View
*/
public function updateIncome()
{

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

@@ -47,7 +47,7 @@ class CategoryController extends Controller
}
/**
* @return \Illuminate\View\View
* @return View
*/
public function create()
{
@@ -66,7 +66,7 @@ class CategoryController extends Controller
/**
* @param Category $category
*
* @return \Illuminate\View\View
* @return View
*/
public function delete(Category $category)
{
@@ -101,7 +101,7 @@ class CategoryController extends Controller
/**
* @param Category $category
*
* @return \Illuminate\View\View
* @return View
*/
public function edit(Category $category)
{
@@ -122,7 +122,7 @@ class CategoryController extends Controller
/**
* @param CRI $repository
*
* @return \Illuminate\View\View
* @return View
*/
public function index(CRI $repository)
{
@@ -140,7 +140,7 @@ class CategoryController extends Controller
/**
* @param CRI $repository
*
* @return \Illuminate\View\View
* @return View
*/
public function noCategory(CRI $repository)
{
@@ -166,9 +166,10 @@ class CategoryController extends Controller
*/
public function show(CRI $repository, AccountCrudInterface $crud, Category $category)
{
/** @var Carbon $carbon */
$range = Preferences::get('viewRange', '1M')->data;
/** @var Carbon $start */
$start = session('start', Navigation::startOfPeriod(new Carbon, $range));
/** @var Carbon $end */
$end = session('end', Navigation::endOfPeriod(new Carbon, $range));
$hideCategory = true; // used in list.
$page = intval(Input::get('page'));
@@ -232,7 +233,7 @@ class CategoryController extends Controller
*
* @param $date
*
* @return \Illuminate\View\View
* @return View
*/
public function showWithDate(CRI $repository, Category $category, string $date)
{

9
app/Http/Controllers/Chart/BudgetController.php
View File

@@ -214,8 +214,9 @@ class BudgetController extends Controller
$repetitions = $repetitions->filter(
function (LimitRepetition $repetition) use ($budgetIds) {
if (in_array(strval($repetition->budget_id), $budgetIds)) {
return $repetition;
return true;
}
return false;
}
);
/** @var LimitRepetition $repetition */
@@ -289,8 +290,9 @@ class BudgetController extends Controller
$reps = $repetitions->filter(
function (LimitRepetition $repetition) use ($budget, $currentStart) {
if ($repetition->budget_id === $budget->id && $repetition->startdate == $currentStart) {
return $repetition;
return true;
}
return false;
}
);
$budgeted = $reps->sum('amount');
@@ -325,8 +327,9 @@ class BudgetController extends Controller
return $repetitions->filter(
function (LimitRepetition $repetition) use ($budget, $start, $end) {
if ($repetition->startdate < $end && $repetition->enddate > $start && $repetition->budget_id === $budget->id) {
return $repetition;
return true;
}
return false;
}
);
}

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

@@ -43,7 +43,7 @@ class CurrencyController extends Controller
}
/**
* @return \Illuminate\View\View
* @return View
*/
public function create()
{
@@ -131,7 +131,7 @@ class CurrencyController extends Controller
/**
* @param TransactionCurrency $currency
*
* @return \Illuminate\View\View
* @return View
*/
public function edit(TransactionCurrency $currency)
{
@@ -154,7 +154,7 @@ class CurrencyController extends Controller
/**
* @param CurrencyRepositoryInterface $repository
*
* @return \Illuminate\View\View
* @return View
*/
public function index(CurrencyRepositoryInterface $repository)
{
@@ -175,7 +175,7 @@ class CurrencyController extends Controller
* @param CurrencyFormRequest $request
* @param CurrencyRepositoryInterface $repository
*
* @return $this|\Illuminate\Http\RedirectResponse
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function store(CurrencyFormRequest $request, CurrencyRepositoryInterface $repository)
{

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

@@ -92,7 +92,7 @@ class ExportController extends Controller
* @param AccountCrudInterface $crud
* @param EJRI $jobs
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @return View
*/
public function index(AccountCrudInterface $crud, EJRI $jobs)
{

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

@@ -97,7 +97,7 @@ class HomeController extends Controller
/** @var Tag $tag */
foreach ($tags as $tag) {
foreach ($tag->transactionjournals()->get() as $journal) {
foreach ($tag->transactionJournals()->get() as $journal) {
$count = $journal->tags()->count();
$journal->tag_count = $count;
$journal->save();

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

@@ -263,7 +263,7 @@ class ImportController extends Controller
*
* @param ImportJob $job
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @return View
* @throws FireflyException
*/
public function settings(ImportJob $job)

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

@@ -38,7 +38,7 @@ class NewUserController extends Controller
/**
* @param ARI $repository
*
* @@return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
* @@return View
*/
public function index(ARI $repository)
{

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

@@ -54,7 +54,7 @@ class PiggyBankController extends Controller
* @param ARI $repository
* @param PiggyBank $piggyBank
*
* @return $this
* @return View
*/
public function add(ARI $repository, PiggyBank $piggyBank)
{
@@ -74,7 +74,7 @@ class PiggyBankController extends Controller
* @param ARI $repository
* @param PiggyBank $piggyBank
*
* @return $this
* @return View
*/
public function addMobile(ARI $repository, PiggyBank $piggyBank)
{
@@ -113,7 +113,7 @@ class PiggyBankController extends Controller
/**
* @param PiggyBank $piggyBank
*
* @return $this
* @return View
*/
public function delete(PiggyBank $piggyBank)
{
@@ -254,6 +254,7 @@ class PiggyBankController extends Controller
public function postAdd(PiggyBankRepositoryInterface $repository, ARI $accounts, PiggyBank $piggyBank)
{
$amount = strval(round(Input::get('amount'), 2));
/** @var Carbon $date */
$date = session('end', Carbon::now()->endOfMonth());
$leftOnAccount = $accounts->leftOnAccount($piggyBank->account, $date);
$savedSoFar = strval($piggyBank->currentRelevantRep()->currentamount);
@@ -320,7 +321,7 @@ class PiggyBankController extends Controller
* @param PiggyBank $piggyBank
*
*
* @return \Illuminate\View\View
* @return View
*/
public function remove(PiggyBank $piggyBank)
{
@@ -332,7 +333,7 @@ class PiggyBankController extends Controller
*
* @param PiggyBank $piggyBank
*
* @return $this
* @return View
*/
public function removeMobile(PiggyBank $piggyBank)
{
@@ -358,7 +359,7 @@ class PiggyBankController extends Controller
* @param PiggyBankFormRequest $request
* @param PiggyBankRepositoryInterface $repository
*
* @return $this|\Illuminate\Http\RedirectResponse
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function store(PiggyBankFormRequest $request, PiggyBankRepositoryInterface $repository)
{

9
app/Http/Controllers/Popup/ReportController.php
View File

@@ -110,8 +110,9 @@ class ReportController extends Controller
function (TransactionJournal $journal) {
$tags = $journal->tags()->where('tagMode', 'balancingAct')->count();
if ($tags === 0) {
return $journal;
return true;
}
return false;
}
);
break;
@@ -191,8 +192,9 @@ class ReportController extends Controller
$journals = $journals->filter(
function (TransactionJournal $journal) use ($account) {
if ($journal->destination_account_id === $account->id) {
return $journal;
return true;
}
return false;
}
);
@@ -225,8 +227,9 @@ class ReportController extends Controller
$journal->source_account_id === $account->id
&& in_array($journal->destination_account_id, $destinations)
) {
return $journal;
return true;
}
return false;
}
);

1
app/Http/Controllers/PreferencesController.php
View File

@@ -46,6 +46,7 @@ class PreferencesController extends Controller
public function code(Google2FA $google2fa)
{
$domain = $this->getDomain();
/** @noinspection PhpMethodParametersCountMismatchInspection */
$secret = $google2fa->generateSecretKey(16, Auth::user()->id);
Session::flash('two-factor-secret', $secret);
$image = $google2fa->getQRCodeInline('Firefly III at ' . $domain, null, $secret, 150);

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

@@ -19,6 +19,7 @@ use FireflyIII\User;
use Hash;
use Preferences;
use Session;
use View;
/**
* Class ProfileController
@@ -36,7 +37,7 @@ class ProfileController extends Controller
}
/**
* @return \Illuminate\View\View
* @return View
*/
public function changePassword()
{
@@ -46,7 +47,7 @@ class ProfileController extends Controller
}
/**
* @return \Illuminate\View\View
* @return View
*/
public function deleteAccount()
{
@@ -56,7 +57,7 @@ class ProfileController extends Controller
}
/**
* @return \Illuminate\View\View
* @return View
*
*/
public function index()

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

@@ -233,7 +233,7 @@ class RuleController extends Controller
* @param RuleRepositoryInterface $repository
* @param RuleGroup $ruleGroup
*
* @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function store(RuleFormRequest $request, RuleRepositoryInterface $repository, RuleGroup $ruleGroup)
{
@@ -281,7 +281,7 @@ class RuleController extends Controller
*
* @param TestRuleFormRequest $request
*
* @return \Illuminate\View\View
* @return \Illuminate\Http\JsonResponse
*/
public function testTriggers(TestRuleFormRequest $request)
{
@@ -336,7 +336,7 @@ class RuleController extends Controller
* @param RuleFormRequest $request
* @param Rule $rule
*
* @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function update(RuleRepositoryInterface $repository, RuleFormRequest $request, Rule $rule)
{

4
app/Http/Controllers/RuleGroupController.php
View File

@@ -200,7 +200,7 @@ class RuleGroupController extends Controller
* @param RuleGroupFormRequest $request
* @param RuleGroupRepositoryInterface $repository
*
* @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function store(RuleGroupFormRequest $request, RuleGroupRepositoryInterface $repository)
{
@@ -245,7 +245,7 @@ class RuleGroupController extends Controller
* @param RuleGroupRepositoryInterface $repository
* @param RuleGroup $ruleGroup
*
* @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function update(RuleGroupFormRequest $request, RuleGroupRepositoryInterface $repository, RuleGroup $ruleGroup)
{

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

@@ -61,7 +61,7 @@ class TagController extends Controller
}
/**
* @return \Illuminate\View\View
* @return View
*/
public function create()
{
@@ -88,7 +88,7 @@ class TagController extends Controller
/**
* @param Tag $tag
*
* @return \Illuminate\View\View
* @return View
*/
public function delete(Tag $tag)
{
@@ -123,7 +123,7 @@ class TagController extends Controller
/**
* @param Tag $tag
*
* @return \Illuminate\View\View
* @return View
*/
public function edit(Tag $tag)
{
@@ -220,14 +220,14 @@ class TagController extends Controller
/**
* @param Tag $tag
*
* @return \Illuminate\View\View
* @return View
*/
public function show(Tag $tag)
{
$subTitle = $tag->tag;
$subTitleIcon = 'fa-tag';
/** @var Collection $journals */
$journals = $tag->transactionjournals()->sortCorrectly()->expanded()->get(TransactionJournal::queryFields());
$journals = $tag->transactionJournals()->sortCorrectly()->expanded()->get(TransactionJournal::queryFields());
$sum = $journals->sum(
function (TransactionJournal $journal) {

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

@@ -160,7 +160,7 @@ class SplitController extends Controller
* @param JournalInterface $repository
* @param AttachmentHelperInterface $att
*
* @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function update(TransactionJournal $journal, SplitJournalFormRequest $request, JournalInterface $repository, AttachmentHelperInterface $att)
{

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

@@ -49,7 +49,7 @@ class TransactionController extends Controller
/**
* @param string $what
*
* @return \Illuminate\View\View
* @return View
*/
public function create(string $what = TransactionType::DEPOSIT)
{
@@ -88,7 +88,7 @@ class TransactionController extends Controller
*
* @param TransactionJournal $journal
*
* @return \Illuminate\View\View
* @return View
*/
public function delete(TransactionJournal $journal)
{
@@ -336,7 +336,7 @@ class TransactionController extends Controller
* @param AttachmentHelperInterface $att
* @param TransactionJournal $journal
*
* @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function update(JournalFormRequest $request, JournalRepositoryInterface $repository, AttachmentHelperInterface $att, TransactionJournal $journal)
{