diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | psalm-baseline.xml | 3 | ||||
| -rw-r--r-- | test/classes/Controllers/Server/Status/Processes/RefreshControllerTest.php | 4 | ||||
| -rw-r--r-- | test/classes/Stubs/DbiDummy.php | 2 |
4 files changed, 7 insertions, 3 deletions
@@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog - issue #17496 Fix error in table operation page when partitions are broken - issue #17386 Fix system memory and system swap values on Windows - issue #17517 Fix Database Server panel not getting hidden by ShowServerInfo configuration directive +- issue #17271 Fix database names not showing on Processes tab 5.2.0 (2022-05-10) - issue #16521 Upgrade Bootstrap to version 5 diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 24eb45a806..cf427394fe 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -12488,6 +12488,9 @@ <MixedOperand occurrences="1"> <code>$params['sort_order']</code> </MixedOperand> + <RedundantCondition occurrences="1"> + <code>0 !== --$sortableColCount</code> + </RedundantCondition> </file> <file src="libraries/classes/Server/SysInfo/WindowsNt.php"> <MixedArrayAccess occurrences="6"> diff --git a/test/classes/Controllers/Server/Status/Processes/RefreshControllerTest.php b/test/classes/Controllers/Server/Status/Processes/RefreshControllerTest.php index 8835e2deb0..f4ac71e9f9 100644 --- a/test/classes/Controllers/Server/Status/Processes/RefreshControllerTest.php +++ b/test/classes/Controllers/Server/Status/Processes/RefreshControllerTest.php @@ -46,7 +46,7 @@ class RefreshControllerTest extends AbstractTestCase 'User' => 'User1', 'Host' => 'Host1', 'Id' => 'Id1', - 'db' => 'db1', + 'Db' => 'db1', 'Command' => 'Command1', 'Info' => 'Info1', 'State' => 'State1', @@ -95,7 +95,7 @@ class RefreshControllerTest extends AbstractTestCase //validate 4: $process['db'] $this->assertStringContainsString( - __('None'), + $process['Db'], $html ); diff --git a/test/classes/Stubs/DbiDummy.php b/test/classes/Stubs/DbiDummy.php index 726cd0b552..e33e553f40 100644 --- a/test/classes/Stubs/DbiDummy.php +++ b/test/classes/Stubs/DbiDummy.php @@ -2331,7 +2331,7 @@ class DbiDummy implements DbiExtension 'result' => [['Id1', 'User1', 'Host1', 'db1', 'Command1', 'Time1', 'State1', 'Info1']], ], [ - 'query' => 'SELECT * FROM `INFORMATION_SCHEMA`.`PROCESSLIST` ORDER BY `db` ASC', + 'query' => 'SELECT * FROM `INFORMATION_SCHEMA`.`PROCESSLIST` ORDER BY `Db` ASC', 'columns' => ['Id', 'User', 'Host', 'db', 'Command', 'Time', 'State', 'Info'], 'result' => [['Id1', 'User1', 'Host1', 'db1', 'Command1', 'Time1', 'State1', 'Info1']], ], |