Auto commit for release 'develop' on 2024-03-18

This commit is contained in:
github-actions 2024-03-18 20:25:30 +01:00
parent db0dbcfcf1
commit 9aa90650b4
108 changed files with 528 additions and 529 deletions

View File

@ -226,16 +226,16 @@
}, },
{ {
"name": "friendsofphp/php-cs-fixer", "name": "friendsofphp/php-cs-fixer",
"version": "v3.51.0", "version": "v3.52.0",
"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": "127fa74f010da99053e3f5b62672615b72dd6efd" "reference": "a3564bd66f4bce9bc871ef18b690e2dc67a7f969"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/127fa74f010da99053e3f5b62672615b72dd6efd", "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/a3564bd66f4bce9bc871ef18b690e2dc67a7f969",
"reference": "127fa74f010da99053e3f5b62672615b72dd6efd", "reference": "a3564bd66f4bce9bc871ef18b690e2dc67a7f969",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -306,7 +306,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.51.0" "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.52.0"
}, },
"funding": [ "funding": [
{ {
@ -314,7 +314,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2024-02-28T19:50:06+00:00" "time": "2024-03-18T18:40:11+00:00"
}, },
{ {
"name": "psr/container", "name": "psr/container",

View File

@ -53,40 +53,40 @@ class ForceDecimalSize extends Command
{ {
use ShowsFriendlyMessages; use ShowsFriendlyMessages;
protected $description = 'This command resizes DECIMAL columns in MySQL or PostgreSQL and correct amounts (only MySQL).'; protected $description = 'This command resizes DECIMAL columns in MySQL or PostgreSQL and correct amounts (only MySQL).';
protected $signature = 'firefly-iii:force-decimal-size'; protected $signature = 'firefly-iii:force-decimal-size';
private string $cast; private string $cast;
private array $classes private array $classes
= [ = [
'accounts' => Account::class, 'accounts' => Account::class,
'auto_budgets' => AutoBudget::class, 'auto_budgets' => AutoBudget::class,
'available_budgets' => AvailableBudget::class, 'available_budgets' => AvailableBudget::class,
'bills' => Bill::class, 'bills' => Bill::class,
'budget_limits' => BudgetLimit::class, 'budget_limits' => BudgetLimit::class,
'piggy_bank_events' => PiggyBankEvent::class, 'piggy_bank_events' => PiggyBankEvent::class,
'piggy_bank_repetitions' => PiggyBankRepetition::class, 'piggy_bank_repetitions' => PiggyBankRepetition::class,
'piggy_banks' => PiggyBank::class, 'piggy_banks' => PiggyBank::class,
'recurrences_transactions' => RecurrenceTransaction::class, 'recurrences_transactions' => RecurrenceTransaction::class,
'transactions' => Transaction::class, 'transactions' => Transaction::class,
]; ];
private string $operator; private string $operator;
private string $regularExpression; private string $regularExpression;
private array $tables private array $tables
= [ = [
'accounts' => ['virtual_balance'], 'accounts' => ['virtual_balance'],
'auto_budgets' => ['amount'], 'auto_budgets' => ['amount'],
'available_budgets' => ['amount'], 'available_budgets' => ['amount'],
'bills' => ['amount_min', 'amount_max'], 'bills' => ['amount_min', 'amount_max'],
'budget_limits' => ['amount'], 'budget_limits' => ['amount'],
'currency_exchange_rates' => ['rate', 'user_rate'], 'currency_exchange_rates' => ['rate', 'user_rate'],
'limit_repetitions' => ['amount'], 'limit_repetitions' => ['amount'],
'piggy_bank_events' => ['amount'], 'piggy_bank_events' => ['amount'],
'piggy_bank_repetitions' => ['currentamount'], 'piggy_bank_repetitions' => ['currentamount'],
'piggy_banks' => ['targetamount'], 'piggy_banks' => ['targetamount'],
'recurrences_transactions' => ['amount', 'foreign_amount'], 'recurrences_transactions' => ['amount', 'foreign_amount'],
'transactions' => ['amount', 'foreign_amount'], 'transactions' => ['amount', 'foreign_amount'],
]; ];
/** /**
* Execute the console command. * Execute the console command.

View File

@ -75,7 +75,7 @@ class ReconcileController extends Controller
* *
* @throws FireflyException * @throws FireflyException
* */ * */
public function reconcile(Account $account, Carbon $start = null, Carbon $end = null) public function reconcile(Account $account, ?Carbon $start = null, ?Carbon $end = null)
{ {
if (!$this->isEditableAccount($account)) { if (!$this->isEditableAccount($account)) {
return $this->redirectAccountToAccount($account); return $this->redirectAccountToAccount($account);

View File

@ -75,7 +75,7 @@ class ShowController extends Controller
* *
* @throws FireflyException * @throws FireflyException
* */ * */
public function show(Request $request, Account $account, Carbon $start = null, Carbon $end = null) public function show(Request $request, Account $account, ?Carbon $start = null, ?Carbon $end = null)
{ {
$objectType = config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type)); $objectType = config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type));

View File

@ -85,7 +85,7 @@ class IndexController extends Controller
* *
* @throws FireflyException * @throws FireflyException
* */ * */
public function index(Carbon $start = null, Carbon $end = null) public function index(?Carbon $start = null, ?Carbon $end = null)
{ {
$this->abRepository->cleanup(); $this->abRepository->cleanup();
app('log')->debug(sprintf('Start of IndexController::index("%s", "%s")', $start?->format('Y-m-d'), $end?->format('Y-m-d'))); app('log')->debug(sprintf('Start of IndexController::index("%s", "%s")', $start?->format('Y-m-d'), $end?->format('Y-m-d')));

View File

@ -75,7 +75,7 @@ class ShowController extends Controller
* *
* @throws FireflyException * @throws FireflyException
*/ */
public function noBudget(Request $request, Carbon $start = null, Carbon $end = null) public function noBudget(Request $request, ?Carbon $start = null, ?Carbon $end = null)
{ {
// @var Carbon $start // @var Carbon $start
$start ??= session('start'); $start ??= session('start');

View File

@ -70,7 +70,7 @@ class NoCategoryController extends Controller
* *
* @throws FireflyException * @throws FireflyException
*/ */
public function show(Request $request, Carbon $start = null, Carbon $end = null) public function show(Request $request, ?Carbon $start = null, ?Carbon $end = null)
{ {
app('log')->debug('Start of noCategory()'); app('log')->debug('Start of noCategory()');
// @var Carbon $start // @var Carbon $start

View File

@ -71,7 +71,7 @@ class ShowController extends Controller
* *
* @throws FireflyException * @throws FireflyException
*/ */
public function show(Request $request, Category $category, Carbon $start = null, Carbon $end = null) public function show(Request $request, Category $category, ?Carbon $start = null, ?Carbon $end = null)
{ {
// @var Carbon $start // @var Carbon $start
$start ??= session('start', today(config('app.timezone'))->startOfMonth()); $start ??= session('start', today(config('app.timezone'))->startOfMonth());

View File

@ -38,7 +38,7 @@ class IntroController extends Controller
/** /**
* Returns the introduction wizard for a page. * Returns the introduction wizard for a page.
*/ */
public function getIntroSteps(string $route, string $specificPage = null): JsonResponse public function getIntroSteps(string $route, ?string $specificPage = null): JsonResponse
{ {
app('log')->debug(sprintf('getIntroSteps for route "%s" and page "%s"', $route, $specificPage)); app('log')->debug(sprintf('getIntroSteps for route "%s" and page "%s"', $route, $specificPage));
$specificPage ??= ''; $specificPage ??= '';
@ -91,7 +91,7 @@ class IntroController extends Controller
* *
* @throws FireflyException * @throws FireflyException
*/ */
public function postEnable(string $route, string $specialPage = null): JsonResponse public function postEnable(string $route, ?string $specialPage = null): JsonResponse
{ {
$specialPage ??= ''; $specialPage ??= '';
$route = str_replace('.', '_', $route); $route = str_replace('.', '_', $route);
@ -111,7 +111,7 @@ class IntroController extends Controller
* *
* @throws FireflyException * @throws FireflyException
*/ */
public function postFinished(string $route, string $specialPage = null): JsonResponse public function postFinished(string $route, ?string $specialPage = null): JsonResponse
{ {
$specialPage ??= ''; $specialPage ??= '';
$key = 'shown_demo_'.$route; $key = 'shown_demo_'.$route;

View File

@ -67,7 +67,7 @@ class ReconcileController extends Controller
* *
* @throws FireflyException * @throws FireflyException
*/ */
public function overview(Request $request, Account $account = null, Carbon $start = null, Carbon $end = null): JsonResponse public function overview(Request $request, ?Account $account = null, ?Carbon $start = null, ?Carbon $end = null): JsonResponse
{ {
$startBalance = $request->get('startBalance'); $startBalance = $request->get('startBalance');
$endBalance = $request->get('endBalance'); $endBalance = $request->get('endBalance');
@ -177,7 +177,7 @@ class ReconcileController extends Controller
* *
* @throws FireflyException * @throws FireflyException
*/ */
public function transactions(Account $account, Carbon $start = null, Carbon $end = null) public function transactions(Account $account, ?Carbon $start = null, ?Carbon $end = null)
{ {
if (null === $start || null === $end) { if (null === $start || null === $end) {
throw new FireflyException('Invalid dates submitted.'); throw new FireflyException('Invalid dates submitted.');

View File

@ -76,7 +76,7 @@ class CreateController extends Controller
* *
* @throws FireflyException * @throws FireflyException
*/ */
public function create(Request $request, RuleGroup $ruleGroup = null) public function create(Request $request, ?RuleGroup $ruleGroup = null)
{ {
$this->createDefaultRuleGroup(); $this->createDefaultRuleGroup();
$preFilled = [ $preFilled = [

View File

@ -215,7 +215,7 @@ class TagController extends Controller
* *
* @throws FireflyException * @throws FireflyException
*/ */
public function show(Request $request, Tag $tag, Carbon $start = null, Carbon $end = null) public function show(Request $request, Tag $tag, ?Carbon $start = null, ?Carbon $end = null)
{ {
// default values: // default values:
$subTitleIcon = 'fa-tag'; $subTitleIcon = 'fa-tag';

View File

@ -69,7 +69,7 @@ class IndexController extends Controller
* *
* @throws FireflyException * @throws FireflyException
*/ */
public function index(Request $request, string $objectType, Carbon $start = null, Carbon $end = null) public function index(Request $request, string $objectType, ?Carbon $start = null, ?Carbon $end = null)
{ {
if ('transfers' === $objectType) { if ('transfers' === $objectType) {
$objectType = 'transfer'; $objectType = 'transfer';

View File

@ -34,10 +34,10 @@ class TrustProxies extends Middleware
// After... // After...
protected $headers protected $headers
= Request::HEADER_X_FORWARDED_FOR | = Request::HEADER_X_FORWARDED_FOR |
Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_HOST |
Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PORT |
Request::HEADER_X_FORWARDED_PROTO | Request::HEADER_X_FORWARDED_PROTO |
Request::HEADER_X_FORWARDED_AWS_ELB; Request::HEADER_X_FORWARDED_AWS_ELB;
/** /**
* TrustProxies constructor. * TrustProxies constructor.

View File

@ -122,13 +122,13 @@ class Account extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'user_id' => 'integer', 'user_id' => 'integer',
'deleted_at' => 'datetime', 'deleted_at' => 'datetime',
'active' => 'boolean', 'active' => 'boolean',
'encrypted' => 'boolean', 'encrypted' => 'boolean',
]; ];
protected $fillable = ['user_id', 'user_group_id', 'account_type_id', 'name', 'active', 'virtual_balance', 'iban']; protected $fillable = ['user_id', 'user_group_id', 'account_type_id', 'name', 'active', 'virtual_balance', 'iban'];

View File

@ -59,9 +59,9 @@ class AccountMeta extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
]; ];
protected $fillable = ['account_id', 'name', 'data']; protected $fillable = ['account_id', 'name', 'data'];

View File

@ -72,9 +72,9 @@ class AccountType extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
]; ];
protected $fillable = ['type']; protected $fillable = ['type'];

View File

@ -97,11 +97,11 @@ class Attachment extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'deleted_at' => 'datetime', 'deleted_at' => 'datetime',
'uploaded' => 'boolean', 'uploaded' => 'boolean',
]; ];
protected $fillable = ['attachable_id', 'attachable_type', 'user_id', 'md5', 'filename', 'mime', 'title', 'description', 'size', 'uploaded']; protected $fillable = ['attachable_id', 'attachable_type', 'user_id', 'md5', 'filename', 'mime', 'title', 'description', 'size', 'uploaded'];

View File

@ -80,13 +80,13 @@ class AvailableBudget extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'deleted_at' => 'datetime', 'deleted_at' => 'datetime',
'start_date' => 'date', 'start_date' => 'date',
'end_date' => 'date', 'end_date' => 'date',
'transaction_currency_id' => 'int', 'transaction_currency_id' => 'int',
]; ];
protected $fillable = ['user_id', 'user_group_id', 'transaction_currency_id', 'amount', 'start_date', 'end_date']; protected $fillable = ['user_id', 'user_group_id', 'transaction_currency_id', 'amount', 'start_date', 'end_date'];

View File

@ -114,36 +114,36 @@ class Bill extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'deleted_at' => 'datetime', 'deleted_at' => 'datetime',
'date' => 'date', 'date' => 'date',
'end_date' => 'date', 'end_date' => 'date',
'extension_date' => 'date', 'extension_date' => 'date',
'skip' => 'int', 'skip' => 'int',
'automatch' => 'boolean', 'automatch' => 'boolean',
'active' => 'boolean', 'active' => 'boolean',
'name_encrypted' => 'boolean', 'name_encrypted' => 'boolean',
'match_encrypted' => 'boolean', 'match_encrypted' => 'boolean',
]; ];
protected $fillable protected $fillable
= [ = [
'name', 'name',
'match', 'match',
'amount_min', 'amount_min',
'user_id', 'user_id',
'user_group_id', 'user_group_id',
'amount_max', 'amount_max',
'date', 'date',
'repeat_freq', 'repeat_freq',
'skip', 'skip',
'automatch', 'automatch',
'active', 'active',
'transaction_currency_id', 'transaction_currency_id',
'end_date', 'end_date',
'extension_date', 'extension_date',
]; ];
protected $hidden = ['amount_min_encrypted', 'amount_max_encrypted', 'name_encrypted', 'match_encrypted']; protected $hidden = ['amount_min_encrypted', 'amount_max_encrypted', 'name_encrypted', 'match_encrypted'];

View File

@ -97,12 +97,12 @@ class Budget extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'deleted_at' => 'datetime', 'deleted_at' => 'datetime',
'active' => 'boolean', 'active' => 'boolean',
'encrypted' => 'boolean', 'encrypted' => 'boolean',
]; ];
protected $fillable = ['user_id', 'name', 'active', 'order', 'user_group_id']; protected $fillable = ['user_id', 'name', 'active', 'order', 'user_group_id'];

View File

@ -74,18 +74,18 @@ class BudgetLimit extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'start_date' => 'date', 'start_date' => 'date',
'end_date' => 'date', 'end_date' => 'date',
'auto_budget' => 'boolean', 'auto_budget' => 'boolean',
]; ];
protected $dispatchesEvents protected $dispatchesEvents
= [ = [
'created' => Created::class, 'created' => Created::class,
'updated' => Updated::class, 'updated' => Updated::class,
'deleted' => Deleted::class, 'deleted' => Deleted::class,
]; ];
protected $fillable = ['budget_id', 'start_date', 'end_date', 'amount', 'transaction_currency_id']; protected $fillable = ['budget_id', 'start_date', 'end_date', 'amount', 'transaction_currency_id'];

View File

@ -86,11 +86,11 @@ class Category extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'deleted_at' => 'datetime', 'deleted_at' => 'datetime',
'encrypted' => 'boolean', 'encrypted' => 'boolean',
]; ];
protected $fillable = ['user_id', 'user_group_id', 'name']; protected $fillable = ['user_id', 'user_group_id', 'name'];

View File

@ -62,10 +62,10 @@ class Configuration extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'deleted_at' => 'datetime', 'deleted_at' => 'datetime',
]; ];
/** @var string The table to store the data in */ /** @var string The table to store the data in */
protected $table = 'configuration'; protected $table = 'configuration';

View File

@ -82,13 +82,13 @@ class CurrencyExchangeRate extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'user_id' => 'int', 'user_id' => 'int',
'from_currency_id' => 'int', 'from_currency_id' => 'int',
'to_currency_id' => 'int', 'to_currency_id' => 'int',
'date' => 'datetime', 'date' => 'datetime',
]; ];
protected $fillable = ['user_id', 'from_currency_id', 'to_currency_id', 'date', 'rate']; protected $fillable = ['user_id', 'from_currency_id', 'to_currency_id', 'date', 'rate'];
public function fromCurrency(): BelongsTo public function fromCurrency(): BelongsTo

View File

@ -70,9 +70,9 @@ class InvitedUser extends Model
protected $casts protected $casts
= [ = [
'expires' => 'datetime', 'expires' => 'datetime',
'redeemed' => 'boolean', 'redeemed' => 'boolean',
]; ];
protected $fillable = ['user_id', 'email', 'invite_code', 'expires', 'redeemed']; protected $fillable = ['user_id', 'email', 'invite_code', 'expires', 'redeemed'];
/** /**

View File

@ -72,11 +72,11 @@ class LinkType extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'deleted_at' => 'datetime', 'deleted_at' => 'datetime',
'editable' => 'boolean', 'editable' => 'boolean',
]; ];
protected $fillable = ['name', 'inward', 'outward', 'editable']; protected $fillable = ['name', 'inward', 'outward', 'editable'];

View File

@ -74,13 +74,13 @@ class Location extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'deleted_at' => 'datetime', 'deleted_at' => 'datetime',
'zoomLevel' => 'int', 'zoomLevel' => 'int',
'latitude' => 'float', 'latitude' => 'float',
'longitude' => 'float', 'longitude' => 'float',
]; ];
protected $fillable = ['locatable_id', 'locatable_type', 'latitude', 'longitude', 'zoom_level']; protected $fillable = ['locatable_id', 'locatable_type', 'latitude', 'longitude', 'zoom_level'];

View File

@ -69,10 +69,10 @@ class Note extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'deleted_at' => 'datetime', 'deleted_at' => 'datetime',
]; ];
protected $fillable = ['title', 'text', 'noteable_id', 'noteable_type']; protected $fillable = ['title', 'text', 'noteable_id', 'noteable_type'];

View File

@ -79,11 +79,11 @@ class ObjectGroup extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'user_id' => 'integer', 'user_id' => 'integer',
'deleted_at' => 'datetime', 'deleted_at' => 'datetime',
]; ];
protected $fillable = ['title', 'order', 'user_id', 'user_group_id']; protected $fillable = ['title', 'order', 'user_id', 'user_group_id'];
/** /**

View File

@ -92,15 +92,15 @@ class PiggyBank extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'deleted_at' => 'datetime', 'deleted_at' => 'datetime',
'startdate' => 'date', 'startdate' => 'date',
'targetdate' => 'date', 'targetdate' => 'date',
'order' => 'int', 'order' => 'int',
'active' => 'boolean', 'active' => 'boolean',
'encrypted' => 'boolean', 'encrypted' => 'boolean',
]; ];
protected $fillable = ['name', 'account_id', 'order', 'targetamount', 'startdate', 'targetdate', 'active']; protected $fillable = ['name', 'account_id', 'order', 'targetamount', 'startdate', 'targetdate', 'active'];

View File

@ -63,10 +63,10 @@ class PiggyBankEvent extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'date' => 'date', 'date' => 'date',
]; ];
protected $fillable = ['piggy_bank_id', 'transaction_journal_id', 'date', 'amount']; protected $fillable = ['piggy_bank_id', 'transaction_journal_id', 'date', 'amount'];

View File

@ -64,11 +64,11 @@ class PiggyBankRepetition extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'startdate' => 'date', 'startdate' => 'date',
'targetdate' => 'date', 'targetdate' => 'date',
]; ];
protected $fillable = ['piggy_bank_id', 'startdate', 'targetdate', 'currentamount']; protected $fillable = ['piggy_bank_id', 'startdate', 'targetdate', 'currentamount'];

View File

@ -63,10 +63,10 @@ class Preference extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'data' => 'array', 'data' => 'array',
]; ];
protected $fillable = ['user_id', 'data', 'name']; protected $fillable = ['user_id', 'data', 'name'];

View File

@ -104,19 +104,19 @@ class Recurrence extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'deleted_at' => 'datetime', 'deleted_at' => 'datetime',
'title' => 'string', 'title' => 'string',
'id' => 'int', 'id' => 'int',
'description' => 'string', 'description' => 'string',
'first_date' => 'date', 'first_date' => 'date',
'repeat_until' => 'date', 'repeat_until' => 'date',
'latest_date' => 'date', 'latest_date' => 'date',
'repetitions' => 'int', 'repetitions' => 'int',
'active' => 'bool', 'active' => 'bool',
'apply_rules' => 'bool', 'apply_rules' => 'bool',
]; ];
protected $fillable protected $fillable
= ['user_id', 'transaction_type_id', 'title', 'description', 'first_date', 'repeat_until', 'latest_date', 'repetitions', 'apply_rules', 'active']; = ['user_id', 'transaction_type_id', 'title', 'description', 'first_date', 'repeat_until', 'latest_date', 'repetitions', 'apply_rules', 'active'];

View File

@ -67,12 +67,12 @@ class RecurrenceMeta extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'deleted_at' => 'datetime', 'deleted_at' => 'datetime',
'name' => 'string', 'name' => 'string',
'value' => 'string', 'value' => 'string',
]; ];
protected $fillable = ['recurrence_id', 'name', 'value']; protected $fillable = ['recurrence_id', 'name', 'value'];

View File

@ -76,14 +76,14 @@ class RecurrenceRepetition extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'deleted_at' => 'datetime', 'deleted_at' => 'datetime',
'repetition_type' => 'string', 'repetition_type' => 'string',
'repetition_moment' => 'string', 'repetition_moment' => 'string',
'repetition_skip' => 'int', 'repetition_skip' => 'int',
'weekend' => 'int', 'weekend' => 'int',
]; ];
protected $fillable = ['recurrence_id', 'weekend', 'repetition_type', 'repetition_moment', 'repetition_skip']; protected $fillable = ['recurrence_id', 'weekend', 'repetition_type', 'repetition_moment', 'repetition_skip'];

View File

@ -91,25 +91,25 @@ class RecurrenceTransaction extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'deleted_at' => 'datetime', 'deleted_at' => 'datetime',
'amount' => 'string', 'amount' => 'string',
'foreign_amount' => 'string', 'foreign_amount' => 'string',
'description' => 'string', 'description' => 'string',
]; ];
protected $fillable protected $fillable
= [ = [
'recurrence_id', 'recurrence_id',
'transaction_currency_id', 'transaction_currency_id',
'foreign_currency_id', 'foreign_currency_id',
'source_id', 'source_id',
'destination_id', 'destination_id',
'amount', 'amount',
'foreign_amount', 'foreign_amount',
'description', 'description',
]; ];
/** @var string The table to store the data in */ /** @var string The table to store the data in */
protected $table = 'recurrences_transactions'; protected $table = 'recurrences_transactions';

View File

@ -67,12 +67,12 @@ class RecurrenceTransactionMeta extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'deleted_at' => 'datetime', 'deleted_at' => 'datetime',
'name' => 'string', 'name' => 'string',
'value' => 'string', 'value' => 'string',
]; ];
protected $fillable = ['rt_id', 'name', 'value']; protected $fillable = ['rt_id', 'name', 'value'];

View File

@ -62,9 +62,9 @@ class Role extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
]; ];
protected $fillable = ['name', 'display_name', 'description']; protected $fillable = ['name', 'display_name', 'description'];

View File

@ -95,15 +95,15 @@ class Rule extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'deleted_at' => 'datetime', 'deleted_at' => 'datetime',
'active' => 'boolean', 'active' => 'boolean',
'order' => 'int', 'order' => 'int',
'stop_processing' => 'boolean', 'stop_processing' => 'boolean',
'id' => 'int', 'id' => 'int',
'strict' => 'boolean', 'strict' => 'boolean',
]; ];
protected $fillable = ['rule_group_id', 'order', 'active', 'title', 'description', 'user_id', 'strict']; protected $fillable = ['rule_group_id', 'order', 'active', 'title', 'description', 'user_id', 'strict'];

View File

@ -69,12 +69,12 @@ class RuleAction extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'active' => 'boolean', 'active' => 'boolean',
'order' => 'int', 'order' => 'int',
'stop_processing' => 'boolean', 'stop_processing' => 'boolean',
]; ];
protected $fillable = ['rule_id', 'action_type', 'action_value', 'order', 'active', 'stop_processing']; protected $fillable = ['rule_id', 'action_type', 'action_value', 'order', 'active', 'stop_processing'];

View File

@ -85,13 +85,13 @@ class RuleGroup extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'deleted_at' => 'datetime', 'deleted_at' => 'datetime',
'active' => 'boolean', 'active' => 'boolean',
'stop_processing' => 'boolean', 'stop_processing' => 'boolean',
'order' => 'int', 'order' => 'int',
]; ];
protected $fillable = ['user_id', 'user_group_id', 'stop_processing', 'order', 'title', 'description', 'active']; protected $fillable = ['user_id', 'user_group_id', 'stop_processing', 'order', 'title', 'description', 'active'];

View File

@ -66,12 +66,12 @@ class RuleTrigger extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'active' => 'boolean', 'active' => 'boolean',
'order' => 'int', 'order' => 'int',
'stop_processing' => 'boolean', 'stop_processing' => 'boolean',
]; ];
protected $fillable = ['rule_id', 'trigger_type', 'trigger_value', 'order', 'active', 'stop_processing']; protected $fillable = ['rule_id', 'trigger_type', 'trigger_value', 'order', 'active', 'stop_processing'];

View File

@ -93,14 +93,14 @@ class Tag extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'deleted_at' => 'datetime', 'deleted_at' => 'datetime',
'date' => 'date', 'date' => 'date',
'zoomLevel' => 'int', 'zoomLevel' => 'int',
'latitude' => 'float', 'latitude' => 'float',
'longitude' => 'float', 'longitude' => 'float',
]; ];
protected $fillable = ['user_id', 'user_group_id', 'tag', 'date', 'description', 'tagMode']; protected $fillable = ['user_id', 'user_group_id', 'tag', 'date', 'description', 'tagMode'];

View File

@ -99,28 +99,28 @@ class Transaction extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'deleted_at' => 'datetime', 'deleted_at' => 'datetime',
'identifier' => 'int', 'identifier' => 'int',
'encrypted' => 'boolean', // model does not have these fields though 'encrypted' => 'boolean', // model does not have these fields though
'bill_name_encrypted' => 'boolean', 'bill_name_encrypted' => 'boolean',
'reconciled' => 'boolean', 'reconciled' => 'boolean',
'date' => 'datetime', 'date' => 'datetime',
]; ];
protected $fillable protected $fillable
= [ = [
'account_id', 'account_id',
'transaction_journal_id', 'transaction_journal_id',
'description', 'description',
'amount', 'amount',
'identifier', 'identifier',
'transaction_currency_id', 'transaction_currency_id',
'foreign_currency_id', 'foreign_currency_id',
'foreign_amount', 'foreign_amount',
'reconciled', 'reconciled',
]; ];
protected $hidden = ['encrypted']; protected $hidden = ['encrypted'];

View File

@ -89,12 +89,12 @@ class TransactionCurrency extends Model
public ?bool $userGroupEnabled; public ?bool $userGroupEnabled;
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'deleted_at' => 'datetime', 'deleted_at' => 'datetime',
'decimal_places' => 'int', 'decimal_places' => 'int',
'enabled' => 'bool', 'enabled' => 'bool',
]; ];
protected $fillable = ['name', 'code', 'symbol', 'decimal_places', 'enabled']; protected $fillable = ['name', 'code', 'symbol', 'decimal_places', 'enabled'];

View File

@ -78,13 +78,13 @@ class TransactionGroup extends Model
protected $casts protected $casts
= [ = [
'id' => 'integer', 'id' => 'integer',
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'deleted_at' => 'datetime', 'deleted_at' => 'datetime',
'title' => 'string', 'title' => 'string',
'date' => 'datetime', 'date' => 'datetime',
]; ];
protected $fillable = ['user_id', 'user_group_id', 'title']; protected $fillable = ['user_id', 'user_group_id', 'title'];

View File

@ -138,32 +138,32 @@ class TransactionJournal extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'deleted_at' => 'datetime', 'deleted_at' => 'datetime',
'date' => 'datetime', 'date' => 'datetime',
'interest_date' => 'date', 'interest_date' => 'date',
'book_date' => 'date', 'book_date' => 'date',
'process_date' => 'date', 'process_date' => 'date',
'order' => 'int', 'order' => 'int',
'tag_count' => 'int', 'tag_count' => 'int',
'encrypted' => 'boolean', 'encrypted' => 'boolean',
'completed' => 'boolean', 'completed' => 'boolean',
]; ];
protected $fillable protected $fillable
= [ = [
'user_id', 'user_id',
'user_group_id', 'user_group_id',
'transaction_type_id', 'transaction_type_id',
'bill_id', 'bill_id',
'tag_count', 'tag_count',
'transaction_currency_id', 'transaction_currency_id',
'description', 'description',
'completed', 'completed',
'order', 'order',
'date', 'date',
]; ];
protected $hidden = ['encrypted']; protected $hidden = ['encrypted'];

View File

@ -71,9 +71,9 @@ class TransactionJournalLink extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
]; ];
/** @var string The table to store the data in */ /** @var string The table to store the data in */
protected $table = 'journal_links'; protected $table = 'journal_links';

View File

@ -69,10 +69,10 @@ class TransactionJournalMeta extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'deleted_at' => 'datetime', 'deleted_at' => 'datetime',
]; ];
protected $fillable = ['transaction_journal_id', 'name', 'data', 'hash']; protected $fillable = ['transaction_journal_id', 'name', 'data', 'hash'];

View File

@ -73,10 +73,10 @@ class TransactionType extends Model
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'deleted_at' => 'datetime', 'deleted_at' => 'datetime',
]; ];
protected $fillable = ['type']; protected $fillable = ['type'];
/** /**

View File

@ -93,11 +93,11 @@ class Webhook extends Model
protected $casts protected $casts
= [ = [
'active' => 'boolean', 'active' => 'boolean',
'trigger' => 'integer', 'trigger' => 'integer',
'response' => 'integer', 'response' => 'integer',
'delivery' => 'integer', 'delivery' => 'integer',
]; ];
protected $fillable = ['active', 'trigger', 'response', 'delivery', 'user_id', 'user_group_id', 'url', 'title', 'secret']; protected $fillable = ['active', 'trigger', 'response', 'delivery', 'user_id', 'user_group_id', 'url', 'title', 'secret'];
public static function getDeliveries(): array public static function getDeliveries(): array

View File

@ -25,7 +25,6 @@ namespace FireflyIII\Providers;
use FireflyIII\Repositories\LinkType\LinkTypeRepository; use FireflyIII\Repositories\LinkType\LinkTypeRepository;
use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface; use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
use Illuminate\Contracts\Support\DeferrableProvider;
use Illuminate\Foundation\Application; use Illuminate\Foundation\Application;
use Illuminate\Support\ServiceProvider; use Illuminate\Support\ServiceProvider;

View File

@ -122,7 +122,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
$budgetLimit->delete(); $budgetLimit->delete();
} }
public function getAllBudgetLimitsByCurrency(TransactionCurrency $currency, Carbon $start = null, Carbon $end = null): Collection public function getAllBudgetLimitsByCurrency(TransactionCurrency $currency, ?Carbon $start = null, ?Carbon $end = null): Collection
{ {
return $this->getAllBudgetLimits($start, $end)->filter( return $this->getAllBudgetLimits($start, $end)->filter(
static function (BudgetLimit $budgetLimit) use ($currency) { static function (BudgetLimit $budgetLimit) use ($currency) {
@ -131,7 +131,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
); );
} }
public function getAllBudgetLimits(Carbon $start = null, Carbon $end = null): Collection public function getAllBudgetLimits(?Carbon $start = null, ?Carbon $end = null): Collection
{ {
// both are NULL: // both are NULL:
if (null === $start && null === $end) { if (null === $start && null === $end) {
@ -198,7 +198,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
; ;
} }
public function getBudgetLimits(Budget $budget, Carbon $start = null, Carbon $end = null): Collection public function getBudgetLimits(Budget $budget, ?Carbon $start = null, ?Carbon $end = null): Collection
{ {
if (null === $end && null === $start) { if (null === $end && null === $start) {
return $budget->budgetlimits()->with(['transactionCurrency'])->orderBy('budget_limits.start_date', 'DESC')->get(['budget_limits.*']); return $budget->budgetlimits()->with(['transactionCurrency'])->orderBy('budget_limits.start_date', 'DESC')->get(['budget_limits.*']);

View File

@ -57,11 +57,11 @@ interface BudgetLimitRepositoryInterface
/** /**
* TODO this method is not multi currency aware. * TODO this method is not multi currency aware.
*/ */
public function getAllBudgetLimits(Carbon $start = null, Carbon $end = null): Collection; public function getAllBudgetLimits(?Carbon $start = null, ?Carbon $end = null): Collection;
public function getAllBudgetLimitsByCurrency(TransactionCurrency $currency, Carbon $start = null, Carbon $end = null): Collection; public function getAllBudgetLimitsByCurrency(TransactionCurrency $currency, ?Carbon $start = null, ?Carbon $end = null): Collection;
public function getBudgetLimits(Budget $budget, Carbon $start = null, Carbon $end = null): Collection; public function getBudgetLimits(Budget $budget, ?Carbon $start = null, ?Carbon $end = null): Collection;
public function setUser(null|Authenticatable|User $user): void; public function setUser(null|Authenticatable|User $user): void;

View File

@ -438,7 +438,7 @@ class BudgetRepository implements BudgetRepositoryInterface
* *
* @param null|int $budgetId |null * @param null|int $budgetId |null
*/ */
public function find(int $budgetId = null): ?Budget public function find(?int $budgetId = null): ?Budget
{ {
return $this->user->budgets()->find($budgetId); return $this->user->budgets()->find($budgetId);
} }

View File

@ -61,7 +61,7 @@ interface BudgetRepositoryInterface
public function destroyAutoBudget(Budget $budget): void; public function destroyAutoBudget(Budget $budget): void;
public function find(int $budgetId = null): ?Budget; public function find(?int $budgetId = null): ?Budget;
public function findBudget(?int $budgetId, ?string $budgetName): ?Budget; public function findBudget(?int $budgetId, ?string $budgetName): ?Budget;

View File

@ -44,7 +44,7 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface
return $linkType->transactionJournalLinks()->count(); return $linkType->transactionJournalLinks()->count();
} }
public function destroy(LinkType $linkType, LinkType $moveTo = null): bool public function destroy(LinkType $linkType, ?LinkType $moveTo = null): bool
{ {
if (null !== $moveTo) { if (null !== $moveTo) {
TransactionJournalLink::where('link_type_id', $linkType->id)->update(['link_type_id' => $moveTo->id]); TransactionJournalLink::where('link_type_id', $linkType->id)->update(['link_type_id' => $moveTo->id]);
@ -113,7 +113,7 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface
/** /**
* Returns all the journal links (of a specific type). * Returns all the journal links (of a specific type).
*/ */
public function getJournalLinks(LinkType $linkType = null): Collection public function getJournalLinks(?LinkType $linkType = null): Collection
{ {
$query = TransactionJournalLink::with(['source', 'destination']) $query = TransactionJournalLink::with(['source', 'destination'])
->leftJoin('transaction_journals as source_journals', 'journal_links.source_id', '=', 'source_journals.id') ->leftJoin('transaction_journals as source_journals', 'journal_links.source_id', '=', 'source_journals.id')
@ -225,7 +225,7 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface
return LinkType::find($linkTypeId); return LinkType::find($linkTypeId);
} }
public function findByName(string $name = null): ?LinkType public function findByName(?string $name = null): ?LinkType
{ {
if (null === $name) { if (null === $name) {
return null; return null;

View File

@ -37,7 +37,7 @@ interface LinkTypeRepositoryInterface
{ {
public function countJournals(LinkType $linkType): int; public function countJournals(LinkType $linkType): int;
public function destroy(LinkType $linkType, LinkType $moveTo = null): bool; public function destroy(LinkType $linkType, ?LinkType $moveTo = null): bool;
public function destroyLink(TransactionJournalLink $link): bool; public function destroyLink(TransactionJournalLink $link): bool;
@ -46,7 +46,7 @@ interface LinkTypeRepositoryInterface
/** /**
* Find link type by name. * Find link type by name.
*/ */
public function findByName(string $name = null): ?LinkType; public function findByName(?string $name = null): ?LinkType;
/** /**
* Check if link exists between journals. * Check if link exists between journals.
@ -65,7 +65,7 @@ interface LinkTypeRepositoryInterface
*/ */
public function getJournalIds(LinkType $linkType): array; public function getJournalIds(LinkType $linkType): array;
public function getJournalLinks(LinkType $linkType = null): Collection; public function getJournalLinks(?LinkType $linkType = null): Collection;
/** /**
* Return list of existing connections. * Return list of existing connections.

View File

@ -202,7 +202,7 @@ class RecurringRepository implements RecurringRepositoryInterface
/** /**
* Returns the journals created for this recurrence, possibly limited by time. * Returns the journals created for this recurrence, possibly limited by time.
*/ */
public function getJournalCount(Recurrence $recurrence, Carbon $start = null, Carbon $end = null): int public function getJournalCount(Recurrence $recurrence, ?Carbon $start = null, ?Carbon $end = null): int
{ {
$query = TransactionJournal::leftJoin('journal_meta', 'journal_meta.transaction_journal_id', '=', 'transaction_journals.id') $query = TransactionJournal::leftJoin('journal_meta', 'journal_meta.transaction_journal_id', '=', 'transaction_journals.id')
->where('transaction_journals.user_id', $recurrence->user_id) ->where('transaction_journals.user_id', $recurrence->user_id)

View File

@ -83,7 +83,7 @@ interface RecurringRepositoryInterface
/** /**
* Returns the count of journals created for this recurrence, possibly limited by time. * Returns the count of journals created for this recurrence, possibly limited by time.
*/ */
public function getJournalCount(Recurrence $recurrence, Carbon $start = null, Carbon $end = null): int; public function getJournalCount(Recurrence $recurrence, ?Carbon $start = null, ?Carbon $end = null): int;
/** /**
* Get journal ID's for journals created by this recurring transaction. * Get journal ID's for journals created by this recurring transaction.

View File

@ -40,7 +40,7 @@ class Amount
* *
* @throws FireflyException * @throws FireflyException
*/ */
public function formatAnything(TransactionCurrency $format, string $amount, bool $coloured = null): string public function formatAnything(TransactionCurrency $format, string $amount, ?bool $coloured = null): string
{ {
return $this->formatFlat($format->symbol, $format->decimal_places, $amount, $coloured); return $this->formatFlat($format->symbol, $format->decimal_places, $amount, $coloured);
} }
@ -53,7 +53,7 @@ class Amount
* *
* @SuppressWarnings(PHPMD.MissingImport) * @SuppressWarnings(PHPMD.MissingImport)
*/ */
public function formatFlat(string $symbol, int $decimalPlaces, string $amount, bool $coloured = null): string public function formatFlat(string $symbol, int $decimalPlaces, string $amount, ?bool $coloured = null): string
{ {
$locale = app('steam')->getLocale(); $locale = app('steam')->getLocale();
$rounded = app('steam')->bcround($amount, $decimalPlaces); $rounded = app('steam')->bcround($amount, $decimalPlaces);

View File

@ -40,7 +40,7 @@ class ExpandedForm
* *
* @throws FireflyException * @throws FireflyException
*/ */
public function amountNoCurrency(string $name, $value = null, array $options = null): string public function amountNoCurrency(string $name, $value = null, ?array $options = null): string
{ {
$options ??= []; $options ??= [];
$label = $this->label($name, $options); $label = $this->label($name, $options);
@ -71,7 +71,7 @@ class ExpandedForm
* *
* @throws FireflyException * @throws FireflyException
*/ */
public function checkbox(string $name, int $value = null, $checked = null, array $options = null): string public function checkbox(string $name, ?int $value = null, $checked = null, ?array $options = null): string
{ {
$options ??= []; $options ??= [];
$value ??= 1; $value ??= 1;
@ -106,7 +106,7 @@ class ExpandedForm
* *
* @throws FireflyException * @throws FireflyException
*/ */
public function date(string $name, $value = null, array $options = null): string public function date(string $name, $value = null, ?array $options = null): string
{ {
$label = $this->label($name, $options); $label = $this->label($name, $options);
$options = $this->expandOptionArray($name, $label, $options); $options = $this->expandOptionArray($name, $label, $options);
@ -129,7 +129,7 @@ class ExpandedForm
/** /**
* @throws FireflyException * @throws FireflyException
*/ */
public function file(string $name, array $options = null): string public function file(string $name, ?array $options = null): string
{ {
$options ??= []; $options ??= [];
$label = $this->label($name, $options); $label = $this->label($name, $options);
@ -153,7 +153,7 @@ class ExpandedForm
* *
* @throws FireflyException * @throws FireflyException
*/ */
public function integer(string $name, $value = null, array $options = null): string public function integer(string $name, $value = null, ?array $options = null): string
{ {
$options ??= []; $options ??= [];
$label = $this->label($name, $options); $label = $this->label($name, $options);
@ -179,7 +179,7 @@ class ExpandedForm
* *
* @throws FireflyException * @throws FireflyException
*/ */
public function location(string $name, $value = null, array $options = null): string public function location(string $name, $value = null, ?array $options = null): string
{ {
$options ??= []; $options ??= [];
$label = $this->label($name, $options); $label = $this->label($name, $options);
@ -227,7 +227,7 @@ class ExpandedForm
* *
* @throws FireflyException * @throws FireflyException
*/ */
public function objectGroup($value = null, array $options = null): string public function objectGroup($value = null, ?array $options = null): string
{ {
$name = 'object_group'; $name = 'object_group';
$label = $this->label($name, $options); $label = $this->label($name, $options);
@ -272,7 +272,7 @@ class ExpandedForm
/** /**
* @throws FireflyException * @throws FireflyException
*/ */
public function password(string $name, array $options = null): string public function password(string $name, ?array $options = null): string
{ {
$label = $this->label($name, $options); $label = $this->label($name, $options);
$options = $this->expandOptionArray($name, $label, $options); $options = $this->expandOptionArray($name, $label, $options);
@ -297,7 +297,7 @@ class ExpandedForm
* *
* @throws FireflyException * @throws FireflyException
*/ */
public function percentage(string $name, $value = null, array $options = null): string public function percentage(string $name, $value = null, ?array $options = null): string
{ {
$label = $this->label($name, $options); $label = $this->label($name, $options);
$options = $this->expandOptionArray($name, $label, $options); $options = $this->expandOptionArray($name, $label, $options);
@ -323,7 +323,7 @@ class ExpandedForm
* *
* @throws FireflyException * @throws FireflyException
*/ */
public function staticText(string $name, $value, array $options = null): string public function staticText(string $name, $value, ?array $options = null): string
{ {
$label = $this->label($name, $options); $label = $this->label($name, $options);
$options = $this->expandOptionArray($name, $label, $options); $options = $this->expandOptionArray($name, $label, $options);
@ -346,7 +346,7 @@ class ExpandedForm
* *
* @throws FireflyException * @throws FireflyException
*/ */
public function text(string $name, $value = null, array $options = null): string public function text(string $name, $value = null, ?array $options = null): string
{ {
$label = $this->label($name, $options); $label = $this->label($name, $options);
$options = $this->expandOptionArray($name, $label, $options); $options = $this->expandOptionArray($name, $label, $options);
@ -370,7 +370,7 @@ class ExpandedForm
* *
* @throws FireflyException * @throws FireflyException
*/ */
public function textarea(string $name, $value = null, array $options = null): string public function textarea(string $name, $value = null, ?array $options = null): string
{ {
$label = $this->label($name, $options); $label = $this->label($name, $options);
$options = $this->expandOptionArray($name, $label, $options); $options = $this->expandOptionArray($name, $label, $options);

View File

@ -43,7 +43,7 @@ class AccountForm
/** /**
* Grouped dropdown list of all accounts that are valid as the destination of a withdrawal. * Grouped dropdown list of all accounts that are valid as the destination of a withdrawal.
*/ */
public function activeDepositDestinations(string $name, mixed $value = null, array $options = null): string public function activeDepositDestinations(string $name, mixed $value = null, ?array $options = null): string
{ {
$types = [AccountType::MORTGAGE, AccountType::DEBT, AccountType::CREDITCARD, AccountType::LOAN, AccountType::REVENUE]; $types = [AccountType::MORTGAGE, AccountType::DEBT, AccountType::CREDITCARD, AccountType::LOAN, AccountType::REVENUE];
$repository = $this->getAccountRepository(); $repository = $this->getAccountRepository();
@ -55,7 +55,7 @@ class AccountForm
return $this->select($name, $grouped, $value, $options); return $this->select($name, $grouped, $value, $options);
} }
private function getAccountsGrouped(array $types, AccountRepositoryInterface $repository = null): array private function getAccountsGrouped(array $types, ?AccountRepositoryInterface $repository = null): array
{ {
if (null === $repository) { if (null === $repository) {
$repository = $this->getAccountRepository(); $repository = $this->getAccountRepository();
@ -89,7 +89,7 @@ class AccountForm
/** /**
* Grouped dropdown list of all accounts that are valid as the destination of a withdrawal. * Grouped dropdown list of all accounts that are valid as the destination of a withdrawal.
*/ */
public function activeWithdrawalDestinations(string $name, mixed $value = null, array $options = null): string public function activeWithdrawalDestinations(string $name, mixed $value = null, ?array $options = null): string
{ {
$types = [AccountType::MORTGAGE, AccountType::DEBT, AccountType::CREDITCARD, AccountType::LOAN, AccountType::EXPENSE]; $types = [AccountType::MORTGAGE, AccountType::DEBT, AccountType::CREDITCARD, AccountType::LOAN, AccountType::EXPENSE];
$repository = $this->getAccountRepository(); $repository = $this->getAccountRepository();
@ -107,7 +107,7 @@ class AccountForm
* *
* @throws FireflyException * @throws FireflyException
*/ */
public function assetAccountCheckList(string $name, array $options = null): string public function assetAccountCheckList(string $name, ?array $options = null): string
{ {
$options ??= []; $options ??= [];
$label = $this->label($name, $options); $label = $this->label($name, $options);
@ -138,7 +138,7 @@ class AccountForm
* *
* @param mixed $value * @param mixed $value
*/ */
public function assetAccountList(string $name, $value = null, array $options = null): string public function assetAccountList(string $name, $value = null, ?array $options = null): string
{ {
$types = [AccountType::ASSET, AccountType::DEFAULT]; $types = [AccountType::ASSET, AccountType::DEFAULT];
$grouped = $this->getAccountsGrouped($types); $grouped = $this->getAccountsGrouped($types);
@ -151,7 +151,7 @@ class AccountForm
* *
* @param mixed $value * @param mixed $value
*/ */
public function longAccountList(string $name, $value = null, array $options = null): string public function longAccountList(string $name, $value = null, ?array $options = null): string
{ {
$types = [AccountType::ASSET, AccountType::DEFAULT, AccountType::MORTGAGE, AccountType::DEBT, AccountType::CREDITCARD, AccountType::LOAN]; $types = [AccountType::ASSET, AccountType::DEFAULT, AccountType::MORTGAGE, AccountType::DEBT, AccountType::CREDITCARD, AccountType::LOAN];
$grouped = $this->getAccountsGrouped($types); $grouped = $this->getAccountsGrouped($types);

View File

@ -42,7 +42,7 @@ class CurrencyForm
* *
* @throws FireflyException * @throws FireflyException
*/ */
public function amount(string $name, $value = null, array $options = null): string public function amount(string $name, $value = null, ?array $options = null): string
{ {
return $this->currencyField($name, 'amount', $value, $options); return $this->currencyField($name, 'amount', $value, $options);
} }
@ -50,7 +50,7 @@ class CurrencyForm
/** /**
* @throws FireflyException * @throws FireflyException
*/ */
protected function currencyField(string $name, string $view, mixed $value = null, array $options = null): string protected function currencyField(string $name, string $view, mixed $value = null, ?array $options = null): string
{ {
$label = $this->label($name, $options); $label = $this->label($name, $options);
$options = $this->expandOptionArray($name, $label, $options); $options = $this->expandOptionArray($name, $label, $options);
@ -106,7 +106,7 @@ class CurrencyForm
* *
* @throws FireflyException * @throws FireflyException
*/ */
public function balanceAll(string $name, $value = null, array $options = null): string public function balanceAll(string $name, $value = null, ?array $options = null): string
{ {
return $this->allCurrencyField($name, 'balance', $value, $options); return $this->allCurrencyField($name, 'balance', $value, $options);
} }
@ -118,7 +118,7 @@ class CurrencyForm
* *
* @throws FireflyException * @throws FireflyException
*/ */
protected function allCurrencyField(string $name, string $view, $value = null, array $options = null): string protected function allCurrencyField(string $name, string $view, $value = null, ?array $options = null): string
{ {
$label = $this->label($name, $options); $label = $this->label($name, $options);
$options = $this->expandOptionArray($name, $label, $options); $options = $this->expandOptionArray($name, $label, $options);
@ -173,7 +173,7 @@ class CurrencyForm
* *
* @param mixed $value * @param mixed $value
*/ */
public function currencyList(string $name, $value = null, array $options = null): string public function currencyList(string $name, $value = null, ?array $options = null): string
{ {
/** @var CurrencyRepositoryInterface $currencyRepos */ /** @var CurrencyRepositoryInterface $currencyRepos */
$currencyRepos = app(CurrencyRepositoryInterface::class); $currencyRepos = app(CurrencyRepositoryInterface::class);
@ -195,7 +195,7 @@ class CurrencyForm
* *
* @param mixed $value * @param mixed $value
*/ */
public function currencyListEmpty(string $name, $value = null, array $options = null): string public function currencyListEmpty(string $name, $value = null, ?array $options = null): string
{ {
/** @var CurrencyRepositoryInterface $currencyRepos */ /** @var CurrencyRepositoryInterface $currencyRepos */
$currencyRepos = app(CurrencyRepositoryInterface::class); $currencyRepos = app(CurrencyRepositoryInterface::class);

View File

@ -36,7 +36,7 @@ trait FormSupport
/** /**
* @param mixed $selected * @param mixed $selected
*/ */
public function select(string $name, array $list = null, $selected = null, array $options = null): string public function select(string $name, ?array $list = null, $selected = null, ?array $options = null): string
{ {
$list ??= []; $list ??= [];
$label = $this->label($name, $options); $label = $this->label($name, $options);
@ -55,7 +55,7 @@ trait FormSupport
return $html; return $html;
} }
protected function label(string $name, array $options = null): string protected function label(string $name, ?array $options = null): string
{ {
$options ??= []; $options ??= [];
if (array_key_exists('label', $options)) { if (array_key_exists('label', $options)) {
@ -69,7 +69,7 @@ trait FormSupport
/** /**
* @param mixed $label * @param mixed $label
*/ */
protected function expandOptionArray(string $name, $label, array $options = null): array protected function expandOptionArray(string $name, $label, ?array $options = null): array
{ {
$options ??= []; $options ??= [];
$name = str_replace('[]', '', $name); $name = str_replace('[]', '', $name);

View File

@ -40,7 +40,7 @@ class PiggyBankForm
* *
* @param mixed $value * @param mixed $value
*/ */
public function piggyBankList(string $name, $value = null, array $options = null): string public function piggyBankList(string $name, $value = null, ?array $options = null): string
{ {
// make repositories // make repositories
/** @var PiggyBankRepositoryInterface $repository */ /** @var PiggyBankRepositoryInterface $repository */

View File

@ -34,7 +34,7 @@ class RuleForm
{ {
use FormSupport; use FormSupport;
public function ruleGroupList(string $name, mixed $value = null, array $options = null): string public function ruleGroupList(string $name, mixed $value = null, ?array $options = null): string
{ {
/** @var RuleGroupRepositoryInterface $groupRepos */ /** @var RuleGroupRepositoryInterface $groupRepos */
$groupRepos = app(RuleGroupRepositoryInterface::class); $groupRepos = app(RuleGroupRepositoryInterface::class);
@ -54,7 +54,7 @@ class RuleForm
/** /**
* @param null $value * @param null $value
*/ */
public function ruleGroupListWithEmpty(string $name, $value = null, array $options = null): string public function ruleGroupListWithEmpty(string $name, $value = null, ?array $options = null): string
{ {
$options ??= []; $options ??= [];
$options['class'] = 'form-control'; $options['class'] = 'form-control';

View File

@ -38,7 +38,7 @@ class Navigation
{ {
private Calculator $calculator; private Calculator $calculator;
public function __construct(Calculator $calculator = null) public function __construct(?Calculator $calculator = null)
{ {
$this->calculator = $calculator instanceof Calculator ? $calculator : new Calculator(); $this->calculator = $calculator instanceof Calculator ? $calculator : new Calculator();
} }
@ -631,7 +631,7 @@ class Navigation
/** /**
* @throws FireflyException * @throws FireflyException
*/ */
public function subtractPeriod(Carbon $theDate, string $repeatFreq, int $subtract = null): Carbon public function subtractPeriod(Carbon $theDate, string $repeatFreq, ?int $subtract = null): Carbon
{ {
$subtract ??= 1; $subtract ??= 1;
$date = clone $theDate; $date = clone $theDate;

View File

@ -851,7 +851,7 @@ class Steam
return number_format((float)$value, 0, '.', ''); return number_format((float)$value, 0, '.', '');
} }
public function opposite(string $amount = null): ?string public function opposite(?string $amount = null): ?string
{ {
if (null === $amount) { if (null === $amount) {
return null; return null;

View File

@ -87,7 +87,7 @@ class AmountFormat extends AbstractExtension
{ {
return new TwigFunction( return new TwigFunction(
'formatAmountByAccount', 'formatAmountByAccount',
static function (AccountModel $account, string $amount, bool $coloured = null): string { static function (AccountModel $account, string $amount, ?bool $coloured = null): string {
$coloured ??= true; $coloured ??= true;
/** @var AccountRepositoryInterface $accountRepos */ /** @var AccountRepositoryInterface $accountRepos */
@ -107,7 +107,7 @@ class AmountFormat extends AbstractExtension
{ {
return new TwigFunction( return new TwigFunction(
'formatAmountBySymbol', 'formatAmountBySymbol',
static function (string $amount, string $symbol, int $decimalPlaces = null, bool $coloured = null): string { static function (string $amount, string $symbol, ?int $decimalPlaces = null, ?bool $coloured = null): string {
$decimalPlaces ??= 2; $decimalPlaces ??= 2;
$coloured ??= true; $coloured ??= true;
$currency = new TransactionCurrency(); $currency = new TransactionCurrency();
@ -127,7 +127,7 @@ class AmountFormat extends AbstractExtension
{ {
return new TwigFunction( return new TwigFunction(
'formatAmountByCurrency', 'formatAmountByCurrency',
static function (TransactionCurrency $currency, string $amount, bool $coloured = null): string { static function (TransactionCurrency $currency, string $amount, ?bool $coloured = null): string {
$coloured ??= true; $coloured ??= true;
return app('amount')->formatAnything($currency, $amount, $coloured); return app('amount')->formatAnything($currency, $amount, $coloured);

View File

@ -187,10 +187,10 @@ class User extends Authenticatable
protected $casts protected $casts
= [ = [
'created_at' => 'datetime', 'created_at' => 'datetime',
'updated_at' => 'datetime', 'updated_at' => 'datetime',
'blocked' => 'boolean', 'blocked' => 'boolean',
]; ];
protected $fillable = ['email', 'password', 'blocked', 'blocked_code']; protected $fillable = ['email', 'password', 'blocked', 'blocked_code'];
protected $hidden = ['password', 'remember_token']; protected $hidden = ['password', 'remember_token'];
protected $table = 'users'; protected $table = 'users';

View File

@ -253,7 +253,7 @@ class FireflyValidator extends Validator
return 1 === $count; return 1 === $count;
} }
public function validateRuleActionValue(string $attribute, string $value = null): bool public function validateRuleActionValue(string $attribute, ?string $value = null): bool
{ {
// first, get the index from this string: // first, get the index from this string:
$value ??= ''; $value ??= '';
@ -324,7 +324,7 @@ class FireflyValidator extends Validator
/** /**
* $attribute has the format triggers.%d.value. * $attribute has the format triggers.%d.value.
*/ */
public function validateRuleTriggerValue(string $attribute, string $value = null): bool public function validateRuleTriggerValue(string $attribute, ?string $value = null): bool
{ {
// first, get the index from this string: // first, get the index from this string:
$parts = explode('.', $attribute); $parts = explode('.', $attribute);

View File

@ -45,7 +45,7 @@ trait TransactionValidation
* *
* Inclusion of user and/or group is optional. * Inclusion of user and/or group is optional.
*/ */
public function validateAccountInformation(Validator $validator, User $user = null, UserGroup $userGroup = null): void public function validateAccountInformation(Validator $validator, ?User $user = null, ?UserGroup $userGroup = null): void
{ {
if ($validator->errors()->count() > 0) { if ($validator->errors()->count() > 0) {
return; return;

10
composer.lock generated
View File

@ -10277,16 +10277,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "1.10.62", "version": "1.10.63",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "cd5c8a1660ed3540b211407c77abf4af193a6af9" "reference": "ad12836d9ca227301f5fb9960979574ed8628339"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/cd5c8a1660ed3540b211407c77abf4af193a6af9", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ad12836d9ca227301f5fb9960979574ed8628339",
"reference": "cd5c8a1660ed3540b211407c77abf4af193a6af9", "reference": "ad12836d9ca227301f5fb9960979574ed8628339",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -10335,7 +10335,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-03-13T12:27:20+00:00" "time": "2024-03-18T16:53:53+00:00"
}, },
{ {
"name": "phpstan/phpstan-deprecation-rules", "name": "phpstan/phpstan-deprecation-rules",

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
import{f as n}from"./vendor-291d7a70.js";function e(){return{id:"",name:"",alpine_name:""}}function o(){return{description:[],amount:[],currency_code:[],foreign_amount:[],foreign_currency_code:[],source_account:[],destination_account:[],budget_id:[],category_name:[],piggy_bank_id:[],bill_id:[],tags:[],notes:[],internal_reference:[],external_url:[],latitude:[],longitude:[],zoom_level:[],date:[],interest_date:[],book_date:[],process_date:[],due_date:[],payment_date:[],invoice_date:[]}}function d(){let t=n(new Date,"yyyy-MM-dd HH:mm");return{description:"",amount:"",currency_code:"EUR",foreign_amount:"",foreign_currency_code:"",source_account:e(),destination_account:e(),budget_id:null,category_name:"",piggy_bank_id:null,bill_id:null,tags:[],notes:"",internal_reference:"",external_url:"",hasLocation:!1,latitude:null,longitude:null,zoomLevel:null,date:t,interest_date:"",book_date:"",process_date:"",due_date:"",payment_date:"",invoice_date:"",errors:o()}}export{d as c,o as d}; import{f as n}from"./vendor-029c0fc2.js";function e(){return{id:"",name:"",alpine_name:""}}function o(){return{description:[],amount:[],currency_code:[],foreign_amount:[],foreign_currency_code:[],source_account:[],destination_account:[],budget_id:[],category_name:[],piggy_bank_id:[],bill_id:[],tags:[],notes:[],internal_reference:[],external_url:[],latitude:[],longitude:[],zoom_level:[],date:[],interest_date:[],book_date:[],process_date:[],due_date:[],payment_date:[],invoice_date:[]}}function d(){let t=n(new Date,"yyyy-MM-dd HH:mm");return{description:"",amount:"",currency_code:"EUR",foreign_amount:"",foreign_currency_code:"",source_account:e(),destination_account:e(),budget_id:null,category_name:"",piggy_bank_id:null,bill_id:null,tags:[],notes:"",internal_reference:"",external_url:"",hasLocation:!1,latitude:null,longitude:null,zoomLevel:null,date:t,interest_date:"",book_date:"",process_date:"",due_date:"",payment_date:"",invoice_date:"",errors:o()}}export{d as c,o as d};

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
import{a as s}from"./format-money-5a1aa122.js";import{f as n}from"./vendor-291d7a70.js";class c{show(a,t){return s.get("/api/v2/accounts/"+a,{params:t})}index(a){return s.get("/api/v2/accounts",{params:a})}transactions(a,t){const r={page:t.page??1};return t.hasOwnProperty("start")&&(r.start=n(t.start,"y-MM-dd")),t.hasOwnProperty("end")&&(r.end=n(t.end,"y-MM-dd")),s.get("/api/v2/accounts/"+a+"/transactions",{params:r})}}export{c as G}; import{a as s}from"./format-money-89cf90df.js";import{f as n}from"./vendor-029c0fc2.js";class c{show(a,t){return s.get("/api/v2/accounts/"+a,{params:t})}index(a){return s.get("/api/v2/accounts",{params:a})}transactions(a,t){const r={page:t.page??1};return t.hasOwnProperty("start")&&(r.start=n(t.start,"y-MM-dd")),t.hasOwnProperty("end")&&(r.end=n(t.end,"y-MM-dd")),s.get("/api/v2/accounts/"+a+"/transactions",{params:r})}}export{c as G};

View File

@ -1 +1 @@
import{a as s}from"./format-money-5a1aa122.js";let t=class{list(a){return s.get("/api/v2/subscriptions",{params:a})}paid(a){return s.get("/api/v2/subscriptions/sum/paid",{params:a})}unpaid(a){return s.get("/api/v2/subscriptions/sum/unpaid",{params:a})}};class e{list(a){return s.get("/api/v2/piggy-banks",{params:a})}}export{t as G,e as a}; import{a as s}from"./format-money-89cf90df.js";let t=class{list(a){return s.get("/api/v2/subscriptions",{params:a})}paid(a){return s.get("/api/v2/subscriptions/sum/paid",{params:a})}unpaid(a){return s.get("/api/v2/subscriptions/sum/unpaid",{params:a})}};class e{list(a){return s.get("/api/v2/piggy-banks",{params:a})}}export{t as G,e as a};

View File

@ -1 +1 @@
import{a as t}from"./format-money-5a1aa122.js";class n{list(a){return t.get("/api/v2/transactions",{params:a})}infiniteList(a){return t.get("/api/v2/infinite/transactions",{params:a})}show(a,i){return t.get("/api/v2/transactions/"+a,{params:i})}}export{n as G}; import{a as t}from"./format-money-89cf90df.js";class n{list(a){return t.get("/api/v2/transactions",{params:a})}infiniteList(a){return t.get("/api/v2/infinite/transactions",{params:a})}show(a,i){return t.get("/api/v2/transactions/"+a,{params:i})}}export{n as G};

View File

@ -1 +1 @@
import{a as d,d as h,f as p}from"./format-money-5a1aa122.js";import{f as r,i as a}from"./vendor-291d7a70.js";/* empty css */import{G as m}from"./get-2d864c96.js";class f{setElement(t){console.log("GenericEditor.setElement()",t),this.element=t,this.parent=t.parentElement,this.options={}}init(){this.options.type=this.element.dataset.type,this.options.id=this.element.dataset.id,this.options.value=this.element.dataset.value,this.options.index=this.element.dataset.index,this.options.model=this.element.dataset.model,this.options.field=this.element.dataset.field,console.log("GenericEditor["+this.options.index+"].init()")}replace(){console.log("GenericEditor["+this.options.index+"].replace()"),this.options.original=this.element.parentElement.innerHTML,this.options.type==="text"&&this.replaceText()}replaceText(){console.log("GenericEditor["+this.options.index+"].replaceText()");let t=this.formStart()+this.rowStart();t+=this.columnStart("7")+this.label()+this.textField()+this.closeDiv(),t+=this.columnStart("5")+this.buttonGroup()+this.closeDiv(),t+=this.closeDiv()+this.closeForm(),this.element.parentElement.innerHTML=t}textField(){return'<input data-index="'+this.options.index+'input" autocomplete="off" type="text" class="form-control form-control-sm" id="input" name="name" value="'+this.options.value+'" placeholder="'+this.options.value+'" autofocus>'}closeDiv(){return"</div>"}closeForm(){return"</form>"}formStart(){return'<form class="form-inline">'}rowStart(){return'<div class="row">'}columnStart(t){return t===""?'<div class="col">':'<div class="col-'+t+'">'}label(){return'<label class="sr-only" for="input">Field value</label>'}buttonGroup(){return'<div class="btn-group btn-group-sm" role="group" aria-label="Options"><button data-index="'+this.options.index+'" type="button" @click="cancelInlineEdit" class="btn btn-danger"><em class="fa-solid fa-xmark text-white"></em></button><button data-index="'+this.options.index+'" type="submit" @click="submitInlineEdit" class="btn btn-success"><em class="fa-solid fa-check"></em></button></div>'}cancel(){console.log("GenericEditor["+this.options.index+"].cancel()"),console.log(this.element),console.log(this.parent),this.parent.innerHTML=this.options.original}submitInlineEdit(t){console.log("Submit?")}}class b{put(t,n){return d.put("/api/v2/accounts/"+t,n)}}const l=window.location.href.split("/"),g=l[l.length-1];let w=function(){return{notifications:{error:{show:!1,text:"",url:""},success:{show:!1,text:"",url:""},wait:{show:!1,text:""}},totalPages:1,page:1,tableColumns:{name:{enabled:!0}},editors:{},sortingColumn:"",sortDirection:"",accounts:[],sort(e){return this.sortingColumn=e,this.sortDirection=this.sortDirection==="asc"?"desc":"asc",this.loadAccounts(),!1},formatMoney(e,t){return p(e,t)},format(e){return r(e,a.t("config.date_time_fns"))},init(){this.notifications.wait.show=!0,this.notifications.wait.text=a.t("firefly.wait_loading_data"),this.loadAccounts()},submitInlineEdit(e){e.preventDefault();const n=e.currentTarget.dataset.index,i=document.querySelectorAll('[data-index="'+n+'input"]')[0].value??"";if(i==="")return;const o=this.editors[n].options.field,s={};s[o]=i,console.log(s),console.log("New value is "+i+" for account #"+this.editors[n].options.id),new b().put(this.editors[n].options.id,s)},cancelInlineEdit(e){const n=e.currentTarget.dataset.index;this.editors[n].cancel()},triggerEdit(e){const t=e.currentTarget,n=t.dataset.index;this.editors[n]=new f,this.editors[n].setElement(t),this.editors[n].init(),this.editors[n].replace()},loadAccounts(){this.notifications.wait.show=!0,this.notifications.wait.text=a.t("firefly.wait_loading_data"),this.accounts=[];const e=[{column:this.sortingColumn,direction:this.sortDirection}];new m().index({sorting:e,type:g,page:this.page}).then(t=>{for(let n=0;n<t.data.data.length;n++)if(t.data.data.hasOwnProperty(n)){let i=t.data.data[n],o={id:parseInt(i.id),active:i.attributes.active,name:i.attributes.name,type:i.attributes.type,role:i.attributes.account_role,iban:i.attributes.iban===null?"":i.attributes.iban.match(/.{1,4}/g).join(" "),account_number:i.attributes.account_number===null?"":i.attributes.account_number,current_balance:i.attributes.current_balance,currency_code:i.attributes.currency_code,native_current_balance:i.attributes.native_current_balance,native_currency_code:i.attributes.native_currency_code,last_activity:i.attributes.last_activity===null?"":r(new Date(i.attributes.last_activity),"P")};this.accounts.push(o)}this.notifications.wait.show=!1})}}},c={index:w,dates:h};function u(){Object.keys(c).forEach(e=>{console.log(`Loading page component "${e}"`);let t=c[e]();Alpine.data(e,()=>t)}),Alpine.start()}document.addEventListener("firefly-iii-bootstrapped",()=>{console.log("Loaded through event listener."),u()});window.bootstrapped&&(console.log("Loaded through window variable."),u()); import{a as d,d as h,f as p}from"./format-money-89cf90df.js";import{f as r,i as a}from"./vendor-029c0fc2.js";/* empty css */import{G as m}from"./get-23aadb69.js";class f{setElement(t){console.log("GenericEditor.setElement()",t),this.element=t,this.parent=t.parentElement,this.options={}}init(){this.options.type=this.element.dataset.type,this.options.id=this.element.dataset.id,this.options.value=this.element.dataset.value,this.options.index=this.element.dataset.index,this.options.model=this.element.dataset.model,this.options.field=this.element.dataset.field,console.log("GenericEditor["+this.options.index+"].init()")}replace(){console.log("GenericEditor["+this.options.index+"].replace()"),this.options.original=this.element.parentElement.innerHTML,this.options.type==="text"&&this.replaceText()}replaceText(){console.log("GenericEditor["+this.options.index+"].replaceText()");let t=this.formStart()+this.rowStart();t+=this.columnStart("7")+this.label()+this.textField()+this.closeDiv(),t+=this.columnStart("5")+this.buttonGroup()+this.closeDiv(),t+=this.closeDiv()+this.closeForm(),this.element.parentElement.innerHTML=t}textField(){return'<input data-index="'+this.options.index+'input" autocomplete="off" type="text" class="form-control form-control-sm" id="input" name="name" value="'+this.options.value+'" placeholder="'+this.options.value+'" autofocus>'}closeDiv(){return"</div>"}closeForm(){return"</form>"}formStart(){return'<form class="form-inline">'}rowStart(){return'<div class="row">'}columnStart(t){return t===""?'<div class="col">':'<div class="col-'+t+'">'}label(){return'<label class="sr-only" for="input">Field value</label>'}buttonGroup(){return'<div class="btn-group btn-group-sm" role="group" aria-label="Options"><button data-index="'+this.options.index+'" type="button" @click="cancelInlineEdit" class="btn btn-danger"><em class="fa-solid fa-xmark text-white"></em></button><button data-index="'+this.options.index+'" type="submit" @click="submitInlineEdit" class="btn btn-success"><em class="fa-solid fa-check"></em></button></div>'}cancel(){console.log("GenericEditor["+this.options.index+"].cancel()"),console.log(this.element),console.log(this.parent),this.parent.innerHTML=this.options.original}submitInlineEdit(t){console.log("Submit?")}}class b{put(t,n){return d.put("/api/v2/accounts/"+t,n)}}const l=window.location.href.split("/"),g=l[l.length-1];let w=function(){return{notifications:{error:{show:!1,text:"",url:""},success:{show:!1,text:"",url:""},wait:{show:!1,text:""}},totalPages:1,page:1,tableColumns:{name:{enabled:!0}},editors:{},sortingColumn:"",sortDirection:"",accounts:[],sort(e){return this.sortingColumn=e,this.sortDirection=this.sortDirection==="asc"?"desc":"asc",this.loadAccounts(),!1},formatMoney(e,t){return p(e,t)},format(e){return r(e,a.t("config.date_time_fns"))},init(){this.notifications.wait.show=!0,this.notifications.wait.text=a.t("firefly.wait_loading_data"),this.loadAccounts()},submitInlineEdit(e){e.preventDefault();const n=e.currentTarget.dataset.index,i=document.querySelectorAll('[data-index="'+n+'input"]')[0].value??"";if(i==="")return;const o=this.editors[n].options.field,s={};s[o]=i,console.log(s),console.log("New value is "+i+" for account #"+this.editors[n].options.id),new b().put(this.editors[n].options.id,s)},cancelInlineEdit(e){const n=e.currentTarget.dataset.index;this.editors[n].cancel()},triggerEdit(e){const t=e.currentTarget,n=t.dataset.index;this.editors[n]=new f,this.editors[n].setElement(t),this.editors[n].init(),this.editors[n].replace()},loadAccounts(){this.notifications.wait.show=!0,this.notifications.wait.text=a.t("firefly.wait_loading_data"),this.accounts=[];const e=[{column:this.sortingColumn,direction:this.sortDirection}];new m().index({sorting:e,type:g,page:this.page}).then(t=>{for(let n=0;n<t.data.data.length;n++)if(t.data.data.hasOwnProperty(n)){let i=t.data.data[n],o={id:parseInt(i.id),active:i.attributes.active,name:i.attributes.name,type:i.attributes.type,role:i.attributes.account_role,iban:i.attributes.iban===null?"":i.attributes.iban.match(/.{1,4}/g).join(" "),account_number:i.attributes.account_number===null?"":i.attributes.account_number,current_balance:i.attributes.current_balance,currency_code:i.attributes.currency_code,native_current_balance:i.attributes.native_current_balance,native_currency_code:i.attributes.native_currency_code,last_activity:i.attributes.last_activity===null?"":r(new Date(i.attributes.last_activity),"P")};this.accounts.push(o)}this.notifications.wait.show=!1})}}},c={index:w,dates:h};function u(){Object.keys(c).forEach(e=>{console.log(`Loading page component "${e}"`);let t=c[e]();Alpine.data(e,()=>t)}),Alpine.start()}document.addEventListener("firefly-iii-bootstrapped",()=>{console.log("Loaded through event listener."),u()});window.bootstrapped&&(console.log("Loaded through window variable."),u());

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
import{c as o}from"./create-empty-split-70d17748.js";import{f as _}from"./vendor-291d7a70.js";function l(a,r){let n=[];for(let i in a)if(a.hasOwnProperty(i)){let e=a[i],t=o();t.transaction_journal_id=e.transaction_journal_id,t.transaction_group_id=r,t.bill_id=e.bill_id,t.bill_name=e.bill_name,t.budget_id=e.budget_id,t.budget_name=e.budget_name,t.category_name=e.category_name,t.category_id=e.category_id,t.piggy_bank_id=e.piggy_bank_id,t.piggy_bank_name=e.piggy_bank_name,t.book_date=e.book_date,t.due_date=e.due_date,t.interest_date=e.interest_date,t.invoice_date=e.invoice_date,t.payment_date=e.payment_date,t.process_date=e.process_date,t.external_url=e.external_url,t.internal_reference=e.internal_reference,t.notes=e.notes,t.tags=e.tags,t.amount=parseFloat(e.amount).toFixed(e.currency_decimal_places),t.currency_code=e.currency_code,e.foreign_amount!==null&&(t.forein_currency_code=e.foreign_currency_code,t.foreign_amount=parseFloat(e.foreign_amount).toFixed(e.foreign_currency_decimal_places)),t.date=_(new Date(e.date),"yyyy-MM-dd HH:mm"),t.description=e.description,t.destination_account={id:e.destination_id,name:e.destination_name,type:e.destination_type,alpine_name:e.destination_name},t.source_account={id:e.source_id,name:e.source_name,type:e.source_type,alpine_name:e.source_name},e.latitude!==null&&(t.hasLocation=!0,t.latitude=e.latitude,t.longitude=e.longitude,t.zoomLevel=e.zoom_level),n.push(t)}return n}export{l as p}; import{c as o}from"./create-empty-split-9549645c.js";import{f as _}from"./vendor-029c0fc2.js";function l(a,r){let n=[];for(let i in a)if(a.hasOwnProperty(i)){let e=a[i],t=o();t.transaction_journal_id=e.transaction_journal_id,t.transaction_group_id=r,t.bill_id=e.bill_id,t.bill_name=e.bill_name,t.budget_id=e.budget_id,t.budget_name=e.budget_name,t.category_name=e.category_name,t.category_id=e.category_id,t.piggy_bank_id=e.piggy_bank_id,t.piggy_bank_name=e.piggy_bank_name,t.book_date=e.book_date,t.due_date=e.due_date,t.interest_date=e.interest_date,t.invoice_date=e.invoice_date,t.payment_date=e.payment_date,t.process_date=e.process_date,t.external_url=e.external_url,t.internal_reference=e.internal_reference,t.notes=e.notes,t.tags=e.tags,t.amount=parseFloat(e.amount).toFixed(e.currency_decimal_places),t.currency_code=e.currency_code,e.foreign_amount!==null&&(t.forein_currency_code=e.foreign_currency_code,t.foreign_amount=parseFloat(e.foreign_amount).toFixed(e.foreign_currency_decimal_places)),t.date=_(new Date(e.date),"yyyy-MM-dd HH:mm"),t.description=e.description,t.destination_account={id:e.destination_id,name:e.destination_name,type:e.destination_type,alpine_name:e.destination_name},t.source_account={id:e.source_id,name:e.source_name,type:e.source_type,alpine_name:e.source_name},e.latitude!==null&&(t.hasLocation=!0,t.latitude=e.latitude,t.longitude=e.longitude,t.zoomLevel=e.zoom_level),n.push(t)}return n}export{l as p};

View File

@ -1 +1 @@
import{a as p}from"./format-money-5a1aa122.js";class u{put(t,a){let r="/api/v2/transactions/"+parseInt(a.id);return p.put(r,t)}}export{u as P}; import{a as p}from"./format-money-89cf90df.js";class u{put(t,a){let r="/api/v2/transactions/"+parseInt(a.id);return p.put(r,t)}}export{u as P};

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,57 +1,57 @@
{ {
"_create-empty-split-70d17748.js": { "_create-empty-split-9549645c.js": {
"file": "assets/create-empty-split-70d17748.js", "file": "assets/create-empty-split-9549645c.js",
"imports": [ "imports": [
"_vendor-291d7a70.js" "_vendor-029c0fc2.js"
] ]
}, },
"_format-money-5a1aa122.js": { "_format-money-89cf90df.js": {
"file": "assets/format-money-5a1aa122.js", "file": "assets/format-money-89cf90df.js",
"imports": [ "imports": [
"_vendor-291d7a70.js" "_vendor-029c0fc2.js"
] ]
}, },
"_get-2d864c96.js": { "_get-23aadb69.js": {
"file": "assets/get-2d864c96.js", "file": "assets/get-23aadb69.js",
"imports": [ "imports": [
"_format-money-5a1aa122.js", "_format-money-89cf90df.js",
"_vendor-291d7a70.js" "_vendor-029c0fc2.js"
] ]
}, },
"_get-316f0281.js": { "_get-58830780.js": {
"file": "assets/get-316f0281.js", "file": "assets/get-58830780.js",
"imports": [ "imports": [
"_format-money-5a1aa122.js" "_format-money-89cf90df.js"
] ]
}, },
"_get-a398221d.js": { "_get-b646f004.js": {
"file": "assets/get-a398221d.js", "file": "assets/get-b646f004.js",
"imports": [ "imports": [
"_format-money-5a1aa122.js" "_format-money-89cf90df.js"
] ]
}, },
"_parse-downloaded-splits-ce04c01c.js": { "_parse-downloaded-splits-2d74acfc.js": {
"file": "assets/parse-downloaded-splits-ce04c01c.js", "file": "assets/parse-downloaded-splits-2d74acfc.js",
"imports": [ "imports": [
"_create-empty-split-70d17748.js", "_create-empty-split-9549645c.js",
"_vendor-291d7a70.js" "_vendor-029c0fc2.js"
] ]
}, },
"_put-02a25c9f.js": { "_put-c581fff2.js": {
"file": "assets/put-02a25c9f.js", "file": "assets/put-c581fff2.js",
"imports": [ "imports": [
"_format-money-5a1aa122.js" "_format-money-89cf90df.js"
] ]
}, },
"_splice-errors-into-transactions-5b51d5fd.js": { "_splice-errors-into-transactions-81484c73.js": {
"file": "assets/splice-errors-into-transactions-5b51d5fd.js", "file": "assets/splice-errors-into-transactions-81484c73.js",
"imports": [ "imports": [
"_format-money-5a1aa122.js", "_format-money-89cf90df.js",
"_get-316f0281.js", "_get-58830780.js",
"_vendor-291d7a70.js" "_vendor-029c0fc2.js"
] ]
}, },
"_vendor-291d7a70.js": { "_vendor-029c0fc2.js": {
"assets": [ "assets": [
"assets/layers-1dbbe9d0.png", "assets/layers-1dbbe9d0.png",
"assets/layers-2x-066daca8.png", "assets/layers-2x-066daca8.png",
@ -60,7 +60,7 @@
"css": [ "css": [
"assets/vendor-52daf6b6.css" "assets/vendor-52daf6b6.css"
], ],
"file": "assets/vendor-291d7a70.js" "file": "assets/vendor-029c0fc2.js"
}, },
"grid-ff3-theme.css": { "grid-ff3-theme.css": {
"file": "assets/grid-ff3-theme-badb0a41.css", "file": "assets/grid-ff3-theme-badb0a41.css",
@ -106,50 +106,50 @@
"css": [ "css": [
"assets/grid-ff3-theme-badb0a41.css" "assets/grid-ff3-theme-badb0a41.css"
], ],
"file": "assets/index-548de579.js", "file": "assets/index-56152516.js",
"imports": [ "imports": [
"_format-money-5a1aa122.js", "_format-money-89cf90df.js",
"_vendor-291d7a70.js", "_vendor-029c0fc2.js",
"_get-2d864c96.js" "_get-23aadb69.js"
], ],
"isEntry": true, "isEntry": true,
"src": "resources/assets/v2/pages/accounts/index.js" "src": "resources/assets/v2/pages/accounts/index.js"
}, },
"resources/assets/v2/pages/dashboard/dashboard.js": { "resources/assets/v2/pages/dashboard/dashboard.js": {
"file": "assets/dashboard-39513f31.js", "file": "assets/dashboard-f6f6ae3f.js",
"imports": [ "imports": [
"_format-money-5a1aa122.js", "_format-money-89cf90df.js",
"_vendor-291d7a70.js", "_vendor-029c0fc2.js",
"_get-2d864c96.js", "_get-23aadb69.js",
"_get-a398221d.js", "_get-b646f004.js",
"_get-316f0281.js" "_get-58830780.js"
], ],
"isEntry": true, "isEntry": true,
"src": "resources/assets/v2/pages/dashboard/dashboard.js" "src": "resources/assets/v2/pages/dashboard/dashboard.js"
}, },
"resources/assets/v2/pages/transactions/create.js": { "resources/assets/v2/pages/transactions/create.js": {
"file": "assets/create-b70c5f7e.js", "file": "assets/create-dec509ea.js",
"imports": [ "imports": [
"_format-money-5a1aa122.js", "_format-money-89cf90df.js",
"_create-empty-split-70d17748.js", "_create-empty-split-9549645c.js",
"_splice-errors-into-transactions-5b51d5fd.js", "_splice-errors-into-transactions-81484c73.js",
"_vendor-291d7a70.js", "_vendor-029c0fc2.js",
"_get-316f0281.js" "_get-58830780.js"
], ],
"isEntry": true, "isEntry": true,
"src": "resources/assets/v2/pages/transactions/create.js" "src": "resources/assets/v2/pages/transactions/create.js"
}, },
"resources/assets/v2/pages/transactions/edit.js": { "resources/assets/v2/pages/transactions/edit.js": {
"file": "assets/edit-0146de3c.js", "file": "assets/edit-990ac3ab.js",
"imports": [ "imports": [
"_format-money-5a1aa122.js", "_format-money-89cf90df.js",
"_get-a398221d.js", "_get-b646f004.js",
"_parse-downloaded-splits-ce04c01c.js", "_parse-downloaded-splits-2d74acfc.js",
"_splice-errors-into-transactions-5b51d5fd.js", "_splice-errors-into-transactions-81484c73.js",
"_vendor-291d7a70.js", "_vendor-029c0fc2.js",
"_create-empty-split-70d17748.js", "_create-empty-split-9549645c.js",
"_put-02a25c9f.js", "_put-c581fff2.js",
"_get-316f0281.js" "_get-58830780.js"
], ],
"isEntry": true, "isEntry": true,
"src": "resources/assets/v2/pages/transactions/edit.js" "src": "resources/assets/v2/pages/transactions/edit.js"
@ -158,12 +158,12 @@
"css": [ "css": [
"assets/grid-ff3-theme-badb0a41.css" "assets/grid-ff3-theme-badb0a41.css"
], ],
"file": "assets/index-80c224c9.js", "file": "assets/index-979da1db.js",
"imports": [ "imports": [
"_format-money-5a1aa122.js", "_format-money-89cf90df.js",
"_vendor-291d7a70.js", "_vendor-029c0fc2.js",
"_put-02a25c9f.js", "_put-c581fff2.js",
"_get-a398221d.js" "_get-b646f004.js"
], ],
"isEntry": true, "isEntry": true,
"src": "resources/assets/v2/pages/transactions/index.js" "src": "resources/assets/v2/pages/transactions/index.js"
@ -176,13 +176,13 @@
"css": [ "css": [
"assets/show-8b1429e5.css" "assets/show-8b1429e5.css"
], ],
"file": "assets/show-7b497861.js", "file": "assets/show-31120d76.js",
"imports": [ "imports": [
"_format-money-5a1aa122.js", "_format-money-89cf90df.js",
"_vendor-291d7a70.js", "_vendor-029c0fc2.js",
"_get-a398221d.js", "_get-b646f004.js",
"_parse-downloaded-splits-ce04c01c.js", "_parse-downloaded-splits-2d74acfc.js",
"_create-empty-split-70d17748.js" "_create-empty-split-9549645c.js"
], ],
"isEntry": true, "isEntry": true,
"src": "resources/assets/v2/pages/transactions/show.js" "src": "resources/assets/v2/pages/transactions/show.js"

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -2,7 +2,7 @@
"config": { "config": {
"html_language": "de", "html_language": "de",
"date_time_fns": "dd. MMM. yyyy um HH:mm:ss", "date_time_fns": "dd. MMM. yyyy um HH:mm:ss",
"date_time_fns_short": "MMMM do, yyyy @ HH:mm" "date_time_fns_short": "dd. MMM. yyyy um HH:mm"
}, },
"firefly": { "firefly": {
"spent": "Ausgegeben", "spent": "Ausgegeben",

Some files were not shown because too many files have changed in this diff Show More