From 9d3cb6859624b85d1a7bf08fdb66d583cd99d8c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Mon, 26 Jun 2023 17:26:02 -0300 Subject: [PATCH] Update PHPStan/Psalm baselines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- libraries/classes/Gis/GisGeometry.php | 6 +- phpstan-baseline.neon | 85 +++++++++++++++++++++++++++ psalm-baseline.xml | 65 +++++++------------- 3 files changed, 109 insertions(+), 47 deletions(-) diff --git a/libraries/classes/Gis/GisGeometry.php b/libraries/classes/Gis/GisGeometry.php index ddc71a98b7..84ba828615 100644 --- a/libraries/classes/Gis/GisGeometry.php +++ b/libraries/classes/Gis/GisGeometry.php @@ -300,10 +300,8 @@ abstract class GisGeometry } /** - * @param string $constructor - * OpenLayers geometry constructor string - * @param float[]|float[][]|float[][][]|float[][][][] $coordinates - * Array of coordintes 1-4 dimensions + * @param string $constructor OpenLayers geometry constructor string + * @param float[]|float[][]|float[][][]|float[][][][] $coordinates Array of coordinates 1-4 dimensions */ protected function toOpenLayersObject(string $constructor, array $coordinates, int $srid): string { diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index f91b3c5b61..d94bfc9fd2 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -2165,11 +2165,36 @@ parameters: count: 1 path: libraries/classes/Controllers/Table/ReplaceController.php + - + message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#" + count: 2 + path: libraries/classes/Controllers/Table/ReplaceController.php + - message: "#^Call to function method_exists\\(\\) with PhpMyAdmin\\\\Plugins\\\\IOTransformationsPlugin and 'isSuccess' will always evaluate to true\\.$#" count: 1 path: libraries/classes/Controllers/Table/ReplaceController.php + - + message: "#^Cannot access offset 'multi_edit' on mixed\\.$#" + count: 11 + path: libraries/classes/Controllers/Table/ReplaceController.php + + - + message: "#^Cannot access offset \\(int\\|string\\) on mixed\\.$#" + count: 10 + path: libraries/classes/Controllers/Table/ReplaceController.php + + - + message: "#^Cannot access offset 0 on mixed\\.$#" + count: 2 + path: libraries/classes/Controllers/Table/ReplaceController.php + + - + message: "#^Cannot access offset int\\|string on mixed\\.$#" + count: 11 + path: libraries/classes/Controllers/Table/ReplaceController.php + - message: "#^Method PhpMyAdmin\\\\Controllers\\\\Table\\\\ReplaceController\\:\\:getParamsForUpdateOrInsert\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 @@ -2180,6 +2205,16 @@ parameters: count: 1 path: libraries/classes/Controllers/Table/ReplaceController.php + - + message: "#^Parameter \\#1 \\$columnName of class PhpMyAdmin\\\\EditField constructor expects string, mixed given\\.$#" + count: 1 + path: libraries/classes/Controllers/Table/ReplaceController.php + + - + message: "#^Parameter \\#1 \\$oneWhereClause of method PhpMyAdmin\\\\InsertEdit\\:\\:setSessionForEditNext\\(\\) expects string, mixed given\\.$#" + count: 1 + path: libraries/classes/Controllers/Table/ReplaceController.php + - message: "#^Parameter \\#1 \\$rows of static method PhpMyAdmin\\\\Message\\:\\:getMessageForAffectedRows\\(\\) expects int, mixed given\\.$#" count: 1 @@ -2190,6 +2225,51 @@ parameters: count: 1 path: libraries/classes/Controllers/Table/ReplaceController.php + - + message: "#^Parameter \\#1 \\$string of function parse_str expects string, mixed given\\.$#" + count: 2 + path: libraries/classes/Controllers/Table/ReplaceController.php + + - + message: "#^Parameter \\#1 \\$tableName of class PhpMyAdmin\\\\Table constructor expects string, mixed given\\.$#" + count: 1 + path: libraries/classes/Controllers/Table/ReplaceController.php + + - + message: "#^Parameter \\#2 \\$dbName of class PhpMyAdmin\\\\Table constructor expects string, mixed given\\.$#" + count: 1 + path: libraries/classes/Controllers/Table/ReplaceController.php + + - + message: "#^Parameter \\#3 \\$columnName of method PhpMyAdmin\\\\InsertEdit\\:\\:verifyWhetherValueCanBeTruncatedAndAppendExtraData\\(\\) expects string, mixed given\\.$#" + count: 1 + path: libraries/classes/Controllers/Table/ReplaceController.php + + - + message: "#^Parameter \\#3 \\$type of class PhpMyAdmin\\\\EditField constructor expects string, mixed given\\.$#" + count: 1 + path: libraries/classes/Controllers/Table/ReplaceController.php + + - + message: "#^Parameter \\#3 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, mixed given\\.$#" + count: 1 + path: libraries/classes/Controllers/Table/ReplaceController.php + + - + message: "#^Parameter \\#7 \\$function of class PhpMyAdmin\\\\EditField constructor expects string, mixed given\\.$#" + count: 1 + path: libraries/classes/Controllers/Table/ReplaceController.php + + - + message: "#^Parameter \\#8 \\$salt of class PhpMyAdmin\\\\EditField constructor expects string\\|null, mixed given\\.$#" + count: 1 + path: libraries/classes/Controllers/Table/ReplaceController.php + + - + message: "#^Parameter \\#9 \\$previousValue of class PhpMyAdmin\\\\EditField constructor expects string\\|null, mixed given\\.$#" + count: 1 + path: libraries/classes/Controllers/Table/ReplaceController.php + - message: "#^Cannot cast mixed to string\\.$#" count: 1 @@ -4490,6 +4570,11 @@ parameters: count: 1 path: libraries/classes/InsertEdit.php + - + message: "#^Property PhpMyAdmin\\\\InsertEditColumn\\:\\:\\$pmaType \\(string\\) does not accept string\\|null\\.$#" + count: 1 + path: libraries/classes/InsertEditColumn.php + - message: "#^Property PhpMyAdmin\\\\InsertEditColumn\\:\\:\\$trueType \\(string\\) does not accept string\\|null\\.$#" count: 1 diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 162813db4d..a06be3cc9d 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1,5 +1,5 @@ - + $matches[1] @@ -278,12 +278,6 @@ $url $value - - string - - - $cookiePath - $defaultValue @@ -1977,6 +1971,9 @@ + + + $collationsList @@ -3611,33 +3608,36 @@ - $columnName $columnName $columnName $errorMessages $extraData + $lastMessages $multiEditColumnsPrev[$key] ?? null $multiEditSalt[$key] ?? null $oneWhereClause + $relFieldsList $relationField $relationFieldValue + getParsedBodyParam('db')]]> + getParsedBodyParam('table')]]> + getParsedBodyParam('transform_fields_list')]]> $totalAffectedRows $totalAffectedRows $warningMessages - - $multiEditColumnsPrev[$key] $multiEditColumnsType[$key] $multiEditColumns[$key] $multiEditFuncs[$key] $multiEditSalt[$key] + getParsedBodyParam('fields_name')['multi_edit']]]> @@ -3657,10 +3657,15 @@ + + $afterInsert + $clauseIsUnique $columnName $columnName $currRelField + $fields + $insertRows $multiEditAutoIncrement $multiEditColumns $multiEditColumnsName @@ -3673,8 +3678,12 @@ $multiEditSalt $multiEditVirtual $oneWhereClause + $relFieldsList $relationField $relationFieldValue + $submitType + $whereClause + $whereClause new $className() @@ -3682,36 +3691,6 @@ $relationFieldValue - - $multiEditColumns[$key] - - - - - - - - - - - $multiEditColumnsPrev[$key] - $multiEditColumnsType[$key] - $multiEditColumns[$key] - $multiEditColumns[$key] - $multiEditColumns[$key] - $multiEditFuncs[$key] - $multiEditSalt[$key] - - - - - - - - - - $multiEditColumnsName - @@ -8306,6 +8285,9 @@ + + $format + $row[0] $row[0] @@ -12342,9 +12324,6 @@ - - - $filesizeInfo