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

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

Browse Source
This commit is contained in:
JC5
2025-09-27 06:04:46 +02:00
parent 6743b3fe83
commit 308abffb0b
13 changed files with 197 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.ci/php-cs-fixer/composer.lock generated
View File

@@ -402,16 +402,16 @@
}, },
{ {
"name": "friendsofphp/php-cs-fixer", "name": "friendsofphp/php-cs-fixer",
"version": "v3.88.0", "version": "v3.88.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
"reference": "f23469674ae50d40e398bfff8018911a2a2b0dbe" "reference": "a8d15584bafb0f0d9d938827840060fd4a3ebc99"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/f23469674ae50d40e398bfff8018911a2a2b0dbe", "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/a8d15584bafb0f0d9d938827840060fd4a3ebc99",
"reference": "f23469674ae50d40e398bfff8018911a2a2b0dbe", "reference": "a8d15584bafb0f0d9d938827840060fd4a3ebc99",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -494,7 +494,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
"source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.88.0" "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.88.2"
}, },
"funding": [ "funding": [
{ {
@@ -502,7 +502,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2025-09-24T21:31:42+00:00" "time": "2025-09-27T00:24:15+00:00"
}, },
{ {
"name": "psr/container", "name": "psr/container",

1
app/Console/Commands/Tools/ApplyRules.php
View File

@@ -24,7 +24,6 @@ declare(strict_types=1);
namespace FireflyIII\Console\Commands\Tools; namespace FireflyIII\Console\Commands\Tools;
use Carbon\CarbonInterface;
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Console\Commands\ShowsFriendlyMessages; use FireflyIII\Console\Commands\ShowsFriendlyMessages;
use FireflyIII\Console\Commands\VerifiesAccessToken; use FireflyIII\Console\Commands\VerifiesAccessToken;

4
app/Handlers/Events/StoredGroupEventHandler.php
View File

@@ -109,10 +109,10 @@ class StoredGroupEventHandler
$dest = $journal->transactions()->where('amount', '>', '0')->first(); $dest = $journal->transactions()->where('amount', '>', '0')->first();
$repository->deleteStatisticsForModel($source->account, $journal->date); $repository->deleteStatisticsForModel($source->account, $journal->date);
$repository->deleteStatisticsForModel($dest->account, $journal->date); $repository->deleteStatisticsForModel($dest->account, $journal->date);
foreach($journal->categories as $category) { foreach ($journal->categories as $category) {
$repository->deleteStatisticsForModel($category, $journal->date); $repository->deleteStatisticsForModel($category, $journal->date);
} }
foreach($journal->tags as $tag) { foreach ($journal->tags as $tag) {
$repository->deleteStatisticsForModel($tag, $journal->date); $repository->deleteStatisticsForModel($tag, $journal->date);
} }
} }

8
app/Handlers/Events/UpdatedGroupEventHandler.php
View File

@@ -60,10 +60,6 @@ class UpdatedGroupEventHandler
/** /**
* TODO duplicate * TODO duplicate
*
* @param UpdatedTransactionGroup $event
*
* @return void
*/ */
private function removePeriodStatistics(UpdatedTransactionGroup $event): void private function removePeriodStatistics(UpdatedTransactionGroup $event): void
{ {
@@ -76,10 +72,10 @@ class UpdatedGroupEventHandler
$dest = $journal->transactions()->where('amount', '>', '0')->first(); $dest = $journal->transactions()->where('amount', '>', '0')->first();
$repository->deleteStatisticsForModel($source->account, $journal->date); $repository->deleteStatisticsForModel($source->account, $journal->date);
$repository->deleteStatisticsForModel($dest->account, $journal->date); $repository->deleteStatisticsForModel($dest->account, $journal->date);
foreach($journal->categories as $category) { foreach ($journal->categories as $category) {
$repository->deleteStatisticsForModel($category, $journal->date); $repository->deleteStatisticsForModel($category, $journal->date);
} }
foreach($journal->tags as $tag) { foreach ($journal->tags as $tag) {
$repository->deleteStatisticsForModel($tag, $journal->date); $repository->deleteStatisticsForModel($tag, $journal->date);
} }
} }

3
app/Http/Controllers/Transaction/CreateController.php
View File

@@ -115,7 +115,8 @@ class CreateController extends Controller
$preFilled = session()->has('preFilled') ? session('preFilled') : []; $preFilled = session()->has('preFilled') ? session('preFilled') : [];
$subTitle = (string) trans(sprintf('breadcrumbs.create_%s', strtolower((string) $objectType))); $subTitle = (string) trans(sprintf('breadcrumbs.create_%s', strtolower((string) $objectType)));
$subTitleIcon = 'fa-plus'; $subTitleIcon = 'fa-plus';
/** @var array|null $optionalFields */
/** @var null|array $optionalFields */
$optionalFields = Preferences::get('transaction_journal_optional_fields', [])->data; $optionalFields = Preferences::get('transaction_journal_optional_fields', [])->data;
$allowedOpposingTypes = config('firefly.allowed_opposing_types'); $allowedOpposingTypes = config('firefly.allowed_opposing_types');
$accountToTypes = config('firefly.account_to_transaction'); $accountToTypes = config('firefly.account_to_transaction');

2
app/Repositories/Category/CategoryRepository.php
View File

@@ -364,7 +364,7 @@ class CategoryRepository implements CategoryRepositoryInterface, UserGroupInterf
Log::debug(sprintf('periodCollection(#%d, %s, %s)', $category->id, $start->format('Y-m-d'), $end->format('Y-m-d'))); Log::debug(sprintf('periodCollection(#%d, %s, %s)', $category->id, $start->format('Y-m-d'), $end->format('Y-m-d')));
return $category->transactionJournals() return $category->transactionJournals()
->leftJoin('transactions','transactions.transaction_journal_id', '=', 'transaction_journals.id') ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id') ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
->leftJoin('transaction_currencies', 'transaction_currencies.id', '=', 'transactions.transaction_currency_id') ->leftJoin('transaction_currencies', 'transaction_currencies.id', '=', 'transactions.transaction_currency_id')
->leftJoin('transaction_currencies as foreign_currencies', 'foreign_currencies.id', '=', 'transactions.foreign_currency_id') ->leftJoin('transaction_currencies as foreign_currencies', 'foreign_currencies.id', '=', 'transactions.foreign_currency_id')

2
app/Repositories/Category/OperationsRepository.php
View File

@@ -510,7 +510,7 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
$summarizer->setConvertToPrimary($convertToPrimary); $summarizer->setConvertToPrimary($convertToPrimary);
// filter $journals by range AND currency if it is present. // filter $journals by range AND currency if it is present.
$expenses = array_filter($expenses, static fn(array $expense): bool => $expense['category_id'] === $category->id); $expenses = array_filter($expenses, static fn (array $expense): bool => $expense['category_id'] === $category->id);
return $summarizer->groupByCurrencyId($expenses, $method, false); return $summarizer->groupByCurrencyId($expenses, $method, false);
} }

