diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 500412b024..56d8000a58 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -140,11 +140,6 @@ parameters: count: 1 path: libraries/classes/CheckUserPrivileges.php - - - message: "#^Call to method PhpMyAdmin\\\\Command\\\\CacheWarmupCommand\\:\\:warmUpTwigCache\\(\\) with incorrect case\\: warmUptwigCache$#" - count: 1 - path: libraries/classes/Command/CacheWarmupCommand.php - - message: "#^PHPDoc type string of property PhpMyAdmin\\\\Command\\\\SetVersionCommand\\:\\:\\$defaultName is not the same as PHPDoc type string\\|null of overridden property Symfony\\\\Component\\\\Console\\\\Command\\\\Command\\:\\:\\$defaultName\\.$#" count: 1 @@ -1070,6 +1065,16 @@ parameters: count: 1 path: libraries/classes/Controllers/Database/DataDictionaryController.php + - + message: "#^Parameter \\#1 \\$sqlQuery of static method PhpMyAdmin\\\\Database\\\\MultiTableQuery\\:\\:displayResults\\(\\) expects string, mixed given\\.$#" + count: 1 + path: libraries/classes/Controllers/Database/MultiTableQuery/QueryController.php + + - + message: "#^Parameter \\#2 \\$db of static method PhpMyAdmin\\\\Database\\\\MultiTableQuery\\:\\:displayResults\\(\\) expects string, mixed given\\.$#" + count: 1 + path: libraries/classes/Controllers/Database/MultiTableQuery/QueryController.php + - message: "#^Negated boolean expression is always true\\.$#" count: 6 @@ -2895,11 +2900,6 @@ parameters: count: 2 path: libraries/classes/Dbal/MysqliResult.php - - - message: "#^Call to method PhpMyAdmin\\\\Plugins\\\\TransformationsInterface\\:\\:getMIMEType\\(\\) with incorrect case\\: getMIMEtype$#" - count: 1 - path: libraries/classes/Display/Results.php - - message: "#^Cannot access offset int\\<0, max\\> on mixed\\.$#" count: 2 @@ -3690,16 +3690,6 @@ parameters: count: 1 path: libraries/classes/Gis/GisGeometryCollection.php - - - message: "#^Call to method TCPDF\\:\\:setFontSize\\(\\) with incorrect case\\: SetFontSize$#" - count: 1 - path: libraries/classes/Gis/GisLineString.php - - - - message: "#^Call to method TCPDF\\:\\:setXY\\(\\) with incorrect case\\: SetXY$#" - count: 1 - path: libraries/classes/Gis/GisLineString.php - - message: "#^Method PhpMyAdmin\\\\Gis\\\\GisLineString\\:\\:generateParams\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 @@ -3755,16 +3745,6 @@ parameters: count: 1 path: libraries/classes/Gis/GisLineString.php - - - message: "#^Call to method TCPDF\\:\\:setFontSize\\(\\) with incorrect case\\: SetFontSize$#" - count: 1 - path: libraries/classes/Gis/GisMultiLineString.php - - - - message: "#^Call to method TCPDF\\:\\:setXY\\(\\) with incorrect case\\: SetXY$#" - count: 1 - path: libraries/classes/Gis/GisMultiLineString.php - - message: "#^Method PhpMyAdmin\\\\Gis\\\\GisMultiLineString\\:\\:generateParams\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 @@ -3825,16 +3805,6 @@ parameters: count: 1 path: libraries/classes/Gis/GisMultiLineString.php - - - message: "#^Call to method TCPDF\\:\\:setFontSize\\(\\) with incorrect case\\: SetFontSize$#" - count: 1 - path: libraries/classes/Gis/GisMultiPoint.php - - - - message: "#^Call to method TCPDF\\:\\:setXY\\(\\) with incorrect case\\: SetXY$#" - count: 1 - path: libraries/classes/Gis/GisMultiPoint.php - - message: "#^Method PhpMyAdmin\\\\Gis\\\\GisMultiPoint\\:\\:generateParams\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 @@ -3900,16 +3870,6 @@ parameters: count: 1 path: libraries/classes/Gis/GisMultiPoint.php - - - message: "#^Call to method TCPDF\\:\\:setFontSize\\(\\) with incorrect case\\: SetFontSize$#" - count: 1 - path: libraries/classes/Gis/GisMultiPolygon.php - - - - message: "#^Call to method TCPDF\\:\\:setXY\\(\\) with incorrect case\\: SetXY$#" - count: 1 - path: libraries/classes/Gis/GisMultiPolygon.php - - message: "#^Method PhpMyAdmin\\\\Gis\\\\GisMultiPolygon\\:\\:drawPath\\(\\) has parameter \\$scale_data with no value type specified in iterable type array\\.$#" count: 1 @@ -3975,16 +3935,6 @@ parameters: count: 1 path: libraries/classes/Gis/GisMultiPolygon.php - - - message: "#^Call to method TCPDF\\:\\:setFontSize\\(\\) with incorrect case\\: SetFontSize$#" - count: 1 - path: libraries/classes/Gis/GisPoint.php - - - - message: "#^Call to method TCPDF\\:\\:setXY\\(\\) with incorrect case\\: SetXY$#" - count: 1 - path: libraries/classes/Gis/GisPoint.php - - message: "#^Method PhpMyAdmin\\\\Gis\\\\GisPoint\\:\\:generateParams\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 @@ -4045,16 +3995,6 @@ parameters: count: 1 path: libraries/classes/Gis/GisPoint.php - - - message: "#^Call to method TCPDF\\:\\:setFontSize\\(\\) with incorrect case\\: SetFontSize$#" - count: 1 - path: libraries/classes/Gis/GisPolygon.php - - - - message: "#^Call to method TCPDF\\:\\:setXY\\(\\) with incorrect case\\: SetXY$#" - count: 1 - path: libraries/classes/Gis/GisPolygon.php - - message: "#^Method PhpMyAdmin\\\\Gis\\\\GisPolygon\\:\\:area\\(\\) has parameter \\$ring with no value type specified in iterable type array\\.$#" count: 1 @@ -5570,21 +5510,6 @@ parameters: count: 1 path: libraries/classes/Partitioning/TablePartitionDefinition.php - - - message: "#^Call to method TCPDF\\:\\:setAuthor\\(\\) with incorrect case\\: SetAuthor$#" - count: 1 - path: libraries/classes/Pdf.php - - - - message: "#^Call to method TCPDF\\:\\:setFont\\(\\) with incorrect case\\: SetFont$#" - count: 2 - path: libraries/classes/Pdf.php - - - - message: "#^Call to method TCPDF\\:\\:setY\\(\\) with incorrect case\\: SetY$#" - count: 2 - path: libraries/classes/Pdf.php - - message: "#^Property PhpMyAdmin\\\\Pdf\\:\\:\\$alias type has no value type specified in iterable type array\\.$#" count: 1 @@ -5970,26 +5895,6 @@ parameters: count: 1 path: libraries/classes/Plugins/Export/ExportYaml.php - - - message: "#^Call to method TCPDF\\:\\:setFillColor\\(\\) with incorrect case\\: SetFillColor$#" - count: 2 - path: libraries/classes/Plugins/Export/Helpers/Pdf.php - - - - message: "#^Call to method TCPDF\\:\\:setFont\\(\\) with incorrect case\\: SetFont$#" - count: 5 - path: libraries/classes/Plugins/Export/Helpers/Pdf.php - - - - message: "#^Call to method TCPDF\\:\\:setXY\\(\\) with incorrect case\\: SetXY$#" - count: 7 - path: libraries/classes/Plugins/Export/Helpers/Pdf.php - - - - message: "#^Call to method TCPDF\\:\\:setY\\(\\) with incorrect case\\: SetY$#" - count: 5 - path: libraries/classes/Plugins/Export/Helpers/Pdf.php - - message: "#^Method PhpMyAdmin\\\\Plugins\\\\Export\\\\Helpers\\\\Pdf\\:\\:getTableDef\\(\\) has parameter \\$aliases with no value type specified in iterable type array\\.$#" count: 1 @@ -6420,31 +6325,6 @@ parameters: count: 2 path: libraries/classes/Plugins/Schema/Eps/TableStatsEps.php - - - message: "#^Call to method TCPDF\\:\\:setFont\\(\\) with incorrect case\\: SetFont$#" - count: 2 - path: libraries/classes/Plugins/Schema/Pdf/Pdf.php - - - - message: "#^Call to method TCPDF\\:\\:setFontSize\\(\\) with incorrect case\\: SetFontSize$#" - count: 1 - path: libraries/classes/Plugins/Schema/Pdf/Pdf.php - - - - message: "#^Call to method TCPDF\\:\\:setLineWidth\\(\\) with incorrect case\\: SetLineWidth$#" - count: 1 - path: libraries/classes/Plugins/Schema/Pdf/Pdf.php - - - - message: "#^Call to method TCPDF\\:\\:setX\\(\\) with incorrect case\\: SetX$#" - count: 1 - path: libraries/classes/Plugins/Schema/Pdf/Pdf.php - - - - message: "#^Call to method TCPDF\\:\\:setXY\\(\\) with incorrect case\\: SetXY$#" - count: 2 - path: libraries/classes/Plugins/Schema/Pdf/Pdf.php - - message: "#^Method PhpMyAdmin\\\\Plugins\\\\Schema\\\\Pdf\\\\Pdf\\:\\:row\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" count: 1 @@ -6475,46 +6355,6 @@ parameters: count: 2 path: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php - - - message: "#^Call to method TCPDF\\:\\:setDrawColor\\(\\) with incorrect case\\: SetDrawColor$#" - count: 1 - path: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php - - - - message: "#^Call to method TCPDF\\:\\:setFont\\(\\) with incorrect case\\: SetFont$#" - count: 5 - path: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php - - - - message: "#^Call to method TCPDF\\:\\:setFontSize\\(\\) with incorrect case\\: SetFontSize$#" - count: 1 - path: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php - - - - message: "#^Call to method TCPDF\\:\\:setLink\\(\\) with incorrect case\\: SetLink$#" - count: 3 - path: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php - - - - message: "#^Call to method TCPDF\\:\\:setMargins\\(\\) with incorrect case\\: SetMargins$#" - count: 1 - path: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php - - - - message: "#^Call to method TCPDF\\:\\:setTitle\\(\\) with incorrect case\\: SetTitle$#" - count: 1 - path: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php - - - - message: "#^Call to method TCPDF\\:\\:setX\\(\\) with incorrect case\\: SetX$#" - count: 5 - path: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php - - - - message: "#^Call to method TCPDF\\:\\:setXY\\(\\) with incorrect case\\: SetXY$#" - count: 2 - path: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php - - message: "#^Casting to string something that's already string\\.$#" count: 2 @@ -6570,26 +6410,6 @@ parameters: count: 1 path: libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php - - - message: "#^Call to method TCPDF\\:\\:setFillColor\\(\\) with incorrect case\\: SetFillColor$#" - count: 5 - path: libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php - - - - message: "#^Call to method TCPDF\\:\\:setFont\\(\\) with incorrect case\\: SetFont$#" - count: 4 - path: libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php - - - - message: "#^Call to method TCPDF\\:\\:setLink\\(\\) with incorrect case\\: SetLink$#" - count: 2 - path: libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php - - - - message: "#^Call to method TCPDF\\:\\:setTextColor\\(\\) with incorrect case\\: SetTextColor$#" - count: 2 - path: libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php - - message: "#^Property PhpMyAdmin\\\\Plugins\\\\Schema\\\\TableStats\\:\\:\\$width \\(int\\) does not accept array\\\\|float\\|int\\.$#" count: 1 @@ -6635,11 +6455,6 @@ parameters: count: 1 path: libraries/classes/Plugins/Schema/Svg/Svg.php - - - message: "#^Call to method PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\Svg\\:\\:setAuthor\\(\\) with incorrect case\\: SetAuthor$#" - count: 1 - path: libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php - - message: "#^Parameter \\#1 \\$table of method PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\SvgRelationSchema\\:\\:setMinMax\\(\\) expects PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\TableStatsSvg, PhpMyAdmin\\\\Plugins\\\\Schema\\\\Dia\\\\TableStatsDia\\|PhpMyAdmin\\\\Plugins\\\\Schema\\\\Eps\\\\TableStatsEps\\|PhpMyAdmin\\\\Plugins\\\\Schema\\\\Pdf\\\\TableStatsPdf\\|PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\TableStatsSvg given\\.$#" count: 1 @@ -10905,36 +10720,6 @@ parameters: count: 1 path: test/classes/Partitioning/TablePartitionDefinitionTest.php - - - message: "#^Call to method TCPDF\\:\\:AddPage\\(\\) with incorrect case\\: Addpage$#" - count: 2 - path: test/classes/PdfTest.php - - - - message: "#^Call to method TCPDF\\:\\:Line\\(\\) with incorrect case\\: line$#" - count: 1 - path: test/classes/PdfTest.php - - - - message: "#^Call to method TCPDF\\:\\:setDrawColor\\(\\) with incorrect case\\: SetDrawColor$#" - count: 1 - path: test/classes/PdfTest.php - - - - message: "#^Call to method TCPDF\\:\\:setFont\\(\\) with incorrect case\\: SetFont$#" - count: 1 - path: test/classes/PdfTest.php - - - - message: "#^Call to method TCPDF\\:\\:setMargins\\(\\) with incorrect case\\: SetMargins$#" - count: 1 - path: test/classes/PdfTest.php - - - - message: "#^Call to method TCPDF\\:\\:setTitle\\(\\) with incorrect case\\: SetTitle$#" - count: 1 - path: test/classes/PdfTest.php - - message: "#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertSame\\(\\) with 32 and 0 will always evaluate to false\\.$#" count: 1 @@ -10970,11 +10755,6 @@ parameters: count: 1 path: test/classes/Plugins/Export/ExportHtmlwordTest.php - - - message: "#^Call to method PhpMyAdmin\\\\Properties\\\\Options\\\\Groups\\\\OptionsPropertySubgroup\\:\\:getSubgroupHeader\\(\\) with incorrect case\\: getSubGroupHeader$#" - count: 1 - path: test/classes/Plugins/Export/ExportMediawikiTest.php - - message: "#^Parameter \\#2 \\$haystack of method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, mixed given\\.$#" count: 5 @@ -11410,6 +11190,11 @@ parameters: count: 1 path: test/classes/UtilTest.php + - + message: "#^Method PhpMyAdmin\\\\Tests\\\\UtilTest\\:\\:providerForTestGetMySQLDocuURL\\(\\) should return array\\ but returns array\\{array\\{'ALTER_TABLE', 'alter\\-table\\-index', '8\\.0\\.0', 'index\\.php\\?route\\=…'\\}, array\\{'ALTER_TABLE', 'alter\\-table\\-index', '5\\.7\\.0', 'index\\.php\\?route\\=…'\\}, array\\{'', 'alter\\-table\\-index', '5\\.6\\.0', 'index\\.php\\?route\\=…'\\}, array\\{'ALTER_TABLE', '', '5\\.5\\.0', 'index\\.php\\?route\\=…'\\}, array\\{'', '', '5\\.7\\.0', 'index\\.php\\?route\\=…'\\}\\}\\.$#" + count: 1 + path: test/classes/UtilTest.php + - message: "#^Method PhpMyAdmin\\\\Tests\\\\UtilTest\\:\\:providerFormatByteDown\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 @@ -11610,11 +11395,6 @@ parameters: count: 2 path: test/selenium/TestBase.php - - - message: "#^Call to method Facebook\\\\WebDriver\\\\Remote\\\\RemoteWebDriver\\:\\:getSessionID\\(\\) with incorrect case\\: getSessionId$#" - count: 1 - path: test/selenium/TestBase.php - - message: "#^Variable static method call on Facebook\\\\WebDriver\\\\WebDriverBy\\.$#" count: 4 diff --git a/psalm-baseline.xml b/psalm-baseline.xml index b3e8ae4518..3fd9e679b1 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1261,14 +1261,10 @@ - + $params['db'] $params['sql_query'] - - - $params['db'] - $params['sql_query'] - + @@ -15542,6 +15538,9 @@ array + + empty($GLOBALS['dbi']) + @@ -16381,6 +16380,13 @@ + + testGetMySQLDocuURL + + + + array<int, array{string, string, int, string}> + $_SESSION['cache']['server_server'] $_SESSION['cache']['server_server']