Skip to content

Commit 30ec978

Browse files
kamil-tekielakamil-tekiela
committed
Remove $GLOBALS['plugin_param']
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
1 parent 8c51321 commit 30ec978

22 files changed

Lines changed: 31 additions & 74 deletions

‎phpstan-baseline.neon‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2745,6 +2745,11 @@ parameters:
27452745
count: 1
27462746
path: src/Controllers/Import/ImportController.php
27472747

2748+
-
2749+
message: "#^Static property PhpMyAdmin\\\\Import\\\\ImportSettings\\:\\:\\$importType \\(''\\|'database'\\|'query'\\|'server'\\|'table'\\) does not accept string\\.$#"
2750+
count: 1
2751+
path: src/Controllers/Import/ImportController.php
2752+
27482753
-
27492754
message: "#^Static property PhpMyAdmin\\\\Import\\\\ImportSettings\\:\\:\\$readLimit \\(int\\) does not accept float\\|int\\<min, \\-1\\>\\|int\\<1, max\\>\\.$#"
27502755
count: 1

‎psalm-baseline.xml‎

Lines changed: 3 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1959,6 +1959,9 @@
19591959
<PossiblyInvalidPropertyAssignmentValue>
19601960
<code><![CDATA[$memoryLimit / 8]]></code>
19611961
</PossiblyInvalidPropertyAssignmentValue>
1962+
<PropertyTypeCoercion>
1963+
<code><![CDATA[(string) $request->getParsedBodyParam('import_type')]]></code>
1964+
</PropertyTypeCoercion>
19621965
<RiskyTruthyFalsyComparison>
19631966
<code><![CDATA[empty($GLOBALS['goto'])]]></code>
19641967
</RiskyTruthyFalsyComparison>
@@ -7764,10 +7767,6 @@
77647767
<code><![CDATA[getFieldNames]]></code>
77657768
<code><![CDATA[numFields]]></code>
77667769
</PossiblyFalseReference>
7767-
<PossiblyInvalidArrayOffset>
7768-
<code><![CDATA[$GLOBALS['plugin_param']['export_type']]]></code>
7769-
<code><![CDATA[$GLOBALS['plugin_param']['single_table']]]></code>
7770-
</PossiblyInvalidArrayOffset>
77717770
<PossiblyInvalidOperand>
77727771
<code><![CDATA[str_replace('_', '/', $mimeMap[$fieldName]['mimetype'])]]></code>
77737772
</PossiblyInvalidOperand>
@@ -7782,9 +7781,6 @@
77827781
<code><![CDATA[$tableAlias]]></code>
77837782
<code><![CDATA[$tableAlias]]></code>
77847783
</PossiblyNullOperand>
7785-
<RiskyTruthyFalsyComparison>
7786-
<code><![CDATA[! $GLOBALS['plugin_param']['single_table']]]></code>
7787-
</RiskyTruthyFalsyComparison>
77887784
</file>
77897785
<file src="src/Plugins/Export/ExportMediawiki.php">
77907786
<DeprecatedMethod>
@@ -7888,10 +7884,6 @@
78887884
<code><![CDATA[$GLOBALS[$GLOBALS['what'] . '_null']]]></code>
78897885
<code><![CDATA[str_replace('_', '/', $mimeMap[$fieldName]['mimetype'])]]></code>
78907886
</PossiblyInvalidArgument>
7891-
<PossiblyInvalidArrayOffset>
7892-
<code><![CDATA[$GLOBALS['plugin_param']['export_type']]]></code>
7893-
<code><![CDATA[$GLOBALS['plugin_param']['single_table']]]></code>
7894-
</PossiblyInvalidArrayOffset>
78957887
<PossiblyNullArgument>
78967888
<code><![CDATA[$row[$j]]]></code>
78977889
<code><![CDATA[$tableAlias]]></code>
@@ -7910,7 +7902,6 @@
79107902
<code><![CDATA[string]]></code>
79117903
</PossiblyUnusedReturnValue>
79127904
<RiskyTruthyFalsyComparison>
7913-
<code><![CDATA[! $GLOBALS['plugin_param']['single_table']]]></code>
79147905
<code><![CDATA[$foreigner]]></code>
79157906
</RiskyTruthyFalsyComparison>
79167907
</file>
@@ -8084,11 +8075,6 @@
80848075
<code><![CDATA[$field->key->columns]]></code>
80858076
<code><![CDATA[$field->references->columns]]></code>
80868077
</MixedPropertyTypeCoercion>
8087-
<PossiblyInvalidArrayOffset>
8088-
<code><![CDATA[$GLOBALS['plugin_param']['export_type']]]></code>
8089-
<code><![CDATA[$GLOBALS['plugin_param']['export_type']]]></code>
8090-
<code><![CDATA[$GLOBALS['plugin_param']['single_table']]]></code>
8091-
</PossiblyInvalidArrayOffset>
80928078
<PossiblyNullArgument>
80938079
<code><![CDATA[$createQuery]]></code>
80948080
<code><![CDATA[$definition]]></code>
@@ -8134,7 +8120,6 @@
81348120
<code><![CDATA[bool]]></code>
81358121
</PossiblyUnusedReturnValue>
81368122
<RiskyTruthyFalsyComparison>
8137-
<code><![CDATA[! $GLOBALS['plugin_param']['single_table']]]></code>
81388123
<code><![CDATA[empty($GLOBALS['exporting_metadata'])]]></code>
81398124
<code><![CDATA[empty($GLOBALS['sql_auto_increment'])]]></code>
81408125
<code><![CDATA[empty($GLOBALS['sql_drop_table'])]]></code>
@@ -14264,12 +14249,6 @@
1426414249
<code><![CDATA[$config->selectedServer]]></code>
1426514250
<code><![CDATA[$config->selectedServer]]></code>
1426614251
</InvalidPropertyAssignmentValue>
14267-
<PossiblyInvalidArrayOffset>
14268-
<code><![CDATA[$GLOBALS['plugin_param']['export_type']]]></code>
14269-
<code><![CDATA[$GLOBALS['plugin_param']['export_type']]]></code>
14270-
<code><![CDATA[$GLOBALS['plugin_param']['single_table']]]></code>
14271-
<code><![CDATA[$GLOBALS['plugin_param']['single_table']]]></code>
14272-
</PossiblyInvalidArrayOffset>
1427314252
</file>
1427414253
<file src="tests/unit/Plugins/Export/ExportOdsTest.php">
1427514254
<TypeDoesNotContainType>
@@ -14289,12 +14268,6 @@
1428914268
<MixedAssignment>
1429014269
<code><![CDATA[$result]]></code>
1429114270
</MixedAssignment>
14292-
<PossiblyInvalidArrayOffset>
14293-
<code><![CDATA[$GLOBALS['plugin_param']['export_type']]]></code>
14294-
<code><![CDATA[$GLOBALS['plugin_param']['export_type']]]></code>
14295-
<code><![CDATA[$GLOBALS['plugin_param']['single_table']]]></code>
14296-
<code><![CDATA[$GLOBALS['plugin_param']['single_table']]]></code>
14297-
</PossiblyInvalidArrayOffset>
1429814271
<TypeDoesNotContainType>
1429914272
<code><![CDATA[assertSame]]></code>
1430014273
</TypeDoesNotContainType>
@@ -14325,12 +14298,6 @@
1432514298
<code><![CDATA[$result]]></code>
1432614299
<code><![CDATA[$result]]></code>
1432714300
</MixedAssignment>
14328-
<PossiblyInvalidArrayOffset>
14329-
<code><![CDATA[$GLOBALS['plugin_param']['export_type']]]></code>
14330-
<code><![CDATA[$GLOBALS['plugin_param']['export_type']]]></code>
14331-
<code><![CDATA[$GLOBALS['plugin_param']['single_table']]]></code>
14332-
<code><![CDATA[$GLOBALS['plugin_param']['single_table']]]></code>
14333-
</PossiblyInvalidArrayOffset>
1433414301
<PossiblyNullArgument>
1433514302
<code><![CDATA[$GLOBALS['sql_constraints']]]></code>
1433614303
<code><![CDATA[$GLOBALS['sql_constraints']]]></code>

‎psalm.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
onfly_compression: bool,
8989
output_charset_conversion: bool,
9090
output_kanji_conversion: bool,
91-
plugin_param: string|array{export_type: string, single_table: bool},
91+
plugin_param: array{export_type: string, single_table: bool},
9292
plugin_scripts: string[],
9393
pma_auth_server: string,
9494
PMA_PHP_SELF: string,

‎src/Controllers/Database/ImportController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ public function __invoke(ServerRequest $request): void
7575

7676
[$GLOBALS['SESSION_KEY'], $uploadId] = Ajax::uploadProgressSetup();
7777

78-
$importList = Plugins::getImport('database');
78+
ImportSettings::$importType = 'database';
79+
$importList = Plugins::getImport();
7980

8081
if ($importList === []) {
8182
$this->response->addHTML(Message::error(__(

‎src/Controllers/Import/ImportController.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,6 @@ public function __invoke(ServerRequest $request): void
483483
$queriesToBeExecuted = [];
484484

485485
if (! $GLOBALS['error']) {
486-
$GLOBALS['plugin_param'] = ImportSettings::$importType;
487486
$importPlugin = new ($importFormat->getClassName());
488487

489488
// Do the real import

‎src/Controllers/Server/ImportController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ public function __invoke(ServerRequest $request): void
5555

5656
[$GLOBALS['SESSION_KEY'], $uploadId] = Ajax::uploadProgressSetup();
5757

58-
$importList = Plugins::getImport('server');
58+
ImportSettings::$importType = 'server';
59+
$importList = Plugins::getImport();
5960

6061
if ($importList === []) {
6162
$this->response->addHTML(Message::error(__(

‎src/Controllers/Table/ImportController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ public function __invoke(ServerRequest $request): void
9595

9696
[$GLOBALS['SESSION_KEY'], $uploadId] = Ajax::uploadProgressSetup();
9797

98-
$importList = Plugins::getImport('table');
98+
ImportSettings::$importType = 'table';
99+
$importList = Plugins::getImport();
99100

100101
if ($importList === []) {
101102
$this->response->addHTML(Message::error(__(

‎src/Import/ImportSettings.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ final class ImportSettings
2626
public static int $timestamp = 0;
2727
public static string $message = '';
2828
public static string $importFile = '';
29+
/** @var 'query'|'table'|'database'|'server'|'' */
2930
public static string $importType = '';
3031
public static string $importFileName = '';
3132
public static string $localImportFile = '';

‎src/Plugins.php‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,16 +95,11 @@ public static function getExport(string $type, bool $singleTable): array
9595
}
9696

9797
/**
98-
* @param string $type server|database|table
99-
* @psalm-param 'server'|'database'|'table' $type
100-
*
10198
* @return ImportPlugin[]
10299
* @psalm-return list<ImportPlugin>
103100
*/
104-
public static function getImport(string $type): array
101+
public static function getImport(): array
105102
{
106-
$GLOBALS['plugin_param'] = $type;
107-
108103
return self::getPlugins('Import');
109104
}
110105

‎src/Plugins/Import/ImportCsv.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ protected function setProperties(): ImportPluginProperties
6363
{
6464
$this->analyze = false;
6565

66-
if ($GLOBALS['plugin_param'] !== 'table') {
66+
if (ImportSettings::$importType !== 'table') {
6767
$this->analyze = true;
6868
}
6969

@@ -79,7 +79,7 @@ protected function setProperties(): ImportPluginProperties
7979

8080
$generalOptions = $this->getGeneralOptions();
8181

82-
if ($GLOBALS['plugin_param'] !== 'table') {
82+
if (ImportSettings::$importType !== 'table') {
8383
$leaf = new TextPropertyItem(
8484
'new_tbl_name',
8585
__(
@@ -88,7 +88,7 @@ protected function setProperties(): ImportPluginProperties
8888
);
8989
$generalOptions->addProperty($leaf);
9090

91-
if ($GLOBALS['plugin_param'] === 'server') {
91+
if (ImportSettings::$importType === 'server') {
9292
$leaf = new TextPropertyItem(
9393
'new_db_name',
9494
__(

0 commit comments

Comments
 (0)