Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit 11e34a6feced · 2022-06-09T16:43:54.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -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>
diff --git a/test/selenium/TestBase.php b/test/selenium/TestBase.php
@@ -1107,10 +1107,11 @@ protected function tearDown(): void
             $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();
     }

Original file line number	Diff line number	Diff line change
`@@ -1107,10 +1107,11 @@ protected function tearDown(): void`
`1107`	`1107`	$this->dbQuery('DROP DATABASE IF EXISTS `phpmyadmin`;');
`1108`	`1108`	`}`
`1109`	`1109`
`1110`		`- if (! $this->hasFailed()) {`
`1111`		`- $this->markTestAs('passed', '');`
	`1110`	`+ if ($this->hasFailed()) {`
	`1111`	`+ return;`
`1112`	`1112`	`}`
`1113`	`1113`
	`1114`	`+ $this->markTestAs('passed', '');`
`1114`	`1115`	`$this->sqlWindowHandle = null;`
`1115`	`1116`	`$this->webDriver->quit();`
`1116`	`1117`	`}`