Skip to content

Commit 9fd483d

Browse files
committed
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2 parents b3001e4 + e87d179 commit 9fd483d

File tree

3 files changed

+7
-0
lines changed

3 files changed

+7
-0
lines changed

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@
100100
"pragmarx/google2fa-qrcode": "^2.1",
101101
"psalm/plugin-phpunit": "^0.16.1",
102102
"roave/security-advisories": "dev-latest",
103+
"squizlabs/php_codesniffer": "~3.6.0",
103104
"symfony/console": "^5.2.3",
104105
"tecnickcom/tcpdf": "^6.4.4",
105106
"vimeo/psalm": "^4.22"

js/src/database/routines.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@ const DatabaseRoutines = {
292292
* Display the dialog to the user
293293
*/
294294
that.$ajaxDialog = $('<div id="rteDialog">' + data.message + '</div>').dialog({
295+
height: 400,
295296
width: 700,
296297
minWidth: 500,
297298
buttons: that.buttonOptions,

phpstan-baseline.neon

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2790,6 +2790,11 @@ parameters:
27902790
count: 1
27912791
path: libraries/classes/Display/Results.php
27922792

2793+
-
2794+
message: "#^Method PhpMyAdmin\\\\Display\\\\Results\\:\\:getOffsets\\(\\) should return array\\<int\\> but returns array\\<int, \\(array\\|float\\|int\\)\\>\\.$#"
2795+
count: 1
2796+
path: libraries/classes/Display/Results.php
2797+
27932798
-
27942799
message: "#^Method PhpMyAdmin\\\\Display\\\\Results\\:\\:getOptionsBlock\\(\\) return type has no value type specified in iterable type array\\.$#"
27952800
count: 1

0 commit comments

Comments
 (0)