kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-05 04:03:26 +00:00
Code Issues Projects Releases Wiki Activity

Code cleanup.

Browse Source
This commit is contained in:
James Cole
2021-03-28 11:43:07 +02:00
parent 5abbb8a807
commit 2c575f3ca5
379 changed files with 304 additions and 1727 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,8 +22,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Account;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Account;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;

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

@@ -166,8 +166,6 @@ class EditController extends Controller
)
);
}
/**
* Update the account.
*

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

@@ -181,6 +181,4 @@ class IndexController extends Controller
return prefixView('accounts.index', compact('objectType', 'inactiveCount', 'subTitleIcon', 'subTitle', 'page', 'accounts'));
}
}

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

@@ -95,8 +95,6 @@ class ReconcileController extends Controller
if (!$this->isEditableAccount($account)) {
return $this->redirectAccountToAccount($account); // @codeCoverageIgnore
}
if (AccountType::ASSET !== $account->accountType->type) {
// @codeCoverageIgnoreStart
session()->flash('error', (string) trans('firefly.must_be_asset_account'));

5
app/Http/Controllers/Account/ShowController.php
View File

@@ -72,9 +72,6 @@ class ShowController extends Controller
}
);
}
/**
* Show an account.
*
@@ -167,8 +164,6 @@ class ShowController extends Controller
if (!$this->isEditableAccount($account)) {
return $this->redirectAccountToAccount($account); // @codeCoverageIgnore
}
$location = $this->repository->getLocation($account);
$isLiability = $this->repository->isLiability($account);
$attachments = $this->repository->getAttachments($account);

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

@@ -171,8 +171,6 @@ class AttachmentController extends Controller
return $attachment;
}
);
return prefixView('attachments.index', compact('set'));
}

4
app/Http/Controllers/Auth/LoginController.php
View File

@@ -67,8 +67,6 @@ class LoginController extends Controller
parent::__construct();
$this->middleware('guest')->except('logout');
}
/**
* Handle a login request to the application.
*
@@ -216,8 +214,6 @@ class LoginController extends Controller
$cookieName = config('google2fa.cookie_name', 'google2fa_token');
request()->cookies->set($cookieName, 'invalid');
}
return prefixView('auth.login', compact('allowRegistration', 'email', 'remember', 'allowReset', 'title'));
}

2
app/Http/Controllers/Bill/CreateController.php
View File

@@ -23,8 +23,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Bill;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
use FireflyIII\Http\Controllers\Controller;

2
app/Http/Controllers/Bill/DeleteController.php
View File

@@ -23,8 +23,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Bill;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Bill;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;

6
app/Http/Controllers/Bill/EditController.php
View File

@@ -23,8 +23,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Bill;
use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\BillUpdateRequest;
@@ -64,8 +62,6 @@ class EditController extends Controller
}
);
}
/**
* Edit a bill.
*
@@ -112,8 +108,6 @@ class EditController extends Controller
return prefixView('bills.edit', compact('subTitle', 'periods', 'rules', 'bill', 'defaultCurrency', 'preFilled'));
}
/**
* Update a bill.
*

8
app/Http/Controllers/Bill/IndexController.php
View File

@@ -23,8 +23,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Bill;
use Carbon\Carbon;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Bill;
@@ -73,8 +71,6 @@ class IndexController extends Controller
{
$this->cleanupObjectGroups();
$this->repository->correctOrder();
$start = session('start');
$end = session('end');
$collection = $this->repository->getBills();
@@ -100,8 +96,6 @@ class IndexController extends Controller
'bills' => [],
],
];
/** @var Bill $bill */
foreach ($collection as $bill) {
$array = $transformer->transform($bill);
@@ -145,8 +139,6 @@ class IndexController extends Controller
return prefixView('bills.index', compact('bills', 'sums', 'total', 'totals'));
}
/**
* @param array $bills
*

6
app/Http/Controllers/Bill/ShowController.php
View File

@@ -22,8 +22,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Bill;
use Carbon\Carbon;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
@@ -118,8 +116,6 @@ class ShowController extends Controller
return redirect(route('bills.show', [$bill->id]));
}
/**
* Show a bill.
*
@@ -182,8 +178,6 @@ class ShowController extends Controller
}
// @codeCoverageIgnoreEnd
return prefixView('bills.show', compact('attachments', 'groups', 'rules', 'yearAverage', 'overallAverage', 'year', 'object', 'bill', 'subTitle'));
}

4
app/Http/Controllers/Budget/AvailableBudgetController.php
View File

@@ -127,8 +127,6 @@ class AvailableBudgetController extends Controller
return true;
}
);
$page = (int)($request->get('page') ?? 1);
return prefixView('budgets.available-budgets.create-alternative', compact('start', 'end', 'page', 'currencies'));
@@ -245,8 +243,6 @@ class AvailableBudgetController extends Controller
return redirect(route('budgets.index', [$start->format('Y-m-d'), $end->format('Y-m-d')]));
}
$this->abRepository->update($availableBudget, ['amount' => $amount]);
session()->flash('success', trans('firefly.updated_ab'));

2
app/Http/Controllers/Budget/BudgetLimitController.php
View File

@@ -161,8 +161,6 @@ class BudgetLimitController extends Controller
if ($request->expectsJson()) {
$array = $limit->toArray();
// add some extra meta data:
$spentArr = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, null, new Collection([$budget]), $currency);
$array['spent'] = $spentArr[$currency->id]['sum'] ?? '0';

8
app/Http/Controllers/Budget/CreateController.php
View File

@@ -22,8 +22,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Budget;
use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\BudgetFormStoreRequest;
@@ -50,8 +48,6 @@ class CreateController extends Controller
public function __construct()
{
parent::__construct();
$this->middleware(
function ($request, $next) {
app('view')->share('title', (string) trans('firefly.budgets'));
@@ -63,8 +59,6 @@ class CreateController extends Controller
}
);
}
/**
* Form to create a budget.
*
@@ -108,8 +102,6 @@ class CreateController extends Controller
return prefixView('budgets.create', compact('subTitle', 'autoBudgetTypes', 'autoBudgetPeriods'));
}
/**
* Stores a budget.
*

4
app/Http/Controllers/Budget/DeleteController.php
View File

@@ -22,8 +22,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Budget;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Budget;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
@@ -61,8 +59,6 @@ class DeleteController extends Controller
}
);
}
/**
* Deletes a budget.
*

2
app/Http/Controllers/Budget/EditController.php
View File

@@ -22,8 +22,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Budget;
use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\BudgetFormUpdateRequest;

6
app/Http/Controllers/Budget/ShowController.php
View File

@@ -22,8 +22,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Budget;
use Carbon\Carbon;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
@@ -133,8 +131,6 @@ class ShowController extends Controller
return prefixView('budgets.no-budget', compact('groups', 'subTitle', 'start', 'end'));
}
/**
* Show a single budget.
*
@@ -148,8 +144,6 @@ class ShowController extends Controller
/** @var Carbon $start */
$allStart = session('first', Carbon::now()->startOfYear());
$allEnd = today();
$page = (int) $request->get('page');
$pageSize = (int) app('preferences')->get('listPageSize', 50)->data;
$limits = $this->getLimits($budget, $allStart, $allEnd);

