Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit 9fd483de160b · 2022-06-14T17:40:04.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git 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
@@ -292,6 +292,7 @@ const DatabaseRoutines = {
                  * Display the dialog to the user
                  */
                 that.$ajaxDialog = $('<div id="rteDialog">' + data.message + '</div>').dialog({
+                    height: 400,
                     width: 700,
                     minWidth: 500,
                     buttons: that.buttonOptions,
diff --git 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\\<int\\> but returns array\\<int, \\(array\\|float\\|int\\)\\>\\.$#"
+			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
