diff --git a/.ci/php-cs-fixer/.php-cs-fixer.php b/.ci/php-cs-fixer/.php-cs-fixer.php index 40c69e75d7..7475d96d5e 100644 --- a/.ci/php-cs-fixer/.php-cs-fixer.php +++ b/.ci/php-cs-fixer/.php-cs-fixer.php @@ -55,7 +55,7 @@ return $config->setRules([ ], ], 'statement_indentation' => true, - 'type_declaration_spaces' => true, + 'type_declaration_spaces' => false, 'cast_spaces' => false, 'binary_operator_spaces' => false, 'void_return' => true, diff --git a/app/Api/V1/Controllers/Chart/AccountController.php b/app/Api/V1/Controllers/Chart/AccountController.php index 189b92baa2..9bc23a457e 100644 --- a/app/Api/V1/Controllers/Chart/AccountController.php +++ b/app/Api/V1/Controllers/Chart/AccountController.php @@ -35,8 +35,6 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Support\Http\Api\ApiSupport; use FireflyIII\User; use Illuminate\Http\JsonResponse; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class AccountController @@ -70,8 +68,6 @@ class AccountController extends Controller * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/charts/getChartAccountOverview * * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function overview(DateRequest $request): JsonResponse { diff --git a/app/Api/V1/Controllers/Controller.php b/app/Api/V1/Controllers/Controller.php index 1ef0b6525e..3e13112a12 100644 --- a/app/Api/V1/Controllers/Controller.php +++ b/app/Api/V1/Controllers/Controller.php @@ -35,8 +35,6 @@ use Illuminate\Foundation\Validation\ValidatesRequests; use Illuminate\Routing\Controller as BaseController; use League\Fractal\Manager; use League\Fractal\Serializer\JsonApiSerializer; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; use Symfony\Component\HttpFoundation\Exception\BadRequestException; use Symfony\Component\HttpFoundation\ParameterBag; @@ -109,9 +107,6 @@ abstract class Controller extends BaseController /** * Method to grab all parameters from the URL. - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ private function getParameters(): ParameterBag { diff --git a/app/Api/V1/Controllers/Data/Export/ExportController.php b/app/Api/V1/Controllers/Data/Export/ExportController.php index 167a8445f3..9f75c3503b 100644 --- a/app/Api/V1/Controllers/Data/Export/ExportController.php +++ b/app/Api/V1/Controllers/Data/Export/ExportController.php @@ -29,8 +29,6 @@ use FireflyIII\Api\V1\Requests\Data\Export\ExportRequest; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Support\Export\ExportDataGenerator; use Illuminate\Http\Response as LaravelResponse; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class ExportController @@ -59,9 +57,7 @@ class ExportController extends Controller * This endpoint is documented at: * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportAccounts * - * @throws ContainerExceptionInterface * @throws FireflyException - * @throws NotFoundExceptionInterface * * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ @@ -76,9 +72,7 @@ class ExportController extends Controller * This endpoint is documented at: * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportBills * - * @throws ContainerExceptionInterface * @throws FireflyException - * @throws NotFoundExceptionInterface * * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ @@ -93,9 +87,7 @@ class ExportController extends Controller * This endpoint is documented at: * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportBudgets * - * @throws ContainerExceptionInterface * @throws FireflyException - * @throws NotFoundExceptionInterface * * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ @@ -110,9 +102,7 @@ class ExportController extends Controller * This endpoint is documented at: * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportCategories * - * @throws ContainerExceptionInterface * @throws FireflyException - * @throws NotFoundExceptionInterface * * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ @@ -127,9 +117,7 @@ class ExportController extends Controller * This endpoint is documented at: * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportPiggies * - * @throws ContainerExceptionInterface * @throws FireflyException - * @throws NotFoundExceptionInterface * * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ @@ -144,9 +132,7 @@ class ExportController extends Controller * This endpoint is documented at: * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportRecurring * - * @throws ContainerExceptionInterface * @throws FireflyException - * @throws NotFoundExceptionInterface * * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ @@ -161,9 +147,7 @@ class ExportController extends Controller * This endpoint is documented at: * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportRules * - * @throws ContainerExceptionInterface * @throws FireflyException - * @throws NotFoundExceptionInterface * * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ @@ -178,9 +162,7 @@ class ExportController extends Controller * This endpoint is documented at: * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportTags * - * @throws ContainerExceptionInterface * @throws FireflyException - * @throws NotFoundExceptionInterface * * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ @@ -195,9 +177,7 @@ class ExportController extends Controller * This endpoint is documented at: * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportTransactions * - * @throws ContainerExceptionInterface * @throws FireflyException - * @throws NotFoundExceptionInterface */ public function transactions(ExportRequest $request): LaravelResponse { @@ -212,8 +192,6 @@ class ExportController extends Controller /** * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ private function returnExport(string $key): LaravelResponse { diff --git a/app/Api/V1/Controllers/System/ConfigurationController.php b/app/Api/V1/Controllers/System/ConfigurationController.php index 7cadd4c9ab..7b03eeb8b0 100644 --- a/app/Api/V1/Controllers/System/ConfigurationController.php +++ b/app/Api/V1/Controllers/System/ConfigurationController.php @@ -29,8 +29,6 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Repositories\User\UserRepositoryInterface; use FireflyIII\Support\Binder\EitherConfigKey; use Illuminate\Http\JsonResponse; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class ConfigurationController @@ -58,9 +56,7 @@ class ConfigurationController extends Controller * This endpoint is documented at: * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/configuration/getConfiguration * - * @throws ContainerExceptionInterface * @throws FireflyException - * @throws NotFoundExceptionInterface */ public function index(): JsonResponse { @@ -95,9 +91,6 @@ class ConfigurationController extends Controller /** * This endpoint is documented at: * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/configuration/getSingleConfiguration - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function show(string $configKey): JsonResponse { @@ -128,9 +121,7 @@ class ConfigurationController extends Controller * * Update the configuration. * - * @throws ContainerExceptionInterface * @throws FireflyException - * @throws NotFoundExceptionInterface */ public function update(UpdateRequest $request, string $name): JsonResponse { @@ -157,9 +148,6 @@ class ConfigurationController extends Controller /** * Get all config values. - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ private function getDynamicConfiguration(): array { diff --git a/app/Api/V1/Controllers/System/CronController.php b/app/Api/V1/Controllers/System/CronController.php index a19c571d90..247ed97bf0 100644 --- a/app/Api/V1/Controllers/System/CronController.php +++ b/app/Api/V1/Controllers/System/CronController.php @@ -27,8 +27,6 @@ use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Requests\System\CronRequest; use FireflyIII\Support\Http\Controllers\CronRunner; use Illuminate\Http\JsonResponse; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class CronController @@ -40,9 +38,6 @@ class CronController extends Controller /** * This endpoint is documented at: * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/about/getCron - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function cron(CronRequest $request): JsonResponse { diff --git a/app/Api/V2/Controllers/Chart/AccountController.php b/app/Api/V2/Controllers/Chart/AccountController.php index a3c4a5845d..0b756b9efb 100644 --- a/app/Api/V2/Controllers/Chart/AccountController.php +++ b/app/Api/V2/Controllers/Chart/AccountController.php @@ -36,8 +36,6 @@ use FireflyIII\Support\Http\Api\CleansChartData; use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait; use Illuminate\Http\JsonResponse; use Illuminate\Support\Collection; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class AccountController @@ -76,8 +74,6 @@ class AccountController extends Controller * * TODO validate and set user_group_id from request * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface * @throws FireflyException * * @SuppressWarnings(PHPMD.UnusedFormalParameter) diff --git a/app/Console/Commands/Export/ExportData.php b/app/Console/Commands/Export/ExportData.php index e1f3900720..0e12413de4 100644 --- a/app/Console/Commands/Export/ExportData.php +++ b/app/Console/Commands/Export/ExportData.php @@ -35,8 +35,6 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Support\Export\ExportDataGenerator; use Illuminate\Console\Command; use Illuminate\Support\Collection; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class ExportData @@ -72,8 +70,6 @@ class ExportData extends Command * Execute the console command. * * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function handle(): int { diff --git a/app/Console/Commands/Tools/Cron.php b/app/Console/Commands/Tools/Cron.php index 031108e612..58bbfdb671 100644 --- a/app/Console/Commands/Tools/Cron.php +++ b/app/Console/Commands/Tools/Cron.php @@ -32,8 +32,6 @@ use FireflyIII\Support\Cronjobs\BillWarningCronjob; use FireflyIII\Support\Cronjobs\ExchangeRatesCronjob; use FireflyIII\Support\Cronjobs\RecurringCronjob; use Illuminate\Console\Command; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class Cron @@ -49,10 +47,6 @@ class Cron extends Command {--date= : Set the date in YYYY-MM-DD to make Firefly III think that\'s the current date.} '; - /** - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ public function handle(): int { $date = null; @@ -130,9 +124,7 @@ class Cron extends Command } /** - * @throws ContainerExceptionInterface * @throws FireflyException - * @throws NotFoundExceptionInterface */ private function recurringCronJob(bool $force, ?Carbon $date): void { @@ -180,8 +172,6 @@ class Cron extends Command /** * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ private function billWarningCronJob(bool $force, ?Carbon $date): void { diff --git a/app/Console/Commands/Upgrade/AccountCurrencies.php b/app/Console/Commands/Upgrade/AccountCurrencies.php index 87dc8fb9b5..2732c5c43f 100644 --- a/app/Console/Commands/Upgrade/AccountCurrencies.php +++ b/app/Console/Commands/Upgrade/AccountCurrencies.php @@ -34,8 +34,6 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\User\UserRepositoryInterface; use FireflyIII\User; use Illuminate\Console\Command; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class AccountCurrencies @@ -90,10 +88,6 @@ class AccountCurrencies extends Command $this->count = 0; } - /** - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ private function isExecuted(): bool { $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false); diff --git a/app/Console/Commands/Upgrade/AppendBudgetLimitPeriods.php b/app/Console/Commands/Upgrade/AppendBudgetLimitPeriods.php index 250843e563..b167042cc4 100644 --- a/app/Console/Commands/Upgrade/AppendBudgetLimitPeriods.php +++ b/app/Console/Commands/Upgrade/AppendBudgetLimitPeriods.php @@ -26,8 +26,6 @@ namespace FireflyIII\Console\Commands\Upgrade; use FireflyIII\Console\Commands\ShowsFriendlyMessages; use FireflyIII\Models\BudgetLimit; use Illuminate\Console\Command; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class AppendBudgetLimitPeriods @@ -44,9 +42,6 @@ class AppendBudgetLimitPeriods extends Command /** * Execute the console command. - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function handle(): int { @@ -62,10 +57,6 @@ class AppendBudgetLimitPeriods extends Command return 0; } - /** - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ private function isExecuted(): bool { $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false); diff --git a/app/Console/Commands/Upgrade/BackToJournals.php b/app/Console/Commands/Upgrade/BackToJournals.php index a929b5c925..ce72554139 100644 --- a/app/Console/Commands/Upgrade/BackToJournals.php +++ b/app/Console/Commands/Upgrade/BackToJournals.php @@ -30,8 +30,6 @@ use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; use Illuminate\Console\Command; use Illuminate\Support\Collection; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class BackToJournals @@ -48,9 +46,6 @@ class BackToJournals extends Command /** * Execute the console command. - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function handle(): int { @@ -73,10 +68,6 @@ class BackToJournals extends Command return 0; } - /** - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ private function isMigrated(): bool { $configVar = app('fireflyconfig')->get(MigrateToGroups::CONFIG_NAME, false); @@ -84,10 +75,6 @@ class BackToJournals extends Command return (bool)$configVar->data; } - /** - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ private function isExecuted(): bool { $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false); diff --git a/app/Console/Commands/Upgrade/BudgetLimitCurrency.php b/app/Console/Commands/Upgrade/BudgetLimitCurrency.php index 65e84027ea..6b2121f49d 100644 --- a/app/Console/Commands/Upgrade/BudgetLimitCurrency.php +++ b/app/Console/Commands/Upgrade/BudgetLimitCurrency.php @@ -29,8 +29,6 @@ use FireflyIII\Models\Budget; use FireflyIII\Models\BudgetLimit; use FireflyIII\User; use Illuminate\Console\Command; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class BudgetLimitCurrency @@ -48,9 +46,7 @@ class BudgetLimitCurrency extends Command /** * Execute the console command. * - * @throws ContainerExceptionInterface * @throws FireflyException - * @throws NotFoundExceptionInterface */ public function handle(): int { @@ -91,10 +87,6 @@ class BudgetLimitCurrency extends Command return 0; } - /** - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ private function isExecuted(): bool { $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false); diff --git a/app/Console/Commands/Upgrade/CCLiabilities.php b/app/Console/Commands/Upgrade/CCLiabilities.php index 2f63aced12..df3cb3856a 100644 --- a/app/Console/Commands/Upgrade/CCLiabilities.php +++ b/app/Console/Commands/Upgrade/CCLiabilities.php @@ -29,8 +29,6 @@ use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; use Illuminate\Console\Command; use Illuminate\Support\Collection; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class CCLiabilities @@ -46,9 +44,7 @@ class CCLiabilities extends Command /** * Execute the console command. * - * @throws ContainerExceptionInterface * @throws FireflyException - * @throws NotFoundExceptionInterface */ public function handle(): int { @@ -87,10 +83,6 @@ class CCLiabilities extends Command return 0; } - /** - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ private function isExecuted(): bool { $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false); diff --git a/app/Console/Commands/Upgrade/DecryptDatabase.php b/app/Console/Commands/Upgrade/DecryptDatabase.php index 8edec9a863..411c29c4cc 100644 --- a/app/Console/Commands/Upgrade/DecryptDatabase.php +++ b/app/Console/Commands/Upgrade/DecryptDatabase.php @@ -29,8 +29,6 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Preference; use Illuminate\Console\Command; use Illuminate\Contracts\Encryption\DecryptException; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class DecryptDatabase @@ -44,9 +42,6 @@ class DecryptDatabase extends Command /** * Execute the console command. - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function handle(): int { @@ -75,10 +70,6 @@ class DecryptDatabase extends Command return 0; } - /** - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ private function decryptTable(string $table, array $fields): void { if ($this->isDecrypted($table)) { @@ -95,10 +86,6 @@ class DecryptDatabase extends Command app('fireflyconfig')->set($configName, true); } - /** - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ private function isDecrypted(string $table): bool { $configName = sprintf('is_decrypted_%s', $table); diff --git a/app/Console/Commands/Upgrade/MigrateAttachments.php b/app/Console/Commands/Upgrade/MigrateAttachments.php index 495bb05120..1aa487e213 100644 --- a/app/Console/Commands/Upgrade/MigrateAttachments.php +++ b/app/Console/Commands/Upgrade/MigrateAttachments.php @@ -28,8 +28,6 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Attachment; use FireflyIII\Models\Note; use Illuminate\Console\Command; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class MigrateAttachments @@ -47,9 +45,7 @@ class MigrateAttachments extends Command /** * Execute the console command. * - * @throws ContainerExceptionInterface * @throws FireflyException - * @throws NotFoundExceptionInterface */ public function handle(): int { @@ -98,10 +94,6 @@ class MigrateAttachments extends Command return 0; } - /** - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ private function isExecuted(): bool { $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false); diff --git a/app/Console/Commands/Upgrade/MigrateJournalNotes.php b/app/Console/Commands/Upgrade/MigrateJournalNotes.php index 6e8f8e93a6..ab71126391 100644 --- a/app/Console/Commands/Upgrade/MigrateJournalNotes.php +++ b/app/Console/Commands/Upgrade/MigrateJournalNotes.php @@ -27,8 +27,6 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages; use FireflyIII\Models\Note; use FireflyIII\Models\TransactionJournalMeta; use Illuminate\Console\Command; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class MigrateJournalNotes @@ -45,9 +43,6 @@ class MigrateJournalNotes extends Command /** * Execute the console command. - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function handle(): int { @@ -93,10 +88,6 @@ class MigrateJournalNotes extends Command return 0; } - /** - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ private function isExecuted(): bool { $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false); diff --git a/app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php b/app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php index 5c68e458af..0a7e4204fc 100644 --- a/app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php +++ b/app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php @@ -29,8 +29,6 @@ use FireflyIII\Models\Recurrence; use FireflyIII\Models\RecurrenceMeta; use FireflyIII\Models\RecurrenceTransactionMeta; use Illuminate\Console\Command; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class MigrateRecurrenceMeta @@ -47,9 +45,6 @@ class MigrateRecurrenceMeta extends Command /** * Execute the console command. - * - * @throws ContainerExceptionInterface - * * @throws NotFoundExceptionInterface */ public function handle(): int { @@ -72,22 +67,16 @@ class MigrateRecurrenceMeta extends Command return 0; } - /** - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ private function isExecuted(): bool { $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false); if (null !== $configVar) { - return (bool)$configVar->data; + return (bool) $configVar->data; } return false; } - /** - * */ private function migrateMetaData(): int { $count = 0; @@ -102,8 +91,6 @@ class MigrateRecurrenceMeta extends Command return $count; } - /** - * */ private function migrateEntry(RecurrenceMeta $meta): int { /** @var null|Recurrence $recurrence */ diff --git a/app/Console/Commands/Upgrade/MigrateRecurrenceType.php b/app/Console/Commands/Upgrade/MigrateRecurrenceType.php index 909b7b2556..7c5393a167 100644 --- a/app/Console/Commands/Upgrade/MigrateRecurrenceType.php +++ b/app/Console/Commands/Upgrade/MigrateRecurrenceType.php @@ -29,8 +29,6 @@ use FireflyIII\Models\Recurrence; use FireflyIII\Models\RecurrenceTransaction; use FireflyIII\Models\TransactionType; use Illuminate\Console\Command; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class MigrateRecurrenceType @@ -47,9 +45,6 @@ class MigrateRecurrenceType extends Command /** * Execute the console command. - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function handle(): int { @@ -65,10 +60,6 @@ class MigrateRecurrenceType extends Command return 0; } - /** - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ private function isExecuted(): bool { $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false); diff --git a/app/Console/Commands/Upgrade/MigrateTagLocations.php b/app/Console/Commands/Upgrade/MigrateTagLocations.php index 54c37b9602..a09c0cc0ac 100644 --- a/app/Console/Commands/Upgrade/MigrateTagLocations.php +++ b/app/Console/Commands/Upgrade/MigrateTagLocations.php @@ -28,8 +28,6 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages; use FireflyIII\Models\Location; use FireflyIII\Models\Tag; use Illuminate\Console\Command; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class MigrateTagLocations @@ -46,9 +44,6 @@ class MigrateTagLocations extends Command /** * Execute the console command. - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function handle(): int { @@ -63,10 +58,6 @@ class MigrateTagLocations extends Command return 0; } - /** - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ private function isExecuted(): bool { $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false); diff --git a/app/Console/Commands/Upgrade/MigrateToRules.php b/app/Console/Commands/Upgrade/MigrateToRules.php index 75173acce9..6937e3755d 100644 --- a/app/Console/Commands/Upgrade/MigrateToRules.php +++ b/app/Console/Commands/Upgrade/MigrateToRules.php @@ -34,8 +34,6 @@ use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; use FireflyIII\Repositories\User\UserRepositoryInterface; use FireflyIII\User; use Illuminate\Console\Command; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class MigrateToRules @@ -58,9 +56,7 @@ class MigrateToRules extends Command /** * Execute the console command. * - * @throws ContainerExceptionInterface * @throws FireflyException - * @throws NotFoundExceptionInterface */ public function handle(): int { @@ -105,10 +101,6 @@ class MigrateToRules extends Command $this->ruleRepository = app(RuleRepositoryInterface::class); } - /** - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ private function isExecuted(): bool { $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false); diff --git a/app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php b/app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php index 3755014fcd..32a64b7131 100644 --- a/app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php +++ b/app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php @@ -34,8 +34,6 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Illuminate\Console\Command; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class OtherCurrenciesCorrections @@ -55,9 +53,6 @@ class OtherCurrenciesCorrections extends Command /** * Execute the console command. - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function handle(): int { @@ -91,10 +86,6 @@ class OtherCurrenciesCorrections extends Command $this->cliRepos = app(JournalCLIRepositoryInterface::class); } - /** - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ private function isExecuted(): bool { $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false); diff --git a/app/Console/Commands/Upgrade/RenameAccountMeta.php b/app/Console/Commands/Upgrade/RenameAccountMeta.php index a0dea5a9f5..6d22bb7bb2 100644 --- a/app/Console/Commands/Upgrade/RenameAccountMeta.php +++ b/app/Console/Commands/Upgrade/RenameAccountMeta.php @@ -27,8 +27,6 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\AccountMeta; use Illuminate\Console\Command; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class RenameAccountMeta @@ -46,9 +44,7 @@ class RenameAccountMeta extends Command /** * Execute the console command. * - * @throws ContainerExceptionInterface * @throws FireflyException - * @throws NotFoundExceptionInterface */ public function handle(): int { @@ -89,10 +85,6 @@ class RenameAccountMeta extends Command return 0; } - /** - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ private function isExecuted(): bool { $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false); diff --git a/app/Console/Commands/Upgrade/TransactionIdentifier.php b/app/Console/Commands/Upgrade/TransactionIdentifier.php index f3294cb4c8..3ed8fbab02 100644 --- a/app/Console/Commands/Upgrade/TransactionIdentifier.php +++ b/app/Console/Commands/Upgrade/TransactionIdentifier.php @@ -30,8 +30,6 @@ use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface; use Illuminate\Console\Command; use Illuminate\Database\QueryException; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class TransactionIdentifier @@ -56,9 +54,7 @@ class TransactionIdentifier extends Command * When either of these are the same amount, FF3 can't keep them apart: +3/-3, +3/-3, +3/-3. This happens more * often than you would think. So each set gets a number (1,2,3) to keep them apart. * - * @throws ContainerExceptionInterface * @throws FireflyException - * @throws NotFoundExceptionInterface */ public function handle(): int { @@ -105,10 +101,6 @@ class TransactionIdentifier extends Command $this->count = 0; } - /** - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ private function isExecuted(): bool { $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false); diff --git a/app/Console/Commands/Upgrade/TransferCurrenciesCorrections.php b/app/Console/Commands/Upgrade/TransferCurrenciesCorrections.php index cb4fcf4994..ab5e731c1b 100644 --- a/app/Console/Commands/Upgrade/TransferCurrenciesCorrections.php +++ b/app/Console/Commands/Upgrade/TransferCurrenciesCorrections.php @@ -32,8 +32,6 @@ use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface; use Illuminate\Console\Command; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class TransferCurrenciesCorrections @@ -59,9 +57,6 @@ class TransferCurrenciesCorrections extends Command /** * Execute the console command. - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function handle(): int { @@ -114,10 +109,6 @@ class TransferCurrenciesCorrections extends Command $this->destinationCurrency = null; } - /** - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ private function isExecuted(): bool { $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false); diff --git a/app/Console/Commands/Upgrade/UpgradeLiabilities.php b/app/Console/Commands/Upgrade/UpgradeLiabilities.php index 771a55ea3c..0cda08cdc8 100644 --- a/app/Console/Commands/Upgrade/UpgradeLiabilities.php +++ b/app/Console/Commands/Upgrade/UpgradeLiabilities.php @@ -33,8 +33,6 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Services\Internal\Support\CreditRecalculateService; use FireflyIII\User; use Illuminate\Console\Command; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class UpgradeLiabilities @@ -49,9 +47,6 @@ class UpgradeLiabilities extends Command /** * Execute the console command. - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function handle(): int { @@ -67,10 +62,6 @@ class UpgradeLiabilities extends Command return 0; } - /** - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ private function isExecuted(): bool { $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false); diff --git a/app/Console/Commands/Upgrade/UpgradeLiabilitiesEight.php b/app/Console/Commands/Upgrade/UpgradeLiabilitiesEight.php index 091a456314..445e59533e 100644 --- a/app/Console/Commands/Upgrade/UpgradeLiabilitiesEight.php +++ b/app/Console/Commands/Upgrade/UpgradeLiabilitiesEight.php @@ -34,8 +34,6 @@ use FireflyIII\Services\Internal\Destroy\TransactionGroupDestroyService; use FireflyIII\Services\Internal\Support\CreditRecalculateService; use FireflyIII\User; use Illuminate\Console\Command; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class UpgradeLiabilitiesEight @@ -50,9 +48,6 @@ class UpgradeLiabilitiesEight extends Command /** * Execute the console command. - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function handle(): int { @@ -67,10 +62,6 @@ class UpgradeLiabilitiesEight extends Command return 0; } - /** - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ private function isExecuted(): bool { $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false); diff --git a/app/Factory/TransactionJournalFactory.php b/app/Factory/TransactionJournalFactory.php index aa7bf6373c..73b025aa78 100644 --- a/app/Factory/TransactionJournalFactory.php +++ b/app/Factory/TransactionJournalFactory.php @@ -343,8 +343,6 @@ class TransactionJournalFactory return $journal; } - /** - * */ private function hashArray(NullArrayObject $row): string { $dataRow = $row->getArrayCopy(); diff --git a/app/Handlers/Events/VersionCheckEventHandler.php b/app/Handlers/Events/VersionCheckEventHandler.php index 37b5286312..56f060d678 100644 --- a/app/Handlers/Events/VersionCheckEventHandler.php +++ b/app/Handlers/Events/VersionCheckEventHandler.php @@ -28,8 +28,6 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Update\UpdateTrait; use FireflyIII\Models\Configuration; use FireflyIII\Repositories\User\UserRepositoryInterface; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class VersionCheckEventHandler @@ -42,8 +40,6 @@ class VersionCheckEventHandler * Checks with GitHub to see if there is a new version. * * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface * * @deprecated ? */ @@ -90,8 +86,6 @@ class VersionCheckEventHandler /** * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ protected function warnToCheckForUpdates(RequestedVersionCheckStatus $event): void { diff --git a/app/Helpers/Fiscal/FiscalHelper.php b/app/Helpers/Fiscal/FiscalHelper.php index 39203e501f..8516319741 100644 --- a/app/Helpers/Fiscal/FiscalHelper.php +++ b/app/Helpers/Fiscal/FiscalHelper.php @@ -24,8 +24,6 @@ declare(strict_types=1); namespace FireflyIII\Helpers\Fiscal; use Carbon\Carbon; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class FiscalHelper. @@ -45,9 +43,6 @@ class FiscalHelper implements FiscalHelperInterface /** * @return Carbon date object - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function endOfFiscalYear(Carbon $date): Carbon { @@ -68,9 +63,6 @@ class FiscalHelper implements FiscalHelperInterface /** * @return Carbon date object - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function startOfFiscalYear(Carbon $date): Carbon { diff --git a/app/Helpers/Update/UpdateTrait.php b/app/Helpers/Update/UpdateTrait.php index 51d5ed0aae..acdc836917 100644 --- a/app/Helpers/Update/UpdateTrait.php +++ b/app/Helpers/Update/UpdateTrait.php @@ -24,8 +24,6 @@ declare(strict_types=1); namespace FireflyIII\Helpers\Update; use FireflyIII\Services\FireflyIIIOrg\Update\UpdateRequestInterface; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Trait UpdateTrait @@ -36,9 +34,6 @@ trait UpdateTrait * Returns an array with info on the next release, if any. * 'message' => 'A new version is available. * 'level' => 'info' / 'success' / 'error' - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function getLatestRelease(): array { diff --git a/app/Http/Controllers/Account/CreateController.php b/app/Http/Controllers/Account/CreateController.php index 4f30ea3d51..4279fb5d5f 100644 --- a/app/Http/Controllers/Account/CreateController.php +++ b/app/Http/Controllers/Account/CreateController.php @@ -36,8 +36,6 @@ use Illuminate\Http\Request; use Illuminate\Routing\Redirector; use Illuminate\Support\Facades\Log; use Illuminate\View\View; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class CreateController @@ -131,8 +129,6 @@ class CreateController extends Controller * @return Redirector|RedirectResponse * * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function store(AccountFormRequest $request) { diff --git a/app/Http/Controllers/Account/IndexController.php b/app/Http/Controllers/Account/IndexController.php index a898aef2e5..12ebab549b 100644 --- a/app/Http/Controllers/Account/IndexController.php +++ b/app/Http/Controllers/Account/IndexController.php @@ -33,8 +33,6 @@ use Illuminate\Contracts\View\Factory; use Illuminate\Http\Request; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\View\View; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class IndexController @@ -69,9 +67,7 @@ class IndexController extends Controller * @return Factory|View * * @throws FireflyException - * * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ + * */ public function inactive(Request $request, string $objectType) { $inactivePage = true; @@ -124,9 +120,7 @@ class IndexController extends Controller * @return Factory|View * * @throws FireflyException - * * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ + * */ public function index(Request $request, string $objectType) { app('log')->debug(sprintf('Now at %s', __METHOD__)); diff --git a/app/Http/Controllers/Account/ReconcileController.php b/app/Http/Controllers/Account/ReconcileController.php index 84e3a42ad7..51f3ed2a39 100644 --- a/app/Http/Controllers/Account/ReconcileController.php +++ b/app/Http/Controllers/Account/ReconcileController.php @@ -39,8 +39,6 @@ use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; use Illuminate\Routing\Redirector; use Illuminate\View\View; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class ReconcileController. @@ -76,9 +74,7 @@ class ReconcileController extends Controller * @return Factory|Redirector|RedirectResponse|View * * @throws FireflyException - * * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ + * */ public function reconcile(Account $account, Carbon $start = null, Carbon $end = null) { if (!$this->isEditableAccount($account)) { diff --git a/app/Http/Controllers/Account/ShowController.php b/app/Http/Controllers/Account/ShowController.php index 973f6ea242..2b9c398578 100644 --- a/app/Http/Controllers/Account/ShowController.php +++ b/app/Http/Controllers/Account/ShowController.php @@ -36,8 +36,6 @@ use Illuminate\Http\Request; use Illuminate\Routing\Redirector; use Illuminate\Support\Collection; use Illuminate\View\View; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class ShowController @@ -76,9 +74,7 @@ class ShowController extends Controller * @return Factory|Redirector|RedirectResponse|View * * @throws FireflyException - * * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ + * */ public function show(Request $request, Account $account, Carbon $start = null, Carbon $end = null) { $objectType = config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type)); @@ -161,9 +157,7 @@ class ShowController extends Controller * @return Factory|Redirector|RedirectResponse|View * * @throws FireflyException - * * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ + * */ public function showAll(Request $request, Account $account) { if (!$this->isEditableAccount($account)) { diff --git a/app/Http/Controllers/Admin/ConfigurationController.php b/app/Http/Controllers/Admin/ConfigurationController.php index 4f12511829..553f4dea69 100644 --- a/app/Http/Controllers/Admin/ConfigurationController.php +++ b/app/Http/Controllers/Admin/ConfigurationController.php @@ -30,8 +30,6 @@ use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; use Illuminate\Support\Facades\Log; use Illuminate\View\View; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class ConfigurationController. @@ -60,9 +58,6 @@ class ConfigurationController extends Controller * Show configuration index. * * @return Factory|View - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function index() { diff --git a/app/Http/Controllers/Admin/HomeController.php b/app/Http/Controllers/Admin/HomeController.php index f14b9cf2a3..95c943cc2c 100644 --- a/app/Http/Controllers/Admin/HomeController.php +++ b/app/Http/Controllers/Admin/HomeController.php @@ -34,8 +34,6 @@ use Illuminate\Http\Request; use Illuminate\Routing\Redirector; use Illuminate\Support\Facades\Log; use Illuminate\View\View; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class HomeController. @@ -55,9 +53,6 @@ class HomeController extends Controller * Index of the admin. * * @return Factory|View - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function index() { diff --git a/app/Http/Controllers/Admin/UpdateController.php b/app/Http/Controllers/Admin/UpdateController.php index ecb51fe649..e4c3b2a1cb 100644 --- a/app/Http/Controllers/Admin/UpdateController.php +++ b/app/Http/Controllers/Admin/UpdateController.php @@ -31,8 +31,6 @@ use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Routing\Redirector; use Illuminate\View\View; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class HomeController. @@ -62,9 +60,6 @@ class UpdateController extends Controller * Show page with update options. * * @return Factory|View - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function index() { diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 3358f553dc..1074075515 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -37,8 +37,6 @@ use Illuminate\Http\JsonResponse; use Illuminate\Http\RedirectResponse; use Illuminate\Routing\Redirector; use Illuminate\View\View; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class UserController. @@ -153,9 +151,6 @@ class UserController extends Controller * Show index of user manager. * * @return Factory|View - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function index() { diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index 639e00feb9..2148c655ac 100644 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -32,8 +32,6 @@ use Illuminate\Foundation\Auth\SendsPasswordResetEmails; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\View\View; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class ForgotPasswordController @@ -100,8 +98,6 @@ class ForgotPasswordController extends Controller * @return Factory|View * * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function showLinkRequestForm() { diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 3882757b4b..9bd553e74f 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -40,8 +40,6 @@ use Illuminate\Http\Response; use Illuminate\Routing\Redirector; use Illuminate\Support\Facades\Log; use Illuminate\Validation\ValidationException; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class LoginController @@ -173,8 +171,6 @@ class LoginController extends Controller * @return Application|Factory|Redirector|RedirectResponse|View * * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function showLoginForm(Request $request) { diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index ae8220fd52..dd3b54085f 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -114,9 +114,7 @@ class RegisterController extends Controller * * @return Factory|View * - * @throws ContainerExceptionInterface * @throws FireflyException - * @throws NotFoundExceptionInterface */ public function showInviteForm(Request $request, string $code) { @@ -148,9 +146,7 @@ class RegisterController extends Controller * * @return Factory|View * - * @throws ContainerExceptionInterface * @throws FireflyException - * @throws NotFoundExceptionInterface */ public function showRegistrationForm(Request $request) { diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php index 2252cfaf37..3b1fe3148b 100644 --- a/app/Http/Controllers/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/Auth/ResetPasswordController.php @@ -34,8 +34,6 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Password; use Illuminate\Validation\ValidationException; use Illuminate\View\View; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class ResetPasswordController @@ -118,8 +116,6 @@ class ResetPasswordController extends Controller * @return Factory|View * * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function showResetForm(Request $request, $token = null) { diff --git a/app/Http/Controllers/Bill/IndexController.php b/app/Http/Controllers/Bill/IndexController.php index 59793d8c47..1052b58895 100644 --- a/app/Http/Controllers/Bill/IndexController.php +++ b/app/Http/Controllers/Bill/IndexController.php @@ -35,8 +35,6 @@ use Illuminate\Contracts\View\View; use Illuminate\Foundation\Application; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; use Symfony\Component\HttpFoundation\ParameterBag; /** @@ -156,8 +154,6 @@ class IndexController extends Controller /** * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ private function getSums(array $bills): array { diff --git a/app/Http/Controllers/Bill/ShowController.php b/app/Http/Controllers/Bill/ShowController.php index 8ce9eccf25..78ac8b4fec 100644 --- a/app/Http/Controllers/Bill/ShowController.php +++ b/app/Http/Controllers/Bill/ShowController.php @@ -41,8 +41,6 @@ use Illuminate\View\View; use League\Fractal\Manager; use League\Fractal\Resource\Item; use League\Fractal\Serializer\DataArraySerializer; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; use Symfony\Component\HttpFoundation\ParameterBag; /** @@ -113,9 +111,6 @@ class ShowController extends Controller * Show a bill. * * @return Factory|View - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function show(Request $request, Bill $bill) { diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.php index 11bb78589c..5bf99dfb42 100644 --- a/app/Http/Controllers/Budget/IndexController.php +++ b/app/Http/Controllers/Budget/IndexController.php @@ -41,8 +41,6 @@ use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Support\Collection; use Illuminate\View\View; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class IndexController @@ -86,9 +84,7 @@ class IndexController extends Controller * @return Factory|View * * @throws FireflyException - * * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ + * */ public function index(Carbon $start = null, Carbon $end = null) { $this->abRepository->cleanup(); diff --git a/app/Http/Controllers/Budget/ShowController.php b/app/Http/Controllers/Budget/ShowController.php index 8ccd90f902..4c53d7a4ee 100644 --- a/app/Http/Controllers/Budget/ShowController.php +++ b/app/Http/Controllers/Budget/ShowController.php @@ -37,8 +37,6 @@ use FireflyIII\Support\Http\Controllers\PeriodOverview; use Illuminate\Contracts\View\Factory; use Illuminate\Http\Request; use Illuminate\View\View; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class ShowController @@ -76,8 +74,6 @@ class ShowController extends Controller * @return Factory|View * * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function noBudget(Request $request, Carbon $start = null, Carbon $end = null) { @@ -112,9 +108,6 @@ class ShowController extends Controller * Shows ALL transactions without a budget. * * @return Factory|View - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function noBudgetAll(Request $request) { @@ -140,9 +133,6 @@ class ShowController extends Controller * Show a single budget. * * @return Factory|View - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function show(Request $request, Budget $budget) { @@ -176,8 +166,6 @@ class ShowController extends Controller * @return Factory|View * * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function showByBudgetLimit(Request $request, Budget $budget, BudgetLimit $budgetLimit) { diff --git a/app/Http/Controllers/Category/IndexController.php b/app/Http/Controllers/Category/IndexController.php index 34d5e08c03..e6b7f8c1f1 100644 --- a/app/Http/Controllers/Category/IndexController.php +++ b/app/Http/Controllers/Category/IndexController.php @@ -31,8 +31,6 @@ use Illuminate\Http\Request; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; use Illuminate\View\View; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class IndexController @@ -64,9 +62,6 @@ class IndexController extends Controller * Show all categories. * * @return Factory|View - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function index(Request $request) { diff --git a/app/Http/Controllers/Category/NoCategoryController.php b/app/Http/Controllers/Category/NoCategoryController.php index f902cdf5c9..f0e123b480 100644 --- a/app/Http/Controllers/Category/NoCategoryController.php +++ b/app/Http/Controllers/Category/NoCategoryController.php @@ -34,8 +34,6 @@ use Illuminate\Contracts\View\Factory; use Illuminate\Http\Request; use Illuminate\Support\Collection; use Illuminate\View\View; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class NoCategoryController @@ -71,8 +69,6 @@ class NoCategoryController extends Controller * @return Factory|View * * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function show(Request $request, Carbon $start = null, Carbon $end = null) { @@ -109,9 +105,6 @@ class NoCategoryController extends Controller * Show all transactions without a category. * * @return Factory|View - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function showAll(Request $request) { diff --git a/app/Http/Controllers/Category/ShowController.php b/app/Http/Controllers/Category/ShowController.php index ff3c2c44de..44d56a0266 100644 --- a/app/Http/Controllers/Category/ShowController.php +++ b/app/Http/Controllers/Category/ShowController.php @@ -34,8 +34,6 @@ use Illuminate\Contracts\View\Factory; use Illuminate\Http\Request; use Illuminate\Support\Collection; use Illuminate\View\View; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class ShowController @@ -72,8 +70,6 @@ class ShowController extends Controller * @return Factory|View * * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function show(Request $request, Category $category, Carbon $start = null, Carbon $end = null) { @@ -114,9 +110,6 @@ class ShowController extends Controller * Show all transactions within a category. * * @return Factory|View - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function showAll(Request $request, Category $category) { diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php index b599fa254a..47af20d9a3 100644 --- a/app/Http/Controllers/Chart/AccountController.php +++ b/app/Http/Controllers/Chart/AccountController.php @@ -40,8 +40,6 @@ use FireflyIII\Support\Http\Controllers\ChartGeneration; use FireflyIII\Support\Http\Controllers\DateCalculation; use Illuminate\Http\JsonResponse; use Illuminate\Support\Collection; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class AccountController. @@ -297,9 +295,7 @@ class AccountController extends Controller * Shows the balances for all the user's frontpage accounts. * * @throws FireflyException - * * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ + * */ public function frontpage(AccountRepositoryInterface $repository): JsonResponse { $start = clone session('start', today(config('app.timezone'))->startOfMonth()); diff --git a/app/Http/Controllers/Chart/CategoryController.php b/app/Http/Controllers/Chart/CategoryController.php index 244d6e61f5..1462f2046b 100644 --- a/app/Http/Controllers/Chart/CategoryController.php +++ b/app/Http/Controllers/Chart/CategoryController.php @@ -39,8 +39,6 @@ use FireflyIII\Support\Http\Controllers\ChartGeneration; use FireflyIII\Support\Http\Controllers\DateCalculation; use Illuminate\Http\JsonResponse; use Illuminate\Support\Collection; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class CategoryController. @@ -69,8 +67,6 @@ class CategoryController extends Controller * TODO test method, for category refactor. * * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function all(Category $category): JsonResponse { @@ -171,8 +167,6 @@ class CategoryController extends Controller * TODO test me, for category refactor. * * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function specificPeriod(Category $category, Carbon $date): JsonResponse { diff --git a/app/Http/Controllers/DebugController.php b/app/Http/Controllers/DebugController.php index 36505cd39b..cf30b5eb2e 100644 --- a/app/Http/Controllers/DebugController.php +++ b/app/Http/Controllers/DebugController.php @@ -39,8 +39,6 @@ use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\Log; use Illuminate\View\View; use Monolog\Handler\RotatingFileHandler; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class DebugController @@ -259,10 +257,6 @@ class DebugController extends Controller ]; } - /** - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ private function getuserInfo(): array { $userFlags = $this->getUserFlags(); diff --git a/app/Http/Controllers/Export/IndexController.php b/app/Http/Controllers/Export/IndexController.php index de1dd27c99..e99532fe21 100644 --- a/app/Http/Controllers/Export/IndexController.php +++ b/app/Http/Controllers/Export/IndexController.php @@ -32,8 +32,6 @@ use FireflyIII\Support\Export\ExportDataGenerator; use Illuminate\Contracts\View\Factory; use Illuminate\Http\Response as LaravelResponse; use Illuminate\View\View; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class IndexController @@ -64,8 +62,6 @@ class IndexController extends Controller /** * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function export(): LaravelResponse { diff --git a/app/Http/Controllers/JavascriptController.php b/app/Http/Controllers/JavascriptController.php index 7c396ab56a..1de5892e55 100644 --- a/app/Http/Controllers/JavascriptController.php +++ b/app/Http/Controllers/JavascriptController.php @@ -33,8 +33,6 @@ use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface; use FireflyIII\Support\Http\Controllers\GetConfigurationData; use Illuminate\Http\Request; use Illuminate\Http\Response; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class JavascriptController. @@ -45,9 +43,6 @@ class JavascriptController extends Controller /** * Show info about accounts. - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function accounts(AccountRepositoryInterface $repository): Response { @@ -97,9 +92,7 @@ class JavascriptController extends Controller * Show some common variables to be used in scripts. * * @throws FireflyException - * * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ + * */ public function variables(Request $request, AccountRepositoryInterface $repository): Response { $account = $repository->find((int)$request->get('account')); diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php index 602522bac0..2f74b5de45 100644 --- a/app/Http/Controllers/PreferencesController.php +++ b/app/Http/Controllers/PreferencesController.php @@ -34,8 +34,6 @@ use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Routing\Redirector; use Illuminate\View\View; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class PreferencesController. @@ -65,8 +63,6 @@ class PreferencesController extends Controller * @return Factory|View * * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function index(AccountRepositoryInterface $repository) { @@ -174,8 +170,6 @@ class PreferencesController extends Controller * @return Redirector|RedirectResponse * * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function postIndex(Request $request) { diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index c27161c88c..6d1ff813c2 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -50,8 +50,6 @@ use PragmaRX\Google2FA\Exceptions\IncompatibleWithGoogleAuthenticatorException; use PragmaRX\Google2FA\Exceptions\InvalidCharactersException; use PragmaRX\Google2FA\Exceptions\SecretKeyTooShortException; use PragmaRX\Recovery\Recovery; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class ProfileController. @@ -92,8 +90,6 @@ class ProfileController extends Controller * @throws IncompatibleWithGoogleAuthenticatorException * @throws InvalidCharactersException * @throws SecretKeyTooShortException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function code(Request $request): Factory|RedirectResponse|View { @@ -257,8 +253,6 @@ class ProfileController extends Controller * Index for profile. * * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function index(): Factory|View { @@ -455,8 +449,6 @@ class ProfileController extends Controller * @return Redirector|RedirectResponse * * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function postCode(TokenFormRequest $request) { @@ -644,8 +636,6 @@ class ProfileController extends Controller * TODO duplicate code. * * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ private function addToMFAHistory(string $mfaCode): void { diff --git a/app/Http/Controllers/Recurring/IndexController.php b/app/Http/Controllers/Recurring/IndexController.php index dcd494dd1c..4a5237af4c 100644 --- a/app/Http/Controllers/Recurring/IndexController.php +++ b/app/Http/Controllers/Recurring/IndexController.php @@ -34,8 +34,6 @@ use Illuminate\Contracts\View\Factory; use Illuminate\Http\Request; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\View\View; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; use Symfony\Component\HttpFoundation\ParameterBag; /** @@ -74,8 +72,6 @@ class IndexController extends Controller * @return Factory|View * * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function index(Request $request) { diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index dba5f05f85..8c9e51a5f8 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -39,8 +39,6 @@ use Illuminate\Http\RedirectResponse; use Illuminate\Routing\Redirector; use Illuminate\Support\Collection; use Illuminate\View\View; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class ReportController. @@ -236,9 +234,6 @@ class ReportController extends Controller * Show index. * * @return Factory|View - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function index(AccountRepositoryInterface $repository) { diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index 1fdae2c8bc..2a6f8f994b 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -35,8 +35,6 @@ use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\View\View; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class TagController. @@ -215,8 +213,6 @@ class TagController extends Controller * @return Factory|View * * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function show(Request $request, Tag $tag, Carbon $start = null, Carbon $end = null) { @@ -260,9 +256,6 @@ class TagController extends Controller * Show a single tag over all time. * * @return Factory|View - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function showAll(Request $request, Tag $tag) { diff --git a/app/Http/Controllers/Transaction/CreateController.php b/app/Http/Controllers/Transaction/CreateController.php index b1db88f2b2..99a79a895c 100644 --- a/app/Http/Controllers/Transaction/CreateController.php +++ b/app/Http/Controllers/Transaction/CreateController.php @@ -33,8 +33,6 @@ use Illuminate\Contracts\View\Factory; use Illuminate\Contracts\View\View; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class CreateController @@ -98,9 +96,7 @@ class CreateController extends Controller * @return Factory|View * * @throws FireflyException - * * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ + * */ public function create(?string $objectType) { app('preferences')->mark(); diff --git a/app/Http/Controllers/Transaction/IndexController.php b/app/Http/Controllers/Transaction/IndexController.php index ee9b8f23b8..b2219ebcf6 100644 --- a/app/Http/Controllers/Transaction/IndexController.php +++ b/app/Http/Controllers/Transaction/IndexController.php @@ -32,8 +32,6 @@ use FireflyIII\Support\Http\Controllers\PeriodOverview; use Illuminate\Contracts\View\Factory; use Illuminate\Http\Request; use Illuminate\View\View; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class IndexController @@ -70,8 +68,6 @@ class IndexController extends Controller * @return Factory|View * * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function index(Request $request, string $objectType, Carbon $start = null, Carbon $end = null) { @@ -126,9 +122,6 @@ class IndexController extends Controller * Index for ALL transactions. * * @return Factory|View - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function indexAll(Request $request, string $objectType) { diff --git a/app/Http/Controllers/TransactionCurrency/IndexController.php b/app/Http/Controllers/TransactionCurrency/IndexController.php index c492e4888f..581f73ae18 100644 --- a/app/Http/Controllers/TransactionCurrency/IndexController.php +++ b/app/Http/Controllers/TransactionCurrency/IndexController.php @@ -33,8 +33,6 @@ use Illuminate\Contracts\View\Factory; use Illuminate\Http\Request; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\View\View; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; class IndexController extends Controller { @@ -64,9 +62,6 @@ class IndexController extends Controller * Show overview of currencies. * * @return Factory|View - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function index(Request $request) { diff --git a/app/Repositories/PiggyBank/ModifiesPiggyBanks.php b/app/Repositories/PiggyBank/ModifiesPiggyBanks.php index 5fa4870906..169a8f29cb 100644 --- a/app/Repositories/PiggyBank/ModifiesPiggyBanks.php +++ b/app/Repositories/PiggyBank/ModifiesPiggyBanks.php @@ -84,8 +84,6 @@ trait ModifiesPiggyBanks return true; } - /** - * */ public function canAddAmount(PiggyBank $piggyBank, string $amount): bool { $today = today(config('app.timezone')); diff --git a/app/Repositories/Tag/OperationsRepository.php b/app/Repositories/Tag/OperationsRepository.php index 36df754b20..113c7f07fd 100644 --- a/app/Repositories/Tag/OperationsRepository.php +++ b/app/Repositories/Tag/OperationsRepository.php @@ -30,8 +30,6 @@ use FireflyIII\Models\TransactionType; use FireflyIII\User; use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class OperationsRepository @@ -45,9 +43,6 @@ class OperationsRepository implements OperationsRepositoryInterface * This method returns a list of all the withdrawal transaction journals (as arrays) set in that period * which have the specified tag(s) set to them. It's grouped per currency, with as few details in the array * as possible. Amounts are always negative. - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function listExpenses(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $tags = null): array { @@ -123,9 +118,6 @@ class OperationsRepository implements OperationsRepositoryInterface * This method returns a list of all the deposit transaction journals (as arrays) set in that period * which have the specified tag(s) set to them. It's grouped per currency, with as few details in the array * as possible. Amounts are always positive. - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function listIncome(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $tags = null): array { @@ -211,10 +203,6 @@ class OperationsRepository implements OperationsRepositoryInterface throw new FireflyException(sprintf('%s is not yet implemented.', __METHOD__)); } - /** - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ private function getTags(): Collection { $repository = app(TagRepositoryInterface::class); diff --git a/app/Services/Internal/Support/AccountServiceTrait.php b/app/Services/Internal/Support/AccountServiceTrait.php index f6e97d4dd7..59c68e0cb4 100644 --- a/app/Services/Internal/Support/AccountServiceTrait.php +++ b/app/Services/Internal/Support/AccountServiceTrait.php @@ -188,7 +188,7 @@ trait AccountServiceTrait /** * @throws FireflyException - * * + * * * @deprecated */ protected function createOBGroup(Account $account, array $data): TransactionGroup diff --git a/app/Services/Internal/Support/RecurringTransactionTrait.php b/app/Services/Internal/Support/RecurringTransactionTrait.php index cc9b4c4318..602637befd 100644 --- a/app/Services/Internal/Support/RecurringTransactionTrait.php +++ b/app/Services/Internal/Support/RecurringTransactionTrait.php @@ -162,8 +162,6 @@ trait RecurringTransactionTrait } } - /** - * */ protected function findAccount(array $expectedTypes, ?int $accountId, ?string $accountName): Account { $result = null; diff --git a/app/Support/Authentication/RemoteUserGuard.php b/app/Support/Authentication/RemoteUserGuard.php index f24dff26a3..fda3d0e223 100644 --- a/app/Support/Authentication/RemoteUserGuard.php +++ b/app/Support/Authentication/RemoteUserGuard.php @@ -31,8 +31,6 @@ use Illuminate\Contracts\Auth\Guard; use Illuminate\Contracts\Auth\UserProvider; use Illuminate\Contracts\Foundation\Application; use Illuminate\Http\Request; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class RemoteUserGuard @@ -45,9 +43,6 @@ class RemoteUserGuard implements Guard /** * Create a new authentication guard. - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function __construct(UserProvider $provider, Application $app) { diff --git a/app/Support/Cronjobs/BillWarningCronjob.php b/app/Support/Cronjobs/BillWarningCronjob.php index 9ef7f68047..af0a3c5aef 100644 --- a/app/Support/Cronjobs/BillWarningCronjob.php +++ b/app/Support/Cronjobs/BillWarningCronjob.php @@ -27,8 +27,6 @@ use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Jobs\WarnAboutBills; use FireflyIII\Models\Configuration; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class BillWarningCronjob @@ -37,8 +35,6 @@ class BillWarningCronjob extends AbstractCronjob { /** * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function fire(): void { diff --git a/app/Support/Cronjobs/RecurringCronjob.php b/app/Support/Cronjobs/RecurringCronjob.php index f70512005a..04f449dc23 100644 --- a/app/Support/Cronjobs/RecurringCronjob.php +++ b/app/Support/Cronjobs/RecurringCronjob.php @@ -27,8 +27,6 @@ use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Jobs\CreateRecurringTransactions; use FireflyIII\Models\Configuration; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class RecurringCronjob @@ -37,8 +35,6 @@ class RecurringCronjob extends AbstractCronjob { /** * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function fire(): void { diff --git a/app/Support/Export/ExportDataGenerator.php b/app/Support/Export/ExportDataGenerator.php index 1227ff9e58..fa3f4a1e34 100644 --- a/app/Support/Export/ExportDataGenerator.php +++ b/app/Support/Export/ExportDataGenerator.php @@ -56,8 +56,6 @@ use Illuminate\Support\Collection; use League\Csv\CannotInsertRecord; use League\Csv\Exception; use League\Csv\Writer; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class ExportDataGenerator @@ -100,9 +98,7 @@ class ExportDataGenerator } /** - * @throws ContainerExceptionInterface * @throws FireflyException - * @throws NotFoundExceptionInterface */ public function export(): array { @@ -871,10 +867,8 @@ class ExportDataGenerator /** * @throws CannotInsertRecord - * @throws ContainerExceptionInterface * @throws Exception * @throws FireflyException - * @throws NotFoundExceptionInterface */ private function exportTags(): string { diff --git a/app/Support/Http/Controllers/CronRunner.php b/app/Support/Http/Controllers/CronRunner.php index 3b24f9fc9d..5fb7326bfa 100644 --- a/app/Support/Http/Controllers/CronRunner.php +++ b/app/Support/Http/Controllers/CronRunner.php @@ -29,18 +29,12 @@ use FireflyIII\Support\Cronjobs\AutoBudgetCronjob; use FireflyIII\Support\Cronjobs\BillWarningCronjob; use FireflyIII\Support\Cronjobs\ExchangeRatesCronjob; use FireflyIII\Support\Cronjobs\RecurringCronjob; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Trait CronRunner */ trait CronRunner { - /** - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ protected function billWarningCronJob(bool $force, Carbon $date): array { /** @var BillWarningCronjob $billWarning */ @@ -119,10 +113,6 @@ trait CronRunner ]; } - /** - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ protected function runRecurring(bool $force, Carbon $date): array { /** @var RecurringCronjob $recurring */ diff --git a/app/Support/Http/Controllers/GetConfigurationData.php b/app/Support/Http/Controllers/GetConfigurationData.php index 5bc3a5b709..c40f469917 100644 --- a/app/Support/Http/Controllers/GetConfigurationData.php +++ b/app/Support/Http/Controllers/GetConfigurationData.php @@ -25,8 +25,6 @@ namespace FireflyIII\Support\Http\Controllers; use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Trait GetConfigurationData @@ -79,8 +77,6 @@ trait GetConfigurationData * Get config for date range. * * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ protected function getDateRangeConfig(): array // get configuration + get preferences. { diff --git a/app/Support/Http/Controllers/PeriodOverview.php b/app/Support/Http/Controllers/PeriodOverview.php index 21a6a8309b..698140971c 100644 --- a/app/Support/Http/Controllers/PeriodOverview.php +++ b/app/Support/Http/Controllers/PeriodOverview.php @@ -33,8 +33,6 @@ use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Support\CacheProperties; use Illuminate\Support\Collection; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Trait PeriodOverview. @@ -73,8 +71,6 @@ trait PeriodOverview * performance reasons. * * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ protected function getAccountPeriodOverview(Account $account, Carbon $start, Carbon $end): array { @@ -147,8 +143,6 @@ trait PeriodOverview * Overview for single category. Has been refactored recently. * * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ protected function getCategoryPeriodOverview(Category $category, Carbon $start, Carbon $end): array { @@ -224,8 +218,6 @@ trait PeriodOverview * This method has been refactored recently. * * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ protected function getNoBudgetPeriodOverview(Carbon $start, Carbon $end): array { @@ -277,8 +269,6 @@ trait PeriodOverview * Show period overview for no category view. * * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ protected function getNoCategoryPeriodOverview(Carbon $theDate): array { @@ -344,8 +334,6 @@ trait PeriodOverview * This shows a period overview for a tag. It goes back in time and lists all relevant transactions and sums. * * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ protected function getTagPeriodOverview(Tag $tag, Carbon $start, Carbon $end): array // period overview for tags. { @@ -415,8 +403,6 @@ trait PeriodOverview /** * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ protected function getTransactionPeriodOverview(string $transactionType, Carbon $start, Carbon $end): array { diff --git a/app/Support/Http/Controllers/RequestInformation.php b/app/Support/Http/Controllers/RequestInformation.php index 5e0e80f193..77cfd2ec0d 100644 --- a/app/Support/Http/Controllers/RequestInformation.php +++ b/app/Support/Http/Controllers/RequestInformation.php @@ -32,8 +32,6 @@ use FireflyIII\User; use Illuminate\Contracts\Validation\Validator as ValidatorContract; use Illuminate\Routing\Route; use Illuminate\Support\Facades\Validator; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; use Route as RouteFacade; /** @@ -77,9 +75,6 @@ trait RequestInformation /** * Returns if user has seen demo. - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ final protected function hasSeenDemo(): bool // get request info + get preference { diff --git a/app/Support/Navigation.php b/app/Support/Navigation.php index fe04a1dc91..cb37988a42 100644 --- a/app/Support/Navigation.php +++ b/app/Support/Navigation.php @@ -30,8 +30,6 @@ use FireflyIII\Helpers\Fiscal\FiscalHelperInterface; use FireflyIII\Support\Calendar\Calculator; use FireflyIII\Support\Calendar\Periodicity; use Illuminate\Support\Facades\Log; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class Navigation. @@ -395,9 +393,6 @@ class Navigation /** * Returns the user's view range and if necessary, corrects the dynamic view * range to a normal range. - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function getViewRange(bool $correct): string { diff --git a/app/Support/Search/OperatorQuerySearch.php b/app/Support/Search/OperatorQuerySearch.php index 57091806e2..6c3b23fc33 100644 --- a/app/Support/Search/OperatorQuerySearch.php +++ b/app/Support/Search/OperatorQuerySearch.php @@ -56,8 +56,6 @@ use Gdbots\QueryParser\Node\Word; use Gdbots\QueryParser\QueryParser; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class OperatorQuerySearch @@ -2722,10 +2720,6 @@ class OperatorQuerySearch implements SearchInterface } } - /** - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ private function parseTagInstructions(): void { app('log')->debug('Now in parseTagInstructions()'); diff --git a/app/Support/Steam.php b/app/Support/Steam.php index 705e1417ba..4ea0ab5b20 100644 --- a/app/Support/Steam.php +++ b/app/Support/Steam.php @@ -32,8 +32,6 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Support\Http\Api\ExchangeRateConverter; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Log; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class Steam. @@ -730,8 +728,6 @@ class Steam * Get user's language. * * @throws FireflyException - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function getLanguage(): string // get preference { diff --git a/app/Support/System/OAuthKeys.php b/app/Support/System/OAuthKeys.php index 2eed91de7a..08f7c61a2a 100644 --- a/app/Support/System/OAuthKeys.php +++ b/app/Support/System/OAuthKeys.php @@ -100,9 +100,7 @@ class OAuthKeys } /** - * @throws ContainerExceptionInterface * @throws FireflyException - * @throws NotFoundExceptionInterface */ public static function restoreKeysFromDB(): bool { diff --git a/app/User.php b/app/User.php index 957f8fc788..4fe7b6f54b 100644 --- a/app/User.php +++ b/app/User.php @@ -71,8 +71,6 @@ use Illuminate\Support\Str; use Laravel\Passport\Client; use Laravel\Passport\HasApiTokens; use Laravel\Passport\Token; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** @@ -458,9 +456,6 @@ class User extends Authenticatable /** * Route notifications for the Slack channel. - * - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function routeNotificationForSlack(Notification $notification): string { diff --git a/app/Validation/Api/Data/Bulk/ValidatesBulkTransactionQuery.php b/app/Validation/Api/Data/Bulk/ValidatesBulkTransactionQuery.php index d3912527de..53db5422a9 100644 --- a/app/Validation/Api/Data/Bulk/ValidatesBulkTransactionQuery.php +++ b/app/Validation/Api/Data/Bulk/ValidatesBulkTransactionQuery.php @@ -29,8 +29,6 @@ use Illuminate\Validation\Validator; trait ValidatesBulkTransactionQuery { - /** - * */ protected function validateTransactionQuery(Validator $validator): void { $data = $validator->getData();