From bb5de8bf7e1132e09dd7e09495310ae9bd10b8ed Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 30 Jun 2020 19:05:35 +0200 Subject: [PATCH] Update copyrights. --- .../Controllers/Search/AccountController.php | 6 ++-- .../Search/TransactionController.php | 6 ++-- .../Controllers/Search/TransferController.php | 6 ++-- .../V1/Requests/Search/TransferRequest.php | 6 ++-- .../CorrectOpeningBalanceCurrencies.php | 4 ++- .../Correction/FixLongDescriptions.php | 4 ++- .../Correction/FixRecurringTransactions.php | 4 ++- app/Console/Commands/CreateDatabase.php | 4 +-- app/Console/Commands/Export/ExportData.php | 4 ++- .../Commands/Integrity/RestoreOAuthKeys.php | 4 ++- app/Console/Commands/SetLatestVersion.php | 3 +- .../Upgrade/MigrateRecurrenceMeta.php | 4 ++- .../Commands/Upgrade/MigrateTagLocations.php | 4 ++- .../DuplicateTransactionException.php | 6 ++-- .../Extensions/AccountCollection.php | 4 ++- .../Collector/Extensions/AmountCollection.php | 4 ++- .../Extensions/CollectorProperties.php | 4 ++- .../Collector/Extensions/MetaCollection.php | 4 ++- .../Collector/Extensions/TimeCollection.php | 4 ++- .../Controllers/Admin/TelemetryController.php | 6 ++-- .../Auth/ConfirmPasswordController.php | 4 +-- .../Chart/TransactionController.php | 6 ++-- .../Controllers/Export/IndexController.php | 6 ++-- .../Controllers/Json/BudgetController.php | 4 ++- .../ObjectGroup/DeleteController.php | 21 ++++++++++++++ .../ObjectGroup/EditController.php | 21 ++++++++++++++ .../ObjectGroup/IndexController.php | 22 ++++++++++++++ .../PiggyBank/AmountController.php | 21 ++++++++++++++ .../PiggyBank/CreateController.php | 27 +++++++++++++++-- .../PiggyBank/DeleteController.php | 21 ++++++++++++++ .../Controllers/PiggyBank/EditController.php | 27 +++++++++++++++-- .../Controllers/PiggyBank/IndexController.php | 21 ++++++++++++++ .../Controllers/PiggyBank/ShowController.php | 21 ++++++++++++++ .../Controllers/Profile/DataController.php | 6 ++-- app/Jobs/CreateAutoBudgetLimits.php | 6 ++-- app/Jobs/SubmitTelemetryData.php | 4 ++- app/Models/AutoBudget.php | 6 ++-- app/Models/Location.php | 6 ++-- app/Models/ObjectGroup.php | 29 +++++++++++++++++++ app/Models/Telemetry.php | 6 ++-- .../ObjectGroup/CreatesObjectGroups.php | 21 ++++++++++++++ .../ObjectGroup/ObjectGroupRepository.php | 25 +++++++++++++++- .../ObjectGroupRepositoryInterface.php | 21 ++++++++++++++ .../ObjectGroup/OrganisesObjectGroups.php | 21 ++++++++++++++ .../PiggyBank/ModifiesPiggyBanks.php | 14 ++++++++- .../Telemetry/TelemetryRepository.php | 4 ++- .../TelemetryRepositoryInterface.php | 4 ++- app/Rules/IsTransferAccount.php | 6 ++-- app/Rules/LessThanPiggyTarget.php | 7 +++-- .../FireflyIIIOrg/Update/UpdateRequest.php | 6 ++-- .../Update/UpdateRequestInterface.php | 6 ++-- .../Internal/Support/LocationServiceTrait.php | 6 ++-- .../Authentication/RemoteUserGuard.php | 21 ++++++++++++++ .../Authentication/RemoteUserProvider.php | 21 ++++++++++++++ .../Category/FrontpageChartGenerator.php | 6 ++-- app/Support/Cronjobs/AutoBudgetCronjob.php | 6 ++-- app/Support/Cronjobs/TelemetryCronjob.php | 4 ++- app/Support/Export/ExportDataGenerator.php | 6 ++-- app/Support/ParseDateString.php | 21 ++++++++++++++ app/Support/Search/AccountSearch.php | 6 ++-- app/Support/Search/GenericSearchInterface.php | 6 ++-- app/Support/Search/TransactionSearch.php | 6 ++-- app/Support/Search/TransferSearch.php | 6 ++-- .../System/GeneratesInstallationId.php | 21 ++++++++++++++ app/Support/System/OAuthKeys.php | 6 ++-- app/Support/Telemetry.php | 6 ++-- .../Actions/UpdatePiggybank.php | 21 ++++++++++++++ .../Account/AccountValidatorProperties.php | 4 ++- app/Validation/Account/OBValidation.php | 4 ++- .../Account/ReconciliationValidation.php | 4 ++- app/Validation/CurrencyValidation.php | 6 ++-- app/Validation/GroupValidation.php | 6 ++-- 72 files changed, 613 insertions(+), 91 deletions(-) diff --git a/app/Api/V1/Controllers/Search/AccountController.php b/app/Api/V1/Controllers/Search/AccountController.php index 43ff8ffa5f..bd47d0a62d 100644 --- a/app/Api/V1/Controllers/Search/AccountController.php +++ b/app/Api/V1/Controllers/Search/AccountController.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Api\V1\Controllers\Search; use FireflyIII\Api\V1\Controllers\Controller; diff --git a/app/Api/V1/Controllers/Search/TransactionController.php b/app/Api/V1/Controllers/Search/TransactionController.php index 7febe475e8..b18fd63708 100644 --- a/app/Api/V1/Controllers/Search/TransactionController.php +++ b/app/Api/V1/Controllers/Search/TransactionController.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Api\V1\Controllers\Search; use FireflyIII\Api\V1\Controllers\Controller; diff --git a/app/Api/V1/Controllers/Search/TransferController.php b/app/Api/V1/Controllers/Search/TransferController.php index 38d29e0a0f..847ecbe270 100644 --- a/app/Api/V1/Controllers/Search/TransferController.php +++ b/app/Api/V1/Controllers/Search/TransferController.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Api\V1\Controllers\Search; use FireflyIII\Api\V1\Controllers\Controller; diff --git a/app/Api/V1/Requests/Search/TransferRequest.php b/app/Api/V1/Requests/Search/TransferRequest.php index 5cfb4d3ead..2fd5e96c9d 100644 --- a/app/Api/V1/Requests/Search/TransferRequest.php +++ b/app/Api/V1/Requests/Search/TransferRequest.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Api\V1\Requests\Search; use FireflyIII\Api\V1\Requests\Request; diff --git a/app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php b/app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php index d4cca5e04e..1063d47aa1 100644 --- a/app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php +++ b/app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Console\Commands\Correction; use FireflyIII\Models\Account; diff --git a/app/Console/Commands/Correction/FixLongDescriptions.php b/app/Console/Commands/Correction/FixLongDescriptions.php index ec93912784..28ad7ea15f 100644 --- a/app/Console/Commands/Correction/FixLongDescriptions.php +++ b/app/Console/Commands/Correction/FixLongDescriptions.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Console\Commands\Correction; use FireflyIII\Models\TransactionGroup; diff --git a/app/Console/Commands/Correction/FixRecurringTransactions.php b/app/Console/Commands/Correction/FixRecurringTransactions.php index f392676942..6391a32d84 100644 --- a/app/Console/Commands/Correction/FixRecurringTransactions.php +++ b/app/Console/Commands/Correction/FixRecurringTransactions.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Console\Commands\Correction; use FireflyIII\Models\Recurrence; diff --git a/app/Console/Commands/CreateDatabase.php b/app/Console/Commands/CreateDatabase.php index ee72d3fa17..1c95d9d0e0 100644 --- a/app/Console/Commands/CreateDatabase.php +++ b/app/Console/Commands/CreateDatabase.php @@ -1,6 +1,4 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Console\Commands; use Illuminate\Console\Command; diff --git a/app/Console/Commands/Export/ExportData.php b/app/Console/Commands/Export/ExportData.php index e187b8ef9c..590791e537 100644 --- a/app/Console/Commands/Export/ExportData.php +++ b/app/Console/Commands/Export/ExportData.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Console\Commands\Export; use Carbon\Carbon; diff --git a/app/Console/Commands/Integrity/RestoreOAuthKeys.php b/app/Console/Commands/Integrity/RestoreOAuthKeys.php index 6efce94e4d..14655a5f58 100644 --- a/app/Console/Commands/Integrity/RestoreOAuthKeys.php +++ b/app/Console/Commands/Integrity/RestoreOAuthKeys.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Console\Commands\Integrity; use FireflyIII\Support\System\OAuthKeys; diff --git a/app/Console/Commands/SetLatestVersion.php b/app/Console/Commands/SetLatestVersion.php index 0c3c1c9e36..b961e755d7 100644 --- a/app/Console/Commands/SetLatestVersion.php +++ b/app/Console/Commands/SetLatestVersion.php @@ -1,5 +1,4 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Console\Commands; use Illuminate\Console\Command; diff --git a/app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php b/app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php index bad0d6f1a2..30eca6aec4 100644 --- a/app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php +++ b/app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Console\Commands\Upgrade; use FireflyIII\Models\RecurrenceMeta; diff --git a/app/Console/Commands/Upgrade/MigrateTagLocations.php b/app/Console/Commands/Upgrade/MigrateTagLocations.php index e5009a60a0..bc0f209a55 100644 --- a/app/Console/Commands/Upgrade/MigrateTagLocations.php +++ b/app/Console/Commands/Upgrade/MigrateTagLocations.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Console\Commands\Upgrade; use FireflyIII\Models\Location; diff --git a/app/Exceptions/DuplicateTransactionException.php b/app/Exceptions/DuplicateTransactionException.php index 760f64af6b..28c614f53c 100644 --- a/app/Exceptions/DuplicateTransactionException.php +++ b/app/Exceptions/DuplicateTransactionException.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Exceptions; use Exception; diff --git a/app/Helpers/Collector/Extensions/AccountCollection.php b/app/Helpers/Collector/Extensions/AccountCollection.php index 819a87c3a8..8dc522726e 100644 --- a/app/Helpers/Collector/Extensions/AccountCollection.php +++ b/app/Helpers/Collector/Extensions/AccountCollection.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Helpers\Collector\Extensions; use FireflyIII\Helpers\Collector\GroupCollectorInterface; diff --git a/app/Helpers/Collector/Extensions/AmountCollection.php b/app/Helpers/Collector/Extensions/AmountCollection.php index 719426bfcc..bda1510077 100644 --- a/app/Helpers/Collector/Extensions/AmountCollection.php +++ b/app/Helpers/Collector/Extensions/AmountCollection.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Helpers\Collector\Extensions; use FireflyIII\Helpers\Collector\GroupCollectorInterface; diff --git a/app/Helpers/Collector/Extensions/CollectorProperties.php b/app/Helpers/Collector/Extensions/CollectorProperties.php index 2c0e0463eb..e8cdc2712f 100644 --- a/app/Helpers/Collector/Extensions/CollectorProperties.php +++ b/app/Helpers/Collector/Extensions/CollectorProperties.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Helpers\Collector\Extensions; use FireflyIII\User; diff --git a/app/Helpers/Collector/Extensions/MetaCollection.php b/app/Helpers/Collector/Extensions/MetaCollection.php index 5680226951..ea86e6bb44 100644 --- a/app/Helpers/Collector/Extensions/MetaCollection.php +++ b/app/Helpers/Collector/Extensions/MetaCollection.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Helpers\Collector\Extensions; use FireflyIII\Helpers\Collector\GroupCollectorInterface; diff --git a/app/Helpers/Collector/Extensions/TimeCollection.php b/app/Helpers/Collector/Extensions/TimeCollection.php index 8b2e748970..fb92e3d41f 100644 --- a/app/Helpers/Collector/Extensions/TimeCollection.php +++ b/app/Helpers/Collector/Extensions/TimeCollection.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Helpers\Collector\Extensions; use Carbon\Carbon; diff --git a/app/Http/Controllers/Admin/TelemetryController.php b/app/Http/Controllers/Admin/TelemetryController.php index 2b9163992b..4fb36ae8d4 100644 --- a/app/Http/Controllers/Admin/TelemetryController.php +++ b/app/Http/Controllers/Admin/TelemetryController.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Http\Controllers\Admin; use Carbon\Carbon; diff --git a/app/Http/Controllers/Auth/ConfirmPasswordController.php b/app/Http/Controllers/Auth/ConfirmPasswordController.php index 3077ad4beb..73c1c4d13b 100644 --- a/app/Http/Controllers/Auth/ConfirmPasswordController.php +++ b/app/Http/Controllers/Auth/ConfirmPasswordController.php @@ -1,6 +1,4 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Http\Controllers\Auth; use FireflyIII\Http\Controllers\Controller; diff --git a/app/Http/Controllers/Chart/TransactionController.php b/app/Http/Controllers/Chart/TransactionController.php index ed7d5ad143..8516fb60ce 100644 --- a/app/Http/Controllers/Chart/TransactionController.php +++ b/app/Http/Controllers/Chart/TransactionController.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Http\Controllers\Chart; use Carbon\Carbon; diff --git a/app/Http/Controllers/Export/IndexController.php b/app/Http/Controllers/Export/IndexController.php index 1626b0756c..59a1596ead 100644 --- a/app/Http/Controllers/Export/IndexController.php +++ b/app/Http/Controllers/Export/IndexController.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Http\Controllers\Export; diff --git a/app/Http/Controllers/Json/BudgetController.php b/app/Http/Controllers/Json/BudgetController.php index 48abeb9f79..93aade6c00 100644 --- a/app/Http/Controllers/Json/BudgetController.php +++ b/app/Http/Controllers/Json/BudgetController.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Http\Controllers\Json; diff --git a/app/Http/Controllers/ObjectGroup/DeleteController.php b/app/Http/Controllers/ObjectGroup/DeleteController.php index 293d953ba6..fcbd8e7962 100644 --- a/app/Http/Controllers/ObjectGroup/DeleteController.php +++ b/app/Http/Controllers/ObjectGroup/DeleteController.php @@ -1,4 +1,25 @@ . + */ + declare(strict_types=1); namespace FireflyIII\Http\Controllers\ObjectGroup; diff --git a/app/Http/Controllers/ObjectGroup/EditController.php b/app/Http/Controllers/ObjectGroup/EditController.php index d760007802..781b764eb8 100644 --- a/app/Http/Controllers/ObjectGroup/EditController.php +++ b/app/Http/Controllers/ObjectGroup/EditController.php @@ -1,4 +1,25 @@ . + */ + declare(strict_types=1); namespace FireflyIII\Http\Controllers\ObjectGroup; diff --git a/app/Http/Controllers/ObjectGroup/IndexController.php b/app/Http/Controllers/ObjectGroup/IndexController.php index 6185dade42..6512b73062 100644 --- a/app/Http/Controllers/ObjectGroup/IndexController.php +++ b/app/Http/Controllers/ObjectGroup/IndexController.php @@ -1,4 +1,25 @@ . + */ + declare(strict_types=1); namespace FireflyIII\Http\Controllers\ObjectGroup; @@ -43,6 +64,7 @@ class IndexController extends Controller */ public function index() { + $this->repository->deleteEmpty(); $this->repository->sort(); $subTitle = (string) trans('firefly.object_groups_index'); $objectGroups = $this->repository->get(); diff --git a/app/Http/Controllers/PiggyBank/AmountController.php b/app/Http/Controllers/PiggyBank/AmountController.php index 44ee05c769..ed335332a2 100644 --- a/app/Http/Controllers/PiggyBank/AmountController.php +++ b/app/Http/Controllers/PiggyBank/AmountController.php @@ -1,4 +1,25 @@ . + */ + declare(strict_types=1); namespace FireflyIII\Http\Controllers\PiggyBank; diff --git a/app/Http/Controllers/PiggyBank/CreateController.php b/app/Http/Controllers/PiggyBank/CreateController.php index de7c18ff72..a6775a70a9 100644 --- a/app/Http/Controllers/PiggyBank/CreateController.php +++ b/app/Http/Controllers/PiggyBank/CreateController.php @@ -1,4 +1,25 @@ . + */ + declare(strict_types=1); namespace FireflyIII\Http\Controllers\PiggyBank; @@ -7,7 +28,7 @@ namespace FireflyIII\Http\Controllers\PiggyBank; use Carbon\Carbon; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Http\Controllers\Controller; -use FireflyIII\Http\Requests\PiggyBankFormRequest; +use FireflyIII\Http\Requests\PiggyBankStoreRequest; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; @@ -67,11 +88,11 @@ class CreateController extends Controller /** * Store a new piggy bank. * - * @param PiggyBankFormRequest $request + * @param PiggyBankStoreRequest $request * * @return RedirectResponse|Redirector */ - public function store(PiggyBankFormRequest $request) + public function store(PiggyBankStoreRequest $request) { $data = $request->getPiggyBankData(); if (null === $data['startdate']) { diff --git a/app/Http/Controllers/PiggyBank/DeleteController.php b/app/Http/Controllers/PiggyBank/DeleteController.php index 3db81000b8..39eefeb451 100644 --- a/app/Http/Controllers/PiggyBank/DeleteController.php +++ b/app/Http/Controllers/PiggyBank/DeleteController.php @@ -1,4 +1,25 @@ . + */ + declare(strict_types=1); namespace FireflyIII\Http\Controllers\PiggyBank; diff --git a/app/Http/Controllers/PiggyBank/EditController.php b/app/Http/Controllers/PiggyBank/EditController.php index 2ed18713a3..66ceae97e9 100644 --- a/app/Http/Controllers/PiggyBank/EditController.php +++ b/app/Http/Controllers/PiggyBank/EditController.php @@ -1,4 +1,25 @@ . + */ + declare(strict_types=1); namespace FireflyIII\Http\Controllers\PiggyBank; @@ -6,7 +27,7 @@ namespace FireflyIII\Http\Controllers\PiggyBank; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Http\Controllers\Controller; -use FireflyIII\Http\Requests\PiggyBankFormRequest; +use FireflyIII\Http\Requests\PiggyBankUpdateRequest; use FireflyIII\Models\PiggyBank; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use Illuminate\Contracts\View\Factory; @@ -89,12 +110,12 @@ class EditController extends Controller /** * Update a piggy bank. * - * @param PiggyBankFormRequest $request + * @param PiggyBankUpdateRequest $request * @param PiggyBank $piggyBank * * @return RedirectResponse|Redirector */ - public function update(PiggyBankFormRequest $request, PiggyBank $piggyBank) + public function update(PiggyBankUpdateRequest $request, PiggyBank $piggyBank) { $data = $request->getPiggyBankData(); $piggyBank = $this->piggyRepos->update($piggyBank, $data); diff --git a/app/Http/Controllers/PiggyBank/IndexController.php b/app/Http/Controllers/PiggyBank/IndexController.php index 6eada96c59..f6b4c5b03f 100644 --- a/app/Http/Controllers/PiggyBank/IndexController.php +++ b/app/Http/Controllers/PiggyBank/IndexController.php @@ -1,4 +1,25 @@ . + */ + declare(strict_types=1); namespace FireflyIII\Http\Controllers\PiggyBank; diff --git a/app/Http/Controllers/PiggyBank/ShowController.php b/app/Http/Controllers/PiggyBank/ShowController.php index 43dec1eea4..6495b197ca 100644 --- a/app/Http/Controllers/PiggyBank/ShowController.php +++ b/app/Http/Controllers/PiggyBank/ShowController.php @@ -1,4 +1,25 @@ . + */ + declare(strict_types=1); namespace FireflyIII\Http\Controllers\PiggyBank; diff --git a/app/Http/Controllers/Profile/DataController.php b/app/Http/Controllers/Profile/DataController.php index a4ded43c29..fa52bd1253 100644 --- a/app/Http/Controllers/Profile/DataController.php +++ b/app/Http/Controllers/Profile/DataController.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Http\Controllers\Profile; use FireflyIII\Http\Controllers\Controller; diff --git a/app/Jobs/CreateAutoBudgetLimits.php b/app/Jobs/CreateAutoBudgetLimits.php index 2bf4be56ce..fc33cf2ba9 100644 --- a/app/Jobs/CreateAutoBudgetLimits.php +++ b/app/Jobs/CreateAutoBudgetLimits.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Jobs; use Carbon\Carbon; diff --git a/app/Jobs/SubmitTelemetryData.php b/app/Jobs/SubmitTelemetryData.php index 3071748d8b..1d06651b42 100644 --- a/app/Jobs/SubmitTelemetryData.php +++ b/app/Jobs/SubmitTelemetryData.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Jobs; diff --git a/app/Models/AutoBudget.php b/app/Models/AutoBudget.php index 3f4c42ee24..6db869fa1c 100644 --- a/app/Models/AutoBudget.php +++ b/app/Models/AutoBudget.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Models; use Eloquent; diff --git a/app/Models/Location.php b/app/Models/Location.php index 4e97b1bd16..6f0a29859f 100644 --- a/app/Models/Location.php +++ b/app/Models/Location.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Models; diff --git a/app/Models/ObjectGroup.php b/app/Models/ObjectGroup.php index 953fafde0e..0505a63e1f 100644 --- a/app/Models/ObjectGroup.php +++ b/app/Models/ObjectGroup.php @@ -1,4 +1,25 @@ . + */ + declare(strict_types=1); namespace FireflyIII\Models; @@ -56,6 +77,14 @@ class ObjectGroup extends Model return $this->morphedByMany(PiggyBank::class, 'object_groupable'); } + /** + * @return \Illuminate\Database\Eloquent\Relations\MorphToMany + */ + public function bills() + { + return $this->morphedByMany(Bill::class, 'object_groupable'); + } + /** * Route binder. Converts the key in the URL to the specified object (or throw 404). * diff --git a/app/Models/Telemetry.php b/app/Models/Telemetry.php index b45593cd94..27fbe48637 100644 --- a/app/Models/Telemetry.php +++ b/app/Models/Telemetry.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Models; diff --git a/app/Repositories/ObjectGroup/CreatesObjectGroups.php b/app/Repositories/ObjectGroup/CreatesObjectGroups.php index 3bdc83bf1f..9abf2f1d4d 100644 --- a/app/Repositories/ObjectGroup/CreatesObjectGroups.php +++ b/app/Repositories/ObjectGroup/CreatesObjectGroups.php @@ -1,4 +1,25 @@ . + */ + declare(strict_types=1); namespace FireflyIII\Repositories\ObjectGroup; diff --git a/app/Repositories/ObjectGroup/ObjectGroupRepository.php b/app/Repositories/ObjectGroup/ObjectGroupRepository.php index 17e68e492f..1354215ebf 100644 --- a/app/Repositories/ObjectGroup/ObjectGroupRepository.php +++ b/app/Repositories/ObjectGroup/ObjectGroupRepository.php @@ -1,4 +1,25 @@ . + */ + declare(strict_types=1); namespace FireflyIII\Repositories\ObjectGroup; @@ -33,7 +54,9 @@ class ObjectGroupRepository implements ObjectGroupRepositoryInterface */ public function get(): Collection { - return $this->user->objectGroups()->orderBy('order', 'ASC')->orderBy('title', 'ASC')->get(); + return $this->user->objectGroups() + ->with(['piggyBanks', 'bills']) + ->orderBy('order', 'ASC')->orderBy('title', 'ASC')->get(); } /** diff --git a/app/Repositories/ObjectGroup/ObjectGroupRepositoryInterface.php b/app/Repositories/ObjectGroup/ObjectGroupRepositoryInterface.php index 4d190c007b..472f72edce 100644 --- a/app/Repositories/ObjectGroup/ObjectGroupRepositoryInterface.php +++ b/app/Repositories/ObjectGroup/ObjectGroupRepositoryInterface.php @@ -1,4 +1,25 @@ . + */ + declare(strict_types=1); namespace FireflyIII\Repositories\ObjectGroup; diff --git a/app/Repositories/ObjectGroup/OrganisesObjectGroups.php b/app/Repositories/ObjectGroup/OrganisesObjectGroups.php index 3e4b459cb2..62e75ee93b 100644 --- a/app/Repositories/ObjectGroup/OrganisesObjectGroups.php +++ b/app/Repositories/ObjectGroup/OrganisesObjectGroups.php @@ -1,4 +1,25 @@ . + */ + declare(strict_types=1); namespace FireflyIII\Repositories\ObjectGroup; diff --git a/app/Repositories/PiggyBank/ModifiesPiggyBanks.php b/app/Repositories/PiggyBank/ModifiesPiggyBanks.php index 4528dba729..7fd9ec4864 100644 --- a/app/Repositories/PiggyBank/ModifiesPiggyBanks.php +++ b/app/Repositories/PiggyBank/ModifiesPiggyBanks.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Repositories\PiggyBank; @@ -360,6 +362,7 @@ trait ModifiesPiggyBanks $repetition->save(); } + // update using name: $objectGroupTitle = $data['object_group'] ?? ''; if ('' !== $objectGroupTitle) { $objectGroup = $this->findOrCreateObjectGroup($objectGroupTitle); @@ -368,6 +371,15 @@ trait ModifiesPiggyBanks $piggyBank->save(); } } + // try also with ID: + $objectGroupId = (int) ($data['object_group_id'] ?? 0); + if (0 !== $objectGroupId) { + $objectGroup = $this->findObjectGroupById($objectGroupId); + if (null !== $objectGroup) { + $piggyBank->objectGroups()->sync([$objectGroup->id]); + $piggyBank->save(); + } + } return $piggyBank; } diff --git a/app/Repositories/Telemetry/TelemetryRepository.php b/app/Repositories/Telemetry/TelemetryRepository.php index fc7f84bece..21f6ed2fac 100644 --- a/app/Repositories/Telemetry/TelemetryRepository.php +++ b/app/Repositories/Telemetry/TelemetryRepository.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Repositories\Telemetry; use FireflyIII\Models\Telemetry; diff --git a/app/Repositories/Telemetry/TelemetryRepositoryInterface.php b/app/Repositories/Telemetry/TelemetryRepositoryInterface.php index e4dc3d3dfd..0e42fcec49 100644 --- a/app/Repositories/Telemetry/TelemetryRepositoryInterface.php +++ b/app/Repositories/Telemetry/TelemetryRepositoryInterface.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Repositories\Telemetry; diff --git a/app/Rules/IsTransferAccount.php b/app/Rules/IsTransferAccount.php index d6d0620629..8ec34933c7 100644 --- a/app/Rules/IsTransferAccount.php +++ b/app/Rules/IsTransferAccount.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Rules; diff --git a/app/Rules/LessThanPiggyTarget.php b/app/Rules/LessThanPiggyTarget.php index d32fd7ca10..d56fdc3fce 100644 --- a/app/Rules/LessThanPiggyTarget.php +++ b/app/Rules/LessThanPiggyTarget.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + + namespace FireflyIII\Rules; use Illuminate\Contracts\Validation\Rule; diff --git a/app/Services/FireflyIIIOrg/Update/UpdateRequest.php b/app/Services/FireflyIIIOrg/Update/UpdateRequest.php index 41f891e232..a675421892 100644 --- a/app/Services/FireflyIIIOrg/Update/UpdateRequest.php +++ b/app/Services/FireflyIIIOrg/Update/UpdateRequest.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Services\FireflyIIIOrg\Update; use Carbon\Carbon; diff --git a/app/Services/FireflyIIIOrg/Update/UpdateRequestInterface.php b/app/Services/FireflyIIIOrg/Update/UpdateRequestInterface.php index 410dee0225..f66baabe85 100644 --- a/app/Services/FireflyIIIOrg/Update/UpdateRequestInterface.php +++ b/app/Services/FireflyIIIOrg/Update/UpdateRequestInterface.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Services\FireflyIIIOrg\Update; use FireflyIII\Exceptions\FireflyException; diff --git a/app/Services/Internal/Support/LocationServiceTrait.php b/app/Services/Internal/Support/LocationServiceTrait.php index 0cdaa0a21f..74b4e6cdf0 100644 --- a/app/Services/Internal/Support/LocationServiceTrait.php +++ b/app/Services/Internal/Support/LocationServiceTrait.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Services\Internal\Support; use FireflyIII\Models\Location; diff --git a/app/Support/Authentication/RemoteUserGuard.php b/app/Support/Authentication/RemoteUserGuard.php index 04a94498c6..baf2d94f73 100644 --- a/app/Support/Authentication/RemoteUserGuard.php +++ b/app/Support/Authentication/RemoteUserGuard.php @@ -1,4 +1,25 @@ . + */ + declare(strict_types=1); namespace FireflyIII\Support\Authentication; diff --git a/app/Support/Authentication/RemoteUserProvider.php b/app/Support/Authentication/RemoteUserProvider.php index 5b6b0fa4ea..5a3ff29ed7 100644 --- a/app/Support/Authentication/RemoteUserProvider.php +++ b/app/Support/Authentication/RemoteUserProvider.php @@ -1,4 +1,25 @@ . + */ + declare(strict_types=1); namespace FireflyIII\Support\Authentication; diff --git a/app/Support/Chart/Category/FrontpageChartGenerator.php b/app/Support/Chart/Category/FrontpageChartGenerator.php index 7a20ece942..d5a1b388b1 100644 --- a/app/Support/Chart/Category/FrontpageChartGenerator.php +++ b/app/Support/Chart/Category/FrontpageChartGenerator.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Support\Chart\Category; use Carbon\Carbon; diff --git a/app/Support/Cronjobs/AutoBudgetCronjob.php b/app/Support/Cronjobs/AutoBudgetCronjob.php index 60cce35976..059491c4f6 100644 --- a/app/Support/Cronjobs/AutoBudgetCronjob.php +++ b/app/Support/Cronjobs/AutoBudgetCronjob.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Support\Cronjobs; diff --git a/app/Support/Cronjobs/TelemetryCronjob.php b/app/Support/Cronjobs/TelemetryCronjob.php index b4f6cc7127..c659166384 100644 --- a/app/Support/Cronjobs/TelemetryCronjob.php +++ b/app/Support/Cronjobs/TelemetryCronjob.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Support\Cronjobs; use Carbon\Carbon; diff --git a/app/Support/Export/ExportDataGenerator.php b/app/Support/Export/ExportDataGenerator.php index 1e49f73d32..31e4d8ce45 100644 --- a/app/Support/Export/ExportDataGenerator.php +++ b/app/Support/Export/ExportDataGenerator.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Support\Export; use Carbon\Carbon; diff --git a/app/Support/ParseDateString.php b/app/Support/ParseDateString.php index 67a1bbf6f9..0b85a98372 100644 --- a/app/Support/ParseDateString.php +++ b/app/Support/ParseDateString.php @@ -1,4 +1,25 @@ . + */ + declare(strict_types=1); diff --git a/app/Support/Search/AccountSearch.php b/app/Support/Search/AccountSearch.php index 6badb4291c..6f6cb5e833 100644 --- a/app/Support/Search/AccountSearch.php +++ b/app/Support/Search/AccountSearch.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Support\Search; diff --git a/app/Support/Search/GenericSearchInterface.php b/app/Support/Search/GenericSearchInterface.php index 016b1f6820..372f83cb75 100644 --- a/app/Support/Search/GenericSearchInterface.php +++ b/app/Support/Search/GenericSearchInterface.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Support\Search; diff --git a/app/Support/Search/TransactionSearch.php b/app/Support/Search/TransactionSearch.php index 7f7aedf8c8..a1899d1927 100644 --- a/app/Support/Search/TransactionSearch.php +++ b/app/Support/Search/TransactionSearch.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Support\Search; use Illuminate\Support\Collection; diff --git a/app/Support/Search/TransferSearch.php b/app/Support/Search/TransferSearch.php index 722da14ab6..5560bb096a 100644 --- a/app/Support/Search/TransferSearch.php +++ b/app/Support/Search/TransferSearch.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Support\Search; diff --git a/app/Support/System/GeneratesInstallationId.php b/app/Support/System/GeneratesInstallationId.php index 3ffe860b1e..64314cd57c 100644 --- a/app/Support/System/GeneratesInstallationId.php +++ b/app/Support/System/GeneratesInstallationId.php @@ -1,4 +1,25 @@ . + */ + declare(strict_types=1); namespace FireflyIII\Support\System; diff --git a/app/Support/System/OAuthKeys.php b/app/Support/System/OAuthKeys.php index ee46cf8569..156566e83a 100644 --- a/app/Support/System/OAuthKeys.php +++ b/app/Support/System/OAuthKeys.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Support\System; use Artisan; diff --git a/app/Support/Telemetry.php b/app/Support/Telemetry.php index 76e8bbd696..66c96015a6 100644 --- a/app/Support/Telemetry.php +++ b/app/Support/Telemetry.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Support; use Carbon\Carbon; diff --git a/app/TransactionRules/Actions/UpdatePiggybank.php b/app/TransactionRules/Actions/UpdatePiggybank.php index 2ee81e812e..b60c0e5f19 100644 --- a/app/TransactionRules/Actions/UpdatePiggybank.php +++ b/app/TransactionRules/Actions/UpdatePiggybank.php @@ -1,4 +1,25 @@ . + */ + declare(strict_types=1); diff --git a/app/Validation/Account/AccountValidatorProperties.php b/app/Validation/Account/AccountValidatorProperties.php index 12f10bc209..416e95b5f5 100644 --- a/app/Validation/Account/AccountValidatorProperties.php +++ b/app/Validation/Account/AccountValidatorProperties.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Validation\Account; use FireflyIII\Models\Account; diff --git a/app/Validation/Account/OBValidation.php b/app/Validation/Account/OBValidation.php index b3fa427e6d..2f366ddac4 100644 --- a/app/Validation/Account/OBValidation.php +++ b/app/Validation/Account/OBValidation.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Validation\Account; use FireflyIII\Models\Account; diff --git a/app/Validation/Account/ReconciliationValidation.php b/app/Validation/Account/ReconciliationValidation.php index cd002e2a6d..6ea09a47b6 100644 --- a/app/Validation/Account/ReconciliationValidation.php +++ b/app/Validation/Account/ReconciliationValidation.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Validation\Account; use Log; diff --git a/app/Validation/CurrencyValidation.php b/app/Validation/CurrencyValidation.php index 1cff24e8b9..6dc42b2944 100644 --- a/app/Validation/CurrencyValidation.php +++ b/app/Validation/CurrencyValidation.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Validation; diff --git a/app/Validation/GroupValidation.php b/app/Validation/GroupValidation.php index 4361a757e3..5cbc109b99 100644 --- a/app/Validation/GroupValidation.php +++ b/app/Validation/GroupValidation.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Validation; use FireflyIII\Models\TransactionGroup;