From 6b9c9458fa2333d7160ccdf164b02f075dcc84c1 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 8 Apr 2017 18:00:45 +0200 Subject: [PATCH 001/169] This fixes possible null errors. --- app/Console/Commands/UpgradeDatabase.php | 29 +++++++++++++++--------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/app/Console/Commands/UpgradeDatabase.php b/app/Console/Commands/UpgradeDatabase.php index bb96f18643..dcaebf9050 100644 --- a/app/Console/Commands/UpgradeDatabase.php +++ b/app/Console/Commands/UpgradeDatabase.php @@ -102,18 +102,25 @@ class UpgradeDatabase extends Command /** @var PiggyBankEvent $event */ foreach ($set as $event) { - if (!is_null($event->transaction_journal_id)) { - $type = $event->transactionJournal->transactionType->type; - if ($type !== TransactionType::TRANSFER) { - $event->transaction_journal_id = null; - $event->save(); - $this->line( - sprintf('Piggy bank #%d ("%s") was referenced by an invalid event. This has been fixed.', $event->piggy_bank_id, + if (is_null($event->transaction_journal_id)) { + continue; + } + /** @var TransactionJournal $journal */ + $journal = $event->transactionJournal()->first(); + if (is_null($journal)) { + continue; + } + + $type = $journal->transactionType->type; + if ($type !== TransactionType::TRANSFER) { + $event->transaction_journal_id = null; + $event->save(); + $this->line( + sprintf( + 'Piggy bank #%d ("%s") was referenced by an invalid event. This has been fixed.', $event->piggy_bank_id, $event->piggyBank->name - )); - } - - + ) + ); } } } From 852ce3e32fd52b2ecb3256002dd82c1f530210a0 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 8 Apr 2017 18:02:16 +0200 Subject: [PATCH 002/169] Remove unused classes. --- app/Bootstrap/ConfigureLogging.php | 63 ------------------------------ app/Console/Kernel.php | 1 - 2 files changed, 64 deletions(-) delete mode 100644 app/Bootstrap/ConfigureLogging.php diff --git a/app/Bootstrap/ConfigureLogging.php b/app/Bootstrap/ConfigureLogging.php deleted file mode 100644 index 03b704d0f2..0000000000 --- a/app/Bootstrap/ConfigureLogging.php +++ /dev/null @@ -1,63 +0,0 @@ -make('config'); - - $maxFiles = $config->get('app.log_max_files'); - - $log->useDailyFiles( - $app->storagePath() . '/logs/firefly-iii.log', is_null($maxFiles) ? 5 : $maxFiles, - $config->get('app.log_level', 'debug') - ); - } - - /** - * Configure the Monolog handlers for the application. - * - * @param \Illuminate\Contracts\Foundation\Application $app - * @param \Illuminate\Log\Writer $log - * - * @return void - */ - protected function configureSingleHandler(Application $app, Writer $log) - { - $log->useFiles( - $app->storagePath() . '/logs/firefly-iii.log', - $app->make('config')->get('app.log_level', 'debug') - ); - } -} diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index f4a1e32559..2b5ccd9aca 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -41,7 +41,6 @@ class Kernel extends ConsoleKernel = [ 'Illuminate\Foundation\Bootstrap\LoadEnvironmentVariables', 'Illuminate\Foundation\Bootstrap\LoadConfiguration', - //'FireflyIII\Bootstrap\ConfigureLogging', 'Illuminate\Foundation\Bootstrap\HandleExceptions', 'Illuminate\Foundation\Bootstrap\RegisterFacades', 'Illuminate\Foundation\Bootstrap\SetRequestForConsole', From 6cafb916809f32370e8342e049e326fd3d346ee5 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 8 Apr 2017 19:05:37 +0200 Subject: [PATCH 003/169] This fixes #629 --- app/Http/Controllers/PiggyBankController.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php index 54185731c6..01109c755c 100644 --- a/app/Http/Controllers/PiggyBankController.php +++ b/app/Http/Controllers/PiggyBankController.php @@ -9,7 +9,8 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); + namespace FireflyIII\Http\Controllers; use Amount; @@ -220,7 +221,9 @@ class PiggyBankController extends Controller * Fill account information: */ $account = $piggyBank->account; + $new = false; if (!isset($accounts[$account->id])) { + $new = true; $accounts[$account->id] = [ 'name' => $account->name, 'balance' => Steam::balanceIgnoreVirtual($account, $end), @@ -230,7 +233,7 @@ class PiggyBankController extends Controller 'leftToSave' => $piggyBank->leftToSave, ]; } - if (isset($accounts[$account->id])) { + if (isset($accounts[$account->id]) && $new === false) { $accounts[$account->id]['sumOfSaved'] = bcadd($accounts[$account->id]['sumOfSaved'], strval($piggyBank->savedSoFar)); $accounts[$account->id]['sumOfTargets'] = bcadd($accounts[$account->id]['sumOfTargets'], $piggyBank->targetamount); $accounts[$account->id]['leftToSave'] = bcadd($accounts[$account->id]['leftToSave'], $piggyBank->leftToSave); @@ -308,12 +311,7 @@ class PiggyBankController extends Controller return redirect(route('piggy-banks.index')); } - - $amount = strval(round($request->get('amount'), 12)); - $savedSoFar = $piggyBank->currentRelevantRep()->currentamount; - - if (bccomp($amount, $savedSoFar) <= 0) { - } + $amount = strval(round($request->get('amount'), 12)); Session::flash('error', strval(trans('firefly.cannot_remove_from_piggy', ['amount' => Amount::format($amount, false), 'name' => e($piggyBank->name)]))); From 240797e92afc363aaeed476dd59f452c54456271 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 9 Apr 2017 07:36:58 +0200 Subject: [PATCH 004/169] Fixes #630 [skip ci] --- resources/views/partials/favicons.twig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/views/partials/favicons.twig b/resources/views/partials/favicons.twig index 9f559c0e8c..63516c4a51 100644 --- a/resources/views/partials/favicons.twig +++ b/resources/views/partials/favicons.twig @@ -1,6 +1,6 @@ - - - - - + + + + + From 595596d73fc3812071826c9ec5eddc07a6eb9db8 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 9 Apr 2017 07:44:22 +0200 Subject: [PATCH 005/169] =?UTF-8?q?Apparently=20this=20is=20changed=20in?= =?UTF-8?q?=20PHPStorm=E2=80=99s=20formatting=20templates=20so=20there=20y?= =?UTF-8?q?ou=20go=20[skip=20ci].?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Console/Commands/CreateImport.php | 2 +- app/Console/Commands/EncryptFile.php | 2 +- app/Console/Commands/Import.php | 2 +- app/Console/Commands/ScanAttachments.php | 2 +- .../Commands/UpgradeFireflyInstructions.php | 2 +- app/Console/Commands/VerifyDatabase.php | 2 +- app/Console/Kernel.php | 2 +- app/Events/Event.php | 3 +- app/Events/RegisteredUser.php | 2 +- app/Events/RequestedNewPassword.php | 2 +- app/Events/StoredTransactionJournal.php | 2 +- app/Events/UpdatedTransactionJournal.php | 2 +- app/Exceptions/FireflyException.php | 3 +- app/Exceptions/Handler.php | 3 +- app/Exceptions/NotImplementedException.php | 3 +- app/Exceptions/ValidationException.php | 3 +- app/Export/Collector/AttachmentCollector.php | 2 +- app/Export/Collector/BasicCollector.php | 2 +- app/Export/Collector/CollectorInterface.php | 2 +- .../Collector/JournalExportCollector.php | 2 +- app/Export/Collector/UploadCollector.php | 2 +- app/Export/Entry/Entry.php | 2 +- app/Export/Exporter/BasicExporter.php | 2 +- app/Export/Exporter/CsvExporter.php | 2 +- app/Export/Exporter/ExporterInterface.php | 2 +- app/Export/Processor.php | 2 +- app/Export/ProcessorInterface.php | 2 +- .../Chart/Basic/ChartJsGenerator.php | 2 +- .../Chart/Basic/GeneratorInterface.php | 2 +- .../Report/Audit/MonthReportGenerator.php | 2 +- .../Report/Audit/MultiYearReportGenerator.php | 2 +- .../Report/Audit/YearReportGenerator.php | 2 +- .../Report/Budget/MonthReportGenerator.php | 2 +- .../Budget/MultiYearReportGenerator.php | 2 +- .../Report/Budget/YearReportGenerator.php | 2 +- .../Report/Category/MonthReportGenerator.php | 2 +- .../Category/MultiYearReportGenerator.php | 2 +- .../Report/Category/YearReportGenerator.php | 2 +- .../Report/ReportGeneratorFactory.php | 2 +- .../Report/ReportGeneratorInterface.php | 2 +- .../Report/Standard/MonthReportGenerator.php | 2 +- .../Standard/MultiYearReportGenerator.php | 2 +- .../Report/Standard/YearReportGenerator.php | 2 +- app/Generator/Report/Support.php | 2 +- .../Report/Tag/MonthReportGenerator.php | 2 +- .../Report/Tag/MultiYearReportGenerator.php | 2 +- .../Report/Tag/YearReportGenerator.php | 2 +- .../Events/StoredJournalEventHandler.php | 2 +- .../Events/UpdatedJournalEventHandler.php | 2 +- app/Handlers/Events/UserEventHandler.php | 2 +- app/Helpers/Attachments/AttachmentHelper.php | 3 +- app/Helpers/Chart/MetaPieChart.php | 2 +- app/Helpers/Chart/MetaPieChartInterface.php | 2 +- app/Helpers/Collection/Balance.php | 3 +- app/Helpers/Collection/BalanceEntry.php | 3 +- app/Helpers/Collection/BalanceHeader.php | 3 +- app/Helpers/Collection/BalanceLine.php | 3 +- app/Helpers/Collection/Bill.php | 3 +- app/Helpers/Collection/BillLine.php | 3 +- app/Helpers/Collection/Category.php | 3 +- app/Helpers/Collector/JournalCollector.php | 2 +- .../Collector/JournalCollectorInterface.php | 2 +- app/Helpers/FiscalHelper.php | 2 +- app/Helpers/FiscalHelperInterface.php | 2 +- app/Helpers/Help/HelpInterface.php | 3 +- app/Helpers/Report/BalanceReportHelper.php | 2 +- .../Report/BalanceReportHelperInterface.php | 2 +- app/Helpers/Report/BudgetReportHelper.php | 2 +- .../Report/BudgetReportHelperInterface.php | 2 +- app/Helpers/Report/PopupReport.php | 62 +++++++++---------- app/Helpers/Report/ReportHelper.php | 2 +- app/Helpers/Report/ReportHelperInterface.php | 2 +- app/Http/Controllers/AccountController.php | 2 +- .../Admin/ConfigurationController.php | 2 +- app/Http/Controllers/Admin/HomeController.php | 2 +- app/Http/Controllers/AttachmentController.php | 2 +- .../Auth/ForgotPasswordController.php | 2 +- app/Http/Controllers/Auth/LoginController.php | 2 +- .../Controllers/Auth/PasswordController.php | 2 +- .../Controllers/Auth/RegisterController.php | 2 +- .../Auth/ResetPasswordController.php | 2 +- .../Controllers/Auth/TwoFactorController.php | 6 +- app/Http/Controllers/BillController.php | 2 +- app/Http/Controllers/BudgetController.php | 2 +- .../Controllers/Chart/AccountController.php | 2 +- app/Http/Controllers/Chart/BillController.php | 2 +- .../Controllers/Chart/BudgetController.php | 2 +- .../Controllers/Chart/PiggyBankController.php | 2 +- .../Controllers/Chart/ReportController.php | 2 +- .../Controllers/Chart/TagReportController.php | 2 +- app/Http/Controllers/Controller.php | 2 +- app/Http/Controllers/CurrencyController.php | 2 +- app/Http/Controllers/ExportController.php | 2 +- app/Http/Controllers/HelpController.php | 2 +- app/Http/Controllers/HomeController.php | 3 +- app/Http/Controllers/JavascriptController.php | 2 +- app/Http/Controllers/JsonController.php | 3 +- app/Http/Controllers/NewUserController.php | 3 +- .../Controllers/Popup/ReportController.php | 1 - app/Http/Controllers/ProfileController.php | 4 +- .../Controllers/Report/AccountController.php | 2 +- .../Controllers/Report/BalanceController.php | 2 +- .../Controllers/Report/BudgetController.php | 2 +- .../Controllers/Report/CategoryController.php | 3 +- .../Report/OperationsController.php | 2 +- app/Http/Controllers/ReportController.php | 1 + app/Http/Controllers/SearchController.php | 2 +- .../Transaction/ConvertController.php | 2 +- .../Transaction/MassController.php | 2 +- .../Transaction/SingleController.php | 4 +- .../Transaction/SplitController.php | 2 +- app/Http/Kernel.php | 2 +- app/Http/Middleware/Authenticate.php | 2 +- app/Http/Middleware/AuthenticateTwoFactor.php | 2 +- app/Http/Middleware/Binder.php | 2 +- app/Http/Middleware/EncryptCookies.php | 2 +- app/Http/Middleware/IsAdmin.php | 2 +- app/Http/Middleware/Range.php | 2 +- .../Middleware/RedirectIfAuthenticated.php | 2 +- .../RedirectIfTwoFactorAuthenticated.php | 2 +- app/Http/Middleware/Sandstorm.php | 2 +- app/Http/Middleware/StartFireflySession.php | 2 +- app/Http/Middleware/VerifyCsrfToken.php | 2 +- app/Http/Requests/AccountFormRequest.php | 2 +- app/Http/Requests/AttachmentFormRequest.php | 2 +- app/Http/Requests/BudgetFormRequest.php | 2 +- app/Http/Requests/BudgetIncomeRequest.php | 2 +- app/Http/Requests/CategoryFormRequest.php | 2 +- app/Http/Requests/ConfigurationRequest.php | 2 +- app/Http/Requests/CurrencyFormRequest.php | 2 +- .../Requests/DeleteAccountFormRequest.php | 2 +- app/Http/Requests/ExportFormRequest.php | 2 +- app/Http/Requests/ImportUploadRequest.php | 2 +- app/Http/Requests/JournalFormRequest.php | 2 +- .../Requests/MassDeleteJournalRequest.php | 2 +- app/Http/Requests/MassEditJournalRequest.php | 2 +- app/Http/Requests/NewUserFormRequest.php | 2 +- app/Http/Requests/PiggyBankFormRequest.php | 2 +- app/Http/Requests/ProfileFormRequest.php | 2 +- app/Http/Requests/ReportFormRequest.php | 2 +- app/Http/Requests/Request.php | 2 +- app/Http/Requests/RuleFormRequest.php | 2 +- app/Http/Requests/RuleGroupFormRequest.php | 2 +- .../Requests/SelectTransactionsRequest.php | 2 +- app/Http/Requests/SplitJournalFormRequest.php | 2 +- app/Http/Requests/TagFormRequest.php | 3 +- app/Http/Requests/TestRuleFormRequest.php | 2 +- app/Http/Requests/TokenFormRequest.php | 2 +- app/Import/Converter/AccountId.php | 2 +- app/Import/Converter/Amount.php | 2 +- app/Import/Converter/AssetAccountIban.php | 2 +- app/Import/Converter/AssetAccountName.php | 2 +- app/Import/Converter/AssetAccountNumber.php | 2 +- app/Import/Converter/BasicConverter.php | 2 +- app/Import/Converter/BillId.php | 2 +- app/Import/Converter/BillName.php | 2 +- app/Import/Converter/BudgetId.php | 2 +- app/Import/Converter/BudgetName.php | 2 +- app/Import/Converter/CategoryId.php | 2 +- app/Import/Converter/CategoryName.php | 2 +- app/Import/Converter/ConverterInterface.php | 2 +- app/Import/Converter/CurrencyCode.php | 2 +- app/Import/Converter/CurrencyId.php | 2 +- app/Import/Converter/CurrencyName.php | 2 +- app/Import/Converter/CurrencySymbol.php | 2 +- app/Import/Converter/Date.php | 2 +- app/Import/Converter/Description.php | 2 +- app/Import/Converter/ExternalId.php | 2 +- app/Import/Converter/INGDebetCredit.php | 2 +- app/Import/Converter/Ignore.php | 2 +- app/Import/Converter/OpposingAccountIban.php | 2 +- app/Import/Converter/OpposingAccountName.php | 2 +- .../Converter/OpposingAccountNumber.php | 2 +- app/Import/Converter/RabobankDebetCredit.php | 2 +- app/Import/Converter/TagSplit.php | 2 +- app/Import/Converter/TagsComma.php | 2 +- app/Import/Converter/TagsSpace.php | 2 +- app/Import/ImportProcedure.php | 2 +- app/Import/ImportProcedureInterface.php | 2 +- app/Import/ImportStorage.php | 2 +- app/Import/ImportValidator.php | 2 +- app/Import/Importer/CsvImporter.php | 2 +- app/Import/Importer/ImporterInterface.php | 2 +- app/Import/Logging/CommandHandler.php | 2 +- app/Import/Mapper/AssetAccountIbans.php | 2 +- app/Import/Mapper/AssetAccounts.php | 2 +- app/Import/Mapper/Bills.php | 2 +- app/Import/Mapper/Budgets.php | 2 +- app/Import/Mapper/Categories.php | 2 +- app/Import/Mapper/MapperInterface.php | 2 +- app/Import/Mapper/OpposingAccountIbans.php | 2 +- app/Import/Mapper/OpposingAccounts.php | 2 +- app/Import/Mapper/Tags.php | 2 +- app/Import/Mapper/TransactionCurrencies.php | 2 +- .../PreProcessorInterface.php | 2 +- app/Import/MapperPreProcess/TagsComma.php | 2 +- app/Import/MapperPreProcess/TagsSpace.php | 2 +- app/Import/Setup/CsvSetup.php | 2 +- app/Import/Setup/SetupInterface.php | 2 +- app/Import/Specifics/AbnAmroDescription.php | 2 +- app/Import/Specifics/IngDescription.php | 2 +- app/Import/Specifics/PresidentsChoice.php | 2 +- app/Import/Specifics/RabobankDescription.php | 2 +- app/Import/Specifics/SpecificInterface.php | 2 +- ...ExecuteRuleGroupOnExistingTransactions.php | 2 +- app/Jobs/Job.php | 2 +- app/Jobs/MailError.php | 2 +- app/Models/Account.php | 2 +- app/Models/AccountMeta.php | 2 +- app/Models/Attachment.php | 2 +- app/Models/AvailableBudget.php | 2 +- app/Models/Bill.php | 2 +- app/Models/Budget.php | 2 +- app/Models/BudgetLimit.php | 2 +- app/Models/Category.php | 2 +- app/Models/Configuration.php | 2 +- app/Models/ExportJob.php | 2 +- app/Models/LimitRepetition.php | 2 +- app/Models/Note.php | 2 +- app/Models/PiggyBank.php | 2 +- app/Models/PiggyBankEvent.php | 2 +- app/Models/PiggyBankRepetition.php | 2 +- app/Models/Role.php | 3 +- app/Models/Rule.php | 2 +- app/Models/RuleAction.php | 2 +- app/Models/RuleGroup.php | 2 +- app/Models/RuleTrigger.php | 2 +- app/Models/Transaction.php | 2 +- app/Models/TransactionCurrency.php | 2 +- app/Models/TransactionJournal.php | 2 +- app/Models/TransactionJournalMeta.php | 2 +- app/Models/TransactionType.php | 2 +- app/Providers/AccountServiceProvider.php | 2 +- app/Providers/AppServiceProvider.php | 2 +- app/Providers/AttachmentServiceProvider.php | 2 +- app/Providers/AuthServiceProvider.php | 2 +- app/Providers/BillServiceProvider.php | 2 +- app/Providers/BroadcastServiceProvider.php | 2 +- app/Providers/BudgetServiceProvider.php | 2 +- app/Providers/CategoryServiceProvider.php | 2 +- app/Providers/CurrencyServiceProvider.php | 2 +- app/Providers/EventServiceProvider.php | 2 +- app/Providers/ExportJobServiceProvider.php | 2 +- app/Providers/FireflySessionProvider.php | 2 +- app/Providers/JournalServiceProvider.php | 2 +- app/Providers/LogServiceProvider.php | 2 +- app/Providers/PiggyBankServiceProvider.php | 2 +- app/Providers/RouteServiceProvider.php | 2 +- app/Providers/RuleGroupServiceProvider.php | 2 +- app/Providers/RuleServiceProvider.php | 2 +- app/Providers/SearchServiceProvider.php | 2 +- app/Providers/TagServiceProvider.php | 2 +- .../Account/AccountRepository.php | 2 +- .../Account/AccountRepositoryInterface.php | 2 +- app/Repositories/Account/AccountTasker.php | 4 +- .../Account/AccountTaskerInterface.php | 2 +- .../Attachment/AttachmentRepository.php | 2 +- .../AttachmentRepositoryInterface.php | 2 +- app/Repositories/Bill/BillRepository.php | 6 +- .../Bill/BillRepositoryInterface.php | 2 +- app/Repositories/Budget/BudgetRepository.php | 2 +- .../Budget/BudgetRepositoryInterface.php | 2 +- .../Category/CategoryRepository.php | 2 +- .../Category/CategoryRepositoryInterface.php | 2 +- .../Currency/CurrencyRepository.php | 2 +- .../Currency/CurrencyRepositoryInterface.php | 2 +- .../ExportJob/ExportJobRepository.php | 2 +- .../ExportJobRepositoryInterface.php | 2 +- .../ImportJob/ImportJobRepository.php | 2 +- .../ImportJobRepositoryInterface.php | 2 +- app/Repositories/Journal/JournalTasker.php | 2 +- .../Journal/JournalTaskerInterface.php | 2 +- .../PiggyBank/PiggyBankRepository.php | 2 +- .../PiggyBankRepositoryInterface.php | 2 +- app/Repositories/Rule/RuleRepository.php | 2 +- .../Rule/RuleRepositoryInterface.php | 2 +- .../RuleGroup/RuleGroupRepository.php | 2 +- .../RuleGroupRepositoryInterface.php | 2 +- .../User/UserRepositoryInterface.php | 2 +- app/Rules/Actions/ActionInterface.php | 2 +- app/Rules/Actions/AddTag.php | 2 +- app/Rules/Actions/AppendDescription.php | 2 +- app/Rules/Actions/ClearBudget.php | 2 +- app/Rules/Actions/ClearCategory.php | 2 +- app/Rules/Actions/PrependDescription.php | 2 +- app/Rules/Actions/RemoveAllTags.php | 2 +- app/Rules/Actions/RemoveTag.php | 2 +- app/Rules/Actions/SetBudget.php | 2 +- app/Rules/Actions/SetCategory.php | 2 +- app/Rules/Actions/SetDescription.php | 2 +- app/Rules/Actions/SetDestinationAccount.php | 2 +- app/Rules/Actions/SetSourceAccount.php | 2 +- app/Rules/Factory/ActionFactory.php | 2 +- app/Rules/Factory/TriggerFactory.php | 2 +- app/Rules/Processor.php | 2 +- app/Rules/TransactionMatcher.php | 2 +- app/Rules/Triggers/AbstractTrigger.php | 2 +- app/Rules/Triggers/AmountExactly.php | 2 +- app/Rules/Triggers/AmountLess.php | 2 +- app/Rules/Triggers/AmountMore.php | 2 +- app/Rules/Triggers/BudgetIs.php | 2 +- app/Rules/Triggers/CategoryIs.php | 2 +- app/Rules/Triggers/DescriptionContains.php | 2 +- app/Rules/Triggers/DescriptionEnds.php | 2 +- app/Rules/Triggers/DescriptionIs.php | 2 +- app/Rules/Triggers/DescriptionStarts.php | 2 +- app/Rules/Triggers/FromAccountContains.php | 2 +- app/Rules/Triggers/FromAccountEnds.php | 2 +- app/Rules/Triggers/FromAccountIs.php | 2 +- app/Rules/Triggers/FromAccountStarts.php | 2 +- app/Rules/Triggers/TagIs.php | 2 +- app/Rules/Triggers/ToAccountContains.php | 2 +- app/Rules/Triggers/ToAccountEnds.php | 2 +- app/Rules/Triggers/ToAccountIs.php | 2 +- app/Rules/Triggers/ToAccountStarts.php | 2 +- app/Rules/Triggers/TransactionType.php | 2 +- app/Rules/Triggers/TriggerInterface.php | 2 +- app/Rules/Triggers/UserAction.php | 2 +- app/Support/Amount.php | 2 +- app/Support/Binder/AccountList.php | 2 +- app/Support/Binder/BinderInterface.php | 2 +- app/Support/Binder/BudgetList.php | 2 +- app/Support/Binder/CategoryList.php | 2 +- app/Support/Binder/Date.php | 2 +- app/Support/Binder/TagList.php | 2 +- app/Support/Binder/UnfinishedJournal.php | 2 +- app/Support/CacheProperties.php | 2 +- app/Support/ChartColour.php | 2 +- app/Support/Domain.php | 2 +- app/Support/Events/BillScanner.php | 2 +- app/Support/ExpandedForm.php | 2 +- app/Support/Facades/Amount.php | 2 +- app/Support/Facades/ExpandedForm.php | 2 +- app/Support/Facades/FireflyConfig.php | 2 +- app/Support/Facades/Navigation.php | 2 +- app/Support/Facades/Preferences.php | 2 +- app/Support/Facades/Steam.php | 2 +- app/Support/FireflyConfig.php | 2 +- app/Support/Navigation.php | 2 +- app/Support/Preferences.php | 2 +- app/Support/Search/Modifier.php | 2 +- app/Support/Search/Search.php | 1 + app/Support/Search/SearchInterface.php | 2 +- app/Support/Steam.php | 2 +- app/Support/Twig/General.php | 2 +- app/Support/Twig/Journal.php | 2 +- app/Support/Twig/PiggyBank.php | 2 +- app/Support/Twig/Rule.php | 2 +- app/Support/Twig/Transaction.php | 2 +- app/Support/Twig/Translation.php | 2 +- app/User.php | 2 +- 351 files changed, 406 insertions(+), 387 deletions(-) diff --git a/app/Console/Commands/CreateImport.php b/app/Console/Commands/CreateImport.php index c42ca44a2b..3c0d14fb18 100644 --- a/app/Console/Commands/CreateImport.php +++ b/app/Console/Commands/CreateImport.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Console\Commands; diff --git a/app/Console/Commands/EncryptFile.php b/app/Console/Commands/EncryptFile.php index 1ff271a9e5..42e79d8337 100644 --- a/app/Console/Commands/EncryptFile.php +++ b/app/Console/Commands/EncryptFile.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Console\Commands; diff --git a/app/Console/Commands/Import.php b/app/Console/Commands/Import.php index a472cd4a55..d2ff9b8997 100644 --- a/app/Console/Commands/Import.php +++ b/app/Console/Commands/Import.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Console\Commands; diff --git a/app/Console/Commands/ScanAttachments.php b/app/Console/Commands/ScanAttachments.php index 0dc03631f1..23364b129f 100644 --- a/app/Console/Commands/ScanAttachments.php +++ b/app/Console/Commands/ScanAttachments.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Console\Commands; diff --git a/app/Console/Commands/UpgradeFireflyInstructions.php b/app/Console/Commands/UpgradeFireflyInstructions.php index 03e7761172..f98e84f86a 100644 --- a/app/Console/Commands/UpgradeFireflyInstructions.php +++ b/app/Console/Commands/UpgradeFireflyInstructions.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Console\Commands; diff --git a/app/Console/Commands/VerifyDatabase.php b/app/Console/Commands/VerifyDatabase.php index 095bd40884..52cf80c265 100644 --- a/app/Console/Commands/VerifyDatabase.php +++ b/app/Console/Commands/VerifyDatabase.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Console\Commands; diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 2b5ccd9aca..ea6b8598ba 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Console; diff --git a/app/Events/Event.php b/app/Events/Event.php index feaaa07846..c80c8ea3b0 100644 --- a/app/Events/Event.php +++ b/app/Events/Event.php @@ -9,7 +9,8 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); + namespace FireflyIII\Events; /** diff --git a/app/Events/RegisteredUser.php b/app/Events/RegisteredUser.php index 3afc5e05e0..034430e8f2 100644 --- a/app/Events/RegisteredUser.php +++ b/app/Events/RegisteredUser.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Events; diff --git a/app/Events/RequestedNewPassword.php b/app/Events/RequestedNewPassword.php index 52919a646b..c519add49e 100644 --- a/app/Events/RequestedNewPassword.php +++ b/app/Events/RequestedNewPassword.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Events; diff --git a/app/Events/StoredTransactionJournal.php b/app/Events/StoredTransactionJournal.php index 1bc73c5f7a..c76bc7c006 100644 --- a/app/Events/StoredTransactionJournal.php +++ b/app/Events/StoredTransactionJournal.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Events; diff --git a/app/Events/UpdatedTransactionJournal.php b/app/Events/UpdatedTransactionJournal.php index 985aa44fd7..aab43fca25 100644 --- a/app/Events/UpdatedTransactionJournal.php +++ b/app/Events/UpdatedTransactionJournal.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Events; diff --git a/app/Exceptions/FireflyException.php b/app/Exceptions/FireflyException.php index 7b288959a2..37ba66d3db 100644 --- a/app/Exceptions/FireflyException.php +++ b/app/Exceptions/FireflyException.php @@ -9,7 +9,8 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); + namespace FireflyIII\Exceptions; diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 5d314ae2f5..14cb6b0df5 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -9,7 +9,8 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); + namespace FireflyIII\Exceptions; use ErrorException; diff --git a/app/Exceptions/NotImplementedException.php b/app/Exceptions/NotImplementedException.php index 406989bf09..1c31424dd9 100644 --- a/app/Exceptions/NotImplementedException.php +++ b/app/Exceptions/NotImplementedException.php @@ -9,7 +9,8 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); + namespace FireflyIII\Exceptions; diff --git a/app/Exceptions/ValidationException.php b/app/Exceptions/ValidationException.php index 5de31b4fdd..22fc7ce1d8 100644 --- a/app/Exceptions/ValidationException.php +++ b/app/Exceptions/ValidationException.php @@ -9,7 +9,8 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); + namespace FireflyIII\Exceptions; /** diff --git a/app/Export/Collector/AttachmentCollector.php b/app/Export/Collector/AttachmentCollector.php index f65cb72ae3..e3b8f295e9 100644 --- a/app/Export/Collector/AttachmentCollector.php +++ b/app/Export/Collector/AttachmentCollector.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Export\Collector; diff --git a/app/Export/Collector/BasicCollector.php b/app/Export/Collector/BasicCollector.php index c80e8ec280..1780f43246 100644 --- a/app/Export/Collector/BasicCollector.php +++ b/app/Export/Collector/BasicCollector.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Export\Collector; diff --git a/app/Export/Collector/CollectorInterface.php b/app/Export/Collector/CollectorInterface.php index 6cbbac9c2a..fbe25edb72 100644 --- a/app/Export/Collector/CollectorInterface.php +++ b/app/Export/Collector/CollectorInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Export\Collector; diff --git a/app/Export/Collector/JournalExportCollector.php b/app/Export/Collector/JournalExportCollector.php index 234c548baa..175b405f79 100644 --- a/app/Export/Collector/JournalExportCollector.php +++ b/app/Export/Collector/JournalExportCollector.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Export\Collector; diff --git a/app/Export/Collector/UploadCollector.php b/app/Export/Collector/UploadCollector.php index 35c2e75188..17f863e721 100644 --- a/app/Export/Collector/UploadCollector.php +++ b/app/Export/Collector/UploadCollector.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Export\Collector; diff --git a/app/Export/Entry/Entry.php b/app/Export/Entry/Entry.php index f5300ede71..f4061f703b 100644 --- a/app/Export/Entry/Entry.php +++ b/app/Export/Entry/Entry.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Export\Entry; diff --git a/app/Export/Exporter/BasicExporter.php b/app/Export/Exporter/BasicExporter.php index 256fa3b544..a2ce5a32a0 100644 --- a/app/Export/Exporter/BasicExporter.php +++ b/app/Export/Exporter/BasicExporter.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Export\Exporter; diff --git a/app/Export/Exporter/CsvExporter.php b/app/Export/Exporter/CsvExporter.php index 200bf8116d..34a56182e0 100644 --- a/app/Export/Exporter/CsvExporter.php +++ b/app/Export/Exporter/CsvExporter.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Export\Exporter; diff --git a/app/Export/Exporter/ExporterInterface.php b/app/Export/Exporter/ExporterInterface.php index 9e267b4812..c72f8de3ef 100644 --- a/app/Export/Exporter/ExporterInterface.php +++ b/app/Export/Exporter/ExporterInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Export\Exporter; diff --git a/app/Export/Processor.php b/app/Export/Processor.php index cbbdd2736b..8df3a93dce 100644 --- a/app/Export/Processor.php +++ b/app/Export/Processor.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Export; diff --git a/app/Export/ProcessorInterface.php b/app/Export/ProcessorInterface.php index 540dbcaf37..137c8e4c8a 100644 --- a/app/Export/ProcessorInterface.php +++ b/app/Export/ProcessorInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Export; diff --git a/app/Generator/Chart/Basic/ChartJsGenerator.php b/app/Generator/Chart/Basic/ChartJsGenerator.php index b7588d2da2..c3980a5c5f 100644 --- a/app/Generator/Chart/Basic/ChartJsGenerator.php +++ b/app/Generator/Chart/Basic/ChartJsGenerator.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Generator\Chart\Basic; diff --git a/app/Generator/Chart/Basic/GeneratorInterface.php b/app/Generator/Chart/Basic/GeneratorInterface.php index 8b4b90af8a..92b1b29d93 100644 --- a/app/Generator/Chart/Basic/GeneratorInterface.php +++ b/app/Generator/Chart/Basic/GeneratorInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Generator\Chart\Basic; diff --git a/app/Generator/Report/Audit/MonthReportGenerator.php b/app/Generator/Report/Audit/MonthReportGenerator.php index 25f255f3a7..0b12e60fe0 100644 --- a/app/Generator/Report/Audit/MonthReportGenerator.php +++ b/app/Generator/Report/Audit/MonthReportGenerator.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Generator\Report\Audit; diff --git a/app/Generator/Report/Audit/MultiYearReportGenerator.php b/app/Generator/Report/Audit/MultiYearReportGenerator.php index f8baa6e66f..f2313d4114 100644 --- a/app/Generator/Report/Audit/MultiYearReportGenerator.php +++ b/app/Generator/Report/Audit/MultiYearReportGenerator.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Generator\Report\Audit; diff --git a/app/Generator/Report/Audit/YearReportGenerator.php b/app/Generator/Report/Audit/YearReportGenerator.php index b44bae8820..aa730a1d0f 100644 --- a/app/Generator/Report/Audit/YearReportGenerator.php +++ b/app/Generator/Report/Audit/YearReportGenerator.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Generator\Report\Audit; diff --git a/app/Generator/Report/Budget/MonthReportGenerator.php b/app/Generator/Report/Budget/MonthReportGenerator.php index 0934ef20c6..14715045d3 100644 --- a/app/Generator/Report/Budget/MonthReportGenerator.php +++ b/app/Generator/Report/Budget/MonthReportGenerator.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Generator\Report\Budget; diff --git a/app/Generator/Report/Budget/MultiYearReportGenerator.php b/app/Generator/Report/Budget/MultiYearReportGenerator.php index b3820f88dd..cea5926ce2 100644 --- a/app/Generator/Report/Budget/MultiYearReportGenerator.php +++ b/app/Generator/Report/Budget/MultiYearReportGenerator.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Generator\Report\Budget; diff --git a/app/Generator/Report/Budget/YearReportGenerator.php b/app/Generator/Report/Budget/YearReportGenerator.php index 30f51e599c..38cd127d00 100644 --- a/app/Generator/Report/Budget/YearReportGenerator.php +++ b/app/Generator/Report/Budget/YearReportGenerator.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Generator\Report\Budget; diff --git a/app/Generator/Report/Category/MonthReportGenerator.php b/app/Generator/Report/Category/MonthReportGenerator.php index 654f67befc..bb622d2a0b 100644 --- a/app/Generator/Report/Category/MonthReportGenerator.php +++ b/app/Generator/Report/Category/MonthReportGenerator.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Generator\Report\Category; diff --git a/app/Generator/Report/Category/MultiYearReportGenerator.php b/app/Generator/Report/Category/MultiYearReportGenerator.php index 0f57b6b888..5d5c501697 100644 --- a/app/Generator/Report/Category/MultiYearReportGenerator.php +++ b/app/Generator/Report/Category/MultiYearReportGenerator.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Generator\Report\Category; diff --git a/app/Generator/Report/Category/YearReportGenerator.php b/app/Generator/Report/Category/YearReportGenerator.php index e4f62dba0f..4d53762990 100644 --- a/app/Generator/Report/Category/YearReportGenerator.php +++ b/app/Generator/Report/Category/YearReportGenerator.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Generator\Report\Category; diff --git a/app/Generator/Report/ReportGeneratorFactory.php b/app/Generator/Report/ReportGeneratorFactory.php index c62dfd6ac4..8884c21863 100644 --- a/app/Generator/Report/ReportGeneratorFactory.php +++ b/app/Generator/Report/ReportGeneratorFactory.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Generator\Report; diff --git a/app/Generator/Report/ReportGeneratorInterface.php b/app/Generator/Report/ReportGeneratorInterface.php index 12942190f4..300eca098c 100644 --- a/app/Generator/Report/ReportGeneratorInterface.php +++ b/app/Generator/Report/ReportGeneratorInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Generator\Report; diff --git a/app/Generator/Report/Standard/MonthReportGenerator.php b/app/Generator/Report/Standard/MonthReportGenerator.php index bf4d1889ca..93f5d11d2d 100644 --- a/app/Generator/Report/Standard/MonthReportGenerator.php +++ b/app/Generator/Report/Standard/MonthReportGenerator.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Generator\Report\Standard; diff --git a/app/Generator/Report/Standard/MultiYearReportGenerator.php b/app/Generator/Report/Standard/MultiYearReportGenerator.php index a5b1702a95..228edba2a7 100644 --- a/app/Generator/Report/Standard/MultiYearReportGenerator.php +++ b/app/Generator/Report/Standard/MultiYearReportGenerator.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Generator\Report\Standard; diff --git a/app/Generator/Report/Standard/YearReportGenerator.php b/app/Generator/Report/Standard/YearReportGenerator.php index e755b45057..3c8ac07cff 100644 --- a/app/Generator/Report/Standard/YearReportGenerator.php +++ b/app/Generator/Report/Standard/YearReportGenerator.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Generator\Report\Standard; diff --git a/app/Generator/Report/Support.php b/app/Generator/Report/Support.php index 9a8e0f7233..167e99e22e 100644 --- a/app/Generator/Report/Support.php +++ b/app/Generator/Report/Support.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Generator\Report; diff --git a/app/Generator/Report/Tag/MonthReportGenerator.php b/app/Generator/Report/Tag/MonthReportGenerator.php index d58598c8f9..1bcba866a5 100644 --- a/app/Generator/Report/Tag/MonthReportGenerator.php +++ b/app/Generator/Report/Tag/MonthReportGenerator.php @@ -7,7 +7,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Generator\Report\Tag; diff --git a/app/Generator/Report/Tag/MultiYearReportGenerator.php b/app/Generator/Report/Tag/MultiYearReportGenerator.php index 3f92a96e7a..5e7028286d 100644 --- a/app/Generator/Report/Tag/MultiYearReportGenerator.php +++ b/app/Generator/Report/Tag/MultiYearReportGenerator.php @@ -7,7 +7,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Generator\Report\Tag; diff --git a/app/Generator/Report/Tag/YearReportGenerator.php b/app/Generator/Report/Tag/YearReportGenerator.php index bf221e62f8..bbcbc8bb08 100644 --- a/app/Generator/Report/Tag/YearReportGenerator.php +++ b/app/Generator/Report/Tag/YearReportGenerator.php @@ -7,7 +7,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Generator\Report\Tag; diff --git a/app/Handlers/Events/StoredJournalEventHandler.php b/app/Handlers/Events/StoredJournalEventHandler.php index ae67587d67..33df20ebe9 100644 --- a/app/Handlers/Events/StoredJournalEventHandler.php +++ b/app/Handlers/Events/StoredJournalEventHandler.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Handlers\Events; diff --git a/app/Handlers/Events/UpdatedJournalEventHandler.php b/app/Handlers/Events/UpdatedJournalEventHandler.php index 0deea00280..d6432049c6 100644 --- a/app/Handlers/Events/UpdatedJournalEventHandler.php +++ b/app/Handlers/Events/UpdatedJournalEventHandler.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Handlers\Events; diff --git a/app/Handlers/Events/UserEventHandler.php b/app/Handlers/Events/UserEventHandler.php index 836f7b11b5..a3a7e9d84f 100644 --- a/app/Handlers/Events/UserEventHandler.php +++ b/app/Handlers/Events/UserEventHandler.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Handlers\Events; diff --git a/app/Helpers/Attachments/AttachmentHelper.php b/app/Helpers/Attachments/AttachmentHelper.php index 74b189469b..634d912bfb 100644 --- a/app/Helpers/Attachments/AttachmentHelper.php +++ b/app/Helpers/Attachments/AttachmentHelper.php @@ -9,7 +9,8 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); + namespace FireflyIII\Helpers\Attachments; use Crypt; diff --git a/app/Helpers/Chart/MetaPieChart.php b/app/Helpers/Chart/MetaPieChart.php index b93035c179..e3b268a812 100644 --- a/app/Helpers/Chart/MetaPieChart.php +++ b/app/Helpers/Chart/MetaPieChart.php @@ -7,7 +7,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Helpers\Chart; diff --git a/app/Helpers/Chart/MetaPieChartInterface.php b/app/Helpers/Chart/MetaPieChartInterface.php index b4aa0cd736..30e691a299 100644 --- a/app/Helpers/Chart/MetaPieChartInterface.php +++ b/app/Helpers/Chart/MetaPieChartInterface.php @@ -7,7 +7,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Helpers\Chart; diff --git a/app/Helpers/Collection/Balance.php b/app/Helpers/Collection/Balance.php index b708321536..8a946f2200 100644 --- a/app/Helpers/Collection/Balance.php +++ b/app/Helpers/Collection/Balance.php @@ -9,7 +9,8 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); + namespace FireflyIII\Helpers\Collection; use Illuminate\Support\Collection; diff --git a/app/Helpers/Collection/BalanceEntry.php b/app/Helpers/Collection/BalanceEntry.php index 85701ea48b..23fbdf0c62 100644 --- a/app/Helpers/Collection/BalanceEntry.php +++ b/app/Helpers/Collection/BalanceEntry.php @@ -9,7 +9,8 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); + namespace FireflyIII\Helpers\Collection; use FireflyIII\Models\Account as AccountModel; diff --git a/app/Helpers/Collection/BalanceHeader.php b/app/Helpers/Collection/BalanceHeader.php index 66a6145b44..d0a4e8e934 100644 --- a/app/Helpers/Collection/BalanceHeader.php +++ b/app/Helpers/Collection/BalanceHeader.php @@ -9,7 +9,8 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); + namespace FireflyIII\Helpers\Collection; use FireflyIII\Models\Account as AccountModel; diff --git a/app/Helpers/Collection/BalanceLine.php b/app/Helpers/Collection/BalanceLine.php index 9b14902d40..73b1a0f486 100644 --- a/app/Helpers/Collection/BalanceLine.php +++ b/app/Helpers/Collection/BalanceLine.php @@ -9,7 +9,8 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); + namespace FireflyIII\Helpers\Collection; use Carbon\Carbon; diff --git a/app/Helpers/Collection/Bill.php b/app/Helpers/Collection/Bill.php index 1cfac94d20..e78e31631b 100644 --- a/app/Helpers/Collection/Bill.php +++ b/app/Helpers/Collection/Bill.php @@ -9,7 +9,8 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); + namespace FireflyIII\Helpers\Collection; diff --git a/app/Helpers/Collection/BillLine.php b/app/Helpers/Collection/BillLine.php index 3b7bd692b6..10a24dbcb8 100644 --- a/app/Helpers/Collection/BillLine.php +++ b/app/Helpers/Collection/BillLine.php @@ -9,7 +9,8 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); + namespace FireflyIII\Helpers\Collection; use Carbon\Carbon; diff --git a/app/Helpers/Collection/Category.php b/app/Helpers/Collection/Category.php index faa4119a86..7a4a8b6415 100644 --- a/app/Helpers/Collection/Category.php +++ b/app/Helpers/Collection/Category.php @@ -9,7 +9,8 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); + namespace FireflyIII\Helpers\Collection; use FireflyIII\Models\Category as CategoryModel; diff --git a/app/Helpers/Collector/JournalCollector.php b/app/Helpers/Collector/JournalCollector.php index 46024ad842..cafc431ea4 100644 --- a/app/Helpers/Collector/JournalCollector.php +++ b/app/Helpers/Collector/JournalCollector.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Helpers\Collector; diff --git a/app/Helpers/Collector/JournalCollectorInterface.php b/app/Helpers/Collector/JournalCollectorInterface.php index 05306699a7..954ae46cfa 100644 --- a/app/Helpers/Collector/JournalCollectorInterface.php +++ b/app/Helpers/Collector/JournalCollectorInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Helpers\Collector; diff --git a/app/Helpers/FiscalHelper.php b/app/Helpers/FiscalHelper.php index 16e965f82b..2e8f9cd534 100644 --- a/app/Helpers/FiscalHelper.php +++ b/app/Helpers/FiscalHelper.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Helpers; diff --git a/app/Helpers/FiscalHelperInterface.php b/app/Helpers/FiscalHelperInterface.php index 830610fa9f..24673f2423 100644 --- a/app/Helpers/FiscalHelperInterface.php +++ b/app/Helpers/FiscalHelperInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Helpers; diff --git a/app/Helpers/Help/HelpInterface.php b/app/Helpers/Help/HelpInterface.php index 9501cdc019..027552f203 100644 --- a/app/Helpers/Help/HelpInterface.php +++ b/app/Helpers/Help/HelpInterface.php @@ -9,7 +9,8 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); + namespace FireflyIII\Helpers\Help; /** diff --git a/app/Helpers/Report/BalanceReportHelper.php b/app/Helpers/Report/BalanceReportHelper.php index 2c6dae78a8..9c62ea1ebc 100644 --- a/app/Helpers/Report/BalanceReportHelper.php +++ b/app/Helpers/Report/BalanceReportHelper.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Helpers\Report; diff --git a/app/Helpers/Report/BalanceReportHelperInterface.php b/app/Helpers/Report/BalanceReportHelperInterface.php index 6687eb6cf6..a0cd05246e 100644 --- a/app/Helpers/Report/BalanceReportHelperInterface.php +++ b/app/Helpers/Report/BalanceReportHelperInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Helpers\Report; diff --git a/app/Helpers/Report/BudgetReportHelper.php b/app/Helpers/Report/BudgetReportHelper.php index 8025b0a159..55c6ea64a7 100644 --- a/app/Helpers/Report/BudgetReportHelper.php +++ b/app/Helpers/Report/BudgetReportHelper.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Helpers\Report; diff --git a/app/Helpers/Report/BudgetReportHelperInterface.php b/app/Helpers/Report/BudgetReportHelperInterface.php index a64d47d39f..7977453193 100644 --- a/app/Helpers/Report/BudgetReportHelperInterface.php +++ b/app/Helpers/Report/BudgetReportHelperInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Helpers\Report; diff --git a/app/Helpers/Report/PopupReport.php b/app/Helpers/Report/PopupReport.php index 58df239d0f..f4d0a07d17 100644 --- a/app/Helpers/Report/PopupReport.php +++ b/app/Helpers/Report/PopupReport.php @@ -28,6 +28,37 @@ class PopupReport implements PopupReportInterface { + /** + * @param $account + * @param $attributes + * + * @return Collection + */ + public function balanceDifference($account, $attributes): Collection + { + // row that displays difference + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector + ->setAccounts(new Collection([$account])) + ->setTypes([TransactionType::WITHDRAWAL]) + ->setRange($attributes['startDate'], $attributes['endDate']) + ->withoutBudget(); + $journals = $collector->getJournals(); + + + return $journals->filter( + function (Transaction $transaction) { + $tags = $transaction->transactionJournal->tags()->where('tagMode', 'balancingAct')->count(); + if ($tags === 0) { + return true; + } + + return false; + } + ); + } + /** * @param Budget $budget * @param Account $account @@ -165,35 +196,4 @@ class PopupReport implements PopupReportInterface return $journals; } - - /** - * @param $account - * @param $attributes - * - * @return Collection - */ - public function balanceDifference($account, $attributes): Collection - { - // row that displays difference - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector - ->setAccounts(new Collection([$account])) - ->setTypes([TransactionType::WITHDRAWAL]) - ->setRange($attributes['startDate'], $attributes['endDate']) - ->withoutBudget(); - $journals = $collector->getJournals(); - - - return $journals->filter( - function (Transaction $transaction) { - $tags = $transaction->transactionJournal->tags()->where('tagMode', 'balancingAct')->count(); - if ($tags === 0) { - return true; - } - - return false; - } - ); - } } \ No newline at end of file diff --git a/app/Helpers/Report/ReportHelper.php b/app/Helpers/Report/ReportHelper.php index 20a008e87a..997901b7fe 100644 --- a/app/Helpers/Report/ReportHelper.php +++ b/app/Helpers/Report/ReportHelper.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Helpers\Report; diff --git a/app/Helpers/Report/ReportHelperInterface.php b/app/Helpers/Report/ReportHelperInterface.php index fb14625126..0b003a4c44 100644 --- a/app/Helpers/Report/ReportHelperInterface.php +++ b/app/Helpers/Report/ReportHelperInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Helpers\Report; diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 932716929c..83098c0fb6 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers; diff --git a/app/Http/Controllers/Admin/ConfigurationController.php b/app/Http/Controllers/Admin/ConfigurationController.php index 909d33ae62..746c9cbdfe 100644 --- a/app/Http/Controllers/Admin/ConfigurationController.php +++ b/app/Http/Controllers/Admin/ConfigurationController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Admin; diff --git a/app/Http/Controllers/Admin/HomeController.php b/app/Http/Controllers/Admin/HomeController.php index fa798ef248..6cc7090a62 100644 --- a/app/Http/Controllers/Admin/HomeController.php +++ b/app/Http/Controllers/Admin/HomeController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Admin; diff --git a/app/Http/Controllers/AttachmentController.php b/app/Http/Controllers/AttachmentController.php index d731a913cc..cd8de38752 100644 --- a/app/Http/Controllers/AttachmentController.php +++ b/app/Http/Controllers/AttachmentController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers; diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index b478e3ee61..5f5f36f159 100644 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -8,7 +8,7 @@ * * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Auth; diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index d02e9e34d7..d2186aa40f 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -8,7 +8,7 @@ * * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Auth; diff --git a/app/Http/Controllers/Auth/PasswordController.php b/app/Http/Controllers/Auth/PasswordController.php index 2f98b71c3f..035b11bb13 100644 --- a/app/Http/Controllers/Auth/PasswordController.php +++ b/app/Http/Controllers/Auth/PasswordController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Auth; diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 042ea85145..7f7816b64d 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -8,7 +8,7 @@ * * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Auth; diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php index bc9d48f3a3..1cdb78b988 100644 --- a/app/Http/Controllers/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/Auth/ResetPasswordController.php @@ -8,7 +8,7 @@ * * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Auth; diff --git a/app/Http/Controllers/Auth/TwoFactorController.php b/app/Http/Controllers/Auth/TwoFactorController.php index 337f9391fd..f0b2b74993 100644 --- a/app/Http/Controllers/Auth/TwoFactorController.php +++ b/app/Http/Controllers/Auth/TwoFactorController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Auth; @@ -42,8 +42,8 @@ class TwoFactorController extends Controller // to make sure the validator in the next step gets the secret, we push it in session $secretPreference = Preferences::get('twoFactorAuthSecret', null); - $secret = is_null($secretPreference) ? null : $secretPreference->data; - $title = strval(trans('firefly.two_factor_title')); + $secret = is_null($secretPreference) ? null : $secretPreference->data; + $title = strval(trans('firefly.two_factor_title')); // make sure the user has two factor configured: $has2FA = Preferences::get('twoFactorAuthEnabled', false)->data; diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php index d738234d40..2418bde1b0 100644 --- a/app/Http/Controllers/BillController.php +++ b/app/Http/Controllers/BillController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers; diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index 79cbfd9580..9fd5d23a6a 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers; diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php index 6fb04e613c..0e37cba3da 100644 --- a/app/Http/Controllers/Chart/AccountController.php +++ b/app/Http/Controllers/Chart/AccountController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Chart; diff --git a/app/Http/Controllers/Chart/BillController.php b/app/Http/Controllers/Chart/BillController.php index 2e1b856db9..27a0ad5ad8 100644 --- a/app/Http/Controllers/Chart/BillController.php +++ b/app/Http/Controllers/Chart/BillController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Chart; diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php index 4c9896afe0..1a13892cea 100644 --- a/app/Http/Controllers/Chart/BudgetController.php +++ b/app/Http/Controllers/Chart/BudgetController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Chart; diff --git a/app/Http/Controllers/Chart/PiggyBankController.php b/app/Http/Controllers/Chart/PiggyBankController.php index 12bf655f9a..7cec7acf2d 100644 --- a/app/Http/Controllers/Chart/PiggyBankController.php +++ b/app/Http/Controllers/Chart/PiggyBankController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Chart; diff --git a/app/Http/Controllers/Chart/ReportController.php b/app/Http/Controllers/Chart/ReportController.php index f616db007a..3e93d69d4e 100644 --- a/app/Http/Controllers/Chart/ReportController.php +++ b/app/Http/Controllers/Chart/ReportController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Chart; diff --git a/app/Http/Controllers/Chart/TagReportController.php b/app/Http/Controllers/Chart/TagReportController.php index 71ecdbd5b1..ca7834b792 100644 --- a/app/Http/Controllers/Chart/TagReportController.php +++ b/app/Http/Controllers/Chart/TagReportController.php @@ -7,7 +7,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Chart; diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 203628861f..63cbe9c975 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers; diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php index ca2bef553b..7590ff821a 100644 --- a/app/Http/Controllers/CurrencyController.php +++ b/app/Http/Controllers/CurrencyController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers; diff --git a/app/Http/Controllers/ExportController.php b/app/Http/Controllers/ExportController.php index 6bdec809f1..6bb4cd3f44 100644 --- a/app/Http/Controllers/ExportController.php +++ b/app/Http/Controllers/ExportController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers; diff --git a/app/Http/Controllers/HelpController.php b/app/Http/Controllers/HelpController.php index ce2e0d2bfa..e776749bc6 100644 --- a/app/Http/Controllers/HelpController.php +++ b/app/Http/Controllers/HelpController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers; diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 1fe4cc1d43..7e4cca9547 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -9,7 +9,8 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); + namespace FireflyIII\Http\Controllers; use Artisan; diff --git a/app/Http/Controllers/JavascriptController.php b/app/Http/Controllers/JavascriptController.php index 9dd5ec59d5..b1d67fdaf9 100644 --- a/app/Http/Controllers/JavascriptController.php +++ b/app/Http/Controllers/JavascriptController.php @@ -7,7 +7,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers; diff --git a/app/Http/Controllers/JsonController.php b/app/Http/Controllers/JsonController.php index c20552ae0a..a9502f5fdb 100644 --- a/app/Http/Controllers/JsonController.php +++ b/app/Http/Controllers/JsonController.php @@ -9,7 +9,8 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); + namespace FireflyIII\Http\Controllers; use Amount; diff --git a/app/Http/Controllers/NewUserController.php b/app/Http/Controllers/NewUserController.php index 12a9c396a9..cbecfb9593 100644 --- a/app/Http/Controllers/NewUserController.php +++ b/app/Http/Controllers/NewUserController.php @@ -9,7 +9,8 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); + namespace FireflyIII\Http\Controllers; use Carbon\Carbon; diff --git a/app/Http/Controllers/Popup/ReportController.php b/app/Http/Controllers/Popup/ReportController.php index d557b554b2..db70c528aa 100644 --- a/app/Http/Controllers/Popup/ReportController.php +++ b/app/Http/Controllers/Popup/ReportController.php @@ -19,7 +19,6 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Collection\BalanceLine; use FireflyIII\Helpers\Report\PopupReportInterface; use FireflyIII\Http\Controllers\Controller; -use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index b816a1e5bd..780c3038f4 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -140,18 +140,18 @@ class ProfileController extends Controller return redirect(route('index')); } + /** * @param User $user * @param string $current * @param string $new - * @param string $newConfirmation * * @return bool * @throws ValidationException */ protected function validatePassword(User $user, string $current, string $new): bool { - if (!Hash::check($current, auth()->user()->password)) { + if (!Hash::check($current, $user->password)) { throw new ValidationException(strval(trans('firefly.invalid_current_password'))); } diff --git a/app/Http/Controllers/Report/AccountController.php b/app/Http/Controllers/Report/AccountController.php index 70a92d9c2b..3453b525c5 100644 --- a/app/Http/Controllers/Report/AccountController.php +++ b/app/Http/Controllers/Report/AccountController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Report; diff --git a/app/Http/Controllers/Report/BalanceController.php b/app/Http/Controllers/Report/BalanceController.php index 4de9d74ea6..9793f45275 100644 --- a/app/Http/Controllers/Report/BalanceController.php +++ b/app/Http/Controllers/Report/BalanceController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Report; diff --git a/app/Http/Controllers/Report/BudgetController.php b/app/Http/Controllers/Report/BudgetController.php index 6ea5384250..b6b4c8bebd 100644 --- a/app/Http/Controllers/Report/BudgetController.php +++ b/app/Http/Controllers/Report/BudgetController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Report; diff --git a/app/Http/Controllers/Report/CategoryController.php b/app/Http/Controllers/Report/CategoryController.php index 3ac8f8e423..1528f44460 100644 --- a/app/Http/Controllers/Report/CategoryController.php +++ b/app/Http/Controllers/Report/CategoryController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Report; @@ -20,7 +20,6 @@ use FireflyIII\Models\Category; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use FireflyIII\Support\CacheProperties; use Illuminate\Support\Collection; -use Log; use Navigation; /** diff --git a/app/Http/Controllers/Report/OperationsController.php b/app/Http/Controllers/Report/OperationsController.php index 44c778f49b..0ddf9148df 100644 --- a/app/Http/Controllers/Report/OperationsController.php +++ b/app/Http/Controllers/Report/OperationsController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Report; diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index b6adef9c32..9b13cc1bb3 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -262,6 +262,7 @@ class ReportController extends Controller $categories = join(',', $request->getCategoryList()->pluck('id')->toArray()); $budgets = join(',', $request->getBudgetList()->pluck('id')->toArray()); $tags = join(',', $request->getTagList()->pluck('tag')->toArray()); + $uri = route('reports.index'); if ($request->getAccountList()->count() === 0) { Log::debug('Account count is zero'); diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index bf4b933d7d..f014f8325a 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers; diff --git a/app/Http/Controllers/Transaction/ConvertController.php b/app/Http/Controllers/Transaction/ConvertController.php index efae285b27..72e4209a51 100644 --- a/app/Http/Controllers/Transaction/ConvertController.php +++ b/app/Http/Controllers/Transaction/ConvertController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Transaction; diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.php index dfff2e24b7..285a73f3e9 100644 --- a/app/Http/Controllers/Transaction/MassController.php +++ b/app/Http/Controllers/Transaction/MassController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Transaction; diff --git a/app/Http/Controllers/Transaction/SingleController.php b/app/Http/Controllers/Transaction/SingleController.php index c58edf55f2..da12791431 100644 --- a/app/Http/Controllers/Transaction/SingleController.php +++ b/app/Http/Controllers/Transaction/SingleController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Transaction; @@ -238,7 +238,7 @@ class SingleController extends Controller $optionalFields = Preferences::get('transaction_journal_optional_fields', [])->data; $preFilled = [ 'date' => $journal->dateAsString(), - 'interest_date' => $journal->dateAsString( 'interest_date'), + 'interest_date' => $journal->dateAsString('interest_date'), 'book_date' => $journal->dateAsString('book_date'), 'process_date' => $journal->dateAsString('process_date'), 'category' => $journal->categoryAsString(), diff --git a/app/Http/Controllers/Transaction/SplitController.php b/app/Http/Controllers/Transaction/SplitController.php index 8038734622..c587129811 100644 --- a/app/Http/Controllers/Transaction/SplitController.php +++ b/app/Http/Controllers/Transaction/SplitController.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Controllers\Transaction; diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 289a6924d1..5224ad8579 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -8,7 +8,7 @@ * * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http; diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index 529546437d..5733cb1c1a 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Middleware; diff --git a/app/Http/Middleware/AuthenticateTwoFactor.php b/app/Http/Middleware/AuthenticateTwoFactor.php index 5325150bcc..625f55ba23 100644 --- a/app/Http/Middleware/AuthenticateTwoFactor.php +++ b/app/Http/Middleware/AuthenticateTwoFactor.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Middleware; diff --git a/app/Http/Middleware/Binder.php b/app/Http/Middleware/Binder.php index 79cf3267fd..52ac1c10ab 100644 --- a/app/Http/Middleware/Binder.php +++ b/app/Http/Middleware/Binder.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Middleware; diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php index 6475f4f6da..85188c9c17 100644 --- a/app/Http/Middleware/EncryptCookies.php +++ b/app/Http/Middleware/EncryptCookies.php @@ -8,7 +8,7 @@ * * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Middleware; diff --git a/app/Http/Middleware/IsAdmin.php b/app/Http/Middleware/IsAdmin.php index 823be2f20d..a8e82710dc 100644 --- a/app/Http/Middleware/IsAdmin.php +++ b/app/Http/Middleware/IsAdmin.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Middleware; diff --git a/app/Http/Middleware/Range.php b/app/Http/Middleware/Range.php index 7bc60818c9..025478e7df 100644 --- a/app/Http/Middleware/Range.php +++ b/app/Http/Middleware/Range.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Middleware; diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php index e7cf7f3bcf..e2ba0517f2 100644 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -8,7 +8,7 @@ * * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Middleware; diff --git a/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php b/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php index 5d58521a7d..1320204959 100644 --- a/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php +++ b/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Middleware; diff --git a/app/Http/Middleware/Sandstorm.php b/app/Http/Middleware/Sandstorm.php index e07a0ca1b5..a9ba75bd09 100644 --- a/app/Http/Middleware/Sandstorm.php +++ b/app/Http/Middleware/Sandstorm.php @@ -7,7 +7,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Middleware; diff --git a/app/Http/Middleware/StartFireflySession.php b/app/Http/Middleware/StartFireflySession.php index f72e13aed3..c419b0e8c3 100644 --- a/app/Http/Middleware/StartFireflySession.php +++ b/app/Http/Middleware/StartFireflySession.php @@ -7,7 +7,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Middleware; diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php index 0c7c3ed591..98ded14137 100644 --- a/app/Http/Middleware/VerifyCsrfToken.php +++ b/app/Http/Middleware/VerifyCsrfToken.php @@ -8,7 +8,7 @@ * * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Middleware; diff --git a/app/Http/Requests/AccountFormRequest.php b/app/Http/Requests/AccountFormRequest.php index cadf22b600..1433e65f48 100644 --- a/app/Http/Requests/AccountFormRequest.php +++ b/app/Http/Requests/AccountFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/AttachmentFormRequest.php b/app/Http/Requests/AttachmentFormRequest.php index 6f7608bc46..30d2fe6d2b 100644 --- a/app/Http/Requests/AttachmentFormRequest.php +++ b/app/Http/Requests/AttachmentFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/BudgetFormRequest.php b/app/Http/Requests/BudgetFormRequest.php index c7d9d0de63..5c6f1ce537 100644 --- a/app/Http/Requests/BudgetFormRequest.php +++ b/app/Http/Requests/BudgetFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/BudgetIncomeRequest.php b/app/Http/Requests/BudgetIncomeRequest.php index e8c2c93e39..8af316dd48 100644 --- a/app/Http/Requests/BudgetIncomeRequest.php +++ b/app/Http/Requests/BudgetIncomeRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/CategoryFormRequest.php b/app/Http/Requests/CategoryFormRequest.php index b7b5e94a5e..9fb1942d20 100644 --- a/app/Http/Requests/CategoryFormRequest.php +++ b/app/Http/Requests/CategoryFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/ConfigurationRequest.php b/app/Http/Requests/ConfigurationRequest.php index 452e613e73..15cfe56a43 100644 --- a/app/Http/Requests/ConfigurationRequest.php +++ b/app/Http/Requests/ConfigurationRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/CurrencyFormRequest.php b/app/Http/Requests/CurrencyFormRequest.php index 0449f9b4ab..6a779665e5 100644 --- a/app/Http/Requests/CurrencyFormRequest.php +++ b/app/Http/Requests/CurrencyFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/DeleteAccountFormRequest.php b/app/Http/Requests/DeleteAccountFormRequest.php index 9586af3767..b3dd484d7e 100644 --- a/app/Http/Requests/DeleteAccountFormRequest.php +++ b/app/Http/Requests/DeleteAccountFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/ExportFormRequest.php b/app/Http/Requests/ExportFormRequest.php index 028a3246cf..16a5638302 100644 --- a/app/Http/Requests/ExportFormRequest.php +++ b/app/Http/Requests/ExportFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/ImportUploadRequest.php b/app/Http/Requests/ImportUploadRequest.php index 62e4f117d8..93065bcada 100644 --- a/app/Http/Requests/ImportUploadRequest.php +++ b/app/Http/Requests/ImportUploadRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/JournalFormRequest.php b/app/Http/Requests/JournalFormRequest.php index 62dc5656d2..0a03746797 100644 --- a/app/Http/Requests/JournalFormRequest.php +++ b/app/Http/Requests/JournalFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/MassDeleteJournalRequest.php b/app/Http/Requests/MassDeleteJournalRequest.php index 13283012d1..004f4aa4ed 100644 --- a/app/Http/Requests/MassDeleteJournalRequest.php +++ b/app/Http/Requests/MassDeleteJournalRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/MassEditJournalRequest.php b/app/Http/Requests/MassEditJournalRequest.php index 03ae6ae6f7..7067d34e05 100644 --- a/app/Http/Requests/MassEditJournalRequest.php +++ b/app/Http/Requests/MassEditJournalRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/NewUserFormRequest.php b/app/Http/Requests/NewUserFormRequest.php index b8627cffa2..b5ef0fd040 100644 --- a/app/Http/Requests/NewUserFormRequest.php +++ b/app/Http/Requests/NewUserFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/PiggyBankFormRequest.php b/app/Http/Requests/PiggyBankFormRequest.php index ba969dcf64..c2d9f7f9e5 100644 --- a/app/Http/Requests/PiggyBankFormRequest.php +++ b/app/Http/Requests/PiggyBankFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/ProfileFormRequest.php b/app/Http/Requests/ProfileFormRequest.php index 02bce0c99c..fe1ac7bf93 100644 --- a/app/Http/Requests/ProfileFormRequest.php +++ b/app/Http/Requests/ProfileFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/ReportFormRequest.php b/app/Http/Requests/ReportFormRequest.php index 02a5f5c8e5..db8b5fbe74 100644 --- a/app/Http/Requests/ReportFormRequest.php +++ b/app/Http/Requests/ReportFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php index cf8bbae71e..16e77bad4a 100644 --- a/app/Http/Requests/Request.php +++ b/app/Http/Requests/Request.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/RuleFormRequest.php b/app/Http/Requests/RuleFormRequest.php index 6295bd9e3f..8206b53264 100644 --- a/app/Http/Requests/RuleFormRequest.php +++ b/app/Http/Requests/RuleFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/RuleGroupFormRequest.php b/app/Http/Requests/RuleGroupFormRequest.php index 7d2250882f..4e94676e23 100644 --- a/app/Http/Requests/RuleGroupFormRequest.php +++ b/app/Http/Requests/RuleGroupFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/SelectTransactionsRequest.php b/app/Http/Requests/SelectTransactionsRequest.php index 097089ff79..5b85dd3b26 100644 --- a/app/Http/Requests/SelectTransactionsRequest.php +++ b/app/Http/Requests/SelectTransactionsRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/SplitJournalFormRequest.php b/app/Http/Requests/SplitJournalFormRequest.php index 3d82027c6b..2c1fab0dac 100644 --- a/app/Http/Requests/SplitJournalFormRequest.php +++ b/app/Http/Requests/SplitJournalFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/TagFormRequest.php b/app/Http/Requests/TagFormRequest.php index 06c976e516..d61e5cb8d9 100644 --- a/app/Http/Requests/TagFormRequest.php +++ b/app/Http/Requests/TagFormRequest.php @@ -9,7 +9,8 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); + namespace FireflyIII\Http\Requests; use FireflyIII\Repositories\Tag\TagRepositoryInterface; diff --git a/app/Http/Requests/TestRuleFormRequest.php b/app/Http/Requests/TestRuleFormRequest.php index df76fd08a3..c2d3bd8c61 100644 --- a/app/Http/Requests/TestRuleFormRequest.php +++ b/app/Http/Requests/TestRuleFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Http/Requests/TokenFormRequest.php b/app/Http/Requests/TokenFormRequest.php index 4c90a2539f..8e30d3eaa7 100644 --- a/app/Http/Requests/TokenFormRequest.php +++ b/app/Http/Requests/TokenFormRequest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Http\Requests; diff --git a/app/Import/Converter/AccountId.php b/app/Import/Converter/AccountId.php index 4c07790fa5..88161515ab 100644 --- a/app/Import/Converter/AccountId.php +++ b/app/Import/Converter/AccountId.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/Amount.php b/app/Import/Converter/Amount.php index ab0fceb6b7..c7840e397c 100644 --- a/app/Import/Converter/Amount.php +++ b/app/Import/Converter/Amount.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/AssetAccountIban.php b/app/Import/Converter/AssetAccountIban.php index d2336c282d..f98bef6110 100644 --- a/app/Import/Converter/AssetAccountIban.php +++ b/app/Import/Converter/AssetAccountIban.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/AssetAccountName.php b/app/Import/Converter/AssetAccountName.php index 8618d52f2d..8355c3b056 100644 --- a/app/Import/Converter/AssetAccountName.php +++ b/app/Import/Converter/AssetAccountName.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/AssetAccountNumber.php b/app/Import/Converter/AssetAccountNumber.php index d389492c91..880b4d3061 100644 --- a/app/Import/Converter/AssetAccountNumber.php +++ b/app/Import/Converter/AssetAccountNumber.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/BasicConverter.php b/app/Import/Converter/BasicConverter.php index 91183ba936..49fba30f0d 100644 --- a/app/Import/Converter/BasicConverter.php +++ b/app/Import/Converter/BasicConverter.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/BillId.php b/app/Import/Converter/BillId.php index cb20e4c7c9..11c91d6536 100644 --- a/app/Import/Converter/BillId.php +++ b/app/Import/Converter/BillId.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/BillName.php b/app/Import/Converter/BillName.php index 3d2dbe9a71..2ba4ad2761 100644 --- a/app/Import/Converter/BillName.php +++ b/app/Import/Converter/BillName.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/BudgetId.php b/app/Import/Converter/BudgetId.php index cf709c0beb..ea74b8302f 100644 --- a/app/Import/Converter/BudgetId.php +++ b/app/Import/Converter/BudgetId.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/BudgetName.php b/app/Import/Converter/BudgetName.php index 7ecd85530c..5d36a109ac 100644 --- a/app/Import/Converter/BudgetName.php +++ b/app/Import/Converter/BudgetName.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/CategoryId.php b/app/Import/Converter/CategoryId.php index 2544a61597..4b5cd4e6af 100644 --- a/app/Import/Converter/CategoryId.php +++ b/app/Import/Converter/CategoryId.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/CategoryName.php b/app/Import/Converter/CategoryName.php index f8af2414b1..fcd52413cc 100644 --- a/app/Import/Converter/CategoryName.php +++ b/app/Import/Converter/CategoryName.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/ConverterInterface.php b/app/Import/Converter/ConverterInterface.php index 0cc0137a05..f5c27a2746 100644 --- a/app/Import/Converter/ConverterInterface.php +++ b/app/Import/Converter/ConverterInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/CurrencyCode.php b/app/Import/Converter/CurrencyCode.php index f78433ddf3..1afa778292 100644 --- a/app/Import/Converter/CurrencyCode.php +++ b/app/Import/Converter/CurrencyCode.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/CurrencyId.php b/app/Import/Converter/CurrencyId.php index 299cde1bf3..d3b74da000 100644 --- a/app/Import/Converter/CurrencyId.php +++ b/app/Import/Converter/CurrencyId.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/CurrencyName.php b/app/Import/Converter/CurrencyName.php index 71af377582..f68ec043a1 100644 --- a/app/Import/Converter/CurrencyName.php +++ b/app/Import/Converter/CurrencyName.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/CurrencySymbol.php b/app/Import/Converter/CurrencySymbol.php index 27ed50dd48..a40b06af40 100644 --- a/app/Import/Converter/CurrencySymbol.php +++ b/app/Import/Converter/CurrencySymbol.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/Date.php b/app/Import/Converter/Date.php index e4b6cbb0e9..b799aed9e7 100644 --- a/app/Import/Converter/Date.php +++ b/app/Import/Converter/Date.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/Description.php b/app/Import/Converter/Description.php index b9c3bdf807..9eb507acb8 100644 --- a/app/Import/Converter/Description.php +++ b/app/Import/Converter/Description.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/ExternalId.php b/app/Import/Converter/ExternalId.php index 344e793be4..feb2e8c3d1 100644 --- a/app/Import/Converter/ExternalId.php +++ b/app/Import/Converter/ExternalId.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/INGDebetCredit.php b/app/Import/Converter/INGDebetCredit.php index 1640e76d0c..80650257ae 100644 --- a/app/Import/Converter/INGDebetCredit.php +++ b/app/Import/Converter/INGDebetCredit.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/Ignore.php b/app/Import/Converter/Ignore.php index 88f1c2c889..ac619bac3a 100644 --- a/app/Import/Converter/Ignore.php +++ b/app/Import/Converter/Ignore.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/OpposingAccountIban.php b/app/Import/Converter/OpposingAccountIban.php index ee8b40747c..ce01993ea5 100644 --- a/app/Import/Converter/OpposingAccountIban.php +++ b/app/Import/Converter/OpposingAccountIban.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/OpposingAccountName.php b/app/Import/Converter/OpposingAccountName.php index fa51245fd6..90a959408c 100644 --- a/app/Import/Converter/OpposingAccountName.php +++ b/app/Import/Converter/OpposingAccountName.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/OpposingAccountNumber.php b/app/Import/Converter/OpposingAccountNumber.php index d513a88ae0..8ede15ed85 100644 --- a/app/Import/Converter/OpposingAccountNumber.php +++ b/app/Import/Converter/OpposingAccountNumber.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/RabobankDebetCredit.php b/app/Import/Converter/RabobankDebetCredit.php index dfa8363e2a..9b3e89314d 100644 --- a/app/Import/Converter/RabobankDebetCredit.php +++ b/app/Import/Converter/RabobankDebetCredit.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/TagSplit.php b/app/Import/Converter/TagSplit.php index d93074b7d0..f5ebd034af 100644 --- a/app/Import/Converter/TagSplit.php +++ b/app/Import/Converter/TagSplit.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/TagsComma.php b/app/Import/Converter/TagsComma.php index e9fbbaeecd..93e13698f0 100644 --- a/app/Import/Converter/TagsComma.php +++ b/app/Import/Converter/TagsComma.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/Converter/TagsSpace.php b/app/Import/Converter/TagsSpace.php index 3c437bd94b..ae9635a8b7 100644 --- a/app/Import/Converter/TagsSpace.php +++ b/app/Import/Converter/TagsSpace.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Converter; diff --git a/app/Import/ImportProcedure.php b/app/Import/ImportProcedure.php index 991c5addcd..9150010dae 100644 --- a/app/Import/ImportProcedure.php +++ b/app/Import/ImportProcedure.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import; diff --git a/app/Import/ImportProcedureInterface.php b/app/Import/ImportProcedureInterface.php index 22a519aa95..ca2c6ff5da 100644 --- a/app/Import/ImportProcedureInterface.php +++ b/app/Import/ImportProcedureInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import; diff --git a/app/Import/ImportStorage.php b/app/Import/ImportStorage.php index 89b5e76ded..2d5524fcec 100644 --- a/app/Import/ImportStorage.php +++ b/app/Import/ImportStorage.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import; diff --git a/app/Import/ImportValidator.php b/app/Import/ImportValidator.php index 9a5a254151..3a3a373b2b 100644 --- a/app/Import/ImportValidator.php +++ b/app/Import/ImportValidator.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import; diff --git a/app/Import/Importer/CsvImporter.php b/app/Import/Importer/CsvImporter.php index 0cc869fcd4..99f8c62a97 100644 --- a/app/Import/Importer/CsvImporter.php +++ b/app/Import/Importer/CsvImporter.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Importer; diff --git a/app/Import/Importer/ImporterInterface.php b/app/Import/Importer/ImporterInterface.php index 9994faa205..06c18bd793 100644 --- a/app/Import/Importer/ImporterInterface.php +++ b/app/Import/Importer/ImporterInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Importer; diff --git a/app/Import/Logging/CommandHandler.php b/app/Import/Logging/CommandHandler.php index 56813cd2ad..b87830469d 100644 --- a/app/Import/Logging/CommandHandler.php +++ b/app/Import/Logging/CommandHandler.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Logging; diff --git a/app/Import/Mapper/AssetAccountIbans.php b/app/Import/Mapper/AssetAccountIbans.php index e5ff5b8016..e94f502cbb 100644 --- a/app/Import/Mapper/AssetAccountIbans.php +++ b/app/Import/Mapper/AssetAccountIbans.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Mapper; diff --git a/app/Import/Mapper/AssetAccounts.php b/app/Import/Mapper/AssetAccounts.php index dc6032dc7a..8335bea7e4 100644 --- a/app/Import/Mapper/AssetAccounts.php +++ b/app/Import/Mapper/AssetAccounts.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Mapper; diff --git a/app/Import/Mapper/Bills.php b/app/Import/Mapper/Bills.php index 2fddb31e4e..57d60b3013 100644 --- a/app/Import/Mapper/Bills.php +++ b/app/Import/Mapper/Bills.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Mapper; diff --git a/app/Import/Mapper/Budgets.php b/app/Import/Mapper/Budgets.php index b566568d25..37276ddcc0 100644 --- a/app/Import/Mapper/Budgets.php +++ b/app/Import/Mapper/Budgets.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Mapper; diff --git a/app/Import/Mapper/Categories.php b/app/Import/Mapper/Categories.php index 6e66964040..5144a06a41 100644 --- a/app/Import/Mapper/Categories.php +++ b/app/Import/Mapper/Categories.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Mapper; diff --git a/app/Import/Mapper/MapperInterface.php b/app/Import/Mapper/MapperInterface.php index c80b71fa26..237780d502 100644 --- a/app/Import/Mapper/MapperInterface.php +++ b/app/Import/Mapper/MapperInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Mapper; diff --git a/app/Import/Mapper/OpposingAccountIbans.php b/app/Import/Mapper/OpposingAccountIbans.php index dd2a3261ca..bcf3372e10 100644 --- a/app/Import/Mapper/OpposingAccountIbans.php +++ b/app/Import/Mapper/OpposingAccountIbans.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Mapper; diff --git a/app/Import/Mapper/OpposingAccounts.php b/app/Import/Mapper/OpposingAccounts.php index 8fbc20768e..fd2d86a5bb 100644 --- a/app/Import/Mapper/OpposingAccounts.php +++ b/app/Import/Mapper/OpposingAccounts.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Mapper; diff --git a/app/Import/Mapper/Tags.php b/app/Import/Mapper/Tags.php index ac8daa8f77..e549fd90ef 100644 --- a/app/Import/Mapper/Tags.php +++ b/app/Import/Mapper/Tags.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Mapper; diff --git a/app/Import/Mapper/TransactionCurrencies.php b/app/Import/Mapper/TransactionCurrencies.php index 94baa13b91..d24f083b0f 100644 --- a/app/Import/Mapper/TransactionCurrencies.php +++ b/app/Import/Mapper/TransactionCurrencies.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Mapper; diff --git a/app/Import/MapperPreProcess/PreProcessorInterface.php b/app/Import/MapperPreProcess/PreProcessorInterface.php index 9c0c8a213f..7631ea7a79 100644 --- a/app/Import/MapperPreProcess/PreProcessorInterface.php +++ b/app/Import/MapperPreProcess/PreProcessorInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\MapperPreProcess; diff --git a/app/Import/MapperPreProcess/TagsComma.php b/app/Import/MapperPreProcess/TagsComma.php index ec2ed1013d..71ae03a2f4 100644 --- a/app/Import/MapperPreProcess/TagsComma.php +++ b/app/Import/MapperPreProcess/TagsComma.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\MapperPreProcess; diff --git a/app/Import/MapperPreProcess/TagsSpace.php b/app/Import/MapperPreProcess/TagsSpace.php index bd3c18b660..7b588802be 100644 --- a/app/Import/MapperPreProcess/TagsSpace.php +++ b/app/Import/MapperPreProcess/TagsSpace.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\MapperPreProcess; diff --git a/app/Import/Setup/CsvSetup.php b/app/Import/Setup/CsvSetup.php index 01fcdc756a..51ccedb338 100644 --- a/app/Import/Setup/CsvSetup.php +++ b/app/Import/Setup/CsvSetup.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Setup; diff --git a/app/Import/Setup/SetupInterface.php b/app/Import/Setup/SetupInterface.php index 995292b52f..cffae80eba 100644 --- a/app/Import/Setup/SetupInterface.php +++ b/app/Import/Setup/SetupInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Setup; diff --git a/app/Import/Specifics/AbnAmroDescription.php b/app/Import/Specifics/AbnAmroDescription.php index 4931e6b327..b0eebd0904 100644 --- a/app/Import/Specifics/AbnAmroDescription.php +++ b/app/Import/Specifics/AbnAmroDescription.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Specifics; diff --git a/app/Import/Specifics/IngDescription.php b/app/Import/Specifics/IngDescription.php index aa03ff06d1..c421d45d2d 100644 --- a/app/Import/Specifics/IngDescription.php +++ b/app/Import/Specifics/IngDescription.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Specifics; diff --git a/app/Import/Specifics/PresidentsChoice.php b/app/Import/Specifics/PresidentsChoice.php index c359edacf8..0f462f00d2 100644 --- a/app/Import/Specifics/PresidentsChoice.php +++ b/app/Import/Specifics/PresidentsChoice.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Specifics; diff --git a/app/Import/Specifics/RabobankDescription.php b/app/Import/Specifics/RabobankDescription.php index 59ff2abb53..ec92580f74 100644 --- a/app/Import/Specifics/RabobankDescription.php +++ b/app/Import/Specifics/RabobankDescription.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Specifics; diff --git a/app/Import/Specifics/SpecificInterface.php b/app/Import/Specifics/SpecificInterface.php index 56a11b9f6b..d7f9186d81 100644 --- a/app/Import/Specifics/SpecificInterface.php +++ b/app/Import/Specifics/SpecificInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Import\Specifics; diff --git a/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php b/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php index 0ac899ffcb..417895ab40 100644 --- a/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php +++ b/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Jobs; diff --git a/app/Jobs/Job.php b/app/Jobs/Job.php index 92fa2f3246..d4688b9ec3 100644 --- a/app/Jobs/Job.php +++ b/app/Jobs/Job.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Jobs; diff --git a/app/Jobs/MailError.php b/app/Jobs/MailError.php index 44e1ec89b5..05de2aca0a 100644 --- a/app/Jobs/MailError.php +++ b/app/Jobs/MailError.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Jobs; diff --git a/app/Models/Account.php b/app/Models/Account.php index 11b337ba10..268f843e61 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/AccountMeta.php b/app/Models/AccountMeta.php index 48953f09d5..ecad235ce1 100644 --- a/app/Models/AccountMeta.php +++ b/app/Models/AccountMeta.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/Attachment.php b/app/Models/Attachment.php index 36599f3d6b..ddca8ad0d1 100644 --- a/app/Models/Attachment.php +++ b/app/Models/Attachment.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/AvailableBudget.php b/app/Models/AvailableBudget.php index d51d8b0418..ae3f69ddab 100644 --- a/app/Models/AvailableBudget.php +++ b/app/Models/AvailableBudget.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/Bill.php b/app/Models/Bill.php index 54a7429746..4a858720e5 100644 --- a/app/Models/Bill.php +++ b/app/Models/Bill.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/Budget.php b/app/Models/Budget.php index 84ef039aa0..d5f71f21ee 100644 --- a/app/Models/Budget.php +++ b/app/Models/Budget.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/BudgetLimit.php b/app/Models/BudgetLimit.php index a6c2b68f97..edd2c9c776 100644 --- a/app/Models/BudgetLimit.php +++ b/app/Models/BudgetLimit.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/Category.php b/app/Models/Category.php index 50349e9b44..fd7241702f 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php index b5edf6aced..102e2d28fa 100644 --- a/app/Models/Configuration.php +++ b/app/Models/Configuration.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/ExportJob.php b/app/Models/ExportJob.php index a0eb58cfed..89f2e4554b 100644 --- a/app/Models/ExportJob.php +++ b/app/Models/ExportJob.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/LimitRepetition.php b/app/Models/LimitRepetition.php index 3c61c378f9..f59d63f48e 100644 --- a/app/Models/LimitRepetition.php +++ b/app/Models/LimitRepetition.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/Note.php b/app/Models/Note.php index 55ee792ce9..96423130a1 100644 --- a/app/Models/Note.php +++ b/app/Models/Note.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php index 2bdbc32791..e8b24e60b5 100644 --- a/app/Models/PiggyBank.php +++ b/app/Models/PiggyBank.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php index a84383100d..6e14a9096f 100644 --- a/app/Models/PiggyBankEvent.php +++ b/app/Models/PiggyBankEvent.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/PiggyBankRepetition.php b/app/Models/PiggyBankRepetition.php index 00c8221582..56b5b2f12b 100644 --- a/app/Models/PiggyBankRepetition.php +++ b/app/Models/PiggyBankRepetition.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/Role.php b/app/Models/Role.php index 5f1a7c33e9..bdb617438f 100644 --- a/app/Models/Role.php +++ b/app/Models/Role.php @@ -9,7 +9,8 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); + namespace FireflyIII\Models; diff --git a/app/Models/Rule.php b/app/Models/Rule.php index ad3db4309c..28637d2893 100644 --- a/app/Models/Rule.php +++ b/app/Models/Rule.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/RuleAction.php b/app/Models/RuleAction.php index 8817a108dc..5848086595 100644 --- a/app/Models/RuleAction.php +++ b/app/Models/RuleAction.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/RuleGroup.php b/app/Models/RuleGroup.php index 98cbdc0889..8ab7f6a117 100644 --- a/app/Models/RuleGroup.php +++ b/app/Models/RuleGroup.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/RuleTrigger.php b/app/Models/RuleTrigger.php index 048d1c94fc..eea8821f1d 100644 --- a/app/Models/RuleTrigger.php +++ b/app/Models/RuleTrigger.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index 70061c8072..ef5deeadcd 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php index 0a63b24329..4cbc278fa5 100644 --- a/app/Models/TransactionCurrency.php +++ b/app/Models/TransactionCurrency.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index e56f38602c..53506bc61d 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/TransactionJournalMeta.php b/app/Models/TransactionJournalMeta.php index a3f6ec92ba..82c4f9214d 100644 --- a/app/Models/TransactionJournalMeta.php +++ b/app/Models/TransactionJournalMeta.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php index aceffbd8fb..2a075913ac 100644 --- a/app/Models/TransactionType.php +++ b/app/Models/TransactionType.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Models; diff --git a/app/Providers/AccountServiceProvider.php b/app/Providers/AccountServiceProvider.php index 3035731adb..a06860a156 100644 --- a/app/Providers/AccountServiceProvider.php +++ b/app/Providers/AccountServiceProvider.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 43d6df3be4..0458f6077b 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/AttachmentServiceProvider.php b/app/Providers/AttachmentServiceProvider.php index c9f3a9d48d..5acae3ff5b 100644 --- a/app/Providers/AttachmentServiceProvider.php +++ b/app/Providers/AttachmentServiceProvider.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index c46b897aa5..9e209b3a5c 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/BillServiceProvider.php b/app/Providers/BillServiceProvider.php index a07e8e37ff..2ac479114d 100644 --- a/app/Providers/BillServiceProvider.php +++ b/app/Providers/BillServiceProvider.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php index 76858e1e64..daecc1d29f 100644 --- a/app/Providers/BroadcastServiceProvider.php +++ b/app/Providers/BroadcastServiceProvider.php @@ -8,7 +8,7 @@ * * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/BudgetServiceProvider.php b/app/Providers/BudgetServiceProvider.php index df87739ea6..8a67417d74 100644 --- a/app/Providers/BudgetServiceProvider.php +++ b/app/Providers/BudgetServiceProvider.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/CategoryServiceProvider.php b/app/Providers/CategoryServiceProvider.php index bdac9c91f1..7b997a99c6 100644 --- a/app/Providers/CategoryServiceProvider.php +++ b/app/Providers/CategoryServiceProvider.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/CurrencyServiceProvider.php b/app/Providers/CurrencyServiceProvider.php index bfdf535c70..bdcc925234 100644 --- a/app/Providers/CurrencyServiceProvider.php +++ b/app/Providers/CurrencyServiceProvider.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 3fcdd8da06..e1e1e4de4e 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/ExportJobServiceProvider.php b/app/Providers/ExportJobServiceProvider.php index 6850f417b5..b98e433f8e 100644 --- a/app/Providers/ExportJobServiceProvider.php +++ b/app/Providers/ExportJobServiceProvider.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/FireflySessionProvider.php b/app/Providers/FireflySessionProvider.php index 47dfb1bfe7..f2db3f80cd 100644 --- a/app/Providers/FireflySessionProvider.php +++ b/app/Providers/FireflySessionProvider.php @@ -7,7 +7,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/JournalServiceProvider.php b/app/Providers/JournalServiceProvider.php index b44c11b760..fb88520bc7 100644 --- a/app/Providers/JournalServiceProvider.php +++ b/app/Providers/JournalServiceProvider.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/LogServiceProvider.php b/app/Providers/LogServiceProvider.php index dc742d6b80..97d4afab5a 100644 --- a/app/Providers/LogServiceProvider.php +++ b/app/Providers/LogServiceProvider.php @@ -7,7 +7,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/PiggyBankServiceProvider.php b/app/Providers/PiggyBankServiceProvider.php index d91f362114..a3594b80b7 100644 --- a/app/Providers/PiggyBankServiceProvider.php +++ b/app/Providers/PiggyBankServiceProvider.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index f8f1240557..b704a42cc4 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -8,7 +8,7 @@ * * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/RuleGroupServiceProvider.php b/app/Providers/RuleGroupServiceProvider.php index 0a3c8db599..d67e67d458 100644 --- a/app/Providers/RuleGroupServiceProvider.php +++ b/app/Providers/RuleGroupServiceProvider.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/RuleServiceProvider.php b/app/Providers/RuleServiceProvider.php index 9d047d9e74..cefdd3b263 100644 --- a/app/Providers/RuleServiceProvider.php +++ b/app/Providers/RuleServiceProvider.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/SearchServiceProvider.php b/app/Providers/SearchServiceProvider.php index 18d5b48c6e..4a3e712cf8 100644 --- a/app/Providers/SearchServiceProvider.php +++ b/app/Providers/SearchServiceProvider.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Providers/TagServiceProvider.php b/app/Providers/TagServiceProvider.php index b5daa36c6c..b0f7d84a82 100644 --- a/app/Providers/TagServiceProvider.php +++ b/app/Providers/TagServiceProvider.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Providers; diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index 23e53fe8da..a091f92f3e 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Account; diff --git a/app/Repositories/Account/AccountRepositoryInterface.php b/app/Repositories/Account/AccountRepositoryInterface.php index b0ab9b738b..c173941f10 100644 --- a/app/Repositories/Account/AccountRepositoryInterface.php +++ b/app/Repositories/Account/AccountRepositoryInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Account; diff --git a/app/Repositories/Account/AccountTasker.php b/app/Repositories/Account/AccountTasker.php index e5c4ab1bfb..89f51e9217 100644 --- a/app/Repositories/Account/AccountTasker.php +++ b/app/Repositories/Account/AccountTasker.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Account; @@ -126,7 +126,7 @@ class AccountTasker implements AccountTaskerInterface ]; // get first journal date: - $first = $repository->oldestJournal($account); + $first = $repository->oldestJournal($account); $entry['start_balance'] = $startSet[$account->id] ?? '0'; $entry['end_balance'] = $endSet[$account->id] ?? '0'; diff --git a/app/Repositories/Account/AccountTaskerInterface.php b/app/Repositories/Account/AccountTaskerInterface.php index 4ea5be74ef..4927a264b0 100644 --- a/app/Repositories/Account/AccountTaskerInterface.php +++ b/app/Repositories/Account/AccountTaskerInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Account; diff --git a/app/Repositories/Attachment/AttachmentRepository.php b/app/Repositories/Attachment/AttachmentRepository.php index 79a481e4ab..b7c174b103 100644 --- a/app/Repositories/Attachment/AttachmentRepository.php +++ b/app/Repositories/Attachment/AttachmentRepository.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Attachment; diff --git a/app/Repositories/Attachment/AttachmentRepositoryInterface.php b/app/Repositories/Attachment/AttachmentRepositoryInterface.php index cc7cb887f8..caeb3af8b8 100644 --- a/app/Repositories/Attachment/AttachmentRepositoryInterface.php +++ b/app/Repositories/Attachment/AttachmentRepositoryInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Attachment; diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php index dda6483486..43599dc820 100644 --- a/app/Repositories/Bill/BillRepository.php +++ b/app/Repositories/Bill/BillRepository.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Bill; @@ -482,8 +482,8 @@ class BillRepository implements BillRepositoryInterface $sourceAccounts = $journal->sourceAccountList(); $matches = explode(',', $bill->match); $description = strtolower($journal->description) . ' '; - $description .= strtolower(join(' ', $destinationAccounts->pluck('name')->toArray())); - $description .= strtolower(join(' ', $sourceAccounts->pluck('name')->toArray())); + $description .= strtolower(join(' ', $destinationAccounts->pluck('name')->toArray())); + $description .= strtolower(join(' ', $sourceAccounts->pluck('name')->toArray())); $wordMatch = $this->doWordMatch($matches, $description); $amountMatch = $this->doAmountMatch($journal->amountPositive(), $bill->amount_min, $bill->amount_max); diff --git a/app/Repositories/Bill/BillRepositoryInterface.php b/app/Repositories/Bill/BillRepositoryInterface.php index 2e07d12d93..4fc31cf2d6 100644 --- a/app/Repositories/Bill/BillRepositoryInterface.php +++ b/app/Repositories/Bill/BillRepositoryInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Bill; diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index 9b4f985390..8754c70ca8 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Budget; diff --git a/app/Repositories/Budget/BudgetRepositoryInterface.php b/app/Repositories/Budget/BudgetRepositoryInterface.php index 906a4827ae..eb522deb77 100644 --- a/app/Repositories/Budget/BudgetRepositoryInterface.php +++ b/app/Repositories/Budget/BudgetRepositoryInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Budget; diff --git a/app/Repositories/Category/CategoryRepository.php b/app/Repositories/Category/CategoryRepository.php index fad7e4ffc1..36bee69b0a 100644 --- a/app/Repositories/Category/CategoryRepository.php +++ b/app/Repositories/Category/CategoryRepository.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Category; diff --git a/app/Repositories/Category/CategoryRepositoryInterface.php b/app/Repositories/Category/CategoryRepositoryInterface.php index 9e89a78f50..c85568f0a6 100644 --- a/app/Repositories/Category/CategoryRepositoryInterface.php +++ b/app/Repositories/Category/CategoryRepositoryInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Category; diff --git a/app/Repositories/Currency/CurrencyRepository.php b/app/Repositories/Currency/CurrencyRepository.php index e16efb4cea..fd69d254cb 100644 --- a/app/Repositories/Currency/CurrencyRepository.php +++ b/app/Repositories/Currency/CurrencyRepository.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Currency; diff --git a/app/Repositories/Currency/CurrencyRepositoryInterface.php b/app/Repositories/Currency/CurrencyRepositoryInterface.php index 63eb9bf0b5..0b9431cc5f 100644 --- a/app/Repositories/Currency/CurrencyRepositoryInterface.php +++ b/app/Repositories/Currency/CurrencyRepositoryInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Currency; diff --git a/app/Repositories/ExportJob/ExportJobRepository.php b/app/Repositories/ExportJob/ExportJobRepository.php index aa956f901e..a0eb52fc86 100644 --- a/app/Repositories/ExportJob/ExportJobRepository.php +++ b/app/Repositories/ExportJob/ExportJobRepository.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\ExportJob; diff --git a/app/Repositories/ExportJob/ExportJobRepositoryInterface.php b/app/Repositories/ExportJob/ExportJobRepositoryInterface.php index 7e93663ea5..9f610bc7c2 100644 --- a/app/Repositories/ExportJob/ExportJobRepositoryInterface.php +++ b/app/Repositories/ExportJob/ExportJobRepositoryInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\ExportJob; diff --git a/app/Repositories/ImportJob/ImportJobRepository.php b/app/Repositories/ImportJob/ImportJobRepository.php index b8fbaa9c3f..6af984a06c 100644 --- a/app/Repositories/ImportJob/ImportJobRepository.php +++ b/app/Repositories/ImportJob/ImportJobRepository.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\ImportJob; diff --git a/app/Repositories/ImportJob/ImportJobRepositoryInterface.php b/app/Repositories/ImportJob/ImportJobRepositoryInterface.php index ae7f4d4dee..5bdf636d42 100644 --- a/app/Repositories/ImportJob/ImportJobRepositoryInterface.php +++ b/app/Repositories/ImportJob/ImportJobRepositoryInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\ImportJob; diff --git a/app/Repositories/Journal/JournalTasker.php b/app/Repositories/Journal/JournalTasker.php index 7a75d8a871..b56abe0db8 100644 --- a/app/Repositories/Journal/JournalTasker.php +++ b/app/Repositories/Journal/JournalTasker.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Journal; diff --git a/app/Repositories/Journal/JournalTaskerInterface.php b/app/Repositories/Journal/JournalTaskerInterface.php index 1273f69c3a..bb2aa688c9 100644 --- a/app/Repositories/Journal/JournalTaskerInterface.php +++ b/app/Repositories/Journal/JournalTaskerInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Journal; diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.php index 86f05c8832..85fa634279 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepository.php +++ b/app/Repositories/PiggyBank/PiggyBankRepository.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\PiggyBank; diff --git a/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php b/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php index 69fb317c93..4c063931fc 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php +++ b/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\PiggyBank; diff --git a/app/Repositories/Rule/RuleRepository.php b/app/Repositories/Rule/RuleRepository.php index 7e0487be63..47a848427c 100644 --- a/app/Repositories/Rule/RuleRepository.php +++ b/app/Repositories/Rule/RuleRepository.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Rule; diff --git a/app/Repositories/Rule/RuleRepositoryInterface.php b/app/Repositories/Rule/RuleRepositoryInterface.php index 6ca1456214..13fc6c3382 100644 --- a/app/Repositories/Rule/RuleRepositoryInterface.php +++ b/app/Repositories/Rule/RuleRepositoryInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\Rule; diff --git a/app/Repositories/RuleGroup/RuleGroupRepository.php b/app/Repositories/RuleGroup/RuleGroupRepository.php index 404e2f9d2f..0ee1a72dfd 100644 --- a/app/Repositories/RuleGroup/RuleGroupRepository.php +++ b/app/Repositories/RuleGroup/RuleGroupRepository.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\RuleGroup; diff --git a/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php b/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php index c365fca704..0afa9b1dec 100644 --- a/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php +++ b/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Repositories\RuleGroup; diff --git a/app/Repositories/User/UserRepositoryInterface.php b/app/Repositories/User/UserRepositoryInterface.php index 458cad07e8..118ecf4a84 100644 --- a/app/Repositories/User/UserRepositoryInterface.php +++ b/app/Repositories/User/UserRepositoryInterface.php @@ -51,7 +51,7 @@ interface UserRepositoryInterface public function changePassword(User $user, string $password); /** - * @param User $user + * @param User $user * @param bool $isBlocked * @param string $code * diff --git a/app/Rules/Actions/ActionInterface.php b/app/Rules/Actions/ActionInterface.php index 0c66106d7f..7d8696f047 100644 --- a/app/Rules/Actions/ActionInterface.php +++ b/app/Rules/Actions/ActionInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Actions; diff --git a/app/Rules/Actions/AddTag.php b/app/Rules/Actions/AddTag.php index 8dc7cb17a2..38560c83aa 100644 --- a/app/Rules/Actions/AddTag.php +++ b/app/Rules/Actions/AddTag.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Actions; diff --git a/app/Rules/Actions/AppendDescription.php b/app/Rules/Actions/AppendDescription.php index 4169399773..0bca1c7397 100644 --- a/app/Rules/Actions/AppendDescription.php +++ b/app/Rules/Actions/AppendDescription.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Actions; diff --git a/app/Rules/Actions/ClearBudget.php b/app/Rules/Actions/ClearBudget.php index fc29eb4aae..4f029089ac 100644 --- a/app/Rules/Actions/ClearBudget.php +++ b/app/Rules/Actions/ClearBudget.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Actions; diff --git a/app/Rules/Actions/ClearCategory.php b/app/Rules/Actions/ClearCategory.php index d60afcf77a..6eea4ce560 100644 --- a/app/Rules/Actions/ClearCategory.php +++ b/app/Rules/Actions/ClearCategory.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Actions; diff --git a/app/Rules/Actions/PrependDescription.php b/app/Rules/Actions/PrependDescription.php index 7e734873ee..a59b5e6172 100644 --- a/app/Rules/Actions/PrependDescription.php +++ b/app/Rules/Actions/PrependDescription.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Actions; diff --git a/app/Rules/Actions/RemoveAllTags.php b/app/Rules/Actions/RemoveAllTags.php index 66ddbc4810..32290d7a70 100644 --- a/app/Rules/Actions/RemoveAllTags.php +++ b/app/Rules/Actions/RemoveAllTags.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Actions; diff --git a/app/Rules/Actions/RemoveTag.php b/app/Rules/Actions/RemoveTag.php index c002c1ff21..ca9912f5f0 100644 --- a/app/Rules/Actions/RemoveTag.php +++ b/app/Rules/Actions/RemoveTag.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Actions; diff --git a/app/Rules/Actions/SetBudget.php b/app/Rules/Actions/SetBudget.php index 7797501e2b..62b530b8c8 100644 --- a/app/Rules/Actions/SetBudget.php +++ b/app/Rules/Actions/SetBudget.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Actions; diff --git a/app/Rules/Actions/SetCategory.php b/app/Rules/Actions/SetCategory.php index ff6e79fb66..8b1953db5d 100644 --- a/app/Rules/Actions/SetCategory.php +++ b/app/Rules/Actions/SetCategory.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Actions; diff --git a/app/Rules/Actions/SetDescription.php b/app/Rules/Actions/SetDescription.php index 8be7339f03..fd882f405d 100644 --- a/app/Rules/Actions/SetDescription.php +++ b/app/Rules/Actions/SetDescription.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Actions; diff --git a/app/Rules/Actions/SetDestinationAccount.php b/app/Rules/Actions/SetDestinationAccount.php index 33ca3d27c3..00249b2660 100644 --- a/app/Rules/Actions/SetDestinationAccount.php +++ b/app/Rules/Actions/SetDestinationAccount.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Actions; diff --git a/app/Rules/Actions/SetSourceAccount.php b/app/Rules/Actions/SetSourceAccount.php index 07f0125d4a..f651f0fbe1 100644 --- a/app/Rules/Actions/SetSourceAccount.php +++ b/app/Rules/Actions/SetSourceAccount.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Actions; diff --git a/app/Rules/Factory/ActionFactory.php b/app/Rules/Factory/ActionFactory.php index 9bbdb7468d..16d33605e3 100644 --- a/app/Rules/Factory/ActionFactory.php +++ b/app/Rules/Factory/ActionFactory.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Factory; diff --git a/app/Rules/Factory/TriggerFactory.php b/app/Rules/Factory/TriggerFactory.php index fe0a23e355..9f98560f0f 100644 --- a/app/Rules/Factory/TriggerFactory.php +++ b/app/Rules/Factory/TriggerFactory.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Factory; diff --git a/app/Rules/Processor.php b/app/Rules/Processor.php index 1bca777f62..579521af61 100644 --- a/app/Rules/Processor.php +++ b/app/Rules/Processor.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules; diff --git a/app/Rules/TransactionMatcher.php b/app/Rules/TransactionMatcher.php index 5241e4f84c..090d3553ba 100644 --- a/app/Rules/TransactionMatcher.php +++ b/app/Rules/TransactionMatcher.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules; diff --git a/app/Rules/Triggers/AbstractTrigger.php b/app/Rules/Triggers/AbstractTrigger.php index d38e1dcd9f..b008a1b91c 100644 --- a/app/Rules/Triggers/AbstractTrigger.php +++ b/app/Rules/Triggers/AbstractTrigger.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; diff --git a/app/Rules/Triggers/AmountExactly.php b/app/Rules/Triggers/AmountExactly.php index 9e69692bfe..d160f8495e 100644 --- a/app/Rules/Triggers/AmountExactly.php +++ b/app/Rules/Triggers/AmountExactly.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; diff --git a/app/Rules/Triggers/AmountLess.php b/app/Rules/Triggers/AmountLess.php index ba1f1cc709..433ccb2491 100644 --- a/app/Rules/Triggers/AmountLess.php +++ b/app/Rules/Triggers/AmountLess.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; diff --git a/app/Rules/Triggers/AmountMore.php b/app/Rules/Triggers/AmountMore.php index 34b61d9e0e..8a7f1544b6 100644 --- a/app/Rules/Triggers/AmountMore.php +++ b/app/Rules/Triggers/AmountMore.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; diff --git a/app/Rules/Triggers/BudgetIs.php b/app/Rules/Triggers/BudgetIs.php index fa444f3ffc..ecc2d01b92 100644 --- a/app/Rules/Triggers/BudgetIs.php +++ b/app/Rules/Triggers/BudgetIs.php @@ -7,7 +7,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; diff --git a/app/Rules/Triggers/CategoryIs.php b/app/Rules/Triggers/CategoryIs.php index 28dcddb086..caf39abaaf 100644 --- a/app/Rules/Triggers/CategoryIs.php +++ b/app/Rules/Triggers/CategoryIs.php @@ -7,7 +7,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; diff --git a/app/Rules/Triggers/DescriptionContains.php b/app/Rules/Triggers/DescriptionContains.php index d805d0ea10..45fbf08205 100644 --- a/app/Rules/Triggers/DescriptionContains.php +++ b/app/Rules/Triggers/DescriptionContains.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; diff --git a/app/Rules/Triggers/DescriptionEnds.php b/app/Rules/Triggers/DescriptionEnds.php index ee01fb975f..31c8d269ea 100644 --- a/app/Rules/Triggers/DescriptionEnds.php +++ b/app/Rules/Triggers/DescriptionEnds.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; diff --git a/app/Rules/Triggers/DescriptionIs.php b/app/Rules/Triggers/DescriptionIs.php index 385c17decc..de471e5dc7 100644 --- a/app/Rules/Triggers/DescriptionIs.php +++ b/app/Rules/Triggers/DescriptionIs.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; diff --git a/app/Rules/Triggers/DescriptionStarts.php b/app/Rules/Triggers/DescriptionStarts.php index 9e412db938..6bb9232fc3 100644 --- a/app/Rules/Triggers/DescriptionStarts.php +++ b/app/Rules/Triggers/DescriptionStarts.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; diff --git a/app/Rules/Triggers/FromAccountContains.php b/app/Rules/Triggers/FromAccountContains.php index f2a36b6c67..54fef61b20 100644 --- a/app/Rules/Triggers/FromAccountContains.php +++ b/app/Rules/Triggers/FromAccountContains.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; diff --git a/app/Rules/Triggers/FromAccountEnds.php b/app/Rules/Triggers/FromAccountEnds.php index 9cc61c2066..6121bb9580 100644 --- a/app/Rules/Triggers/FromAccountEnds.php +++ b/app/Rules/Triggers/FromAccountEnds.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; diff --git a/app/Rules/Triggers/FromAccountIs.php b/app/Rules/Triggers/FromAccountIs.php index 944a26c529..06339eb331 100644 --- a/app/Rules/Triggers/FromAccountIs.php +++ b/app/Rules/Triggers/FromAccountIs.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; diff --git a/app/Rules/Triggers/FromAccountStarts.php b/app/Rules/Triggers/FromAccountStarts.php index 5ddf1f4240..52ab178289 100644 --- a/app/Rules/Triggers/FromAccountStarts.php +++ b/app/Rules/Triggers/FromAccountStarts.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; diff --git a/app/Rules/Triggers/TagIs.php b/app/Rules/Triggers/TagIs.php index 684d806760..9ea19ac2ed 100644 --- a/app/Rules/Triggers/TagIs.php +++ b/app/Rules/Triggers/TagIs.php @@ -7,7 +7,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; diff --git a/app/Rules/Triggers/ToAccountContains.php b/app/Rules/Triggers/ToAccountContains.php index 816ff82c57..96eeb960e8 100644 --- a/app/Rules/Triggers/ToAccountContains.php +++ b/app/Rules/Triggers/ToAccountContains.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; diff --git a/app/Rules/Triggers/ToAccountEnds.php b/app/Rules/Triggers/ToAccountEnds.php index b75595ecf2..ff5f470618 100644 --- a/app/Rules/Triggers/ToAccountEnds.php +++ b/app/Rules/Triggers/ToAccountEnds.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; diff --git a/app/Rules/Triggers/ToAccountIs.php b/app/Rules/Triggers/ToAccountIs.php index a5faa3e6a9..fffb334153 100644 --- a/app/Rules/Triggers/ToAccountIs.php +++ b/app/Rules/Triggers/ToAccountIs.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; diff --git a/app/Rules/Triggers/ToAccountStarts.php b/app/Rules/Triggers/ToAccountStarts.php index 63e912b4fc..05eebbe028 100644 --- a/app/Rules/Triggers/ToAccountStarts.php +++ b/app/Rules/Triggers/ToAccountStarts.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; diff --git a/app/Rules/Triggers/TransactionType.php b/app/Rules/Triggers/TransactionType.php index 691a16ff9d..e6f220ffce 100644 --- a/app/Rules/Triggers/TransactionType.php +++ b/app/Rules/Triggers/TransactionType.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; diff --git a/app/Rules/Triggers/TriggerInterface.php b/app/Rules/Triggers/TriggerInterface.php index df05a331b6..ac58021ddc 100644 --- a/app/Rules/Triggers/TriggerInterface.php +++ b/app/Rules/Triggers/TriggerInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; diff --git a/app/Rules/Triggers/UserAction.php b/app/Rules/Triggers/UserAction.php index 576ddfe6aa..fb4d6508c6 100644 --- a/app/Rules/Triggers/UserAction.php +++ b/app/Rules/Triggers/UserAction.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Rules\Triggers; diff --git a/app/Support/Amount.php b/app/Support/Amount.php index 1bd525f5f7..32e42cf3bb 100644 --- a/app/Support/Amount.php +++ b/app/Support/Amount.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support; diff --git a/app/Support/Binder/AccountList.php b/app/Support/Binder/AccountList.php index da684a089f..8bd5210d17 100644 --- a/app/Support/Binder/AccountList.php +++ b/app/Support/Binder/AccountList.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Binder; diff --git a/app/Support/Binder/BinderInterface.php b/app/Support/Binder/BinderInterface.php index f75ae11ee6..6d8313686b 100644 --- a/app/Support/Binder/BinderInterface.php +++ b/app/Support/Binder/BinderInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Binder; diff --git a/app/Support/Binder/BudgetList.php b/app/Support/Binder/BudgetList.php index eb617a0ac3..299206e16b 100644 --- a/app/Support/Binder/BudgetList.php +++ b/app/Support/Binder/BudgetList.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Binder; diff --git a/app/Support/Binder/CategoryList.php b/app/Support/Binder/CategoryList.php index 852ac1e396..4bd60aedef 100644 --- a/app/Support/Binder/CategoryList.php +++ b/app/Support/Binder/CategoryList.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Binder; diff --git a/app/Support/Binder/Date.php b/app/Support/Binder/Date.php index be03cc14d2..73dba325e1 100644 --- a/app/Support/Binder/Date.php +++ b/app/Support/Binder/Date.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Binder; diff --git a/app/Support/Binder/TagList.php b/app/Support/Binder/TagList.php index b1c42bb4c8..3acc8f4195 100644 --- a/app/Support/Binder/TagList.php +++ b/app/Support/Binder/TagList.php @@ -7,7 +7,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Binder; diff --git a/app/Support/Binder/UnfinishedJournal.php b/app/Support/Binder/UnfinishedJournal.php index 607f442e46..799a152743 100644 --- a/app/Support/Binder/UnfinishedJournal.php +++ b/app/Support/Binder/UnfinishedJournal.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Binder; diff --git a/app/Support/CacheProperties.php b/app/Support/CacheProperties.php index b8e493d134..555fe427b0 100644 --- a/app/Support/CacheProperties.php +++ b/app/Support/CacheProperties.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support; diff --git a/app/Support/ChartColour.php b/app/Support/ChartColour.php index c04b75b28e..eeb6ef6bfb 100644 --- a/app/Support/ChartColour.php +++ b/app/Support/ChartColour.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support; diff --git a/app/Support/Domain.php b/app/Support/Domain.php index 427bd4628c..8c04fceb9f 100644 --- a/app/Support/Domain.php +++ b/app/Support/Domain.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support; diff --git a/app/Support/Events/BillScanner.php b/app/Support/Events/BillScanner.php index 7d1d362783..dc2ed7a7d1 100644 --- a/app/Support/Events/BillScanner.php +++ b/app/Support/Events/BillScanner.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Events; diff --git a/app/Support/ExpandedForm.php b/app/Support/ExpandedForm.php index 85b85fd5d2..25ad689f2e 100644 --- a/app/Support/ExpandedForm.php +++ b/app/Support/ExpandedForm.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support; diff --git a/app/Support/Facades/Amount.php b/app/Support/Facades/Amount.php index b7a4d53304..4a3df176a6 100644 --- a/app/Support/Facades/Amount.php +++ b/app/Support/Facades/Amount.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Facades; diff --git a/app/Support/Facades/ExpandedForm.php b/app/Support/Facades/ExpandedForm.php index fe6afa5af9..59f2e973ef 100644 --- a/app/Support/Facades/ExpandedForm.php +++ b/app/Support/Facades/ExpandedForm.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Facades; diff --git a/app/Support/Facades/FireflyConfig.php b/app/Support/Facades/FireflyConfig.php index 8a1a5ff617..4fcc685c95 100644 --- a/app/Support/Facades/FireflyConfig.php +++ b/app/Support/Facades/FireflyConfig.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Facades; diff --git a/app/Support/Facades/Navigation.php b/app/Support/Facades/Navigation.php index b59fce49fb..10ed3eb3b4 100644 --- a/app/Support/Facades/Navigation.php +++ b/app/Support/Facades/Navigation.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Facades; diff --git a/app/Support/Facades/Preferences.php b/app/Support/Facades/Preferences.php index d0155f6375..59b83dec80 100644 --- a/app/Support/Facades/Preferences.php +++ b/app/Support/Facades/Preferences.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Facades; diff --git a/app/Support/Facades/Steam.php b/app/Support/Facades/Steam.php index da00e57317..c8b78622c5 100644 --- a/app/Support/Facades/Steam.php +++ b/app/Support/Facades/Steam.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Facades; diff --git a/app/Support/FireflyConfig.php b/app/Support/FireflyConfig.php index 743dc40c2a..68f2323396 100644 --- a/app/Support/FireflyConfig.php +++ b/app/Support/FireflyConfig.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support; diff --git a/app/Support/Navigation.php b/app/Support/Navigation.php index 8bd46c59fe..dc28a613db 100644 --- a/app/Support/Navigation.php +++ b/app/Support/Navigation.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support; diff --git a/app/Support/Preferences.php b/app/Support/Preferences.php index ef7c5b6431..743a6444e1 100644 --- a/app/Support/Preferences.php +++ b/app/Support/Preferences.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support; diff --git a/app/Support/Search/Modifier.php b/app/Support/Search/Modifier.php index 8580784b3f..18e94d3aff 100644 --- a/app/Support/Search/Modifier.php +++ b/app/Support/Search/Modifier.php @@ -7,7 +7,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Search; diff --git a/app/Support/Search/Search.php b/app/Support/Search/Search.php index 972b8a76dc..a4797b3ec8 100644 --- a/app/Support/Search/Search.php +++ b/app/Support/Search/Search.php @@ -64,6 +64,7 @@ class Search implements SearchInterface if (strlen($string) === 0) { return is_string($this->originalQuery) ? $this->originalQuery : ''; } + return $string; } diff --git a/app/Support/Search/SearchInterface.php b/app/Support/Search/SearchInterface.php index e3962fcfea..a06ea95d27 100644 --- a/app/Support/Search/SearchInterface.php +++ b/app/Support/Search/SearchInterface.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Search; diff --git a/app/Support/Steam.php b/app/Support/Steam.php index 5c08deece7..3b5a27ad0d 100644 --- a/app/Support/Steam.php +++ b/app/Support/Steam.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support; diff --git a/app/Support/Twig/General.php b/app/Support/Twig/General.php index 688f37a942..5db0ba95f6 100644 --- a/app/Support/Twig/General.php +++ b/app/Support/Twig/General.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Twig; diff --git a/app/Support/Twig/Journal.php b/app/Support/Twig/Journal.php index afdb412e30..d3c0f314e5 100644 --- a/app/Support/Twig/Journal.php +++ b/app/Support/Twig/Journal.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Twig; diff --git a/app/Support/Twig/PiggyBank.php b/app/Support/Twig/PiggyBank.php index 4263985a82..01ab696171 100644 --- a/app/Support/Twig/PiggyBank.php +++ b/app/Support/Twig/PiggyBank.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Twig; diff --git a/app/Support/Twig/Rule.php b/app/Support/Twig/Rule.php index 630cddc408..2503cec452 100644 --- a/app/Support/Twig/Rule.php +++ b/app/Support/Twig/Rule.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Twig; diff --git a/app/Support/Twig/Transaction.php b/app/Support/Twig/Transaction.php index 648e4caabe..d4b8e84850 100644 --- a/app/Support/Twig/Transaction.php +++ b/app/Support/Twig/Transaction.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Twig; diff --git a/app/Support/Twig/Translation.php b/app/Support/Twig/Translation.php index cb84f85c8e..a01b616bd6 100644 --- a/app/Support/Twig/Translation.php +++ b/app/Support/Twig/Translation.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII\Support\Twig; diff --git a/app/User.php b/app/User.php index 06a150ef49..a40fa3c4e3 100644 --- a/app/User.php +++ b/app/User.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); namespace FireflyIII; From 8db96025a3464e2810dff250ab9dc2e454ec55bb Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 9 Apr 2017 07:56:46 +0200 Subject: [PATCH 006/169] Code cleanup. --- app/Http/Controllers/Admin/UserController.php | 6 ++-- .../Auth/ForgotPasswordController.php | 4 ++- app/Http/Controllers/Auth/LoginController.php | 4 ++- app/Http/Controllers/BudgetController.php | 5 ++-- app/Http/Controllers/CategoryController.php | 4 +++ app/Http/Controllers/ImportController.php | 4 +-- app/Http/Controllers/JavascriptController.php | 3 ++ .../Controllers/PreferencesController.php | 4 ++- app/Http/Controllers/TagController.php | 4 ++- .../Controllers/TransactionController.php | 2 ++ config/auth.php | 16 +++++----- config/broadcasting.php | 10 +++---- config/csv.php | 2 +- config/firefly.php | 16 +++++----- config/queue.php | 24 +++++++-------- config/services.php | 6 ++-- config/session.php | 2 +- config/upgrade.php | 2 +- config/view.php | 2 +- public/css/firefly.css | 11 ------- public/js/ff/budgets/show.js | 2 +- public/js/ff/categories/show-by-date.js | 2 +- public/js/ff/import/status.js | 4 +-- public/js/ff/index.js | 2 +- public/js/ff/reports/default/all.js | 6 ++-- public/js/ff/reports/default/month.js | 2 +- public/js/ff/reports/index.js | 2 +- public/js/ff/rules/create-edit.js | 8 ++--- public/js/ff/tags/create-edit.js | 12 ++++---- public/js/ff/transactions/list.js | 4 +-- public/js/ff/transactions/single/create.js | 6 ++-- public/js/ff/transactions/split/edit.js | 4 +-- resources/lang/de_DE/csv.php | 2 +- resources/lang/en_US/csv.php | 2 +- resources/lang/es_ES/csv.php | 2 +- resources/lang/fr_FR/csv.php | 2 +- resources/lang/hr_HR/csv.php | 2 +- resources/lang/nl_NL/csv.php | 2 +- resources/lang/pl_PL/csv.php | 2 +- resources/lang/pt_BR/csv.php | 2 +- resources/lang/ru_RU/csv.php | 2 +- resources/lang/zh_HK/csv.php | 2 +- resources/lang/zh_TW/csv.php | 2 +- resources/views/accounts/show.twig | 12 ++++---- resources/views/budgets/index.twig | 14 ++++----- resources/views/categories/show.twig | 8 ++--- resources/views/demo/import/configure.twig | 2 +- resources/views/demo/reports/index.twig | 4 +-- resources/views/emails/password-html.twig | 2 +- resources/views/errors/500.twig | 2 +- resources/views/errors/503.twig | 2 +- resources/views/import/finished.twig | 12 ++++---- resources/views/javascript/accounts.twig | 2 +- resources/views/javascript/variables.twig | 30 +++++++++---------- resources/views/layout/default.twig | 4 +-- resources/views/partials/menu-sidebar.twig | 22 +++++++------- resources/views/piggy-banks/show.twig | 14 ++++----- resources/views/preferences/index.twig | 10 +++---- resources/views/reports/budget/month.twig | 5 ++-- resources/views/reports/category/month.twig | 12 +++++--- resources/views/reports/default/month.twig | 1 - .../views/reports/default/multi-year.twig | 6 ++-- resources/views/reports/default/year.twig | 6 ++-- .../views/reports/partials/accounts.twig | 3 +- .../reports/partials/category-period.twig | 4 +-- resources/views/reports/tag/month.twig | 3 +- resources/views/rules/index.twig | 2 +- resources/views/search/partials/accounts.twig | 2 +- resources/views/transactions/convert.twig | 21 +++++-------- resources/views/transactions/mass/edit.twig | 15 ++++++---- resources/views/transactions/show.twig | 12 ++++---- .../Controllers/BillControllerTest.php | 1 - .../Chart/BudgetControllerTest.php | 3 -- .../Chart/BudgetReportControllerTest.php | 5 ---- .../Controllers/CurrencyControllerTest.php | 5 ---- .../Controllers/ImportControllerTest.php | 20 ------------- .../Popup/ReportControllerTest.php | 15 ---------- .../Controllers/ProfileControllerTest.php | 1 - .../Controllers/ReportControllerTest.php | 1 - .../Controllers/RuleGroupControllerTest.php | 12 -------- .../Feature/Controllers/TagControllerTest.php | 2 -- 81 files changed, 228 insertions(+), 276 deletions(-) diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index bd83eb13b4..1a82b02e86 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -125,8 +125,10 @@ class UserController extends Controller } /** - * @param UserFormRequest $request - * @param User $user + * @param UserFormRequest $request + * @param User $user + * + * @param UserRepositoryInterface $repository * * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index 5f5f36f159..d1cfdd7832 100644 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -41,7 +41,9 @@ class ForgotPasswordController extends Controller /** * Send a reset link to the given user. * - * @param Request $request + * @param Request $request + * + * @param UserRepositoryInterface $repository * * @return \Illuminate\Http\RedirectResponse */ diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index d2186aa40f..f74d1a1e7f 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -110,7 +110,9 @@ class LoginController extends Controller /** * Show the application login form. * - * @param Request $request + * @param Request $request + * + * @param CookieJar $cookieJar * * @return \Illuminate\Http\Response */ diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index 9fd5d23a6a..42008215ea 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -191,8 +191,9 @@ class BudgetController extends Controller } /** - * @param Request $request - * @param string $moment + * @param Request $request + * @param JournalRepositoryInterface $repository + * @param string $moment * * @return View */ diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index a9b76e97b7..7975bc26a5 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -154,6 +154,10 @@ class CategoryController extends Controller } /** + * @param Request $request + * @param JournalRepositoryInterface $repository + * @param string $moment + * * @return View */ public function noCategory(Request $request, JournalRepositoryInterface $repository, string $moment = '') diff --git a/app/Http/Controllers/ImportController.php b/app/Http/Controllers/ImportController.php index a1d04f01a1..325698f720 100644 --- a/app/Http/Controllers/ImportController.php +++ b/app/Http/Controllers/ImportController.php @@ -274,10 +274,10 @@ class ImportController extends Controller * Step 5. Depending on the importer, this will show the user settings to * fill in. * - * @param ImportJob $job + * @param ImportJobRepositoryInterface $repository + * @param ImportJob $job * * @return View - * @throws FireflyException */ public function settings(ImportJobRepositoryInterface $repository, ImportJob $job) { diff --git a/app/Http/Controllers/JavascriptController.php b/app/Http/Controllers/JavascriptController.php index b1d67fdaf9..63a6a354d2 100644 --- a/app/Http/Controllers/JavascriptController.php +++ b/app/Http/Controllers/JavascriptController.php @@ -31,7 +31,10 @@ class JavascriptController extends Controller { /** + * @param AccountRepositoryInterface $repository + * @param CurrencyRepositoryInterface $currencyRepository * + * @return $this */ public function accounts(AccountRepositoryInterface $repository, CurrencyRepositoryInterface $currencyRepository) { diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php index 3960264476..0a200b4a47 100644 --- a/app/Http/Controllers/PreferencesController.php +++ b/app/Http/Controllers/PreferencesController.php @@ -132,7 +132,9 @@ class PreferencesController extends Controller } /** - * @param Request $request + * @param Request $request + * + * @param UserRepositoryInterface $repository * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index 325eac42f2..6a6cffa7bc 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -140,7 +140,9 @@ class TagController extends Controller } /** - * @param Tag $tag + * @param Tag $tag + * + * @param TagRepositoryInterface $repository * * @return View */ diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index c8369d0a2f..5fdfa5fa40 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -60,6 +60,8 @@ class TransactionController extends Controller * @param JournalRepositoryInterface $repository * @param string $what * + * @param string $moment + * * @return View */ public function index(Request $request, JournalRepositoryInterface $repository, string $what, string $moment = '') diff --git a/config/auth.php b/config/auth.php index 55a6840414..9145ce8641 100644 --- a/config/auth.php +++ b/config/auth.php @@ -10,32 +10,32 @@ */ return [ - 'defaults' => [ - 'guard' => 'web', + 'defaults' => [ + 'guard' => 'web', 'passwords' => 'users', ], - 'guards' => [ + 'guards' => [ 'web' => [ - 'driver' => 'session', + 'driver' => 'session', 'provider' => 'users', ], 'api' => [ - 'driver' => 'token', + 'driver' => 'token', 'provider' => 'users', ], ], 'providers' => [ 'users' => [ 'driver' => 'eloquent', - 'model' => FireflyIII\User::class, + 'model' => FireflyIII\User::class, ], ], 'passwords' => [ 'users' => [ 'provider' => 'users', - 'table' => 'password_resets', - 'expire' => 120, + 'table' => 'password_resets', + 'expire' => 120, ], ], diff --git a/config/broadcasting.php b/config/broadcasting.php index 8100899690..b165564840 100644 --- a/config/broadcasting.php +++ b/config/broadcasting.php @@ -40,17 +40,17 @@ return [ 'connections' => [ 'pusher' => [ - 'driver' => 'pusher', - 'key' => env('PUSHER_KEY'), - 'secret' => env('PUSHER_SECRET'), - 'app_id' => env('PUSHER_APP_ID'), + 'driver' => 'pusher', + 'key' => env('PUSHER_KEY'), + 'secret' => env('PUSHER_SECRET'), + 'app_id' => env('PUSHER_APP_ID'), 'options' => [ // ], ], 'redis' => [ - 'driver' => 'redis', + 'driver' => 'redis', 'connection' => 'default', ], diff --git a/config/csv.php b/config/csv.php index 0cd7e1183f..5da40e41e0 100644 --- a/config/csv.php +++ b/config/csv.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ diff --git a/config/firefly.php b/config/firefly.php index 81a482e8b6..83aa8d19e2 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); /* * DO NOT EDIT THIS FILE. IT IS AUTO GENERATED. @@ -18,15 +18,15 @@ declare(strict_types = 1); */ return [ - 'configuration' => [ + 'configuration' => [ 'single_user_mode' => true, 'is_demo_site' => false, ], - 'encryption' => (is_null(env('USE_ENCRYPTION')) || env('USE_ENCRYPTION') === true), - 'version' => '4.3.8', - 'maxUploadSize' => 5242880, - 'allowedMimes' => ['image/png', 'image/jpeg', 'application/pdf'], - 'list_length' => 10, + 'encryption' => (is_null(env('USE_ENCRYPTION')) || env('USE_ENCRYPTION') === true), + 'version' => '4.3.8', + 'maxUploadSize' => 5242880, + 'allowedMimes' => ['image/png', 'image/jpeg', 'application/pdf'], + 'list_length' => 10, 'export_formats' => [ 'csv' => 'FireflyIII\Export\Exporter\CsvExporter', ], @@ -205,6 +205,6 @@ return [ 'default_currency' => 'EUR', 'default_language' => 'en_US', 'search_modifiers' => ['amount_is', 'amount', 'amount_max', 'amount_min', 'amount_less', 'amount_more', 'source', 'destination', 'category', - 'budget', 'bill', 'type', 'date', 'date_before', 'date_after','on','before','after'], + 'budget', 'bill', 'type', 'date', 'date_before', 'date_after', 'on', 'before', 'after'], // tag notes has_attachments ]; diff --git a/config/queue.php b/config/queue.php index 664188021f..c50e7c2a44 100644 --- a/config/queue.php +++ b/config/queue.php @@ -44,32 +44,32 @@ return [ ], 'database' => [ - 'driver' => 'database', - 'table' => 'jobs', - 'queue' => 'default', + 'driver' => 'database', + 'table' => 'jobs', + 'queue' => 'default', 'retry_after' => 90, ], 'beanstalkd' => [ - 'driver' => 'beanstalkd', - 'host' => 'localhost', - 'queue' => 'default', + 'driver' => 'beanstalkd', + 'host' => 'localhost', + 'queue' => 'default', 'retry_after' => 90, ], 'sqs' => [ 'driver' => 'sqs', - 'key' => 'your-public-key', + 'key' => 'your-public-key', 'secret' => 'your-secret-key', 'prefix' => 'https://sqs.us-east-1.amazonaws.com/your-account-id', - 'queue' => 'your-queue-name', + 'queue' => 'your-queue-name', 'region' => 'us-east-1', ], 'redis' => [ - 'driver' => 'redis', - 'connection' => 'default', - 'queue' => 'default', + 'driver' => 'redis', + 'connection' => 'default', + 'queue' => 'default', 'retry_after' => 90, ], @@ -88,7 +88,7 @@ return [ 'failed' => [ 'database' => env('DB_CONNECTION', 'mysql'), - 'table' => 'failed_jobs', + 'table' => 'failed_jobs', ], ]; diff --git a/config/services.php b/config/services.php index 5990b52c66..1176da0214 100644 --- a/config/services.php +++ b/config/services.php @@ -29,7 +29,7 @@ return [ ], 'ses' => [ - 'key' => env('SES_KEY'), + 'key' => env('SES_KEY'), 'secret' => env('SES_SECRET'), 'region' => 'us-east-1', ], @@ -39,8 +39,8 @@ return [ ], 'stripe' => [ - 'model' => FireflyIII\User::class, - 'key' => env('STRIPE_KEY'), + 'model' => FireflyIII\User::class, + 'key' => env('STRIPE_KEY'), 'secret' => env('STRIPE_SECRET'), ], diff --git a/config/session.php b/config/session.php index f5af7f0fdc..4a635d2321 100644 --- a/config/session.php +++ b/config/session.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ diff --git a/config/upgrade.php b/config/upgrade.php index 199596e690..58c0ad66bd 100644 --- a/config/upgrade.php +++ b/config/upgrade.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ 'text' => [ diff --git a/config/view.php b/config/view.php index 9d4930f213..bb60cc6e7e 100644 --- a/config/view.php +++ b/config/view.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ diff --git a/public/css/firefly.css b/public/css/firefly.css index cc051e6442..80eea37df7 100644 --- a/public/css/firefly.css +++ b/public/css/firefly.css @@ -25,11 +25,6 @@ body.waiting * { cursor: progress; } -.ui-sortable-placeholder { - display: inline-block; - height: 1px; -} - .preferences-box { border: 1px #ddd solid; border-radius: 4px 4px 0 0; @@ -48,12 +43,6 @@ body.waiting * { margin: 20px auto 0 auto; } -.ff-error-page > .headline { - float: left; - font-size: 100px; - font-weight: 300; -} - .ff-error-page > .error-content { margin-left: 190px; display: block; diff --git a/public/js/ff/budgets/show.js b/public/js/ff/budgets/show.js index 5831c82031..d8f1cbb551 100644 --- a/public/js/ff/budgets/show.js +++ b/public/js/ff/budgets/show.js @@ -15,7 +15,7 @@ $(function () { if (budgetLimitID > 0) { lineChart(budgetChartUri, 'budgetOverview'); } - if (budgetLimitID == 0) { + if (budgetLimitID === 0) { columnChart(budgetChartUri, 'budgetOverview'); } diff --git a/public/js/ff/categories/show-by-date.js b/public/js/ff/categories/show-by-date.js index e97dab4db8..f3bdde08a3 100644 --- a/public/js/ff/categories/show-by-date.js +++ b/public/js/ff/categories/show-by-date.js @@ -12,5 +12,5 @@ $(function () { "use strict"; - columnChart(specific, 'period-specific-period'); + columnChart(specific, 'period-specific-period'); }); \ No newline at end of file diff --git a/public/js/ff/import/status.js b/public/js/ff/import/status.js index cf97ab9935..cc1ec69a9e 100644 --- a/public/js/ff/import/status.js +++ b/public/js/ff/import/status.js @@ -62,7 +62,7 @@ function updateBar(data) { function reportErrors(data) { "use strict"; - if (data.errors.length == 1) { + if (data.errors.length === 1) { $('#import-status-error-intro').text(langImportSingleError); //'An error has occured during the import. The import can continue, however.' } @@ -93,7 +93,7 @@ function kickStartJob() { function updateTimeout(data) { "use strict"; - if (data.stepsDone != stepCount) { + if (data.stepsDone !== stepCount) { stepCount = data.stepsDone; currentLimit = 0; return; diff --git a/public/js/ff/index.js b/public/js/ff/index.js index 1cd119c383..242768712d 100644 --- a/public/js/ff/index.js +++ b/public/js/ff/index.js @@ -14,7 +14,7 @@ $(function () { "use strict"; // do chart JS stuff. drawChart(); - if (showTour == true) { + if (showTour === true) { $.getJSON('json/tour').done(function (data) { var tour = new Tour( { diff --git a/public/js/ff/reports/default/all.js b/public/js/ff/reports/default/all.js index 1f838a0ebc..6fc394d7dd 100644 --- a/public/js/ff/reports/default/all.js +++ b/public/js/ff/reports/default/all.js @@ -99,9 +99,9 @@ function displayAjaxPartial(data, holder) { function failAjaxPartial(uri, holder) { "use strict"; - var holder = $('#' + holder); - holder.parent().find('.overlay').remove(); - holder.addClass('general-chart-error'); + var holderObject = $('#' + holder); + holderObject.parent().find('.overlay').remove(); + holderObject.addClass('general-chart-error'); } diff --git a/public/js/ff/reports/default/month.js b/public/js/ff/reports/default/month.js index 1c2f08be63..fb35e4f8ba 100644 --- a/public/js/ff/reports/default/month.js +++ b/public/js/ff/reports/default/month.js @@ -16,7 +16,7 @@ $(function () { loadAjaxPartial('categoryReport', categoryReportUri); loadAjaxPartial('budgetReport', budgetReportUri); - loadAjaxPartial('balanceReport',balanceReportUri); + loadAjaxPartial('balanceReport', balanceReportUri); }); function drawChart() { diff --git a/public/js/ff/reports/index.js b/public/js/ff/reports/index.js index 2891c12fd1..02994f209f 100644 --- a/public/js/ff/reports/index.js +++ b/public/js/ff/reports/index.js @@ -56,7 +56,7 @@ $(function () { // set date from cookie var startStr = readCookie('report-start'); var endStr = readCookie('report-end'); - if (startStr !== null && endStr !== null && startStr.length == 8 && endStr.length == 8) { + if (startStr !== null && endStr !== null && startStr.length === 8 && endStr.length === 8) { var startDate = moment(startStr, "YYYY-MM-DD"); var endDate = moment(endStr, "YYYY-MM-DD"); var datePicker = $('#inputDateRange').data('daterangepicker'); diff --git a/public/js/ff/rules/create-edit.js b/public/js/ff/rules/create-edit.js index 1652ae804b..3b8e871e04 100644 --- a/public/js/ff/rules/create-edit.js +++ b/public/js/ff/rules/create-edit.js @@ -104,14 +104,14 @@ function addNewAction() { function removeTrigger(e) { "use strict"; var target = $(e.target); - if (target.prop("tagName") == "I") { + if (target.prop("tagName") === "I") { target = target.parent(); } // remove grand parent: target.parent().parent().remove(); // if now at zero, immediatly add one again: - if ($('.rule-trigger-tbody tr').length == 0) { + if ($('.rule-trigger-tbody tr').length === 0) { addNewTrigger(); } return false; @@ -125,14 +125,14 @@ function removeTrigger(e) { function removeAction(e) { "use strict"; var target = $(e.target); - if (target.prop("tagName") == "I") { + if (target.prop("tagName") === "I") { target = target.parent(); } // remove grand parent: target.parent().parent().remove(); // if now at zero, immediatly add one again: - if ($('.rule-action-tbody tr').length == 0) { + if ($('.rule-action-tbody tr').length === 0) { addNewAction(); } return false; diff --git a/public/js/ff/tags/create-edit.js b/public/js/ff/tags/create-edit.js index 7184b17ae2..369d1134ef 100644 --- a/public/js/ff/tags/create-edit.js +++ b/public/js/ff/tags/create-edit.js @@ -51,28 +51,28 @@ function clearLocation() { function initialize() { "use strict"; /* - Create new map: + Create new map: */ map = new google.maps.Map(document.getElementById('map-canvas'), mapOptions); /* - Respond to click event. + Respond to click event. */ google.maps.event.addListener(map, 'rightclick', function (event) { placeMarker(event); }); /* - Respond to zoom event. + Respond to zoom event. */ google.maps.event.addListener(map, 'zoom_changed', function () { saveZoomLevel(); }); /* - Maybe place marker? + Maybe place marker? */ - if(doPlaceMarker == true) { - var myLatlng = new google.maps.LatLng(latitude,longitude); + if (doPlaceMarker === true) { + var myLatlng = new google.maps.LatLng(latitude, longitude); var fakeEvent = {}; fakeEvent.latLng = myLatlng; placeMarker(fakeEvent); diff --git a/public/js/ff/transactions/list.js b/public/js/ff/transactions/list.js index 74dc53f24d..39cc72fc9a 100644 --- a/public/js/ff/transactions/list.js +++ b/public/js/ff/transactions/list.js @@ -72,8 +72,8 @@ function countChecked() { "use strict"; var checked = $('.select_all_single:checked').length; if (checked > 0) { - $('.mass_edit span').text(edit_selected_txt + ' (' + checked + ')') - $('.mass_delete span').text(delete_selected_txt + ' (' + checked + ')') + $('.mass_edit span').text(edit_selected_txt + ' (' + checked + ')'); + $('.mass_delete span').text(delete_selected_txt + ' (' + checked + ')'); $('.mass_button_options').show(); } else { diff --git a/public/js/ff/transactions/single/create.js b/public/js/ff/transactions/single/create.js index 203962b24c..5c10be71d3 100644 --- a/public/js/ff/transactions/single/create.js +++ b/public/js/ff/transactions/single/create.js @@ -26,7 +26,7 @@ $(document).ready(function () { } // update currency - $('select[name="source_account_id"]').on('change', updateCurrency) + $('select[name="source_account_id"]').on('change', updateCurrency); // get JSON things: getJSONautocomplete(); @@ -178,7 +178,7 @@ function updateButtons() { // new click event: button.bind('click', clickButton); - if (button.data('what') == what) { + if (button.data('what') === what) { button.removeClass('btn-default').addClass('btn-info').html(' ' + txt[button.data('what')]); } else { button.removeClass('btn-info').addClass('btn-default').text(txt[button.data('what')]); @@ -190,7 +190,7 @@ function clickButton(e) { "use strict"; var button = $(e.target); var newWhat = button.data('what'); - if (newWhat != what) { + if (newWhat !== what) { what = newWhat; updateButtons(); updateForm(); diff --git a/public/js/ff/transactions/split/edit.js b/public/js/ff/transactions/split/edit.js index 19fffbdf4b..a91c0a3422 100644 --- a/public/js/ff/transactions/split/edit.js +++ b/public/js/ff/transactions/split/edit.js @@ -184,12 +184,12 @@ function calculateSum() { var set = $('input[name$="][amount]"]'); for (var i = 0; i < set.length; i++) { var current = $(set[i]); - sum += (current.val() == "" ? 0 : parseFloat(current.val())); + sum += (current.val() === "" ? 0 : parseFloat(current.val())); } sum = Math.round(sum * 100) / 100; $('.amount-warning').remove(); - if (sum != originalSum) { + if (sum !== originalSum) { var holder = $('#journal_amount_holder'); var par = holder.find('p.form-control-static'); $('').text(' (' + accounting.formatMoney(sum) + ')').addClass('text-danger amount-warning').appendTo(par); diff --git a/resources/lang/de_DE/csv.php b/resources/lang/de_DE/csv.php index fca9ee7d0f..71a33e1fc8 100644 --- a/resources/lang/de_DE/csv.php +++ b/resources/lang/de_DE/csv.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ diff --git a/resources/lang/en_US/csv.php b/resources/lang/en_US/csv.php index 6b5abd3431..d5306e2a88 100644 --- a/resources/lang/en_US/csv.php +++ b/resources/lang/en_US/csv.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ diff --git a/resources/lang/es_ES/csv.php b/resources/lang/es_ES/csv.php index 4acb52efdc..4424610191 100644 --- a/resources/lang/es_ES/csv.php +++ b/resources/lang/es_ES/csv.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ diff --git a/resources/lang/fr_FR/csv.php b/resources/lang/fr_FR/csv.php index b5bbae3400..4c2cd1a072 100644 --- a/resources/lang/fr_FR/csv.php +++ b/resources/lang/fr_FR/csv.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ diff --git a/resources/lang/hr_HR/csv.php b/resources/lang/hr_HR/csv.php index 4acb52efdc..4424610191 100644 --- a/resources/lang/hr_HR/csv.php +++ b/resources/lang/hr_HR/csv.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ diff --git a/resources/lang/nl_NL/csv.php b/resources/lang/nl_NL/csv.php index 876ca796a4..5de8d082fd 100644 --- a/resources/lang/nl_NL/csv.php +++ b/resources/lang/nl_NL/csv.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ diff --git a/resources/lang/pl_PL/csv.php b/resources/lang/pl_PL/csv.php index d9b1b88c79..72961b5ab5 100644 --- a/resources/lang/pl_PL/csv.php +++ b/resources/lang/pl_PL/csv.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ diff --git a/resources/lang/pt_BR/csv.php b/resources/lang/pt_BR/csv.php index a1b92485f2..06ed873ac8 100644 --- a/resources/lang/pt_BR/csv.php +++ b/resources/lang/pt_BR/csv.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ diff --git a/resources/lang/ru_RU/csv.php b/resources/lang/ru_RU/csv.php index 37e4e88998..0bfa2c13e0 100644 --- a/resources/lang/ru_RU/csv.php +++ b/resources/lang/ru_RU/csv.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ diff --git a/resources/lang/zh_HK/csv.php b/resources/lang/zh_HK/csv.php index 4acb52efdc..4424610191 100644 --- a/resources/lang/zh_HK/csv.php +++ b/resources/lang/zh_HK/csv.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ diff --git a/resources/lang/zh_TW/csv.php b/resources/lang/zh_TW/csv.php index e94574c27b..c55b9cea43 100644 --- a/resources/lang/zh_TW/csv.php +++ b/resources/lang/zh_TW/csv.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ diff --git a/resources/views/accounts/show.twig b/resources/views/accounts/show.twig index 39a1729876..a29f420fa8 100644 --- a/resources/views/accounts/show.twig +++ b/resources/views/accounts/show.twig @@ -144,13 +144,13 @@ // uri's for charts: var chartUri = '{{ chartUri }}'; {% if start and end %} - var incomeCategoryUri = '{{ route('chart.account.income-category', [account.id, start.format('Ymd'), end.format('Ymd')]) }}'; - var expenseCategoryUri = '{{ route('chart.account.expense-category', [account.id, start.format('Ymd'), end.format('Ymd')]) }}'; - var expenseBudgetUri = '{{ route('chart.account.expense-budget', [account.id, start.format('Ymd'), end.format('Ymd')]) }}'; + var incomeCategoryUri = '{{ route('chart.account.income-category', [account.id, start.format('Ymd'), end.format('Ymd')]) }}'; + var expenseCategoryUri = '{{ route('chart.account.expense-category', [account.id, start.format('Ymd'), end.format('Ymd')]) }}'; + var expenseBudgetUri = '{{ route('chart.account.expense-budget', [account.id, start.format('Ymd'), end.format('Ymd')]) }}'; {% else %} - var incomeCategoryUri = '{{ route('chart.account.income-category', [account.id, 'all', 'all']) }}'; - var expenseCategoryUri = '{{ route('chart.account.expense-category', [account.id, 'all', 'all']) }}'; - var expenseBudgetUri = '{{ route('chart.account.expense-budget', [account.id, 'all', 'all']) }}'; + var incomeCategoryUri = '{{ route('chart.account.income-category', [account.id, 'all', 'all']) }}'; + var expenseCategoryUri = '{{ route('chart.account.expense-category', [account.id, 'all', 'all']) }}'; + var expenseBudgetUri = '{{ route('chart.account.expense-budget', [account.id, 'all', 'all']) }}'; {% endif %} diff --git a/resources/views/budgets/index.twig b/resources/views/budgets/index.twig index 3928cd2714..9ecec09211 100644 --- a/resources/views/budgets/index.twig +++ b/resources/views/budgets/index.twig @@ -72,14 +72,14 @@ {% if budgets.count > 0 and inactive.count > 0 %} -
-
-

{{ 'createBudget'|_ }}

+
+
+

{{ 'createBudget'|_ }}

+
+
+ {{ 'createBudget'|_ }} +
-
- {{ 'createBudget'|_ }} -
-
{% endif %}
diff --git a/resources/views/categories/show.twig b/resources/views/categories/show.twig index 9fa172096b..13a43903b2 100644 --- a/resources/views/categories/show.twig +++ b/resources/views/categories/show.twig @@ -110,10 +110,10 @@ {{ period.earned|formatAmount }} {% if period.earned != 0 and period.spent != 0 %} - - {{ 'sum'|_ }} - {{ period.sum|formatAmount }} - + + {{ 'sum'|_ }} + {{ period.sum|formatAmount }} + {% endif %} {{ 'transferred'|_ }} diff --git a/resources/views/demo/import/configure.twig b/resources/views/demo/import/configure.twig index a94b4914bb..eee25e4315 100644 --- a/resources/views/demo/import/configure.twig +++ b/resources/views/demo/import/configure.twig @@ -1,3 +1,3 @@ {{ trans('demo.import-configure-security') }} -

+

{{ trans('demo.import-configure-configuration') }} diff --git a/resources/views/demo/reports/index.twig b/resources/views/demo/reports/index.twig index 535fb63c44..adf49baea5 100644 --- a/resources/views/demo/reports/index.twig +++ b/resources/views/demo/reports/index.twig @@ -1,6 +1,6 @@ {{ trans('demo.reports-index-start')|raw }} -
-
+
+
{{ trans('demo.reports-index-examples', { one: route('reports.report.default', ['1,2,3','currentMonthStart','currentMonthEnd']), two: route('reports.report.default', ['1,2,3','20160101','20161231']), diff --git a/resources/views/emails/password-html.twig b/resources/views/emails/password-html.twig index 07e4e0a80a..2b15f16191 100644 --- a/resources/views/emails/password-html.twig +++ b/resources/views/emails/password-html.twig @@ -8,6 +8,6 @@

- {{ url }} + {{ url }}

{% include 'emails.footer-html' %} diff --git a/resources/views/errors/500.twig b/resources/views/errors/500.twig index 456f0b73dd..5c90946598 100644 --- a/resources/views/errors/500.twig +++ b/resources/views/errors/500.twig @@ -1,6 +1,6 @@ - +