From b57785a234fc4f6830e59c2558dff56018ea4e15 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 31 Oct 2022 05:39:22 +0100 Subject: [PATCH] Various code fixes. --- .ci/phpstan.neon | 5 ++++- .ci/phpstan.sh | 2 +- app/Api/V1/Requests/Models/Rule/UpdateRequest.php | 3 +++ .../V1/Requests/Models/TransactionCurrency/UpdateRequest.php | 2 ++ .../V1/Requests/Models/TransactionLinkType/UpdateRequest.php | 3 +++ app/Api/V1/Requests/Models/Webhook/UpdateRequest.php | 2 ++ app/Api/V1/Requests/System/UserUpdateRequest.php | 1 + app/Console/Commands/Export/ExportData.php | 4 ++-- app/Console/Commands/Upgrade/BackToJournals.php | 3 ++- 9 files changed, 20 insertions(+), 5 deletions(-) diff --git a/.ci/phpstan.neon b/.ci/phpstan.neon index af2dcf06c2..17b67f5521 100644 --- a/.ci/phpstan.neon +++ b/.ci/phpstan.neon @@ -12,7 +12,10 @@ parameters: - '#with a nullable type declaration#' - message: '#Control structures using switch should not be used.#' - path: ../app/Api/V1/Controllers/Data/DestroyController.php + paths: + - ../app/Api/V1/Controllers/Data/DestroyController.php + - ../app/Console/Commands/Correction/FixAccountTypes.php + paths: - ../app - ../database diff --git a/.ci/phpstan.sh b/.ci/phpstan.sh index 5e7a80f6e9..aaff99ea71 100755 --- a/.ci/phpstan.sh +++ b/.ci/phpstan.sh @@ -30,6 +30,6 @@ SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) # Do static code analysis. # ./vendor/bin/phpstan analyse -c .ci/phpstan.neon --no-progress -./vendor/bin/phpstan analyse -c .ci/phpstan.neon --error-format=table > phpstan.txt +./vendor/bin/phpstan analyse -c .ci/phpstan.neon --error-format=table > phpstan-report.txt exit 0 diff --git a/app/Api/V1/Requests/Models/Rule/UpdateRequest.php b/app/Api/V1/Requests/Models/Rule/UpdateRequest.php index 586cc45ad4..dcbf686dd2 100644 --- a/app/Api/V1/Requests/Models/Rule/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Rule/UpdateRequest.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Requests\Models\Rule; +use FireflyIII\Models\Rule; use FireflyIII\Rules\IsBoolean; use FireflyIII\Support\Request\ChecksLogin; use FireflyIII\Support\Request\ConvertsDataTypes; @@ -131,6 +132,8 @@ class UpdateRequest extends FormRequest { $validTriggers = $this->getTriggers(); $validActions = array_keys(config('firefly.rule-actions')); + + /** @var Rule $rule */ $rule = $this->route()->parameter('rule'); // some triggers and actions require text: diff --git a/app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php b/app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php index b11889efc0..5c9b5bfa0f 100644 --- a/app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Requests\Models\TransactionCurrency; +use FireflyIII\Models\TransactionCurrency; use FireflyIII\Rules\IsBoolean; use FireflyIII\Support\Request\ChecksLogin; use FireflyIII\Support\Request\ConvertsDataTypes; @@ -66,6 +67,7 @@ class UpdateRequest extends FormRequest */ public function rules(): array { + /** @var TransactionCurrency $currency */ $currency = $this->route()->parameter('currency_code'); return [ diff --git a/app/Api/V1/Requests/Models/TransactionLinkType/UpdateRequest.php b/app/Api/V1/Requests/Models/TransactionLinkType/UpdateRequest.php index 592f9183a7..a49a1f4c17 100644 --- a/app/Api/V1/Requests/Models/TransactionLinkType/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/TransactionLinkType/UpdateRequest.php @@ -23,6 +23,8 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Requests\Models\TransactionLinkType; +use FireflyIII\Models\LinkType; +use FireflyIII\Models\TransactionJournalLink; use FireflyIII\Support\Request\ChecksLogin; use FireflyIII\Support\Request\ConvertsDataTypes; use Illuminate\Foundation\Http\FormRequest; @@ -59,6 +61,7 @@ class UpdateRequest extends FormRequest */ public function rules(): array { + /** @var LinkType $linkType */ $linkType = $this->route()->parameter('linkType'); return [ diff --git a/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php b/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php index 0dad365dd6..6aa3a907c3 100644 --- a/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php @@ -84,6 +84,8 @@ class UpdateRequest extends FormRequest $triggers = implode(',', array_keys(Webhook::getTriggersForValidation())); $responses = implode(',', array_keys(Webhook::getResponsesForValidation())); $deliveries = implode(',', array_keys(Webhook::getDeliveriesForValidation())); + + /** @var Webhook $webhook */ $webhook = $this->route()->parameter('webhook'); return [ diff --git a/app/Api/V1/Requests/System/UserUpdateRequest.php b/app/Api/V1/Requests/System/UserUpdateRequest.php index 4897c30a20..b3383e1c80 100644 --- a/app/Api/V1/Requests/System/UserUpdateRequest.php +++ b/app/Api/V1/Requests/System/UserUpdateRequest.php @@ -96,6 +96,7 @@ class UserUpdateRequest extends FormRequest */ public function withValidator(Validator $validator): void { + /** @var User $current */ $current = $this->route()->parameter('user'); $validator->after( static function (Validator $validator) use ($current) { diff --git a/app/Console/Commands/Export/ExportData.php b/app/Console/Commands/Export/ExportData.php index af46c4feb6..bfe1ac28dd 100644 --- a/app/Console/Commands/Export/ExportData.php +++ b/app/Console/Commands/Export/ExportData.php @@ -121,11 +121,11 @@ class ExportData extends Command $exporter->setExportBills($options['export']['bills']); $exporter->setExportPiggies($options['export']['piggies']); $data = $exporter->export(); - if (empty($data)) { + if (0 === count ($data)) { $this->error('You must export *something*. Use --export-transactions or another option. See docs.firefly-iii.org'); } $returnCode = 0; - if (!empty($data)) { + if (0 !== count($data)) { try { $this->exportData($options, $data); } catch (FireflyException $e) { diff --git a/app/Console/Commands/Upgrade/BackToJournals.php b/app/Console/Commands/Upgrade/BackToJournals.php index 2d504fde12..6150410571 100644 --- a/app/Console/Commands/Upgrade/BackToJournals.php +++ b/app/Console/Commands/Upgrade/BackToJournals.php @@ -148,7 +148,8 @@ class BackToJournals extends Command */ private function getIdsForBudgets(): array { - $transactions = DB::table('budget_transaction')->distinct()->get(['transaction_id'])->pluck('transaction_id')->toArray(); // @phpstan-ignore-line + $transactions = DB::table('budget_transaction')->distinct()->get(['transaction_id'])-> + toCollection()->pluck('transaction_id')->toArray(); // @phpstan-ignore-line $array = []; $chunks = array_chunk($transactions, 500);