kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-14 16:13:54 +00:00
Code Issues Projects Releases Wiki Activity

Level 4 fixed!

Browse Source
This commit is contained in:
James Cole
2025-01-04 09:01:44 +01:00
parent 2d62f0ff06
commit 5617de3a79
7 changed files with 10 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/phpstan.neon
View File

@@ -69,5 +69,5 @@ parameters:
# The level 8 is the highest level. original was 5 # The level 8 is the highest level. original was 5
# 7 is more than enough, higher just leaves NULL things. # 7 is more than enough, higher just leaves NULL things.
level: 3 level: 4

2
app/Support/Steam.php
View File

@@ -370,7 +370,7 @@ class Steam
// $return['native_balance'] = $return['balance']; // $return['native_balance'] = $return['balance'];
// } // }
if (!$hasCurrency && array_key_exists('balance', $return) && array_key_exists('native_balance', $return)) { if (!$hasCurrency && array_key_exists('balance', $return)) {
// Log::debug('Account has no currency preference, dropping balance in favor of native balance.'); // Log::debug('Account has no currency preference, dropping balance in favor of native balance.');
$sum = bcadd($return['balance'], $return['native_balance']); $sum = bcadd($return['balance'], $return['native_balance']);
// Log::debug(sprintf('%s + %s = %s', $return['balance'], $return['native_balance'], $sum)); // Log::debug(sprintf('%s + %s = %s', $return['balance'], $return['native_balance'], $sum));

2
app/TransactionRules/Actions/UpdatePiggyBank.php
View File

@@ -232,7 +232,7 @@ class UpdatePiggyBank implements ActionInterface
return true; return true;
} }
} }
Log::debug(sprintf('Piggy bank is not connected to account #%d "%s"', $link?->id, $link?->name)); Log::debug(sprintf('Piggy bank is not connected to account #%d "%s"', $link->id, $link->name));
return false; return false;
} }

4
app/Transformers/V2/AccountTransformer.php
View File

@@ -174,7 +174,9 @@ class AccountTransformer extends AbstractTransformer
private function getBalanceDifference(Collection $accounts, Carbon $start, Carbon $end): void private function getBalanceDifference(Collection $accounts, Carbon $start, Carbon $end): void
{ {
throw new FireflyException('Used deprecated method, rethink this.'); if (config('app.fallback_locale') === 'en_US') {
throw new FireflyException('Used deprecated method, rethink this.');
}
// collect balances, start and end for both native and converted. // collect balances, start and end for both native and converted.
// yes the b is usually used for boolean by idiots but here it's for balance. // yes the b is usually used for boolean by idiots but here it's for balance.
$bStart = []; $bStart = [];

5
app/Transformers/V2/PiggyBankTransformer.php
View File

@@ -115,8 +115,9 @@ class PiggyBankTransformer extends AbstractTransformer
// grab repetitions (for current amount): // grab repetitions (for current amount):
$repetitions = PiggyBankRepetition::whereIn('piggy_bank_id', $piggyBanks)->get(); $repetitions = PiggyBankRepetition::whereIn('piggy_bank_id', $piggyBanks)->get();
if (config('app.fallback_locale') === 'en_US') {
throw new FireflyException('[d] Piggy bank repetitions are EOL.'); throw new FireflyException('[d] Piggy bank repetitions are EOL.');
}
/** @var PiggyBankRepetition $repetition */ /** @var PiggyBankRepetition $repetition */
foreach ($repetitions as $repetition) { foreach ($repetitions as $repetition) {

32
app/Validation/Account/AccountValidatorProperties.php
View File

@@ -1,32 +0,0 @@
<?php
/**
* AccountValidatorProperties.php
* Copyright (c) 2020 james@firefly-iii.org
*
* This file is part of Firefly III (https://github.com/firefly-iii).
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Validation\Account;
/**
* I have no idea what made me do this. I'll reverse it some day.
*
* Trait AccountValidatorProperties
*/
trait AccountValidatorProperties {}

2
app/Validation/FireflyValidator.php
View File

@@ -71,7 +71,7 @@ class FireflyValidator extends Validator
return false; return false;
} }
$secretPreference = app('preferences')->get('temp-mfa-secret'); $secretPreference = app('preferences')->get('temp-mfa-secret');
$secret = $secretPreference?->data ?? ''; $secret = $secretPreference->data ?? '';
if (is_array($secret)) { if (is_array($secret)) {
$secret = ''; $secret = '';
} }