IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-29 02:11:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added an alias to make methods more readable.

Browse Source
This commit is contained in:
James Cole 2015-12-30 08:00:52 +01:00
parent 449c6dfde5
commit 39b88e8207
12 changed files with 71 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@ use Config;
use ExpandedForm;
use FireflyIII\Http\Requests\AccountFormRequest;
use FireflyIII\Models\Account;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
use Input;
use Preferences;
use Session;
@ -56,12 +56,12 @@ class AccountController extends Controller
}
/**
* @param AccountRepositoryInterface $repository
* @param ARI $repository
* @param Account $account
*
* @return \Illuminate\View\View
*/
public function delete(AccountRepositoryInterface $repository, Account $account)
public function delete(ARI $repository, Account $account)
{
$typeName = Config::get('firefly.shortNamesByFullName.' . $account->accountType->type);
$subTitle = trans('firefly.delete_' . $typeName . '_account', ['name' => $account->name]);
@ -77,12 +77,12 @@ class AccountController extends Controller
}
/**
* @param AccountRepositoryInterface $repository
* @param ARI $repository
* @param Account $account
*
* @return \Illuminate\Http\RedirectResponse
*/
public function destroy(AccountRepositoryInterface $repository, Account $account)
public function destroy(ARI $repository, Account $account)
{
$type = $account->accountType->type;
$typeName = Config::get('firefly.shortNamesByFullName.' . $type);
@ -98,12 +98,12 @@ class AccountController extends Controller
}
/**
* @param AccountRepositoryInterface $repository
* @param ARI $repository
* @param Account $account
*
* @return \Illuminate\View\View
*/
public function edit(AccountRepositoryInterface $repository, Account $account)
public function edit(ARI $repository, Account $account)
{
$what = Config::get('firefly.shortNamesByFullName')[$account->accountType->type];
@ -143,12 +143,12 @@ class AccountController extends Controller
}
/**
* @param AccountRepositoryInterface $repository
* @param ARI $repository
* @param $what
*
* @return \Illuminate\View\View
*/
public function index(AccountRepositoryInterface $repository, $what)
public function index(ARI $repository, $what)
{
$subTitle = trans('firefly.' . $what . '_accounts');
$subTitleIcon = Config::get('firefly.subIconsByIdentifier.' . $what);
@ -184,12 +184,12 @@ class AccountController extends Controller
}
/**
* @param AccountRepositoryInterface $repository
* @param ARI $repository
* @param Account $account
*
* @return \Illuminate\View\View
*/
public function show(AccountRepositoryInterface $repository, Account $account)
public function show(ARI $repository, Account $account)
{
$page = intval(Input::get('page')) == 0 ? 1 : intval(Input::get('page'));
$subTitleIcon = Config::get('firefly.subTitlesByIdentifier.' . $account->accountType->type);
@ -204,11 +204,11 @@ class AccountController extends Controller
/**
* @param AccountFormRequest $request
* @param AccountRepositoryInterface $repository
* @param ARI $repository
*
* @return \Illuminate\Http\RedirectResponse
*/
public function store(AccountFormRequest $request, AccountRepositoryInterface $repository)
public function store(AccountFormRequest $request, ARI $repository)
{
$accountData = [
'name' => $request->input('name'),
@ -243,12 +243,12 @@ class AccountController extends Controller
/**
* @param AccountFormRequest $request
* @param AccountRepositoryInterface $repository
* @param ARI $repository
* @param Account $account
*
* @return \Illuminate\Http\RedirectResponse
*/
public function update(AccountFormRequest $request, AccountRepositoryInterface $repository, Account $account)
public function update(AccountFormRequest $request, ARI $repository, Account $account)
{
$accountData = [

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

@ -6,7 +6,7 @@ use Carbon\Carbon;
use FireflyIII\Http\Requests\BudgetFormRequest;
use FireflyIII\Models\Budget;
use FireflyIII\Models\LimitRepetition;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use Input;
use Navigation;
@ -134,11 +134,11 @@ class BudgetController extends Controller
/**
* @param BudgetRepositoryInterface $repository
*
* @param AccountRepositoryInterface $accountRepository
* @param ARI $accountRepository
*
* @return \Illuminate\View\View
*/
public function index(BudgetRepositoryInterface $repository, AccountRepositoryInterface $accountRepository)
public function index(BudgetRepositoryInterface $repository, ARI $accountRepository)
{
$budgets = $repository->getActiveBudgets();
$inactive = $repository->getInactiveBudgets();

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

@ -5,7 +5,7 @@ namespace FireflyIII\Http\Controllers\Chart;
use Carbon\Carbon;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Account;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
use FireflyIII\Support\CacheProperties;
use Illuminate\Support\Collection;
use Preferences;
@ -68,11 +68,11 @@ class AccountController extends Controller
/**
* Shows the balances for all the user's expense accounts.
*
* @param AccountRepositoryInterface $repository
* @param ARI $repository
*
* @return \Symfony\Component\HttpFoundation\Response
*/
public function expenseAccounts(AccountRepositoryInterface $repository)
public function expenseAccounts(ARI $repository)
{
$start = clone Session::get('start', Carbon::now()->startOfMonth());
$end = clone Session::get('end', Carbon::now()->endOfMonth());
@ -98,11 +98,11 @@ class AccountController extends Controller
/**
* Shows the balances for all the user's frontpage accounts.
*
* @param AccountRepositoryInterface $repository
* @param ARI $repository
*
* @return \Symfony\Component\HttpFoundation\Response
*/
public function frontpage(AccountRepositoryInterface $repository)
public function frontpage(ARI $repository)
{
$frontPage = Preferences::get('frontPageAccounts', []);
$start = clone Session::get('start', Carbon::now()->startOfMonth());

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

@ -6,7 +6,7 @@ use Carbon\Carbon;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Budget;
use FireflyIII\Models\LimitRepetition;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use Illuminate\Support\Collection;
@ -117,13 +117,12 @@ class BudgetController extends Controller
}
/**
* @param BudgetRepositoryInterface $repository
* @param AccountRepositoryInterface $accountRepository
* @param Budget $budget
* @param BudgetRepositoryInterface $repository
* @param Budget $budget
*
* @return \Symfony\Component\HttpFoundation\Response
*/
public function budget(BudgetRepositoryInterface $repository, AccountRepositoryInterface $accountRepository, Budget $budget)
public function budget(BudgetRepositoryInterface $repository, Budget $budget)
{
// dates and times
@ -146,7 +145,7 @@ class BudgetController extends Controller
$last = Navigation::endOfX($last, $range, $final);
$entries = new Collection;
// get all expenses:
$set = $repository->getExpensesPerMonth($budget, $first, $last);
$set = $repository->getExpensesPerMonth($budget, $first, $last); // TODO
while ($first < $last) {
$monthFormatted = $first->format('Y-m');
@ -230,11 +229,11 @@ class BudgetController extends Controller
*
* @param BudgetRepositoryInterface $repository
*
* @param AccountRepositoryInterface $accountRepository
* @param ARI $accountRepository
*
* @return \Symfony\Component\HttpFoundation\Response
*/
public function frontpage(BudgetRepositoryInterface $repository, AccountRepositoryInterface $accountRepository)
public function frontpage(BudgetRepositoryInterface $repository, ARI $accountRepository)
{
$start = Session::get('start', Carbon::now()->startOfMonth());
$end = Session::get('end', Carbon::now()->endOfMonth());

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

@ -8,7 +8,7 @@ use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Csv\Data;
use FireflyIII\Helpers\Csv\Importer;
use FireflyIII\Helpers\Csv\WizardInterface;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
use Illuminate\Http\Request;
use Input;
use Log;
@ -150,7 +150,7 @@ class CsvController extends Controller
*
* @return \Illuminate\View\View
*/
public function index(AccountRepositoryInterface $repository)
public function index(ARI $repository)
{
$subTitle = trans('firefly.csv_import');

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

@ -4,7 +4,7 @@ use Artisan;
use Carbon\Carbon;
use Config;
use FireflyIII\Models\Tag;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
use Input;
use Preferences;
use Session;
@ -62,11 +62,11 @@ class HomeController extends Controller
}
/**
* @param AccountRepositoryInterface $repository
* @param ARI $repository
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
*/
public function index(AccountRepositoryInterface $repository)
public function index(ARI $repository)
{
$types = Config::get('firefly.accountTypesByIdentifier.asset');
$count = $repository->countAccounts($types);

18
app/Http/Controllers/JsonController.php
View File

@ -3,7 +3,7 @@
use Amount;
use Carbon\Carbon;
use FireflyIII\Helpers\Report\ReportQueryInterface;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface as CRI;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
@ -113,11 +113,11 @@ class JsonController extends Controller
/**
* @param ReportQueryInterface $reportQuery
*
* @param AccountRepositoryInterface $accountRepository
* @param ARI $accountRepository
*
* @return \Symfony\Component\HttpFoundation\Response
*/
public function boxIn(ReportQueryInterface $reportQuery, AccountRepositoryInterface $accountRepository)
public function boxIn(ReportQueryInterface $reportQuery, ARI $accountRepository)
{
$start = Session::get('start', Carbon::now()->startOfMonth());
$end = Session::get('end', Carbon::now()->endOfMonth());
@ -142,11 +142,11 @@ class JsonController extends Controller
/**
* @param ReportQueryInterface $reportQuery
*
* @param AccountRepositoryInterface $accountRepository
* @param ARI $accountRepository
*
* @return \Symfony\Component\HttpFoundation\Response
*/
public function boxOut(ReportQueryInterface $reportQuery, AccountRepositoryInterface $accountRepository)
public function boxOut(ReportQueryInterface $reportQuery, ARI $accountRepository)
{
$start = Session::get('start', Carbon::now()->startOfMonth());
$end = Session::get('end', Carbon::now()->endOfMonth());
@ -191,11 +191,11 @@ class JsonController extends Controller
/**
* Returns a JSON list of all beneficiaries.
*
* @param AccountRepositoryInterface $accountRepository
* @param ARI $accountRepository
*
* @return \Illuminate\Http\JsonResponse
*/
public function expenseAccounts(AccountRepositoryInterface $accountRepository)
public function expenseAccounts(ARI $accountRepository)
{
$list = $accountRepository->getAccounts(['Expense account', 'Beneficiary account']);
$return = [];
@ -208,11 +208,11 @@ class JsonController extends Controller
}
/**
* @param AccountRepositoryInterface $accountRepository
* @param ARI $accountRepository
*
* @return \Illuminate\Http\JsonResponse
*/
public function revenueAccounts(AccountRepositoryInterface $accountRepository)
public function revenueAccounts(ARI $accountRepository)
{
$list = $accountRepository->getAccounts(['Revenue account']);
$return = [];

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

@ -5,8 +5,8 @@ use Carbon\Carbon;
use Config;
use FireflyIII\Http\Requests\NewUserFormRequest;
use FireflyIII\Models\AccountMeta;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use Preferences;
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
use Preferences ;
use Session;
use View;
@ -20,11 +20,11 @@ class NewUserController extends Controller
/**
* @param AccountRepositoryInterface $repository
* @param ARI $repository
*
* @@return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
*/
public function index(AccountRepositoryInterface $repository)
public function index(ARI $repository)
{
View::share('title', 'Welcome to Firefly!');
View::share('mainTitleIcon', 'fa-fire');
@ -43,11 +43,11 @@ class NewUserController extends Controller
/**
* @param NewUserFormRequest $request
* @param AccountRepositoryInterface $repository
* @param ARI $repository
*
* @return \Illuminate\Http\RedirectResponse
*/
public function submit(NewUserFormRequest $request, AccountRepositoryInterface $repository)
public function submit(NewUserFormRequest $request, ARI $repository)
{
// create normal asset account:
$assetAccount = [

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

@ -6,7 +6,7 @@ use Config;
use ExpandedForm;
use FireflyIII\Http\Requests\PiggyBankFormRequest;
use FireflyIII\Models\PiggyBank;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
use Illuminate\Support\Collection;
use Input;
@ -40,12 +40,12 @@ class PiggyBankController extends Controller
/**
* Add money to piggy bank
*
* @param AccountRepositoryInterface $repository
* @param ARI $repository
* @param PiggyBank $piggyBank
*
* @return $this
*/
public function add(AccountRepositoryInterface $repository, PiggyBank $piggyBank)
public function add(ARI $repository, PiggyBank $piggyBank)
{
bcscale(2);
$date = Session::get('end', Carbon::now()->endOfMonth());
@ -58,11 +58,11 @@ class PiggyBankController extends Controller
}
/**
* @param AccountRepositoryInterface $repository
* @param ARI $repository
*
* @return mixed
*/
public function create(AccountRepositoryInterface $repository)
public function create(ARI $repository)
{
$periods = Config::get('firefly.piggy_bank_periods');
@ -116,12 +116,12 @@ class PiggyBankController extends Controller
}
/**
* @param AccountRepositoryInterface $repository
* @param ARI $repository
* @param PiggyBank $piggyBank
*
* @return View
*/
public function edit(AccountRepositoryInterface $repository, PiggyBank $piggyBank)
public function edit(ARI $repository, PiggyBank $piggyBank)
{
$periods = Config::get('firefly.piggy_bank_periods');
@ -162,7 +162,7 @@ class PiggyBankController extends Controller
*
* @return View
*/
public function index(AccountRepositoryInterface $repository, PiggyBankRepositoryInterface $piggyRepository)
public function index(ARI $repository, PiggyBankRepositoryInterface $piggyRepository)
{
/** @var Collection $piggyBanks */
$piggyBanks = $piggyRepository->getPiggyBanks();
@ -219,12 +219,12 @@ class PiggyBankController extends Controller
/**
* @param PiggyBankRepositoryInterface $repository
* @param AccountRepositoryInterface $accounts
* @param ARI $accounts
* @param PiggyBank $piggyBank
*
* @return \Illuminate\Http\RedirectResponse
*/
public function postAdd(PiggyBankRepositoryInterface $repository, AccountRepositoryInterface $accounts, PiggyBank $piggyBank)
public function postAdd(PiggyBankRepositoryInterface $repository, ARI $accounts, PiggyBank $piggyBank)
{
bcscale(2);
$amount = round(Input::get('amount'), 2);

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

@ -1,7 +1,7 @@
<?php namespace FireflyIII\Http\Controllers;
use Config;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
use Input;
use Preferences;
use Session;
@ -26,11 +26,11 @@ class PreferencesController extends Controller
}
/**
* @param AccountRepositoryInterface $repository
* @param ARI $repository
*
* @return $this|\Illuminate\View\View
*/
public function index(AccountRepositoryInterface $repository)
public function index(ARI $repository)
{
$accounts = $repository->getAccounts(['Default account', 'Asset account']);
$viewRangePref = Preferences::get('viewRange', '1M');

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

@ -3,7 +3,7 @@
use Carbon\Carbon;
use FireflyIII\Helpers\Report\ReportHelperInterface;
use FireflyIII\Models\Account;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
use Illuminate\Support\Collection;
use Session;
use View;
@ -35,12 +35,12 @@ class ReportController extends Controller
}
/**
* @param AccountRepositoryInterface $repository
* @param ARI $repository
*
* @return View
* @internal param ReportHelperInterface $helper
*/
public function index(AccountRepositoryInterface $repository)
public function index(ARI $repository)
{
$start = Session::get('first');
$months = $this->helper->listOfMonths($start);

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

@ -14,7 +14,7 @@ use FireflyIII\Models\PiggyBankEvent;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use Illuminate\Support\Collection;
use Input;
@ -43,12 +43,12 @@ class TransactionController extends Controller
}
/**
* @param AccountRepositoryInterface $repository
* @param ARI $repository
* @param string $what
*
* @return \Illuminate\View\View
*/
public function create(AccountRepositoryInterface $repository, $what = TransactionType::DEPOSIT)
public function create(ARI $repository, $what = TransactionType::DEPOSIT)
{
$what = strtolower($what);
$maxFileSize = Steam::phpBytes(ini_get('upload_max_filesize'));
@ -133,12 +133,12 @@ class TransactionController extends Controller
/**
* Shows the view to edit a transaction.
*
* @param AccountRepositoryInterface $repository
* @param ARI $repository
* @param TransactionJournal $journal
*
* @return $this
*/
public function edit(AccountRepositoryInterface $repository, TransactionJournal $journal)
public function edit(ARI $repository, TransactionJournal $journal)
{
// cannot edit opening balance
if ($journal->isOpeningBalance()) {