diff --git a/composer.json b/composer.json index 4726ad098c..b156cd7fdf 100644 --- a/composer.json +++ b/composer.json @@ -100,6 +100,7 @@ "pragmarx/google2fa-qrcode": "^2.1", "psalm/plugin-phpunit": "^0.16.1", "roave/security-advisories": "dev-latest", + "squizlabs/php_codesniffer": "~3.6.0", "symfony/console": "^5.2.3", "tecnickcom/tcpdf": "^6.4.4", "vimeo/psalm": "^4.22" diff --git a/js/src/database/routines.js b/js/src/database/routines.js index 7a0800f187..bb50a650c7 100644 --- a/js/src/database/routines.js +++ b/js/src/database/routines.js @@ -292,6 +292,7 @@ const DatabaseRoutines = { * Display the dialog to the user */ that.$ajaxDialog = $('
' + data.message + '
').dialog({ + height: 400, width: 700, minWidth: 500, buttons: that.buttonOptions, diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index b7a489eec5..c4f4020dca 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -2790,6 +2790,11 @@ parameters: count: 1 path: libraries/classes/Display/Results.php + - + message: "#^Method PhpMyAdmin\\\\Display\\\\Results\\:\\:getOffsets\\(\\) should return array\\ but returns array\\\\.$#" + count: 1 + path: libraries/classes/Display/Results.php + - message: "#^Method PhpMyAdmin\\\\Display\\\\Results\\:\\:getOptionsBlock\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1