From 1a8a2b5c7795544b01d93551f367fc398d08ee54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Tue, 14 Jun 2022 15:04:32 -0300
Subject: [PATCH 1/2] Ignore PHPCS and PHPStan errors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 composer.json         | 1 +
 phpstan-baseline.neon | 5 +++++
 2 files changed, 6 insertions(+)

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/phpstan-baseline.neon b/phpstan-baseline.neon
index f1166a9a40..6371d3f096 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -2955,6 +2955,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

From e87d1795c9512b15c6b9e0ea536c65a34a16f075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Tue, 14 Jun 2022 17:22:57 -0300
Subject: [PATCH 2/2] Reduce initial height of New Routine dialog
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 js/src/database/routines.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/src/database/routines.js b/js/src/database/routines.js
index 7db8410ae9..871c69f0ab 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 = $('<div id="rteDialog">' + data.message + '</div>').dialog({
+                    height: 400,
                     width: 700,
                     minWidth: 500,
                     buttons: that.buttonOptions,