Skip to content

Firefly III: a personal finances manager

Do some code cleanup courtesy of Mago.

James Coleebd7dca6a9ad
diff --git a/app/Http/Controllers/Bill/ShowController.php b/app/Http/Controllers/Bill/ShowController.php
index ffa2306dc7..0fbc1cd0be 100644
--- a/app/Http/Controllers/Bill/ShowController.php
+++ b/app/Http/Controllers/Bill/ShowController.php
@@ -185,7 +185,7 @@ class ShowController extends Controller
/** @var AttachmentTransformer $transformer */
$transformer = app(AttachmentTransformer::class);
$attachments = $collection->each(
- static fn (Attachment $attachment) => $transformer->transform($attachment)
+ $transformer->transform(...)
);
}
diff --git a/app/Jobs/CreateRecurringTransactions.php b/app/Jobs/CreateRecurringTransactions.php
index 16a3f2c9c3..73324ac830 100644
--- a/app/Jobs/CreateRecurringTransactions.php
+++ b/app/Jobs/CreateRecurringTransactions.php
@@ -157,7 +157,7 @@ class CreateRecurringTransactions implements ShouldQueue
private function filterRecurrences(Collection $recurrences): Collection
{
return $recurrences->filter(
- fn (Recurrence $recurrence): bool => $this->validRecurrence($recurrence)
+ $this->validRecurrence(...)
);
}
diff --git a/app/Models/AvailableBudget.php b/app/Models/AvailableBudget.php
index db806fd472..c2bb46ec62 100644
--- a/app/Models/AvailableBudget.php
+++ b/app/Models/AvailableBudget.php
@@ -103,7 +103,7 @@ class AvailableBudget extends Model
protected function endDate(): Attribute
{
return Attribute::make(
- get: static fn (string $value): Carbon => Carbon::parse($value),
+ get: Carbon::parse(...),
set: static fn (Carbon $value): string => $value->format('Y-m-d'),
);
}
@@ -111,7 +111,7 @@ class AvailableBudget extends Model
protected function startDate(): Attribute
{
return Attribute::make(
- get: static fn (string $value): Carbon => Carbon::parse($value),
+ get: Carbon::parse(...),
set: static fn (Carbon $value): string => $value->format('Y-m-d'),
);
}
diff --git a/app/Providers/SearchServiceProvider.php b/app/Providers/SearchServiceProvider.php
index 6c02351d74..1c138eb984 100644
--- a/app/Providers/SearchServiceProvider.php
+++ b/app/Providers/SearchServiceProvider.php
@@ -49,16 +49,7 @@ class SearchServiceProvider extends ServiceProvider
public function register(): void
{
$this->app->bind(
- static function (): QueryParserInterface {
- return app(QueryParser::class);
- // 2025-12-20 ignore this setting.
- // $implementation = config('search.query_parser');
- //
- // return match ($implementation) {
- // 'new' => app(QueryParser::class),
- // default => app(GdbotsQueryParser::class),
- // };
- }
+ static fn (): QueryParserInterface => app(QueryParser::class)
);
$this->app->bind(
diff --git a/app/Support/Twig/General.php b/app/Support/Twig/General.php
index e9caec56ff..12ddcfc696 100644
--- a/app/Support/Twig/General.php
+++ b/app/Support/Twig/General.php
@@ -392,7 +392,7 @@ class General extends AbstractExtension
{
return new TwigFunction(
'phpdate',
- static fn (string $str): string => date($str)
+ date(...)
);
}
@@ -400,9 +400,7 @@ class General extends AbstractExtension
{
return new TwigFunction(
'fireflyiiiconfig',
- static function (string $string, mixed $default): mixed {
- return FireflyConfig::get($string, $default)->data;
- }
+ static fn (string $string, mixed $default): mixed => FireflyConfig::get($string, $default)->data
);
}
}
diff --git a/app/Transformers/TransactionGroupTransformer.php b/app/Transformers/TransactionGroupTransformer.php
index 2d420a6f9d..c7a59c1520 100644
--- a/app/Transformers/TransactionGroupTransformer.php
+++ b/app/Transformers/TransactionGroupTransformer.php
@@ -425,9 +425,7 @@ class TransactionGroupTransformer extends AbstractTransformer
private function getSourceTransaction(TransactionJournal $journal): Transaction
{
$result = $journal->transactions->first(
- static function (Transaction $transaction): bool {
- return (float) $transaction->amount < 0; // lame but it works.
- }
+ static fn (Transaction $transaction): bool => (float) $transaction->amount < 0
);
if (null === $result) {
throw new FireflyException(sprintf('Journal #%d unexpectedly has no source transaction.', $journal->id));
@@ -442,9 +440,7 @@ class TransactionGroupTransformer extends AbstractTransformer
private function getDestinationTransaction(TransactionJournal $journal): Transaction
{
$result = $journal->transactions->first(
- static function (Transaction $transaction): bool {
- return (float) $transaction->amount > 0; // lame but it works
- }
+ static fn (Transaction $transaction): bool => (float) $transaction->amount > 0
);
if (null === $result) {
throw new FireflyException(sprintf('Journal #%d unexpectedly has no destination transaction.', $journal->id));
diff --git a/database/seeders/WebhookDataSeeder.php b/database/seeders/WebhookDataSeeder.php
index 67cabb792a..236831e62a 100644
--- a/database/seeders/WebhookDataSeeder.php
+++ b/database/seeders/WebhookDataSeeder.php
@@ -1,5 +1,8 @@
<?php
+declare(strict_types=1);
+
+
/*
* WebhookDataSeeder.php