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

More PHP8.4 updates

Browse Source
This commit is contained in:
James Cole
2025-05-04 13:47:00 +02:00
parent e42107c03c
commit 51e86448c7
195 changed files with 524 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Helpers/Attachments/AttachmentHelper.php
View File

@@ -185,7 +185,7 @@ class AttachmentHelper implements AttachmentHelperInterface
return false;
}
Log::debug(sprintf('Now in saveAttachmentsForModel for model %s', get_class($model)));
Log::debug(sprintf('Now in saveAttachmentsForModel for model %s', $model::class));
if (is_array($files)) {
Log::debug('$files is an array.');
@@ -335,7 +335,7 @@ class AttachmentHelper implements AttachmentHelperInterface
{
$md5 = \Safe\md5_file($file->getRealPath());
$name = $file->getClientOriginalName();
$class = get_class($model);
$class = $model::class;
$count = 0;
// ignore lines about polymorphic calls.
if ($model instanceof PiggyBank) {

12
app/Helpers/Report/NetWorth.php
View File

@@ -50,7 +50,7 @@ class NetWorth implements NetWorthInterface
private AccountRepositoryInterface $accountRepository;
private CurrencyRepositoryInterface $currencyRepos;
private User $user; // @phpstan-ignore-line
private ?UserGroup $userGroup; // @phpstan-ignore-line
private ?UserGroup $userGroup = null; // @phpstan-ignore-line
/**
* This method collects the user's net worth in ALL the user's currencies
@@ -94,8 +94,8 @@ class NetWorth implements NetWorthInterface
}
Log::debug(sprintf('Balance is %s, native balance is %s', $balance, $nativeBalance));
// always subtract virtual balance again.
$balance = '' !== (string) $account->virtual_balance ? bcsub($balance, $account->virtual_balance) : $balance;
$nativeBalance = '' !== (string) $account->native_virtual_balance ? bcsub($nativeBalance, $account->native_virtual_balance) : $nativeBalance;
$balance = '' !== (string) $account->virtual_balance ? bcsub($balance, (string) $account->virtual_balance) : $balance;
$nativeBalance = '' !== (string) $account->native_virtual_balance ? bcsub($nativeBalance, (string) $account->native_virtual_balance) : $nativeBalance;
$amountToUse = $useNative ? $nativeBalance : $balance;
Log::debug(sprintf('Will use %s %s', $currencyCode, $amountToUse));
@@ -108,7 +108,7 @@ class NetWorth implements NetWorthInterface
'currency_decimal_places' => $currency->decimal_places,
];
$netWorth[$currencyCode]['balance'] = bcadd($amountToUse, $netWorth[$currencyCode]['balance']);
$netWorth[$currencyCode]['balance'] = bcadd((string) $amountToUse, $netWorth[$currencyCode]['balance']);
}
$cache->store($netWorth);
@@ -153,7 +153,7 @@ class NetWorth implements NetWorthInterface
// always subtract virtual balance.
$virtualBalance = $account->virtual_balance;
if ('' !== $virtualBalance) {
$balance = bcsub($balance, $virtualBalance);
$balance = bcsub($balance, (string) $virtualBalance);
}
$return[$currency->id] ??= [
@@ -164,7 +164,7 @@ class NetWorth implements NetWorthInterface
'decimal_places' => $currency->decimal_places,
'sum' => '0',
];
$return[$currency->id]['sum'] = bcadd($return[$currency->id]['sum'], $balance);
$return[$currency->id]['sum'] = bcadd($return[$currency->id]['sum'], (string) $balance);
}
return $return;

2
app/Helpers/Webhook/Sha3SignatureGenerator.php
View File

@@ -64,7 +64,7 @@ class Sha3SignatureGenerator implements SignatureGeneratorInterface
// The actual JSON payload (i.e., the request body)
$timestamp = time();
$payload = sprintf('%s.%s', $timestamp, $json);
$signature = hash_hmac('sha3-256', $payload, $message->webhook->secret, false);
$signature = hash_hmac('sha3-256', $payload, (string) $message->webhook->secret, false);
// signature string:
// header included in each signed event contains a timestamp and one or more signatures.