kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-12 01:42:32 +00:00
Code Issues Projects Releases Wiki Activity

🤖 Auto commit for release 'develop' on 2025-10-05

Browse Source
This commit is contained in:
JC5
2025-10-05 13:03:51 +02:00
parent 50279d623c
commit b0033cf9ed
180 changed files with 285 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Support/Binder/CLIToken.php
View File

@@ -35,7 +35,6 @@ class CLIToken implements BinderInterface
{
/**
* @return mixed
*
*/
public static function routeBinder(string $value, Route $route)
{

1
app/Support/CacheProperties.php
View File

@@ -27,6 +27,7 @@ use Carbon\Carbon;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Cache;
use JsonException;
use function Safe\json_encode;
/**

2
app/Support/Export/ExportDataGenerator.php
View File

@@ -107,7 +107,6 @@ class ExportDataGenerator
}
/**
* @return array
* @throws CannotInsertRecord
* @throws ContainerExceptionInterface
* @throws Exception
@@ -754,7 +753,6 @@ class ExportDataGenerator
}
/**
* @return string
* @throws CannotInsertRecord
* @throws Exception
* @throws FireflyException

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

@@ -32,6 +32,7 @@ use FireflyIII\User;
use Illuminate\Support\Facades\Log;
use Laravel\Passport\Passport;
use phpseclib3\Crypt\RSA;
use function Safe\file_put_contents;
/**

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

@@ -35,6 +35,7 @@ use Illuminate\Routing\Route;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Route as RouteFacade;
use Illuminate\Support\Facades\Validator;
use function Safe\parse_url;
/**

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

@@ -42,13 +42,13 @@ class BudgetLimitEnrichment implements EnrichmentInterface
{
private Collection $collection;
private bool $convertToPrimary; // @phpstan-ignore-line
private array $currencies = [];
private array $currencyIds = [];
private array $currencies = [];
private array $currencyIds = [];
private Carbon $end;
private array $expenses = [];
private array $ids = [];
private array $notes = [];
private array $pcExpenses = [];
private array $expenses = [];
private array $ids = [];
private array $notes = [];
private array $pcExpenses = [];
private readonly TransactionCurrency $primaryCurrency;
private Carbon $start;
private User $user;

2
app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php
View File

@@ -159,7 +159,7 @@ class PiggyBankEnrichment implements EnrichmentInterface
// get suggested per month.
$meta['save_per_month'] = Steam::bcround($this->getSuggestedMonthlyAmount($this->date, $item->target_date, $meta['target_amount'], $meta['current_amount']), $currency->decimal_places);
if(null !== $meta['pc_current_amount']) {
if (null !== $meta['pc_current_amount']) {
$meta['pc_save_per_month'] = Steam::bcround($this->getSuggestedMonthlyAmount($this->date, $item->target_date, $meta['pc_target_amount'], $meta['pc_current_amount']), $currency->decimal_places);
}

3
app/Support/JsonApi/Enrichments/RecurringEnrichment.php
View File

@@ -51,6 +51,7 @@ use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Arr;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Log;
use function Safe\json_decode;
class RecurringEnrichment implements EnrichmentInterface
@@ -60,7 +61,7 @@ class RecurringEnrichment implements EnrichmentInterface
// private array $transactionTypeIds = [];
// private array $transactionTypes = [];
private bool $convertToPrimary;
private array $currencies = [];
private array $currencies = [];
private array $currencyIds = [];
private array $destinationAccountIds = [];
private array $foreignCurrencyIds = [];

26
app/Support/Navigation.php
View File

@@ -413,20 +413,20 @@ class Navigation
{
$date = clone $theDate;
$formatMap = [
'1D' => (string)trans('config.specific_day_js'),
'daily' => (string)trans('config.specific_day_js'),
'custom' => (string)trans('config.specific_day_js'),
'1W' => (string)trans('config.week_in_year_js'),
'week' => (string)trans('config.week_in_year_js'),
'weekly' => (string)trans('config.week_in_year_js'),
'1M' => (string)trans('config.month_js'),
'month' => (string)trans('config.month_js'),
'monthly' => (string)trans('config.month_js'),
'1Y' => (string)trans('config.year_js'),
'1D' => (string)trans('config.specific_day_js'),
'daily' => (string)trans('config.specific_day_js'),
'custom' => (string)trans('config.specific_day_js'),
'1W' => (string)trans('config.week_in_year_js'),
'week' => (string)trans('config.week_in_year_js'),
'weekly' => (string)trans('config.week_in_year_js'),
'1M' => (string)trans('config.month_js'),
'month' => (string)trans('config.month_js'),
'monthly' => (string)trans('config.month_js'),
'1Y' => (string)trans('config.year_js'),
'YTD' => (string)trans('config.year_js'),
'year' => (string)trans('config.year_js'),
'yearly' => (string)trans('config.year_js'),
'6M' => (string)trans('config.half_year_js'),
'year' => (string)trans('config.year_js'),
'yearly' => (string)trans('config.year_js'),
'6M' => (string)trans('config.half_year_js'),
];
if (array_key_exists($repeatFrequency, $formatMap)) {

5
app/Support/ParseDateString.php
View File

@@ -30,6 +30,7 @@ use Carbon\Exceptions\InvalidFormatException;
use FireflyIII\Exceptions\FireflyException;
use Illuminate\Support\Facades\Log;
use Safe\Exceptions\PcreException;
use function Safe\preg_match;
/**
@@ -72,11 +73,9 @@ class ParseDateString
}
/**
* @param string $date
*
* @return Carbon
* @throws FireflyException
* @throws PcreException
*
* @SuppressWarnings("PHPMD.NPathComplexity")
*/
public function parseDate(string $date): Carbon

2
app/Support/Preferences.php
View File

@@ -230,8 +230,6 @@ class Preferences
return $this->getForUser($user, $name, $default);
}
/**
*/
public function lastActivity(): string
{
$instance = PreferencesSingleton::getInstance();

2
app/Support/Report/Budget/BudgetReportGenerator.php
View File

@@ -131,8 +131,6 @@ class BudgetReportGenerator
$this->start = $start;
}
/**
*/
public function setUser(User $user): void
{
$this->repository->setUser($user);

1
app/Support/Request/ConvertsDataTypes.php
View File

@@ -31,6 +31,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Support\Facades\Steam;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Log;
use function Safe\preg_replace;
/**

1
app/Support/Search/AccountSearch.php
View File

@@ -28,6 +28,7 @@ use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Support\Collection;
use function Safe\json_encode;
/**

2
app/Support/Search/OperatorQuerySearch.php
View File

@@ -369,8 +369,6 @@ class OperatorQuerySearch implements SearchInterface
}
}
/**
*/
private function parseDateRange(string $type, string $value): array
{
$parser = new ParseDateString();

4
app/Support/Search/QueryParser/GdbotsQueryParser.php
View File

@@ -33,6 +33,7 @@ use Illuminate\Support\Facades\Log;
use LogicException;
use Safe\Exceptions\FilesystemException;
use TypeError;
use function Safe\fwrite;
class GdbotsQueryParser implements QueryParserInterface
@@ -45,9 +46,6 @@ class GdbotsQueryParser implements QueryParserInterface
}
/**
* @param string $query
*
* @return NodeGroup
* @throws FireflyException
* @throws FilesystemException
*/

4
app/Support/Steam.php
View File

@@ -40,6 +40,7 @@ use Illuminate\Support\Str;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use ValueError;
use function Safe\parse_url;
use function Safe\preg_replace;
@@ -534,8 +535,6 @@ class Steam
return Amount::getTransactionCurrencyById((int)$result->data);
}
/**
*/
public function getHostName(string $ipAddress): string
{
$host = '';
@@ -557,7 +556,6 @@ class Steam
/**
* Get user's language.
*
* @return string
* @throws FireflyException
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface

2
app/Support/System/OAuthKeys.php
View File

@@ -32,6 +32,7 @@ use Laravel\Passport\Console\KeysCommand;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use Safe\Exceptions\FilesystemException;
use function Safe\file_get_contents;
use function Safe\file_put_contents;
@@ -79,7 +80,6 @@ class OAuthKeys
}
/**
* @return bool
* @throws ContainerExceptionInterface
* @throws FireflyException
* @throws NotFoundExceptionInterface

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

@@ -37,6 +37,7 @@ use Override;
use Twig\Extension\AbstractExtension;
use Twig\TwigFilter;
use Twig\TwigFunction;
use function Safe\parse_url;
/**

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

@@ -34,6 +34,7 @@ use Illuminate\Support\Facades\DB;
use Override;
use Twig\Extension\AbstractExtension;
use Twig\TwigFunction;
use function Safe\json_decode;
/**