kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-03 20:14:31 +00:00
Code Issues Projects Releases Wiki Activity

Fix code quality with rector [skip ci]

Browse Source
This commit is contained in:
James Cole
2025-11-09 09:08:03 +01:00
parent d2610be790
commit 68183a0a0e
209 changed files with 1021 additions and 1248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Support/Twig/General.php
View File

@@ -104,7 +104,7 @@ class General extends AbstractExtension
{
return new TwigFunction(
'activeRoutePartialObjectType',
static function ($context): string {
static function (array $context): string {
[, $route, $objectType] = func_get_args();
$activeObjectType = $context['objectType'] ?? false;
@@ -292,11 +292,7 @@ class General extends AbstractExtension
'hasRole',
static function (string $role): bool {
$repository = app(UserRepositoryInterface::class);
if ($repository->hasRole(auth()->user(), $role)) {
return true;
}
return false;
return $repository->hasRole(auth()->user(), $role);
}
);
}

6
app/Support/Twig/Rule.php
View File

@@ -37,7 +37,7 @@ class Rule extends AbstractExtension
{
return new TwigFunction(
'allRuleActions',
static function () {
static function (): array {
// array of valid values for actions
$ruleActions = array_keys(Config::get('firefly.rule-actions'));
$possibleActions = [];
@@ -56,7 +56,7 @@ class Rule extends AbstractExtension
{
return new TwigFunction(
'allJournalTriggers',
static fn () => [
static fn (): array => [
'store-journal' => (string)trans('firefly.rule_trigger_store_journal'),
'update-journal' => (string)trans('firefly.rule_trigger_update_journal'),
'manual-activation' => (string)trans('firefly.rule_trigger_manual'),
@@ -68,7 +68,7 @@ class Rule extends AbstractExtension
{
return new TwigFunction(
'allRuleTriggers',
static function () {
static function (): array {
$ruleTriggers = array_keys(config('search.operators'));
$possibleTriggers = [];
foreach ($ruleTriggers as $key) {

5
app/Support/Twig/TransactionGroupTwig.php
View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Support\Twig;
use Carbon\CarbonInterface;
use Carbon\Carbon;
use FireflyIII\Enums\AccountTypeEnum;
use FireflyIII\Enums\TransactionTypeEnum;
@@ -80,7 +81,7 @@ class TransactionGroupTwig extends AbstractExtension
{
return new TwigFunction(
'journalGetMetaDate',
static function (int $journalId, string $metaField) {
static function (int $journalId, string $metaField): CarbonInterface|Carbon {
/** @var null|TransactionJournalMeta $entry */
$entry = DB::table('journal_meta')
->where('name', $metaField)
@@ -122,7 +123,7 @@ class TransactionGroupTwig extends AbstractExtension
{
return new TwigFunction(
'journalHasMeta',
static function (int $journalId, string $metaField) {
static function (int $journalId, string $metaField): bool {
$count = DB::table('journal_meta')
->where('name', $metaField)
->where('transaction_journal_id', $journalId)

7
app/Support/Twig/Translation.php
View File

@@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Support\Twig;
use Illuminate\Contracts\Translation\Translator;
use Override;
use Twig\Extension\AbstractExtension;
use Twig\TwigFilter;
@@ -39,7 +40,7 @@ class Translation extends AbstractExtension
return [
new TwigFilter(
'_',
static fn ($name) => (string)trans(sprintf('firefly.%s', $name)),
static fn (string $name) => (string)trans(sprintf('firefly.%s', $name)),
['is_safe' => ['html']]
),
];
@@ -58,7 +59,7 @@ class Translation extends AbstractExtension
{
return new TwigFunction(
'journalLinkTranslation',
static function (string $direction, string $original) {
static function (string $direction, string $original): string|Translator|array {
$key = sprintf('firefly.%s_%s', $original, $direction);
$translation = trans($key);
if ($key === $translation) {
@@ -75,7 +76,7 @@ class Translation extends AbstractExtension
{
return new TwigFunction(
'__',
static function (string $key) {
static function (string $key): string|Translator|array {
$translation = trans($key);
if ($key === $translation) {
return $key;