gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix failing test

Browse Source 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
This commit is contained in:
Kamil Tekiela 2026-01-21 18:11:36 +00:00 committed by Maurício Meneghini Fauth
parent 5db00e0b39
commit d412a0e7d7
No known key found for this signature in database
GPG Key ID: 6A16FD38AFC89CC8
5 changed files with 37 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
phpstan-baseline.neon
View File

@ -16885,7 +16885,7 @@ parameters:
path: tests/unit/UtilTest.php
-
message: '#^Cannot access offset ''server_2'' on mixed\.$#'
message: '#^Cannot access offset ''server_2_'' on mixed\.$#'
identifier: offsetAccess.nonOffsetAccessible
count: 4
path: tests/unit/UtilTest.php
@ -16896,12 +16896,6 @@ parameters:
count: 2
path: tests/unit/UtilTest.php
-
message: '#^Property PhpMyAdmin\\Config\:\:\$selectedServer \(array\{host\: string, port\: string, socket\: string, ssl\: bool, ssl_key\: string\|null, ssl_cert\: string\|null, ssl_ca\: string\|null, ssl_ca_path\: string\|null, \.\.\.\}\) does not accept array\{host\: string, port\: string, socket\: string, ssl\: bool, ssl_key\: string\|null, ssl_cert\: string\|null, ssl_ca\: string\|null, ssl_ca_path\: string\|null, \.\.\.\}\.$#'
identifier: assign.propertyType
count: 1
path: tests/unit/UtilTest.php
-
message: '''
#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\:
@ -16963,7 +16957,7 @@ parameters:
path: tests/unit/Utils/SessionCacheTest.php
-
message: '#^Cannot access offset ''server_2'' on mixed\.$#'
message: '#^Cannot access offset ''server_2_'' on mixed\.$#'
identifier: offsetAccess.nonOffsetAccessible
count: 4
path: tests/unit/Utils/SessionCacheTest.php
@ -16992,12 +16986,6 @@ parameters:
count: 2
path: tests/unit/Utils/SessionCacheTest.php
-
message: '#^Property PhpMyAdmin\\Config\:\:\$selectedServer \(array\{host\: string, port\: string, socket\: string, ssl\: bool, ssl_key\: string\|null, ssl_cert\: string\|null, ssl_ca\: string\|null, ssl_ca_path\: string\|null, \.\.\.\}\) does not accept array\{host\: string, port\: string, socket\: string, ssl\: bool, ssl_key\: string\|null, ssl_cert\: string\|null, ssl_ca\: string\|null, ssl_ca_path\: string\|null, \.\.\.\}\.$#'
identifier: assign.propertyType
count: 5
path: tests/unit/Utils/SessionCacheTest.php
-
message: '''
#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\:

42
psalm-baseline.xml
View File

@ -10826,20 +10826,17 @@
<code><![CDATA[Config::getInstance()]]></code>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidPropertyAssignmentValue>
<code><![CDATA[Config::getInstance()->selectedServer]]></code>
</InvalidPropertyAssignmentValue>
<MixedArgument>
<code><![CDATA[$_SESSION['cache']['server_2']]]></code>
<code><![CDATA[$_SESSION['cache']['server_2']]]></code>
<code><![CDATA[$_SESSION['cache']['server_2_']]]></code>
<code><![CDATA[$_SESSION['cache']['server_2_']]]></code>
</MixedArgument>
<MixedArrayAccess>
<code><![CDATA[$_SESSION['cache']['server_2']]]></code>
<code><![CDATA[$_SESSION['cache']['server_2']]]></code>
<code><![CDATA[$_SESSION['cache']['server_2']]]></code>
<code><![CDATA[$_SESSION['cache']['server_2']]]></code>
<code><![CDATA[$_SESSION['cache']['server_2']['is_superuser']]]></code>
<code><![CDATA[$_SESSION['cache']['server_2']['mysql_cur_user']]]></code>
<code><![CDATA[$_SESSION['cache']['server_2_']]]></code>
<code><![CDATA[$_SESSION['cache']['server_2_']]]></code>
<code><![CDATA[$_SESSION['cache']['server_2_']]]></code>
<code><![CDATA[$_SESSION['cache']['server_2_']]]></code>
<code><![CDATA[$_SESSION['cache']['server_2_']['is_superuser']]]></code>
<code><![CDATA[$_SESSION['cache']['server_2_']['mysql_cur_user']]]></code>
</MixedArrayAccess>
<PossiblyInvalidArgument>
<code><![CDATA[testBackquote]]></code>
@ -10912,24 +10909,17 @@
<code><![CDATA[$_SESSION['cache']]]></code>
<code><![CDATA[$_SESSION['cache']]]></code>
</EmptyArrayAccess>
<InvalidPropertyAssignmentValue>
<code><![CDATA[Config::getInstance()->selectedServer]]></code>
<code><![CDATA[Config::getInstance()->selectedServer]]></code>
<code><![CDATA[Config::getInstance()->selectedServer]]></code>
<code><![CDATA[Config::getInstance()->selectedServer]]></code>
<code><![CDATA[Config::getInstance()->selectedServer]]></code>
</InvalidPropertyAssignmentValue>
<MixedArgument>
<code><![CDATA[$_SESSION['cache']['server_2']]]></code>
<code><![CDATA[$_SESSION['cache']['server_2']]]></code>
<code><![CDATA[$_SESSION['cache']['server_2_']]]></code>
<code><![CDATA[$_SESSION['cache']['server_2_']]]></code>
</MixedArgument>
<MixedArrayAccess>
<code><![CDATA[$_SESSION['cache']['server_2']]]></code>
<code><![CDATA[$_SESSION['cache']['server_2']]]></code>
<code><![CDATA[$_SESSION['cache']['server_2']]]></code>
<code><![CDATA[$_SESSION['cache']['server_2']]]></code>
<code><![CDATA[$_SESSION['cache']['server_2']['test_data']]]></code>
<code><![CDATA[$_SESSION['cache']['server_2']['test_data_3']]]></code>
<code><![CDATA[$_SESSION['cache']['server_2_']]]></code>
<code><![CDATA[$_SESSION['cache']['server_2_']]]></code>
<code><![CDATA[$_SESSION['cache']['server_2_']]]></code>
<code><![CDATA[$_SESSION['cache']['server_2_']]]></code>
<code><![CDATA[$_SESSION['cache']['server_2_']['test_data']]]></code>
<code><![CDATA[$_SESSION['cache']['server_2_']['test_data_3']]]></code>
</MixedArrayAccess>
</file>
<file src="tests/unit/VersionInformationTest.php">