6
app/Http/Controllers/Category/CreateController.php
View File

@@ -22,8 +22,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Category;
use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\CategoryFormRequest;
@@ -62,8 +60,6 @@ class CreateController extends Controller
}
);
}
/**
* Create category.
*
@@ -81,8 +77,6 @@ class CreateController extends Controller
return prefixView('categories.create', compact('subTitle'));
}
/**
* Store new category.
*

2
app/Http/Controllers/Category/DeleteController.php
View File

@@ -22,8 +22,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Category;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Category;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface;

6
app/Http/Controllers/Category/EditController.php
View File

@@ -22,8 +22,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Category;
use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\CategoryFormRequest;
@@ -64,8 +62,6 @@ class EditController extends Controller
}
);
}
/**
* Edit a category.
*
@@ -119,8 +115,6 @@ class EditController extends Controller
if (count($this->attachments->getMessages()->get('attachments')) > 0) {
$request->session()->flash('info', $this->attachments->getMessages()->get('attachments')); // @codeCoverageIgnore
}
$redirect = redirect($this->getPreviousUri('categories.edit.uri'));
if (1 === (int)$request->get('return_to_edit')) {

4
app/Http/Controllers/Category/IndexController.php
View File

@@ -22,8 +22,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Category;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Category;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
@@ -60,8 +58,6 @@ class IndexController extends Controller
}
);
}
/**
* Show all categories.
*

4
app/Http/Controllers/Category/NoCategoryController.php
View File

@@ -22,8 +22,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Category;
use Carbon\Carbon;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Http\Controllers\Controller;
@@ -105,8 +103,6 @@ class NoCategoryController extends Controller
return prefixView('categories.no-category', compact('groups', 'subTitle', 'periods', 'start', 'end'));
}
/**
* Show all transactions without a category.
*

2
app/Http/Controllers/Category/ShowController.php
View File

@@ -65,8 +65,6 @@ class ShowController extends Controller
}
);
}
/**
* Show a single category.
*

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

@@ -75,11 +75,7 @@ class AccountController extends Controller
return $next($request);
}
);
}
/**
* Shows the balances for all the user's expense accounts (on the front page).
*
@@ -333,8 +329,6 @@ class AccountController extends Controller
$defaultSet = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET])->pluck('id')->toArray();
Log::debug('Default set is ', $defaultSet);
$frontPage = app('preferences')->get('frontPageAccounts', $defaultSet);
Log::debug('Frontpage preference set is ', $frontPage->data);
if (0 === count($frontPage->data)) {
app('preferences')->set('frontPageAccounts', $defaultSet);
@@ -471,8 +465,6 @@ class AccountController extends Controller
{
return response()->json($this->accountBalanceChart($accounts, $start, $end));
}
/**
* Shows the balances for all the user's revenue accounts.
*

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

@@ -50,8 +50,6 @@ class BillController extends Controller
parent::__construct();
$this->generator = app(GeneratorInterface::class);
}
/**
* Shows all bills and whether or not they've been paid this month (pie chart).
*
@@ -94,8 +92,6 @@ class BillController extends Controller
return response()->json($data);
}
/**
* Shows overview for a single bill.
*

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

@@ -77,8 +77,6 @@ class BudgetController extends Controller
}
);
}
/**
* Shows overview of a single budget.
*
@@ -143,8 +141,6 @@ class BudgetController extends Controller
return response()->json($data);
}
/**
* Shows the amount left in a specific budget limit.
*
@@ -196,8 +192,6 @@ class BudgetController extends Controller
return response()->json($data);
}
/**
* Shows how much is spent per asset account.
*
@@ -265,8 +259,6 @@ class BudgetController extends Controller
return response()->json($data);
}
/**
* Shows how much is spent per category.
*
@@ -330,8 +322,6 @@ class BudgetController extends Controller
return response()->json($data);
}
/**
* Shows how much is spent per expense account.
*
@@ -398,8 +388,6 @@ class BudgetController extends Controller
return response()->json($data);
}
/**
* Shows a budget list with spent/left/overspent.
*
@@ -431,8 +419,6 @@ class BudgetController extends Controller
return response()->json($data);
}
/**
* Shows a budget overview chart (spent and budgeted).
*
@@ -508,8 +494,6 @@ class BudgetController extends Controller
return response()->json($data);
}
/**
* Shows a chart for transactions without a budget.
*

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

@@ -60,8 +60,6 @@ class CategoryController extends Controller
// create chart generator:
$this->generator = app(GeneratorInterface::class);
}
/**
* Show an overview for a category for all time, per month/week/year.
* TODO test method, for category refactor.
@@ -94,8 +92,6 @@ class CategoryController extends Controller
return response()->json($data);
}
/**
* Shows the category chart on the front page.
* TODO test method, for category refactor.
@@ -116,8 +112,6 @@ class CategoryController extends Controller
}
$frontPageGenerator = new FrontpageChartGenerator($start, $end);
$chartData = $frontPageGenerator->generate();
$data = $this->generator->multiSet($chartData);
$cache->store($data);
@@ -153,8 +147,6 @@ class CategoryController extends Controller
return response()->json($data);
}
/**
* Chart for period for transactions without a category.
* TODO test me.
@@ -205,8 +197,6 @@ class CategoryController extends Controller
$cache->addProperty($end);
$cache->addProperty($category->id);
$cache->addProperty('chart.category.period-chart');
if ($cache->has()) {
return response()->json($cache->get()); // @codeCoverageIgnore
}
@@ -295,8 +285,6 @@ class CategoryController extends Controller
'type' => 'bar',
'backgroundColor' => 'rgba(0, 141, 76, 0.5)', // green
];
// loop empty periods:
foreach (array_keys($periods) as $period) {
$label = $periods[$period];

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

@@ -247,8 +247,6 @@ class DoubleReportController extends Controller
return response()->json($data);
}
/**
* @param Collection $accounts
* @param Collection $others

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

@@ -64,8 +64,6 @@ class ExpenseReportController extends Controller
}
);
}
/**
* Main chart that shows income and expense for a combination of expense/revenue accounts.
*

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

@@ -171,8 +171,6 @@ class TagReportController extends Controller
return response()->json($data);
}
/**
* @param Collection $accounts
* @param Collection $tags
@@ -427,8 +425,6 @@ class TagReportController extends Controller
return response()->json($data);
}
/**
* @param Collection $accounts
* @param Collection $tags
@@ -462,8 +458,6 @@ class TagReportController extends Controller
return response()->json($data);
}
/**
* TODO duplicate function
*

8
app/Http/Controllers/Chart/TransactionController.php
View File

@@ -68,8 +68,6 @@ class TransactionController extends Controller
if ($cache->has()) {
return response()->json($cache->get()); // @codeCoverageIgnore
}
/** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class);
$collector->setRange($start, $end);
@@ -115,8 +113,6 @@ class TransactionController extends Controller
if ($cache->has()) {
return response()->json($cache->get()); // @codeCoverageIgnore
}
/** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class);
$collector->setRange($start, $end);
@@ -175,8 +171,6 @@ class TransactionController extends Controller
if ($cache->has()) {
return response()->json($cache->get()); // @codeCoverageIgnore
}
/** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class);
$collector->setRange($start, $end);
@@ -234,8 +228,6 @@ class TransactionController extends Controller
if ($cache->has()) {
return response()->json($cache->get()); // @codeCoverageIgnore
}
/** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class);
$collector->setRange($start, $end);

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

@@ -76,8 +76,6 @@ abstract class Controller extends BaseController
$maxFileSize = app('steam')->phpBytes(ini_get('upload_max_filesize'));
$maxPostSize = app('steam')->phpBytes(ini_get('post_max_size'));
$uploadSize = min($maxFileSize, $maxPostSize);
app('view')->share('uploadSize', $uploadSize);
// share is alpha, is beta

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

@@ -21,8 +21,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Requests\CurrencyFormRequest;
use FireflyIII\Models\TransactionCurrency;
@@ -67,8 +65,6 @@ class CurrencyController extends Controller
}
);
}
/**
* Create a currency.
*
@@ -346,8 +342,6 @@ class CurrencyController extends Controller
return prefixView('currencies.index', compact('currencies', 'defaultCurrency', 'isOwner'));
}
/**
* Store new currency.
*
@@ -394,8 +388,6 @@ class CurrencyController extends Controller
return $redirect;
}
/**
* Updates a currency.
*
@@ -421,8 +413,6 @@ class CurrencyController extends Controller
return redirect(route('currencies.index'));
// @codeCoverageIgnoreEnd
}
$currency = $this->repository->update($currency, $data);
Log::channel('audit')->info('Updated (POST) currency.', $data);
$request->session()->flash('success', (string) trans('firefly.updated_currency', ['name' => $currency->name]));

2
app/Http/Controllers/Export/IndexController.php
View File

@@ -23,8 +23,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Export;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Middleware\IsDemoUser;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;

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

@@ -74,8 +74,6 @@ class HomeController extends Controller
$isCustomRange = false;
Log::debug('Received dateRange', ['start' => $request->get('start'), 'end' => $request->get('end'), 'label' => $request->get('label')]);
// check if the label is "everything" or "Custom range" which will betray
// a possible problem with the budgets.
if ($label === (string)trans('firefly.everything') || $label === (string)trans('firefly.customRange')) {
@@ -98,8 +96,6 @@ class HomeController extends Controller
return response()->json(['ok' => 'ok']);
}
/**
* Show index.
*
@@ -134,8 +130,6 @@ class HomeController extends Controller
/** @var BillRepositoryInterface $billRepository */
$billRepository = app(BillRepositoryInterface::class);
$billCount = $billRepository->getBills()->count();
// collect groups for each transaction.
foreach ($accounts as $account) {
/** @var GroupCollectorInterface $collector */

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

@@ -36,8 +36,6 @@ use Illuminate\Http\Request;
*/
class AutoCompleteController extends Controller
{
/**
* Searches in the titles of all transaction journals.
* The result is limited to the top 15 unique results.
@@ -78,8 +76,6 @@ class AutoCompleteController extends Controller
// give another key for consistency
$array[$index]['name'] = sprintf('#%d: %s', $item['transaction_group_id'], $item['description']);
}
return response()->json($array);
}

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

@@ -61,8 +61,6 @@ class BoxController extends Controller
$opsRepository = app(OperationsRepositoryInterface::class);
/** @var AvailableBudgetRepositoryInterface $abRepository */
$abRepository = app(AvailableBudgetRepositoryInterface::class);
/** @var Carbon $start */
$start = session('start', Carbon::now()->startOfMonth());
/** @var Carbon $end */
@@ -127,8 +125,6 @@ class BoxController extends Controller
return response()->json($return);
}
/**
* Current total balance.
*
@@ -209,8 +205,6 @@ class BoxController extends Controller
'size' => count($sums),
'preferred' => $currency->id,
];
$cache->store($response);
return response()->json($response);
@@ -256,8 +250,6 @@ class BoxController extends Controller
);
$netWorthSet = $netWorthHelper->getNetWorthByCurrency($filtered, $date);
$return = [];
foreach ($netWorthSet as $data) {
/** @var TransactionCurrency $currency */

2
app/Http/Controllers/Json/BudgetController.php
View File

@@ -23,8 +23,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Json;
use Carbon\Carbon;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\TransactionCurrency;

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

@@ -162,8 +162,6 @@ class ReconcileController extends Controller
$view = sprintf('Could not render accounts.reconcile.overview: %s', $e->getMessage());
}
// @codeCoverageIgnoreEnd
$return = [
'post_uri' => $route,
'html' => $view,

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

@@ -118,8 +118,6 @@ class RecurrenceController extends Controller
$occurrences = $this->recurring->getXOccurrences($repetition, $actualStart, $repetitions);
break;
}
/** @var Carbon $current */
foreach ($occurrences as $current) {
if ($current->gte($start)) {
@@ -179,8 +177,6 @@ class RecurrenceController extends Controller
];
}
Log::debug('Dropdown is', $result);
return response()->json($result);
}
}

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

@@ -22,8 +22,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Json;
use FireflyIII\Http\Controllers\Controller;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -89,8 +87,6 @@ class RuleController extends Controller
Log::error(sprintf('Cannot render rules.partials.trigger: %s', $e->getMessage()));
$view = 'Could not render view.';
}
return response()->json(['html' => $view]);
}

2
app/Http/Controllers/ObjectGroup/DeleteController.php
View File

@@ -23,8 +23,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\ObjectGroup;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\ObjectGroup;
use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface;

4
app/Http/Controllers/ObjectGroup/EditController.php
View File

@@ -23,8 +23,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\ObjectGroup;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\ObjectGroupFormRequest;
use FireflyIII\Models\ObjectGroup;
@@ -75,8 +73,6 @@ class EditController extends Controller
return prefixView('object-groups.edit', compact('subTitle', 'subTitleIcon', 'objectGroup'));
}
/**
* Update a piggy bank.
*

2
app/Http/Controllers/ObjectGroup/IndexController.php
View File

@@ -23,8 +23,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\ObjectGroup;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\ObjectGroup;
use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface;

2
app/Http/Controllers/PiggyBank/AmountController.php
View File

@@ -23,8 +23,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\PiggyBank;
use Carbon\Carbon;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\PiggyBank;

6
app/Http/Controllers/PiggyBank/CreateController.php
View File

@@ -23,8 +23,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\PiggyBank;
use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\PiggyBankStoreRequest;
@@ -82,8 +80,6 @@ class CreateController extends Controller
return prefixView('piggy-banks.create', compact('subTitle', 'subTitleIcon'));
}
/**
* Store a new piggy bank.
*
@@ -115,8 +111,6 @@ class CreateController extends Controller
if (count($this->attachments->getMessages()->get('attachments')) > 0) {
$request->session()->flash('info', $this->attachments->getMessages()->get('attachments')); // @codeCoverageIgnore
}
$redirect = redirect($this->getPreviousUri('piggy-banks.create.uri'));
if (1 === (int) $request->get('create_another')) {

2
app/Http/Controllers/PiggyBank/DeleteController.php
View File

@@ -23,8 +23,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\PiggyBank;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\PiggyBank;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;

6
app/Http/Controllers/PiggyBank/EditController.php
View File

@@ -23,8 +23,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\PiggyBank;
use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\PiggyBankUpdateRequest;
@@ -105,8 +103,6 @@ class EditController extends Controller
return prefixView('piggy-banks.edit', compact('subTitle', 'subTitleIcon', 'piggyBank', 'preFilled'));
}
/**
* Update a piggy bank.
*
@@ -136,8 +132,6 @@ class EditController extends Controller
if (count($this->attachments->getMessages()->get('attachments')) > 0) {
$request->session()->flash('info', $this->attachments->getMessages()->get('attachments')); // @codeCoverageIgnore
}
$redirect = redirect($this->getPreviousUri('piggy-banks.edit.uri'));
if (1 === (int) $request->get('return_to_edit')) {

2
app/Http/Controllers/PiggyBank/IndexController.php
View File

@@ -23,8 +23,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\PiggyBank;
use Carbon\Carbon;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\PiggyBank;

2
app/Http/Controllers/PiggyBank/ShowController.php
View File

@@ -23,8 +23,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\PiggyBank;
use Carbon\Carbon;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\PiggyBank;

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

@@ -75,6 +75,4 @@ class ReportController extends Controller
return response()->json(['html' => $html]);
}
}

6
app/Http/Controllers/Recurring/CreateController.php
View File

@@ -154,8 +154,6 @@ class CreateController extends Controller
'apply_rules' => true,
];
}
$request->session()->flash('preFilled', $preFilled);
return prefixView(
@@ -195,8 +193,6 @@ class CreateController extends Controller
RecurrenceRepetition::WEEKEND_TO_FRIDAY => (string) trans('firefly.jump_to_friday'),
RecurrenceRepetition::WEEKEND_TO_MONDAY => (string) trans('firefly.jump_to_monday'),
];
$hasOldInput = null !== $request->old('_token'); // flash some data
$preFilled = [
'first_date' => $tomorrow->format('Y-m-d'),
@@ -211,8 +207,6 @@ class CreateController extends Controller
compact('tomorrow', 'oldRepetitionType', 'weekendResponses', 'preFilled', 'repetitionEnds', 'defaultCurrency', 'budgets')
);
}
/**
* Store a recurring transaction.
*

2
app/Http/Controllers/Recurring/DeleteController.php
View File

@@ -22,8 +22,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Recurring;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Recurrence;
use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;

6
app/Http/Controllers/Recurring/EditController.php
View File

@@ -22,8 +22,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Recurring;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
use FireflyIII\Http\Controllers\Controller;
@@ -178,8 +176,6 @@ class EditController extends Controller
if (count($this->attachments->getMessages()->get('attachments')) > 0) {
$request->session()->flash('info', $this->attachments->getMessages()->get('attachments')); // @codeCoverageIgnore
}
app('preferences')->mark();
$redirect = redirect($this->getPreviousUri('recurrences.edit.uri'));
if (1 === (int) $request->get('return_to_edit')) {
@@ -192,6 +188,4 @@ class EditController extends Controller
// redirect to previous URL.
return $redirect;
}
}

2
app/Http/Controllers/Recurring/IndexController.php
View File

@@ -22,8 +22,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Recurring;
use Carbon\Carbon;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;

2
app/Http/Controllers/Recurring/ShowController.php
View File

@@ -66,8 +66,6 @@ class ShowController extends Controller
}
);
}
/**
* Show a single recurring transaction.
*

4
app/Http/Controllers/Report/BalanceController.php
View File

@@ -56,8 +56,6 @@ class BalanceController extends Controller
}
);
}
/**
* Show overview of budget balances.
*
@@ -136,8 +134,6 @@ class BalanceController extends Controller
$report['budgets'][$budgetId]['spent'] = $spent;
// get transactions in budget
}
try {
$result = prefixView('reports.partials.balance', compact('report'))->render();
// @codeCoverageIgnoreStart

6
app/Http/Controllers/Report/BillController.php
View File

@@ -22,8 +22,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Report;
use Carbon\Carbon;
use FireflyIII\Helpers\Report\ReportHelperInterface;
use FireflyIII\Http\Controllers\Controller;
@@ -52,13 +50,9 @@ class BillController extends Controller
if ($cache->has()) {
return $cache->get(); // @codeCoverageIgnore
}
/** @var ReportHelperInterface $helper */
$helper = app(ReportHelperInterface::class);
$report = $helper->getBillReport($accounts, $start, $end);
try {
$result = prefixView('reports.partials.bills', compact('report'))->render();
// @codeCoverageIgnoreStart

2
app/Http/Controllers/Report/BudgetController.php
View File

@@ -321,8 +321,6 @@ class BudgetController extends Controller
$periods = app('navigation')->listOfPeriods($start, $end);
$keyFormat = app('navigation')->preferredCarbonFormat($start, $end);
// list expenses for budgets in account(s)
$expenses = $this->opsRepository->listExpenses($start, $end, $accounts);

4
app/Http/Controllers/Report/CategoryController.php
View File

@@ -124,8 +124,6 @@ class CategoryController extends Controller
}
}
}
// loop income.
foreach ($earned as $currency) {
$currencyId = $currency['currency_id'];
@@ -143,8 +141,6 @@ class CategoryController extends Controller
'currency_decimal_places' => $currency['currency_decimal_places'],
'categories' => [],
];
$report[$destinationId]['currencies'][$currencyId]['categories'][$category['id']]
= $report[$destinationId]['currencies'][$currencyId]['categories'][$category['id']]
??

2
app/Http/Controllers/Report/OperationsController.php
View File

@@ -57,8 +57,6 @@ class OperationsController extends Controller
}
);
}
/**
* View of income and expense.
*

4
app/Http/Controllers/Report/TagController.php
View File

@@ -118,8 +118,6 @@ class TagController extends Controller
}
}
}
// loop income.
foreach ($earned as $currency) {
$currencyId = $currency['currency_id'];
@@ -137,8 +135,6 @@ class TagController extends Controller
'currency_decimal_places' => $currency['currency_decimal_places'],
'tags' => [],
];
$report[$destinationId]['currencies'][$currencyId]['tags'][$tag['id']]
= $report[$destinationId]['currencies'][$currencyId]['tags'][$tag['id']]
??

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

@@ -406,8 +406,6 @@ class ReportController extends Controller
return redirect($uri);
}
/**
* Get a tag report.
*

2
app/Http/Controllers/Rule/DeleteController.php
View File

@@ -22,8 +22,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Rule;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Rule;
use FireflyIII\Repositories\Rule\RuleRepositoryInterface;

4
app/Http/Controllers/Rule/EditController.php
View File

@@ -22,8 +22,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Rule;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\RuleFormRequest;
use FireflyIII\Models\Rule;
@@ -98,8 +96,6 @@ class EditController extends Controller
}
$oldTriggers = $this->parseFromOperators($operators);
}
// has old input?
if (count($request->old()) > 0) {
$oldTriggers = $this->getPreviousTriggers($request);

8
app/Http/Controllers/Rule/SelectController.php
View File

@@ -22,8 +22,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Rule;
use Carbon\Carbon;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\SelectTransactionsRequest;
@@ -103,8 +101,6 @@ class SelectController extends Controller
return redirect()->route('rules.index');
}
/**
* View to select transactions by a rule.
*
@@ -206,8 +202,6 @@ class SelectController extends Controller
if (0 === count($triggers)) {
return response()->json(['html' => '', 'warning' => (string)trans('firefly.warning_no_valid_triggers')]); // @codeCoverageIgnore
}
// create new rule engine:
$newRuleEngine = app(RuleEngineInterface::class);
@@ -235,6 +229,4 @@ class SelectController extends Controller
return response()->json(['html' => $view, 'warning' => $warning]);
}
}

2
app/Http/Controllers/RuleGroup/CreateController.php
View File

@@ -22,8 +22,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\RuleGroup;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\RuleGroupFormRequest;
use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;

4
app/Http/Controllers/RuleGroup/DeleteController.php
View File

@@ -22,8 +22,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\RuleGroup;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\RuleGroup;
use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
@@ -61,8 +59,6 @@ class DeleteController extends Controller
}
);
}
/**
* Delete a rule group.
*

4
app/Http/Controllers/RuleGroup/EditController.php
View File

@@ -79,8 +79,6 @@ class EditController extends Controller
return redirect(route('rules.index'));
}
/**
* Edit a rule group.
*
@@ -97,8 +95,6 @@ class EditController extends Controller
$preFilled = [
'active' => $hasOldInput ? (bool)$request->old('active') : $ruleGroup->active,
];
// put previous url in session if not redirect from store (not "return_to_edit").
if (true !== session('rule-groups.edit.fromUpdate')) {
$this->rememberPreviousUri('rule-groups.edit.uri');

6
app/Http/Controllers/RuleGroup/ExecutionController.php
View File

@@ -22,8 +22,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\RuleGroup;
use Carbon\Carbon;
use Exception;
use FireflyIII\Http\Controllers\Controller;
@@ -63,8 +61,6 @@ class ExecutionController extends Controller
}
);
}
/**
* Execute the given rulegroup on a set of existing transactions.
*
@@ -117,6 +113,4 @@ class ExecutionController extends Controller
return prefixView('rules.rule-group.select-transactions', compact('first', 'today', 'ruleGroup', 'subTitle'));
}
}

4
app/Http/Controllers/System/InstallController.php
View File

@@ -22,8 +22,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\System;
use Artisan;
use Cache;
use Exception;
@@ -49,8 +47,6 @@ class InstallController extends Controller
public const OTHER_ERROR = 'An unknown error prevented Firefly III from executing the upgrade commands. Sorry.';
private array $upgradeCommands;
private string $lastError;
/** @noinspection MagicMethodsValidityInspection */
/** @noinspection PhpMissingParentConstructorInspection */
/**

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

@@ -329,8 +329,6 @@ class TagController extends Controller
if (count($this->attachmentsHelper->getMessages()->get('attachments')) > 0) {
$request->session()->flash('info', $this->attachmentsHelper->getMessages()->get('attachments')); // @codeCoverageIgnore
}
$redirect = redirect($this->getPreviousUri('tags.create.uri'));
if (1 === (int) $request->get('create_another')) {
// @codeCoverageIgnoreStart
@@ -372,8 +370,6 @@ class TagController extends Controller
if (count($this->attachmentsHelper->getMessages()->get('attachments')) > 0) {
$request->session()->flash('info', $this->attachmentsHelper->getMessages()->get('attachments')); // @codeCoverageIgnore
}
$redirect = redirect($this->getPreviousUri('tags.edit.uri'));
if (1 === (int) $request->get('return_to_edit')) {
// @codeCoverageIgnoreStart

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

@@ -22,8 +22,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Transaction;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\BulkEditJournalRequest;
use FireflyIII\Models\TransactionJournal;
@@ -40,8 +38,6 @@ class BulkController extends Controller
{
/** @var JournalRepositoryInterface Journals and transactions overview */
private $repository;
/**
* BulkController constructor.
*
@@ -86,8 +82,6 @@ class BulkController extends Controller
return prefixView('transactions.bulk.edit', compact('journals', 'subTitle', 'budgetList'));
}
/**
* Update all journals.
*

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

@@ -76,8 +76,6 @@ class ConvertController extends Controller
}
);
}
/**
* Show overview of a to be converted transaction.
*

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

@@ -112,8 +112,6 @@ class CreateController extends Controller
$previousUri = str_replace($search, '', $previousUri);
session()->put('preFilled', $preFilled);
return prefixView(
'transactions.create',
compact(

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

@@ -22,8 +22,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Transaction;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\TransactionGroup;
use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface;
@@ -120,6 +118,4 @@ class DeleteController extends Controller
return redirect($this->getPreviousUri('transactions.delete.uri'));
}
}

6
app/Http/Controllers/Transaction/EditController.php
View File

@@ -22,8 +22,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Transaction;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\TransactionGroup;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
@@ -58,8 +56,6 @@ class EditController extends Controller
}
);
}
/**
* @param TransactionGroup $transactionGroup
*
@@ -87,8 +83,6 @@ class EditController extends Controller
$parts = parse_url($previousUri);
$search = sprintf('?%s', $parts['query'] ?? '');
$previousUri = str_replace($search, '', $previousUri);
return prefixView(
'transactions.edit',
compact(

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

@@ -22,8 +22,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Transaction;
use Carbon\Carbon;
use Exception;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;

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

@@ -110,8 +110,6 @@ class MassController extends Controller
}
}
}
app('preferences')->mark();
session()->flash('success', (string) trans_choice('firefly.mass_deleted_transactions_success', $count));

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

@@ -73,8 +73,6 @@ class Authenticate
return $next($request);
}
/**
* Determine if the user is logged in to any of the given guards.
*

4
app/Http/Middleware/InstallationId.php
View File

@@ -20,8 +20,6 @@
*/
declare(strict_types=1);
namespace FireflyIII\Http\Middleware;
use Closure;
@@ -50,8 +48,6 @@ class InstallationId
*/
public function handle($request, Closure $next)
{
$this->generateInstallationId();
return $next($request);

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

@@ -76,8 +76,6 @@ class Installer
OAuthKeys::verifyKeysRoutine();
// update scheme version
// update firefly version
return $next($request);
}

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

@@ -22,8 +22,6 @@
declare(strict_types=1);
namespace FireflyIII\Http\Middleware;
use Closure;
use FireflyIII\Models\TransactionGroup;
use FireflyIII\Models\TransactionJournal;

4
app/Http/Requests/RecurrenceFormRequest.php
View File

@@ -172,8 +172,6 @@ class RecurrenceFormRequest extends FormRequest
}
return $return;
}
/**
@@ -324,8 +322,6 @@ class RecurrenceFormRequest extends FormRequest
$destinationId = (int)$data['destination_id'];
break;
}
// validate source account.
$validSource = $accountValidator->validateSource($sourceId, null, null);