Remove ignored errors

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index b920cd7fea5b6c07f1aae12a551dec9136eeded3..0a11ddf9f8662791154aeff023301d8c98fb3858 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -398,7 +398,7 @@ if (!$columns && support("table")) {
                                foreach ($unique_array as $key => $val) {
                                        if ((JUSH == "sql" || JUSH == "pgsql") && preg_match('~char|text|enum|set~', $fields[$key]["type"]) && strlen($val) > 64) {
                                                $key = (strpos($key, '(') ? $key : idf_escape($key)); //! columns looking like functions
-                                               $key = "MD5(" . (JUSH != 'sql' || preg_match("~^utf8~", $fields[$key]["collation"]) ? $key : "CONVERT($key USING " . charset($connection) . ")") . ")";
+                                               $key = "MD5(" . (JUSH != 'sql' || preg_match("~^utf8~", $fields[$key]["collation"]) ? $key : "CONVERT($key USING " . charset(connection()) . ")") . ")";
                                                $val = md5($val);
                                        }
                                        $unique_idf .= "&" . ($val !== null ? urlencode("where[" . bracket_escape($key) . "]") . "=" . urlencode($val === false ? "f" : $val) : "null%5B%5D=" . urlencode($key));

diff --git a/phpstan.neon b/phpstan.neon
index 5b3051a47f13ff45cde8bd4486a1b87e862f99e3..c50e9f6779bfab0719c705ff84a720da5f323297 100644 (file)
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -12,7 +12,7 @@ parameters:
                - identifier: includeOnce.fileNotFound # ./adminer-plugins.php
                - "~^Function (set_magic_quotes_runtime|mysql_)~" # PHP < 7 functions
                - "~an unknown class OCI-?Lob~" # this looks like PHPStan bug
-               - "~^Variable \\$(adminer|connection|driver|error|translations) might not be defined~" # declared in bootstrap.inc.php
+               - "~^Variable \\$error might not be defined~" # declared in bootstrap.inc.php
                - "~^Constant LANG not found~" # defined in lang.inc.php
                - "~expects int, float given~" # this will work
                - "~expects bool~" # truthy values