kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Clean up code and comments.

Browse Source
This commit is contained in:
James Cole
2023-02-22 18:14:14 +01:00
parent e6dc881f56
commit e421b29b01
249 changed files with 647 additions and 1044 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Admin;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Update\UpdateTrait;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Middleware\IsDemoUser;

1
app/Http/Controllers/Auth/ForgotPasswordController.php
View File

@@ -109,7 +109,6 @@ class ForgotPasswordController extends Controller
/**
* Show form for email recovery.
*
*
* @return Factory|View
* @throws FireflyException

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

@@ -24,7 +24,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Bill;
use Carbon\Carbon;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Attachment;

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

@@ -37,7 +37,6 @@ use FireflyIII\Support\Http\Controllers\PeriodOverview;
use Illuminate\Contracts\View\Factory;
use Illuminate\Http\Request;
use Illuminate\View\View;
use JsonException;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;

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

@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Category;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Category;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface;

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

@@ -34,7 +34,6 @@ use Illuminate\Contracts\View\Factory;
use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use Illuminate\View\View;
use JsonException;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;

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

@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Chart;
use Carbon\Carbon;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;

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

@@ -25,7 +25,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Chart;
use Carbon\Carbon;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Http\Controllers\Controller;

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

@@ -31,8 +31,6 @@ use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Collection;
@@ -46,7 +44,7 @@ use Throwable;
*/
class ReconcileController extends Controller
{
private AccountRepositoryInterface $accountRepos;
private AccountRepositoryInterface $accountRepos;
/**
* ReconcileController constructor.
@@ -62,7 +60,7 @@ class ReconcileController extends Controller
function ($request, $next) {
app('view')->share('mainTitleIcon', 'fa-credit-card');
app('view')->share('title', (string)trans('firefly.accounts'));
$this->accountRepos = app(AccountRepositoryInterface::class);
$this->accountRepos = app(AccountRepositoryInterface::class);
return $next($request);
}

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

@@ -71,7 +71,7 @@ class RecurrenceController extends Controller
*/
public function events(Request $request): JsonResponse
{
$occurrences = [];
$occurrences = [];
$return = [];
$start = Carbon::createFromFormat('Y-m-d', $request->get('start'));
$end = Carbon::createFromFormat('Y-m-d', $request->get('end'));

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

@@ -32,6 +32,7 @@ use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
use FireflyIII\Transformers\PiggyBankTransformer;
use Illuminate\Contracts\View\Factory;
use Illuminate\View\View;
use JsonException;
use Symfony\Component\HttpFoundation\ParameterBag;
/**
@@ -69,7 +70,7 @@ class ShowController extends Controller
*
* @return Factory|View
* @throws FireflyException
* @throws \JsonException
* @throws JsonException
*/
public function show(PiggyBank $piggyBank)
{

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

@@ -95,8 +95,8 @@ class PreferencesController extends Controller
}
ksort($groupedAccounts);
$accountIds = $accounts->pluck('id')->toArray();
$viewRange = app('navigation')->getViewRange(false);
$accountIds = $accounts->pluck('id')->toArray();
$viewRange = app('navigation')->getViewRange(false);
$frontPageAccounts = app('preferences')->get('frontPageAccounts', $accountIds);
$language = app('steam')->getLanguage();
$languages = config('firefly.languages');

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

@@ -25,6 +25,7 @@ namespace FireflyIII\Http\Controllers;
use Auth;
use DB;
use Exception;
use FireflyIII\Events\UserChangedEmail;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Exceptions\ValidationException;
@@ -641,7 +642,7 @@ class ProfileController extends Controller
* @param Request $request
*
* @return RedirectResponse|Redirector
* @throws \Exception
* @throws Exception
*/
public function regenerate(Request $request)
{

1
app/Http/Controllers/Recurring/TriggerController.php
View File

@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Recurring;
use Carbon\Carbon;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\TriggerRecurrenceRequest;
use FireflyIII\Jobs\CreateRecurringTransactions;

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

@@ -36,7 +36,6 @@ use FireflyIII\Support\Report\Category\CategoryReportGenerator;
use Illuminate\Contracts\View\Factory;
use Illuminate\Support\Collection;
use Illuminate\View\View;
use JsonException;
use Log;
use Throwable;

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

@@ -108,7 +108,7 @@ class MassController extends Controller
Log::debug(sprintf('Searching for ID #%d', $journalId));
/** @var TransactionJournal $journal */
$journal = $this->repository->find((int)$journalId);
if (null !== $journal && (int)$journalId === (int) $journal->id) {
if (null !== $journal && (int)$journalId === (int)$journal->id) {
$this->repository->destroyJournal($journal);
++$count;
Log::debug(sprintf('Deleted transaction journal #%d', $journalId));
@@ -239,7 +239,6 @@ class MassController extends Controller
* @param string $key
*
* @return Carbon|null
*/
private function getDateFromRequest(MassEditJournalRequest $request, int $journalId, string $key): ?Carbon
{
@@ -267,7 +266,6 @@ class MassController extends Controller
* @param string $string
*
* @return string|null
*/
private function getStringFromRequest(MassEditJournalRequest $request, int $journalId, string $string): ?string
{
@@ -288,7 +286,6 @@ class MassController extends Controller
* @param string $string
*
* @return int|null
*/
private function getIntFromRequest(MassEditJournalRequest $request, int $journalId, string $string): ?int
{

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

@@ -25,10 +25,9 @@ namespace FireflyIII\Http\Controllers\Webhooks;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Webhook;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\View\Factory;
use Illuminate\Http\RedirectResponse;
use Illuminate\Routing\Redirector;
use Illuminate\View\View;
use Illuminate\Contracts\View\View;
/**
* Class DeleteController
@@ -62,7 +61,7 @@ class DeleteController extends Controller
*
* @param Webhook $webhook
*
* @return Factory|\Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\View
* @return Factory|Application|View
*/
public function index(Webhook $webhook)
{

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

@@ -25,10 +25,9 @@ namespace FireflyIII\Http\Controllers\Webhooks;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Webhook;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\View\Factory;
use Illuminate\Http\RedirectResponse;
use Illuminate\Routing\Redirector;
use Illuminate\View\View;
use Illuminate\Contracts\View\View;
/**
* Class EditController
@@ -61,7 +60,7 @@ class EditController extends Controller
*
* @param Webhook $webhook
*
* @return Factory|\Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\View
* @return Factory|Application|View
*/
public function index(Webhook $webhook)
{

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

@@ -24,7 +24,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Webhooks;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use Illuminate\Contracts\View\Factory;
use Illuminate\Http\Request;

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

@@ -25,10 +25,9 @@ namespace FireflyIII\Http\Controllers\Webhooks;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Webhook;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\View\Factory;
use Illuminate\Http\RedirectResponse;
use Illuminate\Routing\Redirector;
use Illuminate\View\View;
use Illuminate\Contracts\View\View;
/**
* Class ShowController
@@ -61,7 +60,7 @@ class ShowController extends Controller
*
* @param Webhook $webhook
*
* @return Factory|\Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\View
* @return Factory|Application|View
*/
public function index(Webhook $webhook)
{

4
app/Http/Kernel.php
View File

@@ -179,14 +179,14 @@ class Kernel extends HttpKernel
],
// full API authentication
'api' => [
'api' => [
AcceptHeaders::class,
EnsureFrontendRequestsAreStateful::class,
'auth:api,sanctum',
'bindings',
],
// do only bindings, no auth
'api_basic' => [
'api_basic' => [
AcceptHeaders::class,
'bindings',
],

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

@@ -35,7 +35,6 @@ use Log;
/**
* Class Installer
*
*
*/
class Installer

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

@@ -139,6 +139,7 @@ class AccountFormRequest extends FormRequest
return $rules;
}
/**
* Configure the validator instance with special rules for after the basic validation rules.
*

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

@@ -30,7 +30,6 @@ use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Validator;
/**
* Class BudgetFormStoreRequest
*/
class BudgetFormStoreRequest extends FormRequest

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

@@ -31,7 +31,6 @@ use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Validator;
/**
* Class BudgetFormUpdateRequest
*/
class BudgetFormUpdateRequest extends FormRequest

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

@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Requests;
use Carbon\Carbon;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Factory\CategoryFactory;
use FireflyIII\Models\Recurrence;
@@ -312,20 +311,20 @@ class RecurrenceFormRequest extends FormRequest
// TODO typeOverrule: the account validator may have another opinion the transaction type.
// TODO either use 'withdrawal' or the strtolower() variant, not both.
$type = $this->convertString('transaction_type');
$type = $this->convertString('transaction_type');
$throwError = true;
if ('withdrawal' === $type) {
$throwError = false;
$throwError = false;
$sourceId = (int)$data['source_id'];
$destinationId = (int)$data['withdrawal_destination_id'];
}
if ('deposit' === $type) {
$throwError = false;
$throwError = false;
$sourceId = (int)$data['deposit_source_id'];
$destinationId = (int)$data['destination_id'];
}
if ('transfer' === $type) {
$throwError = false;
$throwError = false;
$sourceId = (int)$data['source_id'];
$destinationId = (int)$data['destination_id'];
}