kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-06 12:45:30 +00:00
Code Issues Projects Releases Wiki Activity

Optimize imports.

Browse Source
This commit is contained in:
James Cole
2018-03-10 20:30:09 +01:00
parent da1dc67e1c
commit dd2f3c861b
35 changed files with 125 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,6 @@ namespace FireflyIII\Http\Controllers\Account;
use Carbon\Carbon;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Factory\TransactionJournalFactory;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\ReconciliationStoreRequest;
@@ -37,12 +36,10 @@ use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Services\Internal\Update\TransactionUpdateService;
use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use Log;
use Preferences;
use Response;
use Session;
/**
@@ -163,7 +160,7 @@ class ReconcileController extends Controller
)->render(),
];
return Response::json($return);
return response()->json($return);
}
/**
@@ -375,7 +372,7 @@ class ReconcileController extends Controller
$transactions = $collector->getJournals();
$html = view('accounts.reconcile.transactions', compact('account', 'transactions', 'start', 'end', 'selectionStart', 'selectionEnd'))->render();
return Response::json(['html' => $html, 'startBalance' => $startBalance, 'endBalance' => $endBalance]);
return response()->json(['html' => $html, 'startBalance' => $startBalance, 'endBalance' => $endBalance]);
}
/**

3
app/Http/Controllers/Admin/UpdateController.php
View File

@@ -31,7 +31,6 @@ use FireflyIII\Services\Github\Object\Release;
use FireflyIII\Services\Github\Request\UpdateRequest;
use Illuminate\Http\Request;
use Log;
use Response;
use Session;
/**
@@ -137,6 +136,6 @@ class UpdateController extends Controller
$string = strval(trans('firefly.update_newer_version_alert', ['your_version' => $current, 'new_version' => $first->getTitle()]));
}
return Response::json(['result' => $string]);
return response()->json(['result' => $string]);
}
}

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

@@ -29,7 +29,6 @@ use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
use Illuminate\Http\Request;
use Illuminate\Http\Response as LaravelResponse;
use Preferences;
use Response;
use View;
/**
@@ -182,7 +181,7 @@ class AttachmentController extends Controller
if ($this->repository->exists($attachment)) {
$content = $this->repository->getContent($attachment);
return Response::make(
return response()->make(
$content, 200, [
'Content-Type' => $attachment->mime,
'Content-Disposition' => 'inline; filename="' . $attachment->filename . '"',

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

@@ -22,7 +22,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers;
use Carbon\Carbon;
use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Http\Requests\BillFormRequest;

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

@@ -39,7 +39,6 @@ use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection;
use Log;
use Preferences;
use Response;
use View;
/**
@@ -82,9 +81,9 @@ class BudgetController extends Controller
*/
public function amount(Request $request, BudgetRepositoryInterface $repository, Budget $budget)
{
$amount = strval($request->get('amount'));
$start = Carbon::createFromFormat('Y-m-d', $request->get('start'));
$end = Carbon::createFromFormat('Y-m-d', $request->get('end'));
$amount = strval($request->get('amount'));
$start = Carbon::createFromFormat('Y-m-d', $request->get('start'));
$end = Carbon::createFromFormat('Y-m-d', $request->get('end'));
$budgetLimit = $this->repository->updateLimitAmount($budget, $start, $end, $amount);
if (0 === bccomp($amount, '0')) {
$budgetLimit = null;
@@ -97,7 +96,7 @@ class BudgetController extends Controller
Preferences::mark();
return Response::json(['left' => $left, 'name' => $budget->name, 'limit' => $budgetLimit ? $budgetLimit->id : 0, 'amount' => $amount]);
return response()->json(['left' => $left, 'name' => $budget->name, 'limit' => $budgetLimit ? $budgetLimit->id : 0, 'amount' => $amount]);
}
/**

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

@@ -38,7 +38,6 @@ use FireflyIII\Support\CacheProperties;
use Illuminate\Support\Collection;
use Log;
use Preferences;
use Response;
/** checked
* Class AccountController.
@@ -74,7 +73,7 @@ class AccountController extends Controller
$cache->addProperty($end);
$cache->addProperty('chart.account.expense-accounts');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$start->subDay();
@@ -97,7 +96,7 @@ class AccountController extends Controller
$data = $this->generator->singleSet(strval(trans('firefly.spent')), $chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -115,7 +114,7 @@ class AccountController extends Controller
$cache->addProperty($end);
$cache->addProperty('chart.account.expense-budget');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$collector = app(JournalCollectorInterface::class);
$collector->setAccounts(new Collection([$account]))->setRange($start, $end)->withBudgetInformation()->setTypes([TransactionType::WITHDRAWAL]);
@@ -140,7 +139,7 @@ class AccountController extends Controller
$data = $this->generator->pieChart($chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -172,7 +171,7 @@ class AccountController extends Controller
$cache->addProperty($end);
$cache->addProperty('chart.account.expense-category');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$collector = app(JournalCollectorInterface::class);
@@ -197,7 +196,7 @@ class AccountController extends Controller
$data = $this->generator->pieChart($chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -236,7 +235,7 @@ class AccountController extends Controller
}
$accounts = $repository->getAccountsById($frontPage->data);
return Response::json($this->accountBalanceChart($accounts, $start, $end));
return response()->json($this->accountBalanceChart($accounts, $start, $end));
}
/**
@@ -254,7 +253,7 @@ class AccountController extends Controller
$cache->addProperty($end);
$cache->addProperty('chart.account.income-category');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
// grab all journals:
@@ -279,7 +278,7 @@ class AccountController extends Controller
$data = $this->generator->pieChart($chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -310,7 +309,7 @@ class AccountController extends Controller
$cache->addProperty($end);
$cache->addProperty($account->id);
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
// depending on diff, do something with range of chart.
$step = '1D';
@@ -356,7 +355,7 @@ class AccountController extends Controller
$data = $this->generator->singleSet($account->name, $chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -370,7 +369,7 @@ class AccountController extends Controller
*/
public function report(Collection $accounts, Carbon $start, Carbon $end)
{
return Response::json($this->accountBalanceChart($accounts, $start, $end));
return response()->json($this->accountBalanceChart($accounts, $start, $end));
}
/**
@@ -390,7 +389,7 @@ class AccountController extends Controller
$cache->addProperty($end);
$cache->addProperty('chart.account.revenue-accounts');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$accounts = $repository->getAccountsByType([AccountType::REVENUE]);
@@ -413,7 +412,7 @@ class AccountController extends Controller
$data = $this->generator->singleSet(strval(trans('firefly.earned')), $chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**

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

@@ -31,7 +31,6 @@ use FireflyIII\Models\Transaction;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use Illuminate\Support\Collection;
use Response;
/**
* Class BillController.
@@ -66,7 +65,7 @@ class BillController extends Controller
$cache->addProperty($end);
$cache->addProperty('chart.bill.frontpage');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$paid = $repository->getBillsPaidInRange($start, $end); // will be a negative amount.
@@ -79,7 +78,7 @@ class BillController extends Controller
$data = $this->generator->pieChart($chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -94,7 +93,7 @@ class BillController extends Controller
$cache->addProperty('chart.bill.single');
$cache->addProperty($bill->id);
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$results = $collector->setAllAssetAccounts()->setBills(new Collection([$bill]))->getJournals();
@@ -120,6 +119,6 @@ class BillController extends Controller
$data = $this->generator->multiSet($chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
}

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

@@ -37,7 +37,6 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use Illuminate\Support\Collection;
use Response;
use Steam;
/**
@@ -86,7 +85,7 @@ class BudgetController extends Controller
$cache->addProperty($budget->id);
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
// depending on diff, do something with range of chart.
@@ -122,7 +121,7 @@ class BudgetController extends Controller
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -153,7 +152,7 @@ class BudgetController extends Controller
$cache->addProperty($budget->id);
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$entries = [];
@@ -170,7 +169,7 @@ class BudgetController extends Controller
$data = $this->generator->singleSet(strval(trans('firefly.left')), $entries);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -186,7 +185,7 @@ class BudgetController extends Controller
$cache->addProperty($budgetLimit->id ?? 0);
$cache->addProperty('chart.budget.expense-asset');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
/** @var JournalCollectorInterface $collector */
@@ -214,7 +213,7 @@ class BudgetController extends Controller
$data = $this->generator->pieChart($chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -230,7 +229,7 @@ class BudgetController extends Controller
$cache->addProperty($budgetLimit->id ?? 0);
$cache->addProperty('chart.budget.expense-category');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
/** @var JournalCollectorInterface $collector */
@@ -260,7 +259,7 @@ class BudgetController extends Controller
$data = $this->generator->pieChart($chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -276,7 +275,7 @@ class BudgetController extends Controller
$cache->addProperty($budgetLimit->id ?? 0);
$cache->addProperty('chart.budget.expense-expense');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
/** @var JournalCollectorInterface $collector */
@@ -305,7 +304,7 @@ class BudgetController extends Controller
$data = $this->generator->pieChart($chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -326,7 +325,7 @@ class BudgetController extends Controller
$cache->addProperty($end);
$cache->addProperty('chart.budget.frontpage');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$budgets = $this->repository->getActiveBudgets();
$chartData = [
@@ -359,7 +358,7 @@ class BudgetController extends Controller
$data = $this->generator->multiSet($chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -382,7 +381,7 @@ class BudgetController extends Controller
$cache->addProperty($budget->id);
$cache->addProperty('chart.budget.period');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$periods = app('navigation')->listOfPeriods($start, $end);
$entries = $this->repository->getBudgetPeriodReport(new Collection([$budget]), $accounts, $start, $end); // get the expenses
@@ -404,7 +403,7 @@ class BudgetController extends Controller
$data = $this->generator->multiSet($chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -423,7 +422,7 @@ class BudgetController extends Controller
$cache->addProperty($accounts);
$cache->addProperty('chart.budget.no-budget');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
// the expenses:
@@ -440,7 +439,7 @@ class BudgetController extends Controller
$data = $this->generator->singleSet(strval(trans('firefly.spent')), $chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**

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

@@ -37,7 +37,6 @@ use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use Illuminate\Support\Collection;
use Response;
/**
* Separate controller because many helper functions are shared.
@@ -88,7 +87,7 @@ class BudgetReportController extends Controller
$chartData = $helper->generate('expense', 'account');
$data = $this->generator->pieChart($chartData);
return Response::json($data);
return response()->json($data);
}
/**
@@ -112,7 +111,7 @@ class BudgetReportController extends Controller
$chartData = $helper->generate('expense', 'budget');
$data = $this->generator->pieChart($chartData);
return Response::json($data);
return response()->json($data);
}
/**
@@ -132,7 +131,7 @@ class BudgetReportController extends Controller
$cache->addProperty($start);
$cache->addProperty($end);
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$format = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
$function = app('navigation')->preferredEndOfPeriod($start, $end);
@@ -195,7 +194,7 @@ class BudgetReportController extends Controller
$data = $this->generator->multiSet($chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**

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

@@ -32,7 +32,6 @@ use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use Illuminate\Support\Collection;
use Preferences;
use Response;
/**
* Class CategoryController.
@@ -67,7 +66,7 @@ class CategoryController extends Controller
$cache->addProperty('chart.category.all');
$cache->addProperty($category->id);
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$start = $repository->firstUseDate($category);
@@ -114,7 +113,7 @@ class CategoryController extends Controller
$data = $this->generator->multiSet($chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -133,7 +132,7 @@ class CategoryController extends Controller
$cache->addProperty($end);
$cache->addProperty('chart.category.frontpage');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$chartData = [];
$categories = $repository->getCategories();
@@ -154,7 +153,7 @@ class CategoryController extends Controller
$data = $this->generator->singleSet(strval(trans('firefly.spent')), $chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -212,7 +211,7 @@ class CategoryController extends Controller
$data = $this->generator->multiSet($chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -267,7 +266,7 @@ class CategoryController extends Controller
$data = $this->generator->multiSet($chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -284,7 +283,7 @@ class CategoryController extends Controller
$end = app('navigation')->endOfPeriod($date, $range);
$data = $this->makePeriodChart($repository, $category, $start, $end);
return Response::json($data);
return response()->json($data);
}
/**

13
app/Http/Controllers/Chart/CategoryReportController.php
View File

@@ -36,7 +36,6 @@ use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionType;
use FireflyIII\Support\CacheProperties;
use Illuminate\Support\Collection;
use Response;
/**
* Separate controller because many helper functions are shared.
@@ -81,7 +80,7 @@ class CategoryReportController extends Controller
$chartData = $helper->generate('expense', 'account');
$data = $this->generator->pieChart($chartData);
return Response::json($data);
return response()->json($data);
}
/**
@@ -105,7 +104,7 @@ class CategoryReportController extends Controller
$chartData = $helper->generate('income', 'account');
$data = $this->generator->pieChart($chartData);
return Response::json($data);
return response()->json($data);
}
/**
@@ -129,7 +128,7 @@ class CategoryReportController extends Controller
$chartData = $helper->generate('expense', 'category');
$data = $this->generator->pieChart($chartData);
return Response::json($data);
return response()->json($data);
}
/**
@@ -153,7 +152,7 @@ class CategoryReportController extends Controller
$chartData = $helper->generate('income', 'category');
$data = $this->generator->pieChart($chartData);
return Response::json($data);
return response()->json($data);
}
/**
@@ -173,7 +172,7 @@ class CategoryReportController extends Controller
$cache->addProperty($start);
$cache->addProperty($end);
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$format = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
@@ -258,7 +257,7 @@ class CategoryReportController extends Controller
$data = $this->generator->multiSet($newSet);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**

5
app/Http/Controllers/Chart/ExpenseReportController.php
View File

@@ -33,7 +33,6 @@ use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use Illuminate\Support\Collection;
use Response;
/**
* Separate controller because many helper functions are shared.
@@ -80,7 +79,7 @@ class ExpenseReportController extends Controller
$cache->addProperty($start);
$cache->addProperty($end);
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$format = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
@@ -180,7 +179,7 @@ class ExpenseReportController extends Controller
$data = $this->generator->multiSet($newSet);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**

5
app/Http/Controllers/Chart/PiggyBankController.php
View File

@@ -28,7 +28,6 @@ use FireflyIII\Models\PiggyBank;
use FireflyIII\Models\PiggyBankEvent;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use Response;
/**
* Class PiggyBankController.
@@ -63,7 +62,7 @@ class PiggyBankController extends Controller
$cache->addProperty('chart.piggy-bank.history');
$cache->addProperty($piggyBank->id);
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$set = $repository->getEvents($piggyBank);
@@ -80,6 +79,6 @@ class PiggyBankController extends Controller
$data = $this->generator->singleSet($piggyBank->name, $chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
}

13
app/Http/Controllers/Chart/ReportController.php
View File

@@ -29,7 +29,6 @@ use FireflyIII\Repositories\Account\AccountTaskerInterface;
use FireflyIII\Support\CacheProperties;
use Illuminate\Support\Collection;
use Log;
use Response;
use Steam;
/**
@@ -69,7 +68,7 @@ class ReportController extends Controller
$cache->addProperty($accounts);
$cache->addProperty($end);
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$current = clone $start;
$chartData = [];
@@ -84,7 +83,7 @@ class ReportController extends Controller
$data = $this->generator->singleSet(strval(trans('firefly.net_worth')), $chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -105,7 +104,7 @@ class ReportController extends Controller
$cache->addProperty($accounts);
$cache->addProperty($end);
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
Log::debug('Going to do operations for accounts ', $accounts->pluck('id')->toArray());
$format = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
@@ -139,7 +138,7 @@ class ReportController extends Controller
$data = $this->generator->multiSet($chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -160,7 +159,7 @@ class ReportController extends Controller
$cache->addProperty($end);
$cache->addProperty($accounts);
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$source = $this->getChartData($accounts, $start, $end);
@@ -209,7 +208,7 @@ class ReportController extends Controller
$data = $this->generator->multiSet($chartData);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**

17
app/Http/Controllers/Chart/TagReportController.php
View File

@@ -36,7 +36,6 @@ use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionType;
use FireflyIII\Support\CacheProperties;
use Illuminate\Support\Collection;
use Response;
/**
* Class TagReportController
@@ -77,7 +76,7 @@ class TagReportController extends Controller
$chartData = $helper->generate('expense', 'account');
$data = $this->generator->pieChart($chartData);
return Response::json($data);
return response()->json($data);
}
/**
@@ -101,7 +100,7 @@ class TagReportController extends Controller
$chartData = $helper->generate('income', 'account');
$data = $this->generator->pieChart($chartData);
return Response::json($data);
return response()->json($data);
}
/**
@@ -124,7 +123,7 @@ class TagReportController extends Controller
$chartData = $helper->generate('expense', 'budget');
$data = $this->generator->pieChart($chartData);
return Response::json($data);
return response()->json($data);
}
/**
@@ -147,7 +146,7 @@ class TagReportController extends Controller
$chartData = $helper->generate('expense', 'category');
$data = $this->generator->pieChart($chartData);
return Response::json($data);
return response()->json($data);
}
/**
@@ -167,7 +166,7 @@ class TagReportController extends Controller
$cache->addProperty($start);
$cache->addProperty($end);
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$format = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
@@ -252,7 +251,7 @@ class TagReportController extends Controller
$data = $this->generator->multiSet($newSet);
$cache->store($data);
return Response::json($data);
return response()->json($data);
}
/**
@@ -276,7 +275,7 @@ class TagReportController extends Controller
$chartData = $helper->generate('expense', 'tag');
$data = $this->generator->pieChart($chartData);
return Response::json($data);
return response()->json($data);
}
/**
@@ -300,7 +299,7 @@ class TagReportController extends Controller
$chartData = $helper->generate('income', 'tag');
$data = $this->generator->pieChart($chartData);
return Response::json($data);
return response()->json($data);
}
/**

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

@@ -34,7 +34,6 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\ExportJob\ExportJobRepositoryInterface;
use Illuminate\Http\Response as LaravelResponse;
use Preferences;
use Response;
use View;
/**
@@ -104,7 +103,7 @@ class ExportController extends Controller
*/
public function getStatus(ExportJob $job)
{
return Response::json(['status' => trans('firefly.' . $job->status)]);
return response()->json(['status' => trans('firefly.' . $job->status)]);
}
/**
@@ -121,7 +120,8 @@ class ExportController extends Controller
$jobs->cleanup();
// does the user have shared accounts?
$accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
$accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
// todo could be removed?
$accountList = ExpandedForm::makeSelectList($accounts);
$checked = array_keys($accountList);
$formats = array_keys(config('firefly.export_formats'));
@@ -193,6 +193,6 @@ class ExportController extends Controller
$jobs->changeStatus($job, 'export_status_created_zip_file');
$jobs->changeStatus($job, 'export_status_finished');
return Response::json('ok');
return response()->json('ok');
}
}

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

@@ -25,7 +25,6 @@ namespace FireflyIII\Http\Controllers;
use FireflyIII\Helpers\Help\HelpInterface;
use Log;
use Preferences;
use Response;
/**
* Class HelpController.
@@ -61,7 +60,7 @@ class HelpController extends Controller
$language = Preferences::get('language', config('firefly.default_language', 'en_US'))->data;
$html = $this->getHelpText($route, $language);
return Response::json(['html' => $html]);
return response()->json(['html' => $html]);
}
/**

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

@@ -38,7 +38,6 @@ use Illuminate\Routing\Route;
use Illuminate\Support\Collection;
use Log;
use Preferences;
use Response;
use Route as RouteFacade;
use View;
@@ -93,7 +92,7 @@ class HomeController extends Controller
$request->session()->put('end', $end);
Log::debug(sprintf('Set end to %s', $end->format('Y-m-d H:i:s')));
return Response::json(['ok' => 'ok']);
return response()->json(['ok' => 'ok']);
}

3
app/Http/Controllers/Import/IndexController.php
View File

@@ -30,7 +30,6 @@ use FireflyIII\Models\ImportJob;
use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
use Illuminate\Http\Response as LaravelResponse;
use Log;
use Response;
use View;
@@ -155,7 +154,7 @@ class IndexController extends Controller
$result = $routine->run();
if ($result) {
return Response::json(['run' => 'ok']);
return response()->json(['run' => 'ok']);
}
throw new FireflyException('Job did not complete successfully. Please review the log files.');

3
app/Http/Controllers/Import/StatusController.php
View File

@@ -26,7 +26,6 @@ use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Middleware\IsDemoUser;
use FireflyIII\Models\ImportJob;
use FireflyIII\Repositories\Tag\TagRepositoryInterface;
use Response;
/**
* Class StatusController
@@ -119,6 +118,6 @@ class StatusController extends Controller
}
$result['percentage'] = $result['percentage'] > 100 ? 100 : $result['percentage'];
return Response::json($result);
return response()->json($result);
}
}

13
app/Http/Controllers/Json/AutoCompleteController.php
View File

@@ -29,7 +29,6 @@ use FireflyIII\Models\AccountType;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use Response;
/**
* Class AutoCompleteController.
@@ -52,7 +51,7 @@ class AutoCompleteController extends Controller
);
sort($return);
return Response::json($return);
return response()->json($return);
}
/**
@@ -66,7 +65,7 @@ class AutoCompleteController extends Controller
$return = array_unique($collector->getJournals()->pluck('description')->toArray());
sort($return);
return Response::json($return);
return response()->json($return);
}
/**
@@ -92,7 +91,7 @@ class AutoCompleteController extends Controller
sort($return);
return Response::json($return);
return response()->json($return);
}
/**
@@ -125,7 +124,7 @@ class AutoCompleteController extends Controller
$cache->store($return);
return Response::json($return);
return response()->json($return);
}
/**
@@ -148,7 +147,7 @@ class AutoCompleteController extends Controller
$return = array_unique($filtered->pluck('name')->toArray());
sort($return);
return Response::json($return);
return response()->json($return);
}
/**
@@ -166,6 +165,6 @@ class AutoCompleteController extends Controller
$return = array_unique($collector->getJournals()->pluck('description')->toArray());
sort($return);
return Response::json($return);
return response()->json($return);
}
}

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

@@ -35,7 +35,6 @@ use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use Response;
/**
* Class BoxController.
@@ -58,7 +57,7 @@ class BoxController extends Controller
$cache->addProperty($today);
$cache->addProperty('box-available');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
// get available amount
$currency = app('amount')->getDefaultCurrency();
@@ -86,7 +85,7 @@ class BoxController extends Controller
$cache->store($return);
return Response::json($return);
return response()->json($return);
}
/**
@@ -104,7 +103,7 @@ class BoxController extends Controller
$cache->addProperty($end);
$cache->addProperty('box-balance');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
// prep some arrays:
$incomes = [];
@@ -160,7 +159,7 @@ class BoxController extends Controller
$cache->store($response);
return Response::json($response);
return response()->json($response);
}
/**
@@ -178,7 +177,7 @@ class BoxController extends Controller
$cache->addProperty($end);
$cache->addProperty('box-bills');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
/*
@@ -195,7 +194,7 @@ class BoxController extends Controller
];
$cache->store($return);
return Response::json($return);
return response()->json($return);
}
/**
@@ -224,7 +223,7 @@ class BoxController extends Controller
$cache->addProperty($date);
$cache->addProperty('box-net-worth');
if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore
return response()->json($cache->get()); // @codeCoverageIgnore
}
$netWorth = [];
$accounts = $repository->getActiveAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
@@ -256,6 +255,6 @@ class BoxController extends Controller
$cache->store($return);
return Response::json($return);
return response()->json($return);
}
}

3
app/Http/Controllers/Json/ExchangeController.php
View File

@@ -29,7 +29,6 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Services\Currency\ExchangeRateInterface;
use Illuminate\Http\Request;
use Log;
use Response;
/**
* Class ExchangeController.
@@ -67,6 +66,6 @@ class ExchangeController extends Controller
$return['amount'] = round($return['amount'], $toCurrency->decimal_places);
}
return Response::json($return);
return response()->json($return);
}
}

3
app/Http/Controllers/Json/FrontpageController.php
View File

@@ -25,7 +25,6 @@ namespace FireflyIII\Http\Controllers\Json;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\PiggyBank;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
use Response;
/**
* Class FrontpageController.
@@ -66,6 +65,6 @@ class FrontpageController extends Controller
$html = view('json.piggy-banks', compact('info'))->render();
}
return Response::json(['html' => $html]);
return response()->json(['html' => $html]);
}
}

9
app/Http/Controllers/Json/IntroController.php
View File

@@ -24,7 +24,6 @@ namespace FireflyIII\Http\Controllers\Json;
use FireflyIII\Support\Facades\Preferences;
use Log;
use Response;
/**
* Class IntroController.
@@ -47,7 +46,7 @@ class IntroController
if (0 === count($specificSteps)) {
Log::debug(sprintf('No specific steps for route "%s" and page "%s"', $route, $specificPage));
return Response::json($steps);
return response()->json($steps);
}
if ($this->hasOutroStep($route)) {
// @codeCoverageIgnoreStart
@@ -64,7 +63,7 @@ class IntroController
$steps = array_merge($steps, $specificSteps);
}
return Response::json($steps);
return response()->json($steps);
}
/**
@@ -103,7 +102,7 @@ class IntroController
Log::debug(sprintf('Going to mark the following route as NOT done: %s with special "%s" (%s)', $route, $specialPage, $key));
Preferences::set($key, false);
return Response::json(['message' => trans('firefly.intro_boxes_after_refresh')]);
return response()->json(['message' => trans('firefly.intro_boxes_after_refresh')]);
}
/**
@@ -121,7 +120,7 @@ class IntroController
Log::debug(sprintf('Going to mark the following route as done: %s with special "%s" (%s)', $route, $specialPage, $key));
Preferences::set($key, true);
return Response::json(['result' => sprintf('Reported demo watched for route "%s".', $route)]);
return response()->json(['result' => sprintf('Reported demo watched for route "%s".', $route)]);
}
/**

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

@@ -27,7 +27,6 @@ use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Repositories\Tag\TagRepositoryInterface;
use Illuminate\Http\Request;
use Response;
/**
* Class JsonController.
@@ -59,7 +58,7 @@ class JsonController extends Controller
}
$view = view('rules.partials.action', compact('actions', 'count'))->render();
return Response::json(['html' => $view]);
return response()->json(['html' => $view]);
}
/**
@@ -72,7 +71,7 @@ class JsonController extends Controller
$return = array_unique($repository->getBudgets()->pluck('name')->toArray());
sort($return);
return Response::json($return);
return response()->json($return);
}
/**
@@ -87,7 +86,7 @@ class JsonController extends Controller
$return = array_unique($repository->getCategories()->pluck('name')->toArray());
sort($return);
return Response::json($return);
return response()->json($return);
}
/**
@@ -102,7 +101,7 @@ class JsonController extends Controller
$return = array_unique($tagRepository->get()->pluck('tag')->toArray());
sort($return);
return Response::json($return);
return response()->json($return);
}
/**
@@ -115,7 +114,7 @@ class JsonController extends Controller
$return = array_unique($repository->getTransactionTypes()->pluck('type')->toArray());
sort($return);
return Response::json($return);
return response()->json($return);
}
/**
@@ -139,6 +138,6 @@ class JsonController extends Controller
$view = view('rules.partials.trigger', compact('triggers', 'count'))->render();
return Response::json(['html' => $view]);
return response()->json(['html' => $view]);
}
}

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

@@ -30,7 +30,6 @@ use Illuminate\Http\Request;
use Illuminate\Pagination\LengthAwarePaginator;
use Log;
use Preferences;
use Response;
use Session;
use Steam;
use View;
@@ -252,7 +251,7 @@ class PiggyBankController extends Controller
}
}
return Response::json(['result' => 'ok']);
return response()->json(['result' => 'ok']);
}
/**

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

@@ -34,7 +34,6 @@ use FireflyIII\Support\Binder\AccountList;
use Illuminate\Http\Request;
use Illuminate\Routing\Route;
use InvalidArgumentException;
use Response;
use View;
/**
@@ -116,7 +115,7 @@ class ReportController extends Controller
break;
}
return Response::json(['html' => $html]);
return response()->json(['html' => $html]);
}
/**

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

@@ -36,7 +36,6 @@ use Illuminate\Http\RedirectResponse;
use Illuminate\Support\Collection;
use Log;
use Preferences;
use Response;
use Session;
use View;
@@ -305,7 +304,7 @@ class ReportController extends Controller
break;
}
return Response::json(['html' => $result]);
return response()->json(['html' => $result]);
}
/**

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

@@ -39,7 +39,6 @@ use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
use FireflyIII\TransactionRules\TransactionMatcher;
use Illuminate\Http\Request;
use Preferences;
use Response;
use Session;
use View;
@@ -287,7 +286,7 @@ class RuleController extends Controller
$repository->reorderRuleActions($rule, $ids);
}
return Response::json('true');
return response()->json('true');
}
/**
@@ -304,7 +303,7 @@ class RuleController extends Controller
$repository->reorderRuleTriggers($rule, $ids);
}
return Response::json('true');
return response()->json('true');
}
/**
@@ -373,7 +372,7 @@ class RuleController extends Controller
$triggers = $this->getValidTriggerList($request);
if (0 === count($triggers)) {
return Response::json(['html' => '', 'warning' => trans('firefly.warning_no_valid_triggers')]); // @codeCoverageIgnore
return response()->json(['html' => '', 'warning' => trans('firefly.warning_no_valid_triggers')]); // @codeCoverageIgnore
}
$limit = intval(config('firefly.test-triggers.limit'));
@@ -398,7 +397,7 @@ class RuleController extends Controller
// Return json response
$view = view('list.journals-tiny', ['transactions' => $matchingTransactions])->render();
return Response::json(['html' => $view, 'warning' => $warning]);
return response()->json(['html' => $view, 'warning' => $warning]);
}
/**
@@ -421,7 +420,7 @@ class RuleController extends Controller
$triggers = $rule->ruleTriggers;
if (0 === count($triggers)) {
return Response::json(['html' => '', 'warning' => trans('firefly.warning_no_valid_triggers')]); // @codeCoverageIgnore
return response()->json(['html' => '', 'warning' => trans('firefly.warning_no_valid_triggers')]); // @codeCoverageIgnore
}
$limit = intval(config('firefly.test-triggers.limit'));
@@ -446,7 +445,7 @@ class RuleController extends Controller
// Return json response
$view = view('list.journals-tiny', ['transactions' => $matchingTransactions])->render();
return Response::json(['html' => $view, 'warning' => $warning]);
return response()->json(['html' => $view, 'warning' => $warning]);
}
/**

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

@@ -26,7 +26,6 @@ use FireflyIII\Support\CacheProperties;
use FireflyIII\Support\Search\SearchInterface;
use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use Response;
use View;
/**
@@ -100,6 +99,6 @@ class SearchController extends Controller
$html = view('search.search', compact('transactions'))->render();
return Response::json(['count' => $transactions->count(), 'html' => $html]);
return response()->json(['count' => $transactions->count(), 'html' => $html]);
}
}

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

@@ -37,7 +37,6 @@ use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use Log;
use Preferences;
use Response;
use View;
/**
@@ -144,7 +143,7 @@ class TransactionController extends Controller
$repository->reconcile($transaction);
}
return Response::json(['ok' => 'reconciled']);
return response()->json(['ok' => 'reconciled']);
}
/**
@@ -170,7 +169,7 @@ class TransactionController extends Controller
}
Preferences::mark();
return Response::json([true]);
return response()->json([true]);
}
/**

1
app/Http/Middleware/IsDemoUser.php
View File

@@ -26,7 +26,6 @@ use Closure;
use FireflyIII\Exceptions\IsDemoUserException;
use FireflyIII\User;
use Illuminate\Http\Request;
use Session;
/**
* Class IsDemoUser.

2
app/Http/Middleware/Range.php
View File

@@ -26,9 +26,7 @@ use App;
use Carbon\Carbon;
use Closure;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use Illuminate\Contracts\Auth\Guard;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Preferences;
use Session;
use View;

6
app/Http/Requests/LinkTypeFormRequest.php
View File

@@ -22,8 +22,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Requests;
use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
/**
* Class BillFormRequest.
*/
@@ -44,8 +42,8 @@ class LinkTypeFormRequest extends Request
public function rules()
{
// fixed
$nameRule = 'required|min:1|unique:link_types,name';
$idRule = '';
$nameRule = 'required|min:1|unique:link_types,name';
$idRule = '';
// get parameter link:
$link = $this->route()->parameter('linkType');