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

Clean up code.

Browse Source
This commit is contained in:
James Cole
2023-02-12 07:23:57 +01:00
parent 927d607b1a
commit 789935cf1c
67 changed files with 154 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Api/V1/Controllers/Controller.php
View File

@@ -97,6 +97,7 @@ abstract class Controller extends BaseController
// some date fields: // some date fields:
$dates = ['start', 'end', 'date']; $dates = ['start', 'end', 'date'];
foreach ($dates as $field) { foreach ($dates as $field) {
$date = null;
try { try {
$date = request()->query->get($field); $date = request()->query->get($field);
} catch (BadRequestException $e) { } catch (BadRequestException $e) {

4
app/Api/V1/Controllers/Models/TransactionLinkType/DestroyController.php
View File

@@ -28,7 +28,6 @@ use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\LinkType; use FireflyIII\Models\LinkType;
use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface; use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Support\Http\Api\TransactionFilter; use FireflyIII\Support\Http\Api\TransactionFilter;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
@@ -41,7 +40,6 @@ class DestroyController extends Controller
use TransactionFilter; use TransactionFilter;
private LinkTypeRepositoryInterface $repository; private LinkTypeRepositoryInterface $repository;
private UserRepositoryInterface $userRepository;
/** /**
* LinkTypeController constructor. * LinkTypeController constructor.
@@ -56,7 +54,6 @@ class DestroyController extends Controller
/** @var User $user */ /** @var User $user */
$user = auth()->user(); $user = auth()->user();
$this->repository = app(LinkTypeRepositoryInterface::class); $this->repository = app(LinkTypeRepositoryInterface::class);
$this->userRepository = app(UserRepositoryInterface::class);
$this->repository->setUser($user); $this->repository->setUser($user);
return $next($request); return $next($request);
@@ -74,7 +71,6 @@ class DestroyController extends Controller
* *
* @return JsonResponse * @return JsonResponse
* @throws FireflyException * @throws FireflyException
*/ */
public function destroy(LinkType $linkType): JsonResponse public function destroy(LinkType $linkType): JsonResponse
{ {

1
app/Api/V2/Controllers/Controller.php
View File

@@ -92,6 +92,7 @@ class Controller extends BaseController
// some date fields: // some date fields:
foreach ($dates as $field) { foreach ($dates as $field) {
$date = null;
try { try {
$date = request()->query->get($field); $date = request()->query->get($field);
} catch (BadRequestException $e) { } catch (BadRequestException $e) {

6
app/Console/Commands/Upgrade/UpgradeLiabilitiesEight.php
View File

@@ -160,7 +160,7 @@ class UpgradeLiabilitiesEight extends Command
/** /**
* @param $account * @param $account
* @return void * @return int
*/ */
private function deleteTransactions($account): int private function deleteTransactions($account): int
{ {
@@ -279,9 +279,9 @@ class UpgradeLiabilitiesEight extends Command
->where('transactions.account_id', $account->id) ->where('transactions.account_id', $account->id)
->where('transaction_journals.transaction_type_id', $openingBalanceType->id) ->where('transaction_journals.transaction_type_id', $openingBalanceType->id)
->first(['transaction_journals.*']); ->first(['transaction_journals.*']);
/** @var Transaction $source */ /** @var Transaction|null $source */
$source = $openingJournal->transactions()->where('amount', '<', 0)->first(); $source = $openingJournal->transactions()->where('amount', '<', 0)->first();
/** @var Transaction $dest */ /** @var Transaction|null $dest */
$dest = $openingJournal->transactions()->where('amount', '>', 0)->first(); $dest = $openingJournal->transactions()->where('amount', '>', 0)->first();
if ($source && $dest) { if ($source && $dest) {
$sourceId = $source->account_id; $sourceId = $source->account_id;

2
app/Exceptions/GracefulNotFoundHandler.php
View File

@@ -221,7 +221,7 @@ class GracefulNotFoundHandler extends ExceptionHandler
$user = auth()->user(); $user = auth()->user();
$route = $request->route(); $route = $request->route();
$attachmentId = (int)$route->parameter('attachment'); $attachmentId = (int)$route->parameter('attachment');
/** @var Attachment $attachment */ /** @var Attachment|null $attachment */
$attachment = $user->attachments()->withTrashed()->find($attachmentId); $attachment = $user->attachments()->withTrashed()->find($attachmentId);
if (null === $attachment) { if (null === $attachment) {
Log::error(sprintf('Could not find attachment %d, so give big fat error.', $attachmentId)); Log::error(sprintf('Could not find attachment %d, so give big fat error.', $attachmentId));