From 6bc9fadde25208a26bf1164e5210b4878db7e671 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Tue, 18 Jan 2022 14:51:09 -0300 Subject: [PATCH] Update PHPStan/Psalm baselines MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- phpstan-baseline.neon | 50 +++++++++++++++++++++++++++++++++++--------------- psalm-baseline.xml | 15 ++++++--------- 2 files changed, 41 insertions(+), 24 deletions(-) diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 60d42e448c..ba199918ea 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -386,6 +386,11 @@ parameters: path: libraries/classes/Config/Form.php - + message: "#^Unreachable statement \\- code above always terminates\\.$#" + count: 2 + path: libraries/classes/Config/Form.php + + - message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#" count: 1 path: libraries/classes/Config/FormDisplay.php @@ -1806,7 +1811,7 @@ parameters: path: libraries/classes/Core.php - - message: "#^Offset 'pass'\\|'port'\\|'user' does not exist on array\\{scheme\\?\\: string, host\\: string, port\\?\\: int, user\\?\\: string, pass\\?\\: string, path\\?\\: string, query\\?\\: string, fragment\\?\\: string\\}\\.$#" + message: "#^Offset 'pass'\\|'port'\\|'user' does not exist on array\\{host\\: non\\-empty\\-string, scheme\\?\\: string, port\\?\\: int, user\\?\\: string, pass\\?\\: string, path\\?\\: string, query\\?\\: string, fragment\\?\\: string\\}\\.$#" count: 1 path: libraries/classes/Core.php @@ -2021,22 +2026,22 @@ parameters: path: libraries/classes/Database/Designer/Common.php - - message: "#^Offset 'DCN' does not exist on array\\{C_NAME\\: array\\, DCN\\?\\: non\\-empty\\-array\\, DTN\\?\\: non\\-empty\\-array\\, SCN\\?\\: non\\-empty\\-array\\, STN\\?\\: non\\-empty\\-array\\\\}\\.$#" + message: "#^Offset 'DCN' does not exist on array\\{C_NAME\\: array\\, string\\>, DCN\\?\\: non\\-empty\\-array\\, string\\>, DTN\\?\\: non\\-empty\\-array\\, non\\-empty\\-string\\>, SCN\\?\\: non\\-empty\\-array\\, string\\>, STN\\?\\: non\\-empty\\-array\\, non\\-empty\\-string\\>\\}\\.$#" count: 1 path: libraries/classes/Database/Designer/Common.php - - message: "#^Offset 'DTN' does not exist on array\\{C_NAME\\: array\\, DCN\\?\\: non\\-empty\\-array\\, DTN\\?\\: non\\-empty\\-array\\, SCN\\?\\: non\\-empty\\-array\\, STN\\?\\: non\\-empty\\-array\\\\}\\.$#" + message: "#^Offset 'DTN' does not exist on array\\{C_NAME\\: array\\, string\\>, DCN\\?\\: non\\-empty\\-array\\, string\\>, DTN\\?\\: non\\-empty\\-array\\, non\\-empty\\-string\\>, SCN\\?\\: non\\-empty\\-array\\, string\\>, STN\\?\\: non\\-empty\\-array\\, non\\-empty\\-string\\>\\}\\.$#" count: 1 path: libraries/classes/Database/Designer/Common.php - - message: "#^Offset 'SCN' does not exist on array\\{C_NAME\\: array\\, DCN\\?\\: non\\-empty\\-array\\, DTN\\?\\: non\\-empty\\-array\\, SCN\\?\\: non\\-empty\\-array\\, STN\\?\\: non\\-empty\\-array\\\\}\\.$#" + message: "#^Offset 'SCN' does not exist on array\\{C_NAME\\: array\\, string\\>, DCN\\?\\: non\\-empty\\-array\\, string\\>, DTN\\?\\: non\\-empty\\-array\\, non\\-empty\\-string\\>, SCN\\?\\: non\\-empty\\-array\\, string\\>, STN\\?\\: non\\-empty\\-array\\, non\\-empty\\-string\\>\\}\\.$#" count: 1 path: libraries/classes/Database/Designer/Common.php - - message: "#^Offset 'STN' does not exist on array\\{C_NAME\\: array\\, DCN\\?\\: non\\-empty\\-array\\, DTN\\?\\: non\\-empty\\-array\\, SCN\\?\\: non\\-empty\\-array\\, STN\\?\\: non\\-empty\\-array\\\\}\\.$#" + message: "#^Offset 'STN' does not exist on array\\{C_NAME\\: array\\, string\\>, DCN\\?\\: non\\-empty\\-array\\, string\\>, DTN\\?\\: non\\-empty\\-array\\, non\\-empty\\-string\\>, SCN\\?\\: non\\-empty\\-array\\, string\\>, STN\\?\\: non\\-empty\\-array\\, non\\-empty\\-string\\>\\}\\.$#" count: 2 path: libraries/classes/Database/Designer/Common.php @@ -2881,7 +2886,7 @@ parameters: path: libraries/classes/Display/Results.php - - message: "#^Cannot access offset int on mixed\\.$#" + message: "#^Cannot access offset int\\<0, max\\> on mixed\\.$#" count: 2 path: libraries/classes/Display/Results.php @@ -4272,7 +4277,12 @@ parameters: - message: "#^Cannot access offset int on array\\|false\\.$#" - count: 2 + count: 1 + path: libraries/classes/Git.php + + - + message: "#^Cannot access offset int\\\\|int\\<1, max\\> on array\\|false\\.$#" + count: 1 path: libraries/classes/Git.php - @@ -4481,7 +4491,7 @@ parameters: path: libraries/classes/Import.php - - message: "#^Offset int does not exist on array\\|null\\.$#" + message: "#^Offset int\\<0, max\\> does not exist on array\\|null\\.$#" count: 2 path: libraries/classes/Import.php @@ -6081,7 +6091,7 @@ parameters: path: libraries/classes/Plugins/Export/Helpers/Pdf.php - - message: "#^Property PhpMyAdmin\\\\Plugins\\\\Export\\\\Helpers\\\\Pdf\\:\\:\\$colFits is never read, only written\\.$#" + message: "#^Property PhpMyAdmin\\\\Plugins\\\\Export\\\\Helpers\\\\Pdf\\:\\:\\$colFits is unused\\.$#" count: 1 path: libraries/classes/Plugins/Export/Helpers/Pdf.php @@ -6106,7 +6116,7 @@ parameters: path: libraries/classes/Plugins/Export/Helpers/Pdf.php - - message: "#^Property PhpMyAdmin\\\\Plugins\\\\Export\\\\Helpers\\\\Pdf\\:\\:\\$titleWidth is never read, only written\\.$#" + message: "#^Property PhpMyAdmin\\\\Plugins\\\\Export\\\\Helpers\\\\Pdf\\:\\:\\$titleWidth is unused\\.$#" count: 1 path: libraries/classes/Plugins/Export/Helpers/Pdf.php @@ -6401,11 +6411,6 @@ parameters: path: libraries/classes/Plugins/Import/Upload/UploadProgress.php - - message: "#^Used function uploadprogress_get_info not found\\.$#" - count: 1 - path: libraries/classes/Plugins/Import/Upload/UploadProgress.php - - - message: "#^Method PhpMyAdmin\\\\Plugins\\\\Import\\\\Upload\\\\UploadSession\\:\\:getUploadStatus\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 path: libraries/classes/Plugins/Import/Upload/UploadSession.php @@ -8411,6 +8416,16 @@ parameters: path: libraries/classes/Theme.php - + message: "#^Unreachable statement \\- code above always terminates\\.$#" + count: 1 + path: libraries/classes/Theme.php + + - + message: "#^If condition is always true\\.$#" + count: 1 + path: libraries/classes/ThemeManager.php + + - message: "#^Method PhpMyAdmin\\\\ThemeManager\\:\\:getThemesArray\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 path: libraries/classes/ThemeManager.php @@ -8426,6 +8441,11 @@ parameters: path: libraries/classes/ThemeManager.php - + message: "#^Unreachable statement \\- code above always terminates\\.$#" + count: 2 + path: libraries/classes/ThemeManager.php + + - message: "#^Cannot access property \\$table on PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|string\\.$#" count: 1 path: libraries/classes/Tracker.php diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 2ad8110f4b..1e71aeb808 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1,5 +1,5 @@ - + global $route, $containerBuilder, $request; @@ -4127,15 +4127,13 @@ ['db' => $db] - + $_POST['view']['as'] $_POST['view']['as'] $_POST['view']['column_names'] $_POST['view']['column_names'] $_POST['view']['name'] $_POST['view']['name'] - $_POST['view']['with'] - $_POST['view']['with'] $urlParams['back'] @@ -9014,12 +9012,12 @@ $propertyItem->getName() $subgroup_header->getName() - - strtolower - $properties != null + + strtolower + RadioPropertyItem SelectPropertyItem @@ -13401,12 +13399,11 @@ $values - + $_POST['criteriaColumnNames'][$column_index] $_POST['criteriaColumnTypes'][$column_index] $_POST['criteriaValues'][$column_index] $_POST['geom_func'][$column_index] - $criteriaValues[0] $_POST['criteriaColumnNames'][$column_index] -- 2.11.4.GIT