5
src/Utils/SessionCache.php
View File

@ -14,11 +14,8 @@ final class SessionCache
$key = 'server_' . Current::$server;
$config = Config::getInstance();
if (isset($config->selectedServer['user'])) {
return $key . '_' . $config->selectedServer['user'];
}
return $key;
return $key . '_' . $config->selectedServer['user'];
}
public static function has(string $name): bool

10
tests/unit/UtilTest.php
View File

@ -104,17 +104,17 @@ class UtilTest extends AbstractTestCase
public function testClearUserCache(): void
{
Config::getInstance()->selectedServer['user'] = null;
Config::getInstance()->selectedServer['user'] = '';
Current::$server = 2;
SessionCache::set('is_superuser', 'yes');
self::assertSame('yes', $_SESSION['cache']['server_2']['is_superuser']);
self::assertSame('yes', $_SESSION['cache']['server_2_']['is_superuser']);
SessionCache::set('mysql_cur_user', 'mysql');
self::assertSame('mysql', $_SESSION['cache']['server_2']['mysql_cur_user']);
self::assertSame('mysql', $_SESSION['cache']['server_2_']['mysql_cur_user']);
Util::clearUserCache();
self::assertArrayNotHasKey('is_superuser', $_SESSION['cache']['server_2']);
self::assertArrayNotHasKey('mysql_cur_user', $_SESSION['cache']['server_2']);
self::assertArrayNotHasKey('is_superuser', $_SESSION['cache']['server_2_']);
self::assertArrayNotHasKey('mysql_cur_user', $_SESSION['cache']['server_2_']);
}
/**

26
tests/unit/Utils/SessionCacheTest.php
View File

@ -16,7 +16,7 @@ class SessionCacheTest extends TestCase
public function testGet(): void
{
$_SESSION = [];
Config::getInstance()->selectedServer['user'] = null;
Config::getInstance()->selectedServer['user'] = '';
SessionCache::set('test_data', 5);
SessionCache::set('test_data_2', 5);
@ -29,35 +29,35 @@ class SessionCacheTest extends TestCase
public function testRemove(): void
{
$_SESSION = [];
Config::getInstance()->selectedServer['user'] = null;
Config::getInstance()->selectedServer['user'] = '';
Current::$server = 2;
SessionCache::set('test_data', 25);
SessionCache::set('test_data_2', 25);
SessionCache::remove('test_data');
self::assertArrayNotHasKey('test_data', $_SESSION['cache']['server_2']);
self::assertArrayNotHasKey('test_data', $_SESSION['cache']['server_2_']);
SessionCache::remove('test_data_2');
self::assertArrayNotHasKey('test_data_2', $_SESSION['cache']['server_2']);
self::assertArrayNotHasKey('test_data_2', $_SESSION['cache']['server_2_']);
}
public function testSet(): void
{
$_SESSION = [];
Config::getInstance()->selectedServer['user'] = null;
Config::getInstance()->selectedServer['user'] = '';
Current::$server = 2;
SessionCache::set('test_data', 25);
SessionCache::set('test_data', 5);
self::assertSame(5, $_SESSION['cache']['server_2']['test_data']);
self::assertSame(5, $_SESSION['cache']['server_2_']['test_data']);
SessionCache::set('test_data_3', 3);
self::assertSame(3, $_SESSION['cache']['server_2']['test_data_3']);
self::assertSame(3, $_SESSION['cache']['server_2_']['test_data_3']);
}
public function testHas(): void
{
$_SESSION = [];
Config::getInstance()->selectedServer['user'] = null;
Config::getInstance()->selectedServer['user'] = '';
SessionCache::set('test_data', 5);
SessionCache::set('test_data_2', 5);
@ -74,16 +74,16 @@ class SessionCacheTest extends TestCase
public function testKeyWithoutUser(): void
{
$_SESSION = [];
Config::getInstance()->selectedServer['user'] = null;
Config::getInstance()->selectedServer['user'] = '';
Current::$server = 123;
SessionCache::set('test_data', 5);
self::assertArrayHasKey('cache', $_SESSION);
self::assertIsArray($_SESSION['cache']);
self::assertArrayHasKey('server_123', $_SESSION['cache']);
self::assertIsArray($_SESSION['cache']['server_123']);
self::assertArrayHasKey('test_data', $_SESSION['cache']['server_123']);
self::assertSame(5, $_SESSION['cache']['server_123']['test_data']);
self::assertArrayHasKey('server_123_', $_SESSION['cache']);
self::assertIsArray($_SESSION['cache']['server_123_']);
self::assertArrayHasKey('test_data', $_SESSION['cache']['server_123_']);
self::assertSame(5, $_SESSION['cache']['server_123_']['test_data']);
}
public function testKeyWithUser(): void