kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-31 02:36:28 +00:00
Code Issues Projects Releases Wiki Activity

🤖 Auto commit for release 'develop' on 2025-09-13

Browse Source
This commit is contained in:
JC5
2025-09-13 07:18:32 +02:00
parent f13e0991fb
commit ae7c664418
12 changed files with 91 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,6 @@ use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Account;
use FireflyIII\Models\UserGroup;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use FireflyIII\Support\Facades\Amount;
use FireflyIII\Support\Facades\Steam;

2
app/Http/Controllers/Report/BudgetController.php
View File

@@ -291,7 +291,7 @@ class BudgetController extends Controller
$cache->addProperty('budget-period-report');
$cache->addProperty($accounts->pluck('id')->toArray());
if ($cache->has()) {
return $cache->get();
return $cache->get();
}
$periods = Navigation::listOfPeriods($start, $end);

2
app/Jobs/DownloadExchangeRates.php
View File

@@ -39,8 +39,8 @@ use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Log;
use function Safe\json_decode;
/**

2
app/Repositories/Budget/AvailableBudgetRepository.php
View File

@@ -209,7 +209,7 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface, U
#[Deprecated]
public function setAvailableBudget(TransactionCurrency $currency, Carbon $start, Carbon $end, string $amount): AvailableBudget
{
/** @var AvailableBudget|null $availableBudget */
/** @var null|AvailableBudget $availableBudget */
$availableBudget = $this->user->availableBudgets()
->where('transaction_currency_id', $currency->id)
->where('start_date', $start->format('Y-m-d'))

1
app/Rules/IsDuplicateTransaction.php
View File

@@ -34,7 +34,6 @@ use Closure;
*/
class IsDuplicateTransaction implements ValidationRule
{
/**
* @SuppressWarnings("PHPMD.UnusedFormalParameter")
*/

2
app/Support/Calendar/Calculator.php
View File

@@ -70,7 +70,7 @@ class Calculator
}
self::$intervalMap = new SplObjectStorage();
foreach (Periodicity::cases() as $interval) {
$periodicityClass = sprintf('%s\\Periodicity\\%s',__NAMESPACE__,$interval->name);
$periodicityClass = sprintf('%s\Periodicity\%s', __NAMESPACE__, $interval->name);
self::$intervals[] = $interval->name;
self::$intervalMap->attach($interval, new $periodicityClass());
}

8
app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php
View File

@@ -145,12 +145,12 @@ class BudgetLimitEnrichment implements EnrichmentInterface
private function collectBudgets(): void
{
$budgetIds = $this->collection->pluck('budget_id')->unique()->toArray();
$budgets = Budget::whereIn('id', $budgetIds)->get();
$budgetIds = $this->collection->pluck('budget_id')->unique()->toArray();
$budgets = Budget::whereIn('id', $budgetIds)->get();
$repository = app(OperationsRepository::class);
$repository = app(OperationsRepository::class);
$repository->setUser($this->user);
$expenses = $repository->collectExpenses($this->start, $this->end, null, $budgets, null);
$expenses = $repository->collectExpenses($this->start, $this->end, null, $budgets, null);
/** @var BudgetLimit $budgetLimit */
foreach ($this->collection as $budgetLimit) {