2
app/Repositories/Tag/TagRepository.php
View File

@@ -387,7 +387,7 @@ class TagRepository implements TagRepositoryInterface, UserGroupInterface
Log::debug(sprintf('periodCollection(#%d, %s, %s)', $tag->id, $start->format('Y-m-d'), $end->format('Y-m-d'))); Log::debug(sprintf('periodCollection(#%d, %s, %s)', $tag->id, $start->format('Y-m-d'), $end->format('Y-m-d')));
return $tag->transactionJournals() return $tag->transactionJournals()
->leftJoin('transactions','transactions.transaction_journal_id', '=', 'transaction_journals.id') ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id') ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
->leftJoin('transaction_currencies', 'transaction_currencies.id', '=', 'transactions.transaction_currency_id') ->leftJoin('transaction_currencies', 'transaction_currencies.id', '=', 'transactions.transaction_currency_id')
->leftJoin('transaction_currencies as foreign_currencies', 'foreign_currencies.id', '=', 'transactions.foreign_currency_id') ->leftJoin('transaction_currencies as foreign_currencies', 'foreign_currencies.id', '=', 'transactions.foreign_currency_id')

1
app/Repositories/Tag/TagRepositoryInterface.php
View File

@@ -50,6 +50,7 @@ interface TagRepositoryInterface
* This method destroys a tag. * This method destroys a tag.
*/ */
public function destroy(Tag $tag): bool; public function destroy(Tag $tag): bool;
public function periodCollection(Tag $tag, Carbon $start, Carbon $end): array; public function periodCollection(Tag $tag, Carbon $start, Carbon $end): array;
/** /**

2
app/Support/Debug/Timer.php
View File

@@ -38,7 +38,7 @@ class Timer
public static function getInstance(): self public static function getInstance(): self
{ {
if (!self::$instance instanceof \FireflyIII\Support\Debug\Timer) { if (!self::$instance instanceof self) {
self::$instance = new self(); self::$instance = new self();
} }

1
app/Support/Http/Controllers/PeriodOverview.php
View File

@@ -287,7 +287,6 @@ trait PeriodOverview
return $entries; return $entries;
} }
protected function getSingleAccountPeriod(Account $account, string $period, Carbon $start, Carbon $end): array protected function getSingleAccountPeriod(Account $account, string $period, Carbon $start, Carbon $end): array
{ {
Log::debug(sprintf('Now in getSingleAccountPeriod(#%d, %s %s)', $account->id, $start->format('Y-m-d'), $end->format('Y-m-d'))); Log::debug(sprintf('Now in getSingleAccountPeriod(#%d, %s %s)', $account->id, $start->format('Y-m-d'), $end->format('Y-m-d')));

2
app/Support/Singleton/PreferencesSingleton.php
View File

@@ -38,7 +38,7 @@ class PreferencesSingleton
public static function getInstance(): self public static function getInstance(): self
{ {
if (!self::$instance instanceof PreferencesSingleton) { if (!self::$instance instanceof self) {
self::$instance = new self(); self::$instance = new self();
} }

4
config/firefly.php
View File

@@ -78,8 +78,8 @@ return [
'running_balance_column' => env('USE_RUNNING_BALANCE', false), 'running_balance_column' => env('USE_RUNNING_BALANCE', false),
// see cer.php for exchange rates feature flag. // see cer.php for exchange rates feature flag.
], ],
'version' => 'develop/2025-09-26', 'version' => 'develop/2025-09-27',
'build_time' => 1758914637, 'build_time' => 1758945787,
'api_version' => '2.1.0', // field is no longer used. 'api_version' => '2.1.0', // field is no longer used.
'db_version' => 27, 'db_version' => 27,