webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-29 21:24:44 +03:00
Code Activity

Merge branch 'QA_5_2'

Browse Source 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth
2022-06-09 16:43:54 -03:00
parent 8116903ba6 d7304c1996
commit 11e34a6fec
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
psalm-baseline.xml
View File

@@ -3160,9 +3160,8 @@
<code>$isUpload</code>
<code>$isUpload</code>
</MixedArgument>
<MixedArgumentTypeCoercion occurrences="4">
<MixedArgumentTypeCoercion occurrences="3">
<code>$GLOBALS['jsvkey']</code>
<code>$GLOBALS['urlParams']</code>
<code>$row_id</code>
<code>$row_id</code>
</MixedArgumentTypeCoercion>

5
test/selenium/TestBase.php
View File

@@ -1107,10 +1107,11 @@ JS;
$this->dbQuery('DROP DATABASE IF EXISTS `phpmyadmin`;');
}
if (! $this->hasFailed()) {
$this->markTestAs('passed', '');
if ($this->hasFailed()) {
return;
}
$this->markTestAs('passed', '');
$this->sqlWindowHandle = null;
$this->webDriver->quit();
}