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

Merge pull request #19483 from kamil-tekiela/Remove-unused-lines-from-psalm.xml

Browse Source 
Remove unused lines from psalm.xml
This commit is contained in:
Maurício Meneghini Fauth 2025-01-02 11:29:49 -03:00 committed by GitHub
commit 0df678036e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
psalm-baseline.xml
View File

@ -6463,9 +6463,6 @@
<code><![CDATA[Config::getInstance()]]></code>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<InvalidArgument>
<code><![CDATA[$GLOBALS[$match]]]></code>
</InvalidArgument>
<InvalidReturnStatement>
<code><![CDATA[$GLOBALS[$name] ?? $name ?? '']]></code>
</InvalidReturnStatement>
@ -6490,6 +6487,7 @@
<code><![CDATA[new $class()]]></code>
</MixedMethodCall>
<PossiblyInvalidArgument>
<code><![CDATA[$GLOBALS[$match]]]></code>
<code><![CDATA[$_GET[$opt]]]></code>
<code><![CDATA[$_REQUEST[$opt]]]></code>
<code><![CDATA[$val]]></code>

13
psalm.xml
View File

@ -43,8 +43,6 @@
buffer_needed: bool,
cached_affected_rows: int|numeric-string,
charset: string,
charset_connection: string,
collation_connection: string,
complete_query: string,
compression: 'none'|'zip'|'gzip',
conn_error: string,
@ -58,32 +56,21 @@
error: bool,
excel_edition: 'win'|'mac_excel2003'|'mac_excel2008',
file_handle: resource|null,
finished: bool,
from_cookie: bool,
hostname: string,
import_file: string,
import_file_name: string,
import_text: string,
knjenc: string,
lang: string,
maximum_time: 0|positive-int,
maxsize: string,
memory_limit: int,
offset: int,
old_tz: string,
onfly_compression: bool,
output_charset_conversion: bool,
output_kanji_conversion: bool,
plugin_param: array{export_type: string, single_table: bool},
plugin_scripts: string[],
pma_auth_server: string,
PMA_PHP_SELF: string,
querytime: float|int,
read_limit: int,
save_on_server: bool,
SESSION_KEY: string,
showtable: array&lt;string, string|null&gt;,
tbl_storage_engine: string,
username: string
}"/>
</globals>

2
tests/unit/Controllers/Database/EventsControllerTest.php
View File

@ -23,7 +23,6 @@ final class EventsControllerTest extends AbstractTestCase
public function testWithEvents(): void
{
Current::$server = 2;
$GLOBALS['PMA_PHP_SELF'] = 'index.php';
Current::$database = 'test_db';
Config::getInstance()->selectedServer['DisableIS'] = true;
@ -193,7 +192,6 @@ HTML;
public function testWithoutEvents(): void
{
Current::$server = 2;
$GLOBALS['PMA_PHP_SELF'] = 'index.php';
Current::$database = 'test_db';
Config::getInstance()->selectedServer['DisableIS'] = true;

2
tests/unit/Controllers/Database/RoutinesControllerTest.php
View File

@ -24,7 +24,6 @@ final class RoutinesControllerTest extends AbstractTestCase
public function testWithRoutines(): void
{
Current::$server = 2;
$GLOBALS['PMA_PHP_SELF'] = 'index.php';
Current::$database = 'test_db';
Config::getInstance()->selectedServer['DisableIS'] = true;
@ -246,7 +245,6 @@ HTML;
public function testWithoutRoutines(): void
{
Current::$server = 2;
$GLOBALS['PMA_PHP_SELF'] = 'index.php';
Current::$database = 'test_db';
Config::getInstance()->selectedServer['DisableIS'] = true;

1
tests/unit/Controllers/GisDataEditorControllerTest.php
View File

@ -23,7 +23,6 @@ class GisDataEditorControllerTest extends AbstractTestCase
{
parent::setUp();
$GLOBALS['PMA_PHP_SELF'] = 'index.php';
Current::$database = 'db';
Current::$table = 'table';

2
tests/unit/Controllers/Triggers/IndexControllerTest.php
View File

@ -26,7 +26,6 @@ final class IndexControllerTest extends AbstractTestCase
public function testWithTriggers(): void
{
Current::$server = 2;
$GLOBALS['PMA_PHP_SELF'] = 'index.php';
Current::$database = 'test_db';
Config::getInstance()->selectedServer['DisableIS'] = true;
@ -161,7 +160,6 @@ HTML;
public function testWithoutTriggers(): void
{
Current::$server = 2;
$GLOBALS['PMA_PHP_SELF'] = 'index.php';
Current::$database = 'test_db';
Config::getInstance()->selectedServer['DisableIS'] = true;