kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 01:06:46 +00:00
Code Issues Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
James Cole
2023-11-04 14:18:49 +01:00
parent 5a35960434
commit ba0843d0bb
211 changed files with 566 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,8 +51,8 @@ use Psr\Container\NotFoundExceptionInterface;
*/
class RegisterController extends Controller
{
use RegistersUsers;
use CreateStuff;
use RegistersUsers;
/**
* Where to redirect users after registration.

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

@@ -46,8 +46,8 @@ use Psr\Container\NotFoundExceptionInterface;
*/
class ShowController extends Controller
{
use PeriodOverview;
use AugumentData;
use PeriodOverview;
protected JournalRepositoryInterface $journalRepos;
private BudgetRepositoryInterface $repository;

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

@@ -50,9 +50,9 @@ use Psr\Container\NotFoundExceptionInterface;
*/
class AccountController extends Controller
{
use DateCalculation;
use AugumentData;
use ChartGeneration;
use DateCalculation;
protected GeneratorInterface $generator;
private AccountRepositoryInterface $accountRepository;

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

@@ -49,8 +49,8 @@ use Illuminate\Support\Collection;
*/
class BudgetController extends Controller
{
use DateCalculation;
use AugumentData;
use DateCalculation;
protected GeneratorInterface $generator;
protected OperationsRepositoryInterface $opsRepository;

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

@@ -47,9 +47,9 @@ use Psr\Container\NotFoundExceptionInterface;
*/
class CategoryController extends Controller
{
use DateCalculation;
use AugumentData;
use ChartGeneration;
use DateCalculation;
/** @var GeneratorInterface Chart generation methods. */
protected $generator;

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

@@ -96,7 +96,7 @@ class PiggyBankController extends Controller
$chartData = [];
while ($oldest <= $today) {
$filtered = $set->filter(
function (PiggyBankEvent $event) use ($oldest) {
static function (PiggyBankEvent $event) use ($oldest) {
return $event->date->lte($oldest);
}
);
@@ -106,7 +106,7 @@ class PiggyBankController extends Controller
$oldest = app('navigation')->addPeriod($oldest, $step, 0);
}
$finalFiltered = $set->filter(
function (PiggyBankEvent $event) use ($today) {
static function (PiggyBankEvent $event) use ($today) {
return $event->date->lte($today);
}
);

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

@@ -39,9 +39,9 @@ abstract class Controller extends BaseController
{
use AuthorizesRequests;
use DispatchesJobs;
use ValidatesRequests;
use RequestInformation;
use UserNavigation;
use ValidatesRequests;
protected string $dateTimeFormat;
protected string $monthAndDayFormat;

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

@@ -129,7 +129,7 @@ class DebugController extends Controller
// get latest log file:
$logger = Log::driver();
// PHPstan doesn't recognize the method because of its polymorphic nature.
$handlers = $logger->getHandlers(); // @phpstan-ignore-line
$handlers = $logger->getHandlers(); /** @phpstan-ignore-line */
$logContent = '';
foreach ($handlers as $handler) {
if ($handler instanceof RotatingFileHandler) {
@@ -174,7 +174,7 @@ class DebugController extends Controller
'db_version' => app('fireflyconfig')->get('db_version', 1)->data,
'php_version' => PHP_VERSION,
'php_os' => PHP_OS,
'interface' => PHP_SAPI,
'interface' => \PHP_SAPI,
'bcscale' => bcscale(),
'display_errors' => ini_get('display_errors'),
'error_reporting' => $this->errorReporting((int)ini_get('error_reporting')),
@@ -246,7 +246,7 @@ class DebugController extends Controller
'default_locale' => (string)config('firefly.default_locale'),
'remote_header' => $userGuard === 'remote_user_guard' ? config('auth.guard_header') : 'N/A',
'remote_mail_header' => $userGuard === 'remote_user_guard' ? config('auth.guard_email') : 'N/A',
'stateful_domains' => join(', ', config('sanctum.stateful')),
'stateful_domains' => implode(', ', config('sanctum.stateful')),
// the dates for the cron job are based on the recurring cron job's times.
// any of the cron jobs will do, they always run at the same time.
@@ -339,7 +339,7 @@ class DebugController extends Controller
if ($user->bills()->count() > 0) {
$flags[] = '<span title="Has subscriptions">:email:</span>';
}
return join(' ', $flags);
return implode(' ', $flags);
}
/**

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

@@ -118,7 +118,7 @@ class BoxController extends Controller
$leftToSpendAmount = bcadd($totalAvailableSum, $spentAmount);
app('log')->debug(sprintf('So left to spend is %s', $leftToSpendAmount));
if (1 === bccomp($leftToSpendAmount, '0')) {
app('log')->debug(sprintf('Left to spend is positive!'));
app('log')->debug('Left to spend is positive!');
$boxTitle = (string)trans('firefly.left_to_spend');
$days = $today->diffInDays($end) + 1;
$display = 1; // not overspent
@@ -255,7 +255,7 @@ class BoxController extends Controller
// filter list on preference of being included.
$filtered = $allAccounts->filter(
function (Account $account) use ($accountRepository) {
static function (Account $account) use ($accountRepository) {
$includeNetWorth = $accountRepository->getMetaValue($account, 'include_net_worth');
$result = null === $includeNetWorth ? true : '1' === $includeNetWorth;
if (false === $result) {

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

@@ -53,7 +53,7 @@ class PreferencesController extends Controller
parent::__construct();
$this->middleware(
function ($request, $next) {
static function ($request, $next) {
app('view')->share('title', (string)trans('firefly.preferences'));
app('view')->share('mainTitleIcon', 'fa-gear');

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

@@ -45,8 +45,8 @@ use Illuminate\View\View;
*/
class CreateController extends Controller
{
use RuleManagement;
use ModelInformation;
use RuleManagement;
private RuleRepositoryInterface $ruleRepos;

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

@@ -44,8 +44,8 @@ use Throwable;
*/
class EditController extends Controller
{
use RuleManagement;
use RenderPartialViews;
use RuleManagement;
private RuleRepositoryInterface $ruleRepos;

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

@@ -57,7 +57,7 @@ class SelectController extends Controller
parent::__construct();
$this->middleware(
function ($request, $next) {
static function ($request, $next) {
app('view')->share('title', (string)trans('firefly.rules'));
app('view')->share('mainTitleIcon', 'fa-random');

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

@@ -84,7 +84,7 @@ class IndexController extends Controller
// order so default is on top:
$collection = $collection->sortBy(
function (TransactionCurrency $currency) {
static function (TransactionCurrency $currency) {
$default = true === $currency->userDefault ? 0 : 1;
$enabled = true === $currency->userEnabled ? 0 : 1;
return sprintf('%s-%s-%s', $default, $enabled, $currency->code);

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

@@ -42,7 +42,7 @@ class CreateController extends Controller
// translations:
$this->middleware(
function ($request, $next) {
static function ($request, $next) {
app('view')->share('mainTitleIcon', 'fa-bolt');
app('view')->share('subTitleIcon', 'fa-plus');
app('view')->share('title', (string)trans('firefly.webhooks'));

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

@@ -45,7 +45,7 @@ class DeleteController extends Controller
// translations:
$this->middleware(
function ($request, $next) {
static function ($request, $next) {
app('view')->share('mainTitleIcon', 'fa-bolt');
app('view')->share('subTitleIcon', 'fa-trash');
app('view')->share('title', (string)trans('firefly.webhooks'));

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

@@ -45,7 +45,7 @@ class EditController extends Controller
// translations:
$this->middleware(
function ($request, $next) {
static function ($request, $next) {
app('view')->share('mainTitleIcon', 'fa-bolt');
app('view')->share('subTitleIcon', 'fa-pencil');
app('view')->share('title', (string)trans('firefly.webhooks'));

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

@@ -43,7 +43,7 @@ class IndexController extends Controller
// translations:
$this->middleware(
function ($request, $next) {
static function ($request, $next) {
app('view')->share('mainTitleIcon', 'fa-bolt');
app('view')->share('title', (string)trans('firefly.webhooks'));

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

@@ -45,7 +45,7 @@ class ShowController extends Controller
// translations:
$this->middleware(
function ($request, $next) {
static function ($request, $next) {
app('view')->share('mainTitleIcon', 'fa-bolt');
app('view')->share('subTitleIcon', 'fa-bolt');
app('view')->share('title', (string)trans('firefly.webhooks'));

2
app/Http/Requests/AccountFormRequest.php
View File

@@ -37,9 +37,9 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class AccountFormRequest extends FormRequest
{
use ConvertsDataTypes;
use AppendsLocationData;
use ChecksLogin;
use ConvertsDataTypes;
protected array $acceptedRoles = [UserRoleEnum::MANAGE_TRANSACTIONS];

2
app/Http/Requests/AttachmentFormRequest.php
View File

@@ -34,8 +34,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class AttachmentFormRequest extends FormRequest
{
use ConvertsDataTypes;
use ChecksLogin;
use ConvertsDataTypes;
/**
* Returns the data required by the controller.

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

@@ -32,8 +32,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class BillStoreRequest extends FormRequest
{
use ConvertsDataTypes;
use ChecksLogin;
use ConvertsDataTypes;
/**
* Returns the data required by the controller.
@@ -74,7 +74,7 @@ class BillStoreRequest extends FormRequest
'date' => 'required|date',
'bill_end_date' => 'nullable|date',
'extension_date' => 'nullable|date',
'repeat_freq' => sprintf('required|in:%s', join(',', config('firefly.bill_periods'))),
'repeat_freq' => sprintf('required|in:%s', implode(',', config('firefly.bill_periods'))),
'skip' => 'required|integer|gte:0|lte:31',
'active' => 'boolean',
];

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

@@ -33,8 +33,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class BillUpdateRequest extends FormRequest
{
use ConvertsDataTypes;
use ChecksLogin;
use ConvertsDataTypes;
/**
* Returns the data required by the controller.
@@ -78,7 +78,7 @@ class BillUpdateRequest extends FormRequest
'date' => 'required|date',
'bill_end_date' => 'nullable|date',
'extension_date' => 'nullable|date',
'repeat_freq' => sprintf('required|in:%s', join(',', config('firefly.bill_periods'))),
'repeat_freq' => sprintf('required|in:%s', implode(',', config('firefly.bill_periods'))),
'skip' => 'required|integer|gte:0|lte:31',
'active' => 'boolean',
'notes' => 'between:1,65536|nullable',

2
app/Http/Requests/BudgetFormStoreRequest.php
View File

@@ -34,9 +34,9 @@ use Illuminate\Validation\Validator;
*/
class BudgetFormStoreRequest extends FormRequest
{
use ChecksLogin;
use ConvertsDataTypes;
use ValidatesAutoBudgetRequest;
use ChecksLogin;
/**
* Returns the data required by the controller.

2
app/Http/Requests/BudgetFormUpdateRequest.php
View File

@@ -35,9 +35,9 @@ use Illuminate\Validation\Validator;
*/
class BudgetFormUpdateRequest extends FormRequest
{
use ChecksLogin;
use ConvertsDataTypes;
use ValidatesAutoBudgetRequest;
use ChecksLogin;
/**
* Returns the data required by the controller.

2
app/Http/Requests/BulkEditJournalRequest.php
View File

@@ -32,8 +32,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class BulkEditJournalRequest extends FormRequest
{
use ConvertsDataTypes;
use ChecksLogin;
use ConvertsDataTypes;
/**
* Rules for this request.

2
app/Http/Requests/CategoryFormRequest.php
View File

@@ -33,8 +33,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class CategoryFormRequest extends FormRequest
{
use ConvertsDataTypes;
use ChecksLogin;
use ConvertsDataTypes;
/**
* Get information for the controller.

2
app/Http/Requests/CurrencyFormRequest.php
View File

@@ -33,8 +33,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class CurrencyFormRequest extends FormRequest
{
use ConvertsDataTypes;
use ChecksLogin;
use ConvertsDataTypes;
/**
* Returns the data required by the controller.

2
app/Http/Requests/InviteUserFormRequest.php
View File

@@ -33,8 +33,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class InviteUserFormRequest extends FormRequest
{
use ConvertsDataTypes;
use ChecksLogin;
use ConvertsDataTypes;
/**
* Rules for this request.

2
app/Http/Requests/JournalLinkRequest.php
View File

@@ -33,8 +33,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class JournalLinkRequest extends FormRequest
{
use ConvertsDataTypes;
use ChecksLogin;
use ConvertsDataTypes;
/**
* Returns the data required by the controller.

2
app/Http/Requests/NewUserFormRequest.php
View File

@@ -34,8 +34,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class NewUserFormRequest extends FormRequest
{
use ConvertsDataTypes;
use ChecksLogin;
use ConvertsDataTypes;
/**
* Rules for this request.

2
app/Http/Requests/ObjectGroupFormRequest.php
View File

@@ -33,8 +33,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class ObjectGroupFormRequest extends FormRequest
{
use ConvertsDataTypes;
use ChecksLogin;
use ConvertsDataTypes;
/**
* Returns the data required by the controller.

2
app/Http/Requests/PiggyBankStoreRequest.php
View File

@@ -32,8 +32,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class PiggyBankStoreRequest extends FormRequest
{
use ConvertsDataTypes;
use ChecksLogin;
use ConvertsDataTypes;
/**
* Returns the data required by the controller.

2
app/Http/Requests/PiggyBankUpdateRequest.php
View File

@@ -33,8 +33,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class PiggyBankUpdateRequest extends FormRequest
{
use ConvertsDataTypes;
use ChecksLogin;
use ConvertsDataTypes;
/**
* Returns the data required by the controller.

2
app/Http/Requests/ReconciliationStoreRequest.php
View File

@@ -33,8 +33,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class ReconciliationStoreRequest extends FormRequest
{
use ConvertsDataTypes;
use ChecksLogin;
use ConvertsDataTypes;
/**
* Returns the data required by the controller.

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

@@ -40,8 +40,8 @@ use Illuminate\Validation\Validator;
*/
class RecurrenceFormRequest extends FormRequest
{
use ConvertsDataTypes;
use ChecksLogin;
use ConvertsDataTypes;
/**
* Get the data required by the controller.

2
app/Http/Requests/RuleFormRequest.php
View File

@@ -34,9 +34,9 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class RuleFormRequest extends FormRequest
{
use ChecksLogin;
use ConvertsDataTypes;
use GetRuleConfiguration;
use ChecksLogin;
/**
* Get all data for controller.

2
app/Http/Requests/RuleGroupFormRequest.php
View File

@@ -34,8 +34,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class RuleGroupFormRequest extends FormRequest
{
use ConvertsDataTypes;
use ChecksLogin;
use ConvertsDataTypes;
/**
* Get all data for controller.

2
app/Http/Requests/TagFormRequest.php
View File

@@ -35,9 +35,9 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class TagFormRequest extends FormRequest
{
use ConvertsDataTypes;
use AppendsLocationData;
use ChecksLogin;
use ConvertsDataTypes;
/**
* Get all data for controller.

2
app/Http/Requests/TestRuleFormRequest.php
View File

@@ -34,8 +34,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class TestRuleFormRequest extends FormRequest
{
use GetRuleConfiguration;
use ChecksLogin;
use GetRuleConfiguration;
/**
* Rules for this request.

2
app/Http/Requests/TriggerRecurrenceRequest.php
View File

@@ -34,8 +34,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class TriggerRecurrenceRequest extends FormRequest
{
use ConvertsDataTypes;
use ChecksLogin;
use ConvertsDataTypes;
/**
* Returns the data required by the controller.

2
app/Http/Requests/UserFormRequest.php
View File

@@ -34,8 +34,8 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class UserFormRequest extends FormRequest
{
use ConvertsDataTypes;
use ChecksLogin;
use ConvertsDataTypes;
/**
* Get data for controller.