diff --git a/.ci/phpstan.neon b/.ci/phpstan.neon index 58d2a4cd6b..af2dcf06c2 100644 --- a/.ci/phpstan.neon +++ b/.ci/phpstan.neon @@ -6,6 +6,13 @@ includes: parameters: ignoreErrors: + - '#is not allowed to extend#' + - '#is neither abstract nor final#' + - '#has a nullable return type declaration#' + - '#with a nullable type declaration#' + - + message: '#Control structures using switch should not be used.#' + path: ../app/Api/V1/Controllers/Data/DestroyController.php paths: - ../app - ../database diff --git a/.ci/phpstan.sh b/.ci/phpstan.sh index a89c7f3895..5e7a80f6e9 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 +./vendor/bin/phpstan analyse -c .ci/phpstan.neon --error-format=table > phpstan.txt exit 0 diff --git a/app/Api/V1/Controllers/Chart/AccountController.php b/app/Api/V1/Controllers/Chart/AccountController.php index b6f0d937ed..32f55aacce 100644 --- a/app/Api/V1/Controllers/Chart/AccountController.php +++ b/app/Api/V1/Controllers/Chart/AccountController.php @@ -98,7 +98,7 @@ class AccountController extends Controller $frontPage = app('preferences')->get('frontPageAccounts', $defaultSet); $default = app('amount')->getDefaultCurrency(); - if (empty($frontPage->data)) { + if (!(is_array($frontPage->data) && count($frontPage->data) > 0)) { $frontPage->data = $defaultSet; $frontPage->save(); } diff --git a/app/Api/V1/Controllers/Data/PurgeController.php b/app/Api/V1/Controllers/Data/PurgeController.php index 02360301c8..c9d0fb37b1 100644 --- a/app/Api/V1/Controllers/Data/PurgeController.php +++ b/app/Api/V1/Controllers/Data/PurgeController.php @@ -19,6 +19,8 @@ * along with this program. If not, see . */ +declare(strict_types=1); + namespace FireflyIII\Api\V1\Controllers\Data; use FireflyIII\Api\V1\Controllers\Controller; diff --git a/app/Api/V1/Requests/Data/Bulk/TransactionRequest.php b/app/Api/V1/Requests/Data/Bulk/TransactionRequest.php index e74c9389a3..59567b875d 100644 --- a/app/Api/V1/Requests/Data/Bulk/TransactionRequest.php +++ b/app/Api/V1/Requests/Data/Bulk/TransactionRequest.php @@ -62,7 +62,7 @@ class TransactionRequest extends FormRequest } /** - * @return string[] + * @return array */ public function rules(): array { diff --git a/app/Api/V1/Requests/Models/Account/UpdateRequest.php b/app/Api/V1/Requests/Models/Account/UpdateRequest.php index 619463879d..20b228b802 100644 --- a/app/Api/V1/Requests/Models/Account/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Account/UpdateRequest.php @@ -101,6 +101,7 @@ class UpdateRequest extends FormRequest */ public function rules(): array { + /** @var Account $account */ $account = $this->route()->parameter('account'); $accountRoles = implode(',', config('firefly.accountRoles')); $types = implode(',', array_keys(config('firefly.subTitlesByIdentifier')));