From 16c3653ceefd43b6d150bbce587d230fb2f0f3b6 Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Wed, 22 Feb 2023 06:42:53 +0900 Subject: [PATCH] phpstan updates for Smarty move to composer package --- phpstan.neon | 7 ++----- www/lib/CoreLibs/DB/IO.php | 2 -- www/lib/CoreLibs/Template/SmartyExtend.php | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/phpstan.neon b/phpstan.neon index 49f36864..20f58e35 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -5,6 +5,7 @@ parameters: tmpDir: /tmp/phpstan-corelibs level: 8 # max is now 9 checkMissingCallableSignature: true + treatPhpDocTypesAsCertain: false paths: - %currentWorkingDirectory%/www bootstrapFiles: @@ -12,14 +13,13 @@ parameters: # - %currentWorkingDirectory%/www/lib/autoloader.php - %currentWorkingDirectory%/www/vendor/autoload.php scanDirectories: - - www/lib/Smarty + - www/vendor scanFiles: - www/configs/config.php - www/configs/config.master.php # if composer.json autoloader defined, this is not needed # - www/lib/autoloader.php - www/vendor/autoload.php - - www/lib/Smarty/Autoloader.php excludePaths: # do not check old qq file uploader tests - www/admin/qq_file_upload_*.php @@ -43,9 +43,6 @@ parameters: - www/log - www/media - www/tmp - # external libs are not checked - - www/lib/Smarty/ - - www/lib/smarty-*/ # ignore composer - www/vendor # ignore errores with diff --git a/www/lib/CoreLibs/DB/IO.php b/www/lib/CoreLibs/DB/IO.php index af1668c2..4ecef2b5 100644 --- a/www/lib/CoreLibs/DB/IO.php +++ b/www/lib/CoreLibs/DB/IO.php @@ -1851,7 +1851,6 @@ class IO // if cursor exists ... if ($this->cursor_ext[$query_hash]['cursor']) { - /** @phpstan-ignore-next-line claims this is always false, but can be true */ if ($first_call === true) { $this->cursor_ext[$query_hash]['log'][] = 'First call'; // count the rows returned (if select) @@ -3048,7 +3047,6 @@ class IO } else { // find in all inside the array $__arr = array_column($this->insert_id_arr, $key); - /** @phpstan-ignore-next-line [Why is this always true?] */ if (count($__arr)) { return $__arr; } else { diff --git a/www/lib/CoreLibs/Template/SmartyExtend.php b/www/lib/CoreLibs/Template/SmartyExtend.php index 08bef934..ffbd0280 100644 --- a/www/lib/CoreLibs/Template/SmartyExtend.php +++ b/www/lib/CoreLibs/Template/SmartyExtend.php @@ -453,7 +453,7 @@ class SmartyExtend extends \Smarty $this->DATA['nav_menu_count'] = count($this->DATA['nav_menu']); // messages = ['msg' =>, 'class' => 'error/warning/...'] $this->DATA['messages'] = $cms->messages; - } else { /** @phpstan-ignore-line Because I assume object for phpstan */ + } else { $this->DATA['show_ea_extra'] = false; $this->DATA['ADMIN'] = 0; $this->DATA['nav_menu'] = [];