diff --git a/.ci/phpmd/composer.lock b/.ci/phpmd/composer.lock index 7e88937fa9..1828f38202 100644 --- a/.ci/phpmd/composer.lock +++ b/.ci/phpmd/composer.lock @@ -1009,5 +1009,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } diff --git a/.ci/phpmd/phpmd.xml b/.ci/phpmd/phpmd.xml index 9255fde854..be299fb568 100644 --- a/.ci/phpmd/phpmd.xml +++ b/.ci/phpmd/phpmd.xml @@ -44,21 +44,25 @@ phpmd database,app,tests html /gdrive-all/development/phpmd/phpmd.xml > public/r - + + - + + - + + + diff --git a/app/Console/Commands/Correction/CorrectionSkeleton.php.stub b/app/Console/Commands/Correction/CorrectionSkeleton.php.stub index 7d25d8ff5e..801dd0d845 100644 --- a/app/Console/Commands/Correction/CorrectionSkeleton.php.stub +++ b/app/Console/Commands/Correction/CorrectionSkeleton.php.stub @@ -10,17 +10,8 @@ use Illuminate\Console\Command; */ class CorrectionSkeleton extends Command { - /** - * The console command description. - * - * @var string - */ protected $description = 'DESCRIPTION HERE'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly-iii:CORR_COMMAND'; /** diff --git a/app/Console/Commands/Correction/CreateAccessTokens.php b/app/Console/Commands/Correction/CreateAccessTokens.php index ab53dc2bcf..ec97a99e17 100644 --- a/app/Console/Commands/Correction/CreateAccessTokens.php +++ b/app/Console/Commands/Correction/CreateAccessTokens.php @@ -36,17 +36,8 @@ class CreateAccessTokens extends Command { use ShowsFriendlyMessages; - /** - * The console command description. - * - * @var string - */ protected $description = 'Creates user access tokens which are used for command line access to personal data.'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly-iii:create-access-tokens'; /** diff --git a/app/Console/Commands/Correction/CreateLinkTypes.php b/app/Console/Commands/Correction/CreateLinkTypes.php index 43620515eb..cc9700e0d6 100644 --- a/app/Console/Commands/Correction/CreateLinkTypes.php +++ b/app/Console/Commands/Correction/CreateLinkTypes.php @@ -34,17 +34,8 @@ class CreateLinkTypes extends Command { use ShowsFriendlyMessages; - /** - * The console command description. - * - * @var string - */ protected $description = 'Creates all link types.'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly-iii:create-link-types'; /** diff --git a/app/Console/Commands/Correction/DeleteEmptyJournals.php b/app/Console/Commands/Correction/DeleteEmptyJournals.php index 9382941d1a..8952ed423e 100644 --- a/app/Console/Commands/Correction/DeleteEmptyJournals.php +++ b/app/Console/Commands/Correction/DeleteEmptyJournals.php @@ -37,17 +37,8 @@ class DeleteEmptyJournals extends Command { use ShowsFriendlyMessages; - /** - * The console command description. - * - * @var string - */ protected $description = 'Delete empty and uneven transaction journals.'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly-iii:delete-empty-journals'; /** diff --git a/app/Console/Commands/Correction/DeleteOrphanedTransactions.php b/app/Console/Commands/Correction/DeleteOrphanedTransactions.php index 333ff91fe1..712aeaebb0 100644 --- a/app/Console/Commands/Correction/DeleteOrphanedTransactions.php +++ b/app/Console/Commands/Correction/DeleteOrphanedTransactions.php @@ -37,17 +37,8 @@ class DeleteOrphanedTransactions extends Command { use ShowsFriendlyMessages; - /** - * The console command description. - * - * @var string - */ protected $description = 'Deletes orphaned transactions.'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly-iii:delete-orphaned-transactions'; /** diff --git a/app/Console/Commands/Correction/DeleteZeroAmount.php b/app/Console/Commands/Correction/DeleteZeroAmount.php index f0e52cdccf..82774b1dad 100644 --- a/app/Console/Commands/Correction/DeleteZeroAmount.php +++ b/app/Console/Commands/Correction/DeleteZeroAmount.php @@ -35,17 +35,8 @@ class DeleteZeroAmount extends Command { use ShowsFriendlyMessages; - /** - * The console command description. - * - * @var string - */ protected $description = 'Delete transactions with zero amount.'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly-iii:delete-zero-amount'; /** diff --git a/app/Console/Commands/Export/ExportData.php b/app/Console/Commands/Export/ExportData.php index 719e315946..64043db366 100644 --- a/app/Console/Commands/Export/ExportData.php +++ b/app/Console/Commands/Export/ExportData.php @@ -48,17 +48,9 @@ class ExportData extends Command use ShowsFriendlyMessages; use VerifiesAccessToken; - /** - * The console command description. - * - * @var string - */ + protected $description = 'Command to export data from Firefly III.'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly-iii:export-data {--user=1 : The user ID that the export should run for.} {--token= : The user\'s access token.} diff --git a/app/Console/Commands/Integrity/ReportEmptyObjects.php b/app/Console/Commands/Integrity/ReportEmptyObjects.php index 2152694ed8..b9a396cbe0 100644 --- a/app/Console/Commands/Integrity/ReportEmptyObjects.php +++ b/app/Console/Commands/Integrity/ReportEmptyObjects.php @@ -38,17 +38,9 @@ class ReportEmptyObjects extends Command { use ShowsFriendlyMessages; - /** - * The console command description. - * - * @var string - */ + protected $description = 'Reports on empty database objects.'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly-iii:report-empty-objects'; /** diff --git a/app/Console/Commands/Integrity/ReportIntegrity.php b/app/Console/Commands/Integrity/ReportIntegrity.php index c90224fd22..4ace551c88 100644 --- a/app/Console/Commands/Integrity/ReportIntegrity.php +++ b/app/Console/Commands/Integrity/ReportIntegrity.php @@ -36,17 +36,9 @@ class ReportIntegrity extends Command { use ShowsFriendlyMessages; - /** - * The console command description. - * - * @var string - */ + protected $description = 'Will report on the integrity of your database.'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly-iii:report-integrity'; /** diff --git a/app/Console/Commands/Integrity/ReportSkeleton.php.stub b/app/Console/Commands/Integrity/ReportSkeleton.php.stub index bf37df022f..fa771b24c9 100644 --- a/app/Console/Commands/Integrity/ReportSkeleton.php.stub +++ b/app/Console/Commands/Integrity/ReportSkeleton.php.stub @@ -10,17 +10,9 @@ use Illuminate\Console\Command; */ class ReportSkeleton extends Command { - /** - * The console command description. - * - * @var string - */ + protected $description = 'DESCRIPTION HERE'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly-iii:INT_COMMAND'; /** diff --git a/app/Console/Commands/System/CreateDatabase.php b/app/Console/Commands/System/CreateDatabase.php index 5960f59144..c4b94f0119 100644 --- a/app/Console/Commands/System/CreateDatabase.php +++ b/app/Console/Commands/System/CreateDatabase.php @@ -36,17 +36,9 @@ class CreateDatabase extends Command { use ShowsFriendlyMessages; - /** - * The console command description. - * - * @var string - */ + protected $description = 'Tries to create the database if it doesn\'t exist yet.'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly-iii:create-database'; /** diff --git a/app/Console/Commands/System/CreateFirstUser.php b/app/Console/Commands/System/CreateFirstUser.php index a547a3e47a..0cdc5370e6 100644 --- a/app/Console/Commands/System/CreateFirstUser.php +++ b/app/Console/Commands/System/CreateFirstUser.php @@ -39,17 +39,9 @@ class CreateFirstUser extends Command { use ShowsFriendlyMessages; - /** - * The console command description. - * - * @var string - */ + protected $description = 'Creates a new user and gives admin rights. Outputs the password on the command line. Strictly for testing.'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly-iii:create-first-user {email}'; private UserRepositoryInterface $repository; diff --git a/app/Console/Commands/System/ForceMigration.php b/app/Console/Commands/System/ForceMigration.php index f437fa9482..bd2df4e03a 100644 --- a/app/Console/Commands/System/ForceMigration.php +++ b/app/Console/Commands/System/ForceMigration.php @@ -40,17 +40,9 @@ class ForceMigration extends Command use ShowsFriendlyMessages; use VerifiesAccessToken; - /** - * The console command description. - * - * @var string - */ + protected $description = 'This command will force-run all database migrations.'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly-iii:force-migrations {--user=1 : The user ID.} {--token= : The user\'s access token.}'; diff --git a/app/Console/Commands/System/OutputVersion.php b/app/Console/Commands/System/OutputVersion.php index eea501b031..e11923746c 100644 --- a/app/Console/Commands/System/OutputVersion.php +++ b/app/Console/Commands/System/OutputVersion.php @@ -32,17 +32,9 @@ use Illuminate\Console\Command; */ class OutputVersion extends Command { - /** - * The console command description. - * - * @var string - */ + protected $description = 'Outputs the Firefly III version'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly-iii:output-version'; /** diff --git a/app/Console/Commands/System/ScanAttachments.php b/app/Console/Commands/System/ScanAttachments.php index f7a8b3f28e..a8a99375c5 100644 --- a/app/Console/Commands/System/ScanAttachments.php +++ b/app/Console/Commands/System/ScanAttachments.php @@ -39,18 +39,10 @@ class ScanAttachments extends Command { use ShowsFriendlyMessages; - /** - * The console command description. - * - * @var string - */ + protected $description = 'Rescan all attachments and re-set the correct MD5 hash and mime.'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly-iii:scan-attachments'; /** diff --git a/app/Console/Commands/System/SetLatestVersion.php b/app/Console/Commands/System/SetLatestVersion.php index ab510eb394..7ef7d9d953 100644 --- a/app/Console/Commands/System/SetLatestVersion.php +++ b/app/Console/Commands/System/SetLatestVersion.php @@ -34,17 +34,9 @@ class SetLatestVersion extends Command { use ShowsFriendlyMessages; - /** - * The console command description. - * - * @var string - */ + protected $description = 'Set latest version in DB.'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly-iii:set-latest-version {--james-is-cool}'; /** diff --git a/app/Console/Commands/System/UpgradeFireflyInstructions.php b/app/Console/Commands/System/UpgradeFireflyInstructions.php index f69cc8f940..061e526b10 100644 --- a/app/Console/Commands/System/UpgradeFireflyInstructions.php +++ b/app/Console/Commands/System/UpgradeFireflyInstructions.php @@ -35,17 +35,9 @@ class UpgradeFireflyInstructions extends Command { use GeneratesInstallationId; - /** - * The console command description. - * - * @var string - */ + protected $description = 'Instructions in case of upgrade trouble.'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly:instructions {task}'; /** diff --git a/app/Console/Commands/System/VerifySecurityAlerts.php b/app/Console/Commands/System/VerifySecurityAlerts.php index f9ee68fed8..4cad8c0460 100644 --- a/app/Console/Commands/System/VerifySecurityAlerts.php +++ b/app/Console/Commands/System/VerifySecurityAlerts.php @@ -39,17 +39,9 @@ class VerifySecurityAlerts extends Command { use ShowsFriendlyMessages; - /** - * The console command description. - * - * @var string - */ + protected $description = 'Verify security alerts'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly-iii:verify-security-alerts'; /** diff --git a/app/Console/Commands/Tools/ApplyRules.php b/app/Console/Commands/Tools/ApplyRules.php index 79217b0764..9f1fc9d5aa 100644 --- a/app/Console/Commands/Tools/ApplyRules.php +++ b/app/Console/Commands/Tools/ApplyRules.php @@ -46,17 +46,9 @@ class ApplyRules extends Command use ShowsFriendlyMessages; use VerifiesAccessToken; - /** - * The console command description. - * - * @var string - */ + protected $description = 'This command will apply your rules and rule groups on a selection of your transactions.'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly-iii:apply-rules {--user=1 : The user ID.} diff --git a/app/Console/Commands/Tools/Cron.php b/app/Console/Commands/Tools/Cron.php index b30a67ef37..58079b78ef 100644 --- a/app/Console/Commands/Tools/Cron.php +++ b/app/Console/Commands/Tools/Cron.php @@ -45,17 +45,9 @@ class Cron extends Command { use ShowsFriendlyMessages; - /** - * The console command description. - * - * @var string - */ + protected $description = 'Runs all Firefly III cron-job related commands. Configure a cron job according to the official Firefly III documentation.'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly-iii:cron {--F|force : Force the cron job(s) to execute.} {--date= : Set the date in YYYY-MM-DD to make Firefly III think that\'s the current date.} diff --git a/app/Console/Commands/Upgrade/AppendBudgetLimitPeriods.php b/app/Console/Commands/Upgrade/AppendBudgetLimitPeriods.php index 3c1fceff09..665d4fbb4a 100644 --- a/app/Console/Commands/Upgrade/AppendBudgetLimitPeriods.php +++ b/app/Console/Commands/Upgrade/AppendBudgetLimitPeriods.php @@ -37,17 +37,9 @@ class AppendBudgetLimitPeriods extends Command use ShowsFriendlyMessages; public const CONFIG_NAME = '550_budget_limit_periods'; - /** - * The console command description. - * - * @var string - */ + protected $description = 'Append budget limits with their (estimated) timeframe.'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly-iii:budget-limit-periods {--F|force : Force the execution of this command.}'; /** diff --git a/app/Console/Commands/Upgrade/BackToJournals.php b/app/Console/Commands/Upgrade/BackToJournals.php index 3f6e2c5ca1..6daa7fbb93 100644 --- a/app/Console/Commands/Upgrade/BackToJournals.php +++ b/app/Console/Commands/Upgrade/BackToJournals.php @@ -42,17 +42,9 @@ class BackToJournals extends Command use ShowsFriendlyMessages; public const CONFIG_NAME = '480_back_to_journals'; - /** - * The console command description. - * - * @var string - */ + protected $description = 'Move meta data back to journals, not individual transactions.'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly-iii:back-to-journals {--F|force : Force the execution of this command.}'; /** diff --git a/app/Console/Commands/Upgrade/BudgetLimitCurrency.php b/app/Console/Commands/Upgrade/BudgetLimitCurrency.php index 476b5ff1ac..f0f07b8e68 100644 --- a/app/Console/Commands/Upgrade/BudgetLimitCurrency.php +++ b/app/Console/Commands/Upgrade/BudgetLimitCurrency.php @@ -38,17 +38,9 @@ class BudgetLimitCurrency extends Command use ShowsFriendlyMessages; public const CONFIG_NAME = '480_bl_currency'; - /** - * The console command description. - * - * @var string - */ + protected $description = 'Give budget limits a currency'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly-iii:bl-currency {--F|force : Force the execution of this command.}'; /** diff --git a/app/Console/Commands/Upgrade/FixPostgresSequences.php b/app/Console/Commands/Upgrade/FixPostgresSequences.php index 71399ebd29..8abe8b981e 100644 --- a/app/Console/Commands/Upgrade/FixPostgresSequences.php +++ b/app/Console/Commands/Upgrade/FixPostgresSequences.php @@ -35,17 +35,9 @@ class FixPostgresSequences extends Command { use ShowsFriendlyMessages; - /** - * The console command description. - * - * @var string - */ + protected $description = 'Fixes issues with PostgreSQL sequences.'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly-iii:fix-pgsql-sequences'; /** diff --git a/app/Console/Commands/Upgrade/MigrateAttachments.php b/app/Console/Commands/Upgrade/MigrateAttachments.php index f758e237fb..e2a9c7fd39 100644 --- a/app/Console/Commands/Upgrade/MigrateAttachments.php +++ b/app/Console/Commands/Upgrade/MigrateAttachments.php @@ -39,17 +39,9 @@ class MigrateAttachments extends Command use ShowsFriendlyMessages; public const CONFIG_NAME = '480_migrate_attachments'; - /** - * The console command description. - * - * @var string - */ + protected $description = 'Migrates attachment meta-data.'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly-iii:migrate-attachments {--F|force : Force the execution of this command.}'; /** diff --git a/app/Console/Commands/Upgrade/MigrateJournalNotes.php b/app/Console/Commands/Upgrade/MigrateJournalNotes.php index fd85ff5601..fc5219c4c0 100644 --- a/app/Console/Commands/Upgrade/MigrateJournalNotes.php +++ b/app/Console/Commands/Upgrade/MigrateJournalNotes.php @@ -38,17 +38,9 @@ class MigrateJournalNotes extends Command use ShowsFriendlyMessages; public const CONFIG_NAME = '480_migrate_notes'; - /** - * The console command description. - * - * @var string - */ + protected $description = 'Migrate notes for transaction journals.'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly-iii:migrate-notes {--F|force : Force the execution of this command.}'; /** diff --git a/app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php b/app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php index 10c1ebd0a5..8061107482 100644 --- a/app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php +++ b/app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php @@ -41,17 +41,9 @@ class MigrateRecurrenceMeta extends Command use ShowsFriendlyMessages; public const CONFIG_NAME = '481_migrate_recurrence_meta'; - /** - * The console command description. - * - * @var string - */ + protected $description = 'Migrate recurrence meta data'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly-iii:migrate-recurrence-meta {--F|force : Force the execution of this command.}'; /** diff --git a/app/Console/Commands/Upgrade/MigrateRecurrenceType.php b/app/Console/Commands/Upgrade/MigrateRecurrenceType.php index c6a509495b..9681cde806 100644 --- a/app/Console/Commands/Upgrade/MigrateRecurrenceType.php +++ b/app/Console/Commands/Upgrade/MigrateRecurrenceType.php @@ -40,17 +40,9 @@ class MigrateRecurrenceType extends Command use ShowsFriendlyMessages; public const CONFIG_NAME = '550_migrate_recurrence_type'; - /** - * The console command description. - * - * @var string - */ + protected $description = 'Migrate transaction type of recurring transaction.'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly-iii:migrate-recurrence-type {--F|force : Force the execution of this command.}'; /** diff --git a/app/Console/Commands/Upgrade/MigrateTagLocations.php b/app/Console/Commands/Upgrade/MigrateTagLocations.php index c2d53c178e..25680291b0 100644 --- a/app/Console/Commands/Upgrade/MigrateTagLocations.php +++ b/app/Console/Commands/Upgrade/MigrateTagLocations.php @@ -39,17 +39,9 @@ class MigrateTagLocations extends Command use ShowsFriendlyMessages; public const CONFIG_NAME = '500_migrate_tag_locations'; - /** - * The console command description. - * - * @var string - */ + protected $description = 'Migrate tag locations.'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly-iii:migrate-tag-locations {--F|force : Force the execution of this command.}'; /** diff --git a/app/Console/Commands/Upgrade/MigrateToRules.php b/app/Console/Commands/Upgrade/MigrateToRules.php index 43a325544f..937021f53a 100644 --- a/app/Console/Commands/Upgrade/MigrateToRules.php +++ b/app/Console/Commands/Upgrade/MigrateToRules.php @@ -45,17 +45,9 @@ class MigrateToRules extends Command use ShowsFriendlyMessages; public const CONFIG_NAME = '480_bills_to_rules'; - /** - * The console command description. - * - * @var string - */ + protected $description = 'Migrate bills to rules.'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly-iii:bills-to-rules {--F|force : Force the execution of this command.}'; private BillRepositoryInterface $billRepository; private int $count; diff --git a/app/Console/Commands/Upgrade/RenameAccountMeta.php b/app/Console/Commands/Upgrade/RenameAccountMeta.php index 8451c88f0c..fc17158ad0 100644 --- a/app/Console/Commands/Upgrade/RenameAccountMeta.php +++ b/app/Console/Commands/Upgrade/RenameAccountMeta.php @@ -38,17 +38,9 @@ class RenameAccountMeta extends Command use ShowsFriendlyMessages; public const CONFIG_NAME = '480_rename_account_meta'; - /** - * The console command description. - * - * @var string - */ + protected $description = 'Rename account meta-data to new format.'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly-iii:rename-account-meta {--F|force : Force the execution of this command.}'; /** diff --git a/app/Console/Commands/Upgrade/UpgradeCurrencyPreferences.php b/app/Console/Commands/Upgrade/UpgradeCurrencyPreferences.php index d440d53344..cf55d9efbb 100644 --- a/app/Console/Commands/Upgrade/UpgradeCurrencyPreferences.php +++ b/app/Console/Commands/Upgrade/UpgradeCurrencyPreferences.php @@ -41,17 +41,9 @@ class UpgradeCurrencyPreferences extends Command use ShowsFriendlyMessages; public const CONFIG_NAME = '610_upgrade_currency_prefs'; - /** - * The console command description. - * - * @var string - */ + protected $description = 'Upgrade user currency preferences'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly-iii:upgrade-currency-preferences {--F|force : Force the execution of this command.}'; /** diff --git a/app/Console/Commands/Upgrade/UpgradeSkeleton.php.stub b/app/Console/Commands/Upgrade/UpgradeSkeleton.php.stub index a5fd3aab50..25170f0969 100644 --- a/app/Console/Commands/Upgrade/UpgradeSkeleton.php.stub +++ b/app/Console/Commands/Upgrade/UpgradeSkeleton.php.stub @@ -12,17 +12,9 @@ class UpgradeSkeleton extends Command { use ShowsFriendlyMessages; public const CONFIG_NAME = '480_some_name'; - /** - * The console command description. - * - * @var string - */ + protected $description = 'SOME DESCRIPTION'; - /** - * The name and signature of the console command. - * - * @var string - */ + protected $signature = 'firefly-iii:UPGRSKELETON {--F|force : Force the execution of this command.}'; /** diff --git a/app/Exceptions/IntervalException.php b/app/Exceptions/IntervalException.php index 75bf19530a..04d9a5f918 100644 --- a/app/Exceptions/IntervalException.php +++ b/app/Exceptions/IntervalException.php @@ -36,7 +36,6 @@ final class IntervalException extends Exception { public array $availableIntervals; public Periodicity $periodicity; - /** @var string */ protected $message = 'The periodicity %s is unknown. Choose one of available periodicity: %s'; public function __construct(string $message = '', int $code = 0, ?Throwable $previous = null) diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 83e302cd3f..f1ff165468 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -59,11 +59,6 @@ use PragmaRX\Google2FALaravel\Middleware as MFAMiddleware; */ class Kernel extends HttpKernel { - /** - * The application's global HTTP middleware stack. - * - * @var array - */ protected $middleware = [ SecureHeaders::class, @@ -74,13 +69,6 @@ class Kernel extends HttpKernel TrustProxies::class, InstallationId::class, ]; - /** - * The application's route middleware. - * - * These middleware may be assigned to groups or used individually. - * - * @var array - */ protected $middlewareAliases = [ 'auth' => Authenticate::class, @@ -90,11 +78,6 @@ class Kernel extends HttpKernel 'guest' => RedirectIfAuthenticated::class, 'throttle' => ThrottleRequests::class, ]; - /** - * The application's route middleware groups. - * - * @var array - */ protected $middlewareGroups = [ // does not check login @@ -206,13 +189,6 @@ class Kernel extends HttpKernel 'bindings', ], ]; - /** - * The priority-sorted list of middleware. - * - * This forces non-global middleware to always be in the given order. - * - * @var array - */ protected $middlewarePriority = [ StartFireflySession::class, diff --git a/app/Http/Middleware/TrimStrings.php b/app/Http/Middleware/TrimStrings.php index 049725b850..4903cf6d1b 100644 --- a/app/Http/Middleware/TrimStrings.php +++ b/app/Http/Middleware/TrimStrings.php @@ -32,11 +32,6 @@ use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware; */ class TrimStrings extends Middleware { - /** - * The names of the attributes that should not be trimmed. - * - * @var array - */ protected $except = [ 'password', diff --git a/app/Models/Account.php b/app/Models/Account.php index b44c7ecac2..bbc9e10721 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -111,11 +111,7 @@ class Account extends Model use HasFactory; use SoftDeletes; - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', @@ -125,9 +121,9 @@ class Account extends Model 'active' => 'boolean', 'encrypted' => 'boolean', ]; - /** @var array Fields that can be filled */ + protected $fillable = ['user_id', 'user_group_id', 'account_type_id', 'name', 'active', 'virtual_balance', 'iban']; - /** @var array Hidden from view */ + protected $hidden = ['encrypted']; private bool $joinedAccountTypes = false; diff --git a/app/Models/AccountMeta.php b/app/Models/AccountMeta.php index 2963525301..8fd5b16c21 100644 --- a/app/Models/AccountMeta.php +++ b/app/Models/AccountMeta.php @@ -52,17 +52,13 @@ use Carbon\Carbon; */ class AccountMeta extends Model { - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', 'updated_at' => 'datetime', ]; - /** @var array Fields that can be filled */ + protected $fillable = ['account_id', 'name', 'data']; /** @var string The table to store the data in */ protected $table = 'account_meta'; diff --git a/app/Models/AccountType.php b/app/Models/AccountType.php index 24c39fcfa5..fe6fd00f12 100644 --- a/app/Models/AccountType.php +++ b/app/Models/AccountType.php @@ -66,17 +66,13 @@ class AccountType extends Model public const REVENUE = 'Revenue account'; - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', 'updated_at' => 'datetime', ]; - /** @var array Fields that can be filled */ + protected $fillable = ['type']; /** diff --git a/app/Models/Attachment.php b/app/Models/Attachment.php index 10af718151..668cad5914 100644 --- a/app/Models/Attachment.php +++ b/app/Models/Attachment.php @@ -86,11 +86,7 @@ class Attachment extends Model { use SoftDeletes; - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', @@ -98,7 +94,7 @@ class Attachment extends Model 'deleted_at' => 'datetime', 'uploaded' => 'boolean', ]; - /** @var array Fields that can be filled */ + protected $fillable = ['attachable_id', 'attachable_type', 'user_id', 'md5', 'filename', 'mime', 'title', 'description', 'size', 'uploaded']; /** diff --git a/app/Models/AvailableBudget.php b/app/Models/AvailableBudget.php index 9f1782ba67..67a44254c7 100644 --- a/app/Models/AvailableBudget.php +++ b/app/Models/AvailableBudget.php @@ -70,11 +70,7 @@ class AvailableBudget extends Model { use SoftDeletes; - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', @@ -84,7 +80,7 @@ class AvailableBudget extends Model 'end_date' => 'date', 'transaction_currency_id' => 'int', ]; - /** @var array Fields that can be filled */ + protected $fillable = ['user_id', 'user_group_id', 'transaction_currency_id', 'amount', 'start_date', 'end_date']; /** diff --git a/app/Models/Bill.php b/app/Models/Bill.php index 25b1823a83..db02bd16b3 100644 --- a/app/Models/Bill.php +++ b/app/Models/Bill.php @@ -105,11 +105,7 @@ class Bill extends Model { use SoftDeletes; - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', @@ -125,7 +121,7 @@ class Bill extends Model 'match_encrypted' => 'boolean', ]; - /** @var array Fields that can be filled */ + protected $fillable = [ 'name', @@ -143,7 +139,7 @@ class Bill extends Model 'end_date', 'extension_date', ]; - /** @var array Hidden from view */ + protected $hidden = ['amount_min_encrypted', 'amount_max_encrypted', 'name_encrypted', 'match_encrypted']; /** diff --git a/app/Models/Budget.php b/app/Models/Budget.php index a17258f26d..25a9cd98c9 100644 --- a/app/Models/Budget.php +++ b/app/Models/Budget.php @@ -85,11 +85,7 @@ class Budget extends Model { use SoftDeletes; - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', @@ -98,9 +94,9 @@ class Budget extends Model 'active' => 'boolean', 'encrypted' => 'boolean', ]; - /** @var array Fields that can be filled */ + protected $fillable = ['user_id', 'name', 'active', 'order', 'user_group_id']; - /** @var array Hidden from view */ + protected $hidden = ['encrypted']; /** diff --git a/app/Models/BudgetLimit.php b/app/Models/BudgetLimit.php index 92651f1008..89b3523c25 100644 --- a/app/Models/BudgetLimit.php +++ b/app/Models/BudgetLimit.php @@ -67,11 +67,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; */ class BudgetLimit extends Model { - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', @@ -86,7 +82,7 @@ class BudgetLimit extends Model 'updated' => Updated::class, 'deleted' => Deleted::class, ]; - /** @var array Fields that can be filled */ + protected $fillable = ['budget_id', 'start_date', 'end_date', 'amount', 'transaction_currency_id']; /** diff --git a/app/Models/Category.php b/app/Models/Category.php index 7db3123314..4f9692f5af 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -76,11 +76,7 @@ class Category extends Model { use SoftDeletes; - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', @@ -88,9 +84,9 @@ class Category extends Model 'deleted_at' => 'datetime', 'encrypted' => 'boolean', ]; - /** @var array Fields that can be filled */ + protected $fillable = ['user_id', 'user_group_id', 'name']; - /** @var array Hidden from view */ + protected $hidden = ['encrypted']; /** diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php index c5dcb0288a..d758c8c9f4 100644 --- a/app/Models/Configuration.php +++ b/app/Models/Configuration.php @@ -56,11 +56,7 @@ class Configuration extends Model { use SoftDeletes; - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', diff --git a/app/Models/LinkType.php b/app/Models/LinkType.php index 3697571d08..a725f498b1 100644 --- a/app/Models/LinkType.php +++ b/app/Models/LinkType.php @@ -66,11 +66,7 @@ class LinkType extends Model { use SoftDeletes; - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', @@ -79,7 +75,7 @@ class LinkType extends Model 'editable' => 'boolean', ]; - /** @var array Fields that can be filled */ + protected $fillable = ['name', 'inward', 'outward', 'editable']; /** diff --git a/app/Models/Location.php b/app/Models/Location.php index ad521c6d30..d12ef14adc 100644 --- a/app/Models/Location.php +++ b/app/Models/Location.php @@ -63,11 +63,7 @@ use Carbon\Carbon; */ class Location extends Model { - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', @@ -77,7 +73,7 @@ class Location extends Model 'latitude' => 'float', 'longitude' => 'float', ]; - /** @var array Fields that can be filled */ + protected $fillable = ['locatable_id', 'locatable_type', 'latitude', 'longitude', 'zoom_level']; /** diff --git a/app/Models/Note.php b/app/Models/Note.php index 33c3f03b69..212f41cae7 100644 --- a/app/Models/Note.php +++ b/app/Models/Note.php @@ -62,18 +62,14 @@ class Note extends Model { use SoftDeletes; - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', 'updated_at' => 'datetime', 'deleted_at' => 'datetime', ]; - /** @var array Fields that can be filled */ + protected $fillable = ['title', 'text', 'noteable_id', 'noteable_type']; /** diff --git a/app/Models/ObjectGroup.php b/app/Models/ObjectGroup.php index 80e922e4dd..57fa04e6d9 100644 --- a/app/Models/ObjectGroup.php +++ b/app/Models/ObjectGroup.php @@ -67,11 +67,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; */ class ObjectGroup extends Model { - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php index 406e437249..a783d1c37b 100644 --- a/app/Models/PiggyBank.php +++ b/app/Models/PiggyBank.php @@ -102,9 +102,9 @@ class PiggyBank extends Model 'active' => 'boolean', 'encrypted' => 'boolean', ]; - /** @var array Fields that can be filled */ + protected $fillable = ['name', 'account_id', 'order', 'targetamount', 'startdate', 'targetdate', 'active']; - /** @var array Hidden from view */ + protected $hidden = ['targetamount_encrypted', 'encrypted']; /** diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php index 96b1254e9b..f04479de95 100644 --- a/app/Models/PiggyBankEvent.php +++ b/app/Models/PiggyBankEvent.php @@ -56,20 +56,16 @@ use Carbon\Carbon; */ class PiggyBankEvent extends Model { - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', 'updated_at' => 'datetime', 'date' => 'date', ]; - /** @var array Fields that can be filled */ + protected $fillable = ['piggy_bank_id', 'transaction_journal_id', 'date', 'amount']; - /** @var array Hidden from view */ + protected $hidden = ['amount_encrypted']; /** diff --git a/app/Models/PiggyBankRepetition.php b/app/Models/PiggyBankRepetition.php index eec33efd2b..5640c308b6 100644 --- a/app/Models/PiggyBankRepetition.php +++ b/app/Models/PiggyBankRepetition.php @@ -57,11 +57,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; */ class PiggyBankRepetition extends Model { - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', @@ -69,7 +65,7 @@ class PiggyBankRepetition extends Model 'startdate' => 'date', 'targetdate' => 'date', ]; - /** @var array Fields that can be filled */ + protected $fillable = ['piggy_bank_id', 'startdate', 'targetdate', 'currentamount']; /** diff --git a/app/Models/Preference.php b/app/Models/Preference.php index 1da02183b5..8904904e99 100644 --- a/app/Models/Preference.php +++ b/app/Models/Preference.php @@ -54,11 +54,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; */ class Preference extends Model { - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', @@ -66,7 +62,7 @@ class Preference extends Model 'data' => 'array', ]; - /** @var array Fields that can be filled */ + protected $fillable = ['user_id', 'data', 'name']; /** diff --git a/app/Models/Recurrence.php b/app/Models/Recurrence.php index 4c312ea3ff..d74474af69 100644 --- a/app/Models/Recurrence.php +++ b/app/Models/Recurrence.php @@ -93,11 +93,7 @@ class Recurrence extends Model { use SoftDeletes; - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', @@ -113,7 +109,7 @@ class Recurrence extends Model 'active' => 'bool', 'apply_rules' => 'bool', ]; - /** @var array Fields that can be filled */ + protected $fillable = ['user_id', 'transaction_type_id', 'title', 'description', 'first_date', 'repeat_until', 'latest_date', 'repetitions', 'apply_rules', 'active']; /** @var string The table to store the data in */ diff --git a/app/Models/RecurrenceMeta.php b/app/Models/RecurrenceMeta.php index 649c492410..fca651fe5e 100644 --- a/app/Models/RecurrenceMeta.php +++ b/app/Models/RecurrenceMeta.php @@ -60,11 +60,7 @@ class RecurrenceMeta extends Model { use SoftDeletes; - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', @@ -73,7 +69,7 @@ class RecurrenceMeta extends Model 'name' => 'string', 'value' => 'string', ]; - /** @var array Fields that can be filled */ + protected $fillable = ['recurrence_id', 'name', 'value']; /** @var string The table to store the data in */ protected $table = 'recurrences_meta'; diff --git a/app/Models/RecurrenceRepetition.php b/app/Models/RecurrenceRepetition.php index 5801a65c00..696bb60a4e 100644 --- a/app/Models/RecurrenceRepetition.php +++ b/app/Models/RecurrenceRepetition.php @@ -69,11 +69,7 @@ class RecurrenceRepetition extends Model public const WEEKEND_TO_FRIDAY = 3; public const WEEKEND_TO_MONDAY = 4; - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', @@ -84,7 +80,7 @@ class RecurrenceRepetition extends Model 'repetition_skip' => 'int', 'weekend' => 'int', ]; - /** @var array Fields that can be filled */ + protected $fillable = ['recurrence_id', 'weekend', 'repetition_type', 'repetition_moment', 'repetition_skip']; /** @var string The table to store the data in */ protected $table = 'recurrences_repetitions'; diff --git a/app/Models/RecurrenceTransaction.php b/app/Models/RecurrenceTransaction.php index 9c0ea007d7..4c79f9d005 100644 --- a/app/Models/RecurrenceTransaction.php +++ b/app/Models/RecurrenceTransaction.php @@ -82,11 +82,7 @@ class RecurrenceTransaction extends Model { use SoftDeletes; - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', @@ -96,7 +92,7 @@ class RecurrenceTransaction extends Model 'foreign_amount' => 'string', 'description' => 'string', ]; - /** @var array Fields that can be filled */ + protected $fillable = [ 'recurrence_id', diff --git a/app/Models/RecurrenceTransactionMeta.php b/app/Models/RecurrenceTransactionMeta.php index 7a753d689c..181ffa254e 100644 --- a/app/Models/RecurrenceTransactionMeta.php +++ b/app/Models/RecurrenceTransactionMeta.php @@ -60,11 +60,7 @@ class RecurrenceTransactionMeta extends Model { use SoftDeletes; - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', @@ -73,7 +69,7 @@ class RecurrenceTransactionMeta extends Model 'name' => 'string', 'value' => 'string', ]; - /** @var array Fields that can be filled */ + protected $fillable = ['rt_id', 'name', 'value']; /** @var string The table to store the data in */ protected $table = 'rt_meta'; diff --git a/app/Models/Role.php b/app/Models/Role.php index 738a276d10..ac0f5e29da 100644 --- a/app/Models/Role.php +++ b/app/Models/Role.php @@ -55,18 +55,14 @@ use Carbon\Carbon; */ class Role extends Model { - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', 'updated_at' => 'datetime', ]; - /** @var array Fields that can be filled */ + protected $fillable = ['name', 'display_name', 'description']; /** diff --git a/app/Models/Rule.php b/app/Models/Rule.php index f30d8274c2..d5f0c251cd 100644 --- a/app/Models/Rule.php +++ b/app/Models/Rule.php @@ -83,11 +83,7 @@ class Rule extends Model { use SoftDeletes; - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', @@ -99,7 +95,7 @@ class Rule extends Model 'id' => 'int', 'strict' => 'boolean', ]; - /** @var array Fields that can be filled */ + protected $fillable = ['rule_group_id', 'order', 'active', 'title', 'description', 'user_id', 'strict']; /** diff --git a/app/Models/RuleAction.php b/app/Models/RuleAction.php index dc563b66f5..5fadfa9378 100644 --- a/app/Models/RuleAction.php +++ b/app/Models/RuleAction.php @@ -58,11 +58,7 @@ use Carbon\Carbon; */ class RuleAction extends Model { - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', @@ -72,7 +68,7 @@ class RuleAction extends Model 'stop_processing' => 'boolean', ]; - /** @var array Fields that can be filled */ + protected $fillable = ['rule_id', 'action_type', 'action_value', 'order', 'active', 'stop_processing']; /** diff --git a/app/Models/RuleGroup.php b/app/Models/RuleGroup.php index 5b49769cf4..0a94ff166d 100644 --- a/app/Models/RuleGroup.php +++ b/app/Models/RuleGroup.php @@ -74,11 +74,7 @@ class RuleGroup extends Model { use SoftDeletes; - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', @@ -89,7 +85,7 @@ class RuleGroup extends Model 'order' => 'int', ]; - /** @var array Fields that can be filled */ + protected $fillable = ['user_id', 'user_group_id', 'stop_processing', 'order', 'title', 'description', 'active']; /** diff --git a/app/Models/RuleTrigger.php b/app/Models/RuleTrigger.php index ef8fb5c329..188d903e45 100644 --- a/app/Models/RuleTrigger.php +++ b/app/Models/RuleTrigger.php @@ -58,11 +58,7 @@ use Carbon\Carbon; */ class RuleTrigger extends Model { - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', @@ -72,7 +68,7 @@ class RuleTrigger extends Model 'stop_processing' => 'boolean', ]; - /** @var array Fields that can be filled */ + protected $fillable = ['rule_id', 'trigger_type', 'trigger_value', 'order', 'active', 'stop_processing']; /** diff --git a/app/Models/Tag.php b/app/Models/Tag.php index 80658b8f95..1e94127209 100644 --- a/app/Models/Tag.php +++ b/app/Models/Tag.php @@ -83,11 +83,7 @@ class Tag extends Model { use SoftDeletes; - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', @@ -98,7 +94,7 @@ class Tag extends Model 'latitude' => 'float', 'longitude' => 'float', ]; - /** @var array Fields that can be filled */ + protected $fillable = ['user_id', 'user_group_id', 'tag', 'date', 'description', 'tagMode']; protected $hidden = ['zoomLevel', 'latitude', 'longitude']; diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index f5a92e44f0..f61624df45 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -92,11 +92,7 @@ class Transaction extends Model use HasFactory; use SoftDeletes; - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', @@ -107,7 +103,7 @@ class Transaction extends Model 'bill_name_encrypted' => 'boolean', 'reconciled' => 'boolean', ]; - /** @var array Fields that can be filled */ + protected $fillable = [ 'account_id', @@ -120,7 +116,7 @@ class Transaction extends Model 'foreign_amount', 'reconciled', ]; - /** @var array Hidden from view */ + protected $hidden = ['encrypted']; /** diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php index f3dcd7801a..c49b2d43e6 100644 --- a/app/Models/TransactionCurrency.php +++ b/app/Models/TransactionCurrency.php @@ -82,11 +82,7 @@ class TransactionCurrency extends Model public ?bool $userEnabled; public ?bool $userDefault; - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', @@ -95,7 +91,7 @@ class TransactionCurrency extends Model 'decimal_places' => 'int', 'enabled' => 'bool', ]; - /** @var array Fields that can be filled */ + protected $fillable = ['name', 'code', 'symbol', 'decimal_places', 'enabled']; /** diff --git a/app/Models/TransactionGroup.php b/app/Models/TransactionGroup.php index 606c28855e..b5baeff384 100644 --- a/app/Models/TransactionGroup.php +++ b/app/Models/TransactionGroup.php @@ -67,11 +67,7 @@ class TransactionGroup extends Model { use SoftDeletes; - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'id' => 'integer', @@ -82,7 +78,7 @@ class TransactionGroup extends Model 'date' => 'datetime', ]; - /** @var array Fields that can be filled */ + protected $fillable = ['user_id', 'user_group_id', 'title']; /** diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index 8c89d52ddb..0d00260a13 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -126,11 +126,7 @@ class TransactionJournal extends Model use HasFactory; use SoftDeletes; - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', @@ -146,7 +142,7 @@ class TransactionJournal extends Model 'completed' => 'boolean', ]; - /** @var array Fields that can be filled */ + protected $fillable = [ 'user_id', @@ -160,7 +156,7 @@ class TransactionJournal extends Model 'order', 'date', ]; - /** @var array Hidden from view */ + protected $hidden = ['encrypted']; /** diff --git a/app/Models/TransactionJournalLink.php b/app/Models/TransactionJournalLink.php index 69299ca605..7ce69ed427 100644 --- a/app/Models/TransactionJournalLink.php +++ b/app/Models/TransactionJournalLink.php @@ -63,11 +63,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; */ class TransactionJournalLink extends Model { - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', diff --git a/app/Models/TransactionJournalMeta.php b/app/Models/TransactionJournalMeta.php index 16a7d53812..c8631a80de 100644 --- a/app/Models/TransactionJournalMeta.php +++ b/app/Models/TransactionJournalMeta.php @@ -62,18 +62,14 @@ class TransactionJournalMeta extends Model { use SoftDeletes; - /** - * The attributes that should be casted to native types. - * - * @var array - */ + protected $casts = [ 'created_at' => 'datetime', 'updated_at' => 'datetime', 'deleted_at' => 'datetime', ]; - /** @var array Fields that can be filled */ + protected $fillable = ['transaction_journal_id', 'name', 'data', 'hash']; /** @var string The table to store the data in */ protected $table = 'journal_meta';