diff options
-rw-r--r-- | libraries/classes/Tracker.php | 2 | ||||
-rw-r--r-- | phpstan-baseline.neon | 30 | ||||
-rw-r--r-- | psalm-baseline.xml | 11 |
3 files changed, 8 insertions, 35 deletions
diff --git a/libraries/classes/Tracker.php b/libraries/classes/Tracker.php index e9dfb37184..5ba5e02c8a 100644 --- a/libraries/classes/Tracker.php +++ b/libraries/classes/Tracker.php @@ -929,7 +929,7 @@ class Tracker // 3. the statements // we want to track $sqlQuery .= " WHERE FIND_IN_SET('" . $result['identifier'] . "',tracking) > 0" . - " AND `db_name` = '" . $GLOBALS['dbi']->escapeString($dbname ?? '') . "' " . + " AND `db_name` = '" . $GLOBALS['dbi']->escapeString($dbname) . "' " . " AND `table_name` = '" . $GLOBALS['dbi']->escapeString($result['tablename']) . "' " . " AND `version` = '" . $GLOBALS['dbi']->escapeString((string) $version) . "' "; diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 0f509dfa39..8c1ed5ce26 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -1916,22 +1916,22 @@ parameters: path: libraries/classes/Database/Designer/Common.php - - message: "#^Offset 'DCN' does not exist on array\\{C_NAME\\: array\\<int\\<0, max\\>, string\\>, DCN\\?\\: non\\-empty\\-array\\<int\\<0, max\\>, string\\>, DTN\\?\\: non\\-empty\\-array\\<int\\<0, max\\>, non\\-empty\\-string\\>, SCN\\?\\: non\\-empty\\-array\\<int\\<0, max\\>, string\\>, STN\\?\\: non\\-empty\\-array\\<int\\<0, max\\>, non\\-empty\\-string\\>\\}\\.$#" + message: "#^Offset 'DCN' does not exist on array\\{C_NAME\\: array\\{\\}\\}\\|array\\{C_NAME\\: non\\-empty\\-array\\<int\\<0, max\\>, string\\>, DCN\\: non\\-empty\\-array\\<int\\<0, max\\>, string\\>, DTN\\: non\\-empty\\-array\\<int\\<0, max\\>, non\\-falsy\\-string\\>, SCN\\: non\\-empty\\-array\\<int\\<0, max\\>, string\\>, STN\\: non\\-empty\\-array\\<int\\<0, max\\>, non\\-falsy\\-string\\>\\}\\.$#" count: 1 path: libraries/classes/Database/Designer/Common.php - - message: "#^Offset 'DTN' does not exist on array\\{C_NAME\\: array\\<int\\<0, max\\>, string\\>, DCN\\?\\: non\\-empty\\-array\\<int\\<0, max\\>, string\\>, DTN\\?\\: non\\-empty\\-array\\<int\\<0, max\\>, non\\-empty\\-string\\>, SCN\\?\\: non\\-empty\\-array\\<int\\<0, max\\>, string\\>, STN\\?\\: non\\-empty\\-array\\<int\\<0, max\\>, non\\-empty\\-string\\>\\}\\.$#" + message: "#^Offset 'DTN' does not exist on array\\{C_NAME\\: array\\{\\}\\}\\|array\\{C_NAME\\: non\\-empty\\-array\\<int\\<0, max\\>, string\\>, DCN\\: non\\-empty\\-array\\<int\\<0, max\\>, string\\>, DTN\\: non\\-empty\\-array\\<int\\<0, max\\>, non\\-falsy\\-string\\>, SCN\\: non\\-empty\\-array\\<int\\<0, max\\>, string\\>, STN\\: non\\-empty\\-array\\<int\\<0, max\\>, non\\-falsy\\-string\\>\\}\\.$#" count: 1 path: libraries/classes/Database/Designer/Common.php - - message: "#^Offset 'SCN' does not exist on array\\{C_NAME\\: array\\<int\\<0, max\\>, string\\>, DCN\\?\\: non\\-empty\\-array\\<int\\<0, max\\>, string\\>, DTN\\?\\: non\\-empty\\-array\\<int\\<0, max\\>, non\\-empty\\-string\\>, SCN\\?\\: non\\-empty\\-array\\<int\\<0, max\\>, string\\>, STN\\?\\: non\\-empty\\-array\\<int\\<0, max\\>, non\\-empty\\-string\\>\\}\\.$#" + message: "#^Offset 'SCN' does not exist on array\\{C_NAME\\: array\\{\\}\\}\\|array\\{C_NAME\\: non\\-empty\\-array\\<int\\<0, max\\>, string\\>, DCN\\: non\\-empty\\-array\\<int\\<0, max\\>, string\\>, DTN\\: non\\-empty\\-array\\<int\\<0, max\\>, non\\-falsy\\-string\\>, SCN\\: non\\-empty\\-array\\<int\\<0, max\\>, string\\>, STN\\: non\\-empty\\-array\\<int\\<0, max\\>, non\\-falsy\\-string\\>\\}\\.$#" count: 1 path: libraries/classes/Database/Designer/Common.php - - message: "#^Offset 'STN' does not exist on array\\{C_NAME\\: array\\<int\\<0, max\\>, string\\>, DCN\\?\\: non\\-empty\\-array\\<int\\<0, max\\>, string\\>, DTN\\?\\: non\\-empty\\-array\\<int\\<0, max\\>, non\\-empty\\-string\\>, SCN\\?\\: non\\-empty\\-array\\<int\\<0, max\\>, string\\>, STN\\?\\: non\\-empty\\-array\\<int\\<0, max\\>, non\\-empty\\-string\\>\\}\\.$#" + message: "#^Offset 'STN' does not exist on array\\{C_NAME\\: array\\{\\}\\}\\|array\\{C_NAME\\: non\\-empty\\-array\\<int\\<0, max\\>, string\\>, DCN\\: non\\-empty\\-array\\<int\\<0, max\\>, string\\>, DTN\\: non\\-empty\\-array\\<int\\<0, max\\>, non\\-falsy\\-string\\>, SCN\\: non\\-empty\\-array\\<int\\<0, max\\>, string\\>, STN\\: non\\-empty\\-array\\<int\\<0, max\\>, non\\-falsy\\-string\\>\\}\\.$#" count: 2 path: libraries/classes/Database/Designer/Common.php @@ -2431,11 +2431,6 @@ parameters: path: libraries/classes/DatabaseInterface.php - - message: "#^Comparison operation \"\\<\\=\\>\" between \\(array\\|float\\|int\\) and \\(array\\|float\\|int\\) results in an error\\.$#" - count: 1 - path: libraries/classes/DatabaseInterface.php - - - message: "#^Method PhpMyAdmin\\\\DatabaseInterface\\:\\:attachIndexInfoToColumns\\(\\) has parameter \\$fields with no value type specified in iterable type array\\.$#" count: 1 path: libraries/classes/DatabaseInterface.php @@ -2731,16 +2726,6 @@ parameters: path: libraries/classes/Dbal/MysqliResult.php - - message: "#^Binary operation \"\\+\" between array\\<string, bool\\|string\\>\\|string and array\\{default_action\\: 'insert'\\} results in an error\\.$#" - count: 3 - path: libraries/classes/Display/Results.php - - - - message: "#^Binary operation \"\\+\" between array\\<string, bool\\|string\\>\\|string and array\\{default_action\\: 'update'\\} results in an error\\.$#" - count: 3 - path: libraries/classes/Display/Results.php - - - message: "#^Cannot access offset int\\<0, max\\> on mixed\\.$#" count: 2 path: libraries/classes/Display/Results.php @@ -6611,7 +6596,7 @@ parameters: path: libraries/classes/SavedSearches.php - - message: "#^Offset non\\-empty\\-string does not exist on array\\|string\\.$#" + message: "#^Offset non\\-falsy\\-string does not exist on array\\|string\\.$#" count: 1 path: libraries/classes/SavedSearches.php @@ -7781,11 +7766,6 @@ parameters: path: libraries/classes/Tracker.php - - message: "#^Variable \\$dbname on left side of \\?\\? always exists and is not nullable\\.$#" - count: 1 - path: libraries/classes/Tracker.php - - - message: "#^Cannot access offset 'COLUMNS' on mixed\\.$#" count: 1 path: libraries/classes/Tracking.php diff --git a/psalm-baseline.xml b/psalm-baseline.xml index ee9d0d347f..cd6404002a 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<files psalm-version="4.26.0@6998fabb2bf528b65777bf9941920888d23c03ac"> +<files psalm-version="4.27.0@faf106e717c37b8c81721845dba9de3d8deed8ff"> <file src="libraries/classes/Advisory/Advisor.php"> <MixedArgument occurrences="8"> <code>$matches[1]</code> @@ -5572,7 +5572,7 @@ <InvalidReturnType occurrences="1"> <code>int|bool</code> </InvalidReturnType> - <MixedArgument occurrences="48"> + <MixedArgument occurrences="47"> <code>$_SERVER['SCRIPT_NAME']</code> <code>$a</code> <code>$arrayKeys</code> @@ -5597,7 +5597,6 @@ <code>$link</code> <code>$link</code> <code>$password</code> - <code>$server</code> <code>$sql</code> <code>$table</code> <code>$table</code> @@ -13560,17 +13559,11 @@ <RedundantCastGivenDocblockType occurrences="1"> <code>(string) $version</code> </RedundantCastGivenDocblockType> - <RedundantCondition occurrences="1"> - <code>$dbname</code> - </RedundantCondition> <RedundantConditionGivenDocblockType occurrences="3"> <code>$statement->name !== null</code> <code>$statement->name !== null</code> <code>isset($statement->options)</code> </RedundantConditionGivenDocblockType> - <TypeDoesNotContainNull occurrences="1"> - <code>''</code> - </TypeDoesNotContainNull> </file> <file src="libraries/classes/Tracking.php"> <MixedArgument occurrences="47"> |