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

Use getParsedBodyParamAsString (#19333)

Browse Source 
* Use getParsedBodyParamAsString
* Remove unused stubs

---------

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
This commit is contained in:
Kamil Tekiela 2024-10-29 16:07:39 +01:00 committed by GitHub
parent 6944673f2d
commit cf6d5ed4b5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
114 changed files with 488 additions and 1444 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

669
phpstan-baseline.neon
View File

File diff suppressed because it is too large Load Diff

269
psalm-baseline.xml
View File

@ -828,9 +828,6 @@
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Database/CentralColumns/PopulateColumnsController.php">
<MixedArgument>
<code><![CDATA[$request->getParsedBodyParam('selectedTable')]]></code>
</MixedArgument>
<PossiblyUnusedMethod>
<code><![CDATA[__construct]]></code>
</PossiblyUnusedMethod>
@ -866,40 +863,11 @@
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$db]]></code>
<code><![CDATA[$db]]></code>
<code><![CDATA[$db]]></code>
<code><![CDATA[$db]]></code>
<code><![CDATA[$db]]></code>
<code><![CDATA[$db]]></code>
<code><![CDATA[$db]]></code>
<code><![CDATA[$page]]></code>
<code><![CDATA[$position['dbName']]]></code>
<code><![CDATA[$position['tableName']]]></code>
<code><![CDATA[$request->getParsedBodyParam('DB1')]]></code>
<code><![CDATA[$request->getParsedBodyParam('DB2')]]></code>
<code><![CDATA[$request->getParsedBodyParam('F1')]]></code>
<code><![CDATA[$request->getParsedBodyParam('F1')]]></code>
<code><![CDATA[$request->getParsedBodyParam('F2')]]></code>
<code><![CDATA[$request->getParsedBodyParam('F2')]]></code>
<code><![CDATA[$request->getParsedBodyParam('T1')]]></code>
<code><![CDATA[$request->getParsedBodyParam('T1')]]></code>
<code><![CDATA[$request->getParsedBodyParam('T2')]]></code>
<code><![CDATA[$request->getParsedBodyParam('T2')]]></code>
<code><![CDATA[$request->getParsedBodyParam('field')]]></code>
<code><![CDATA[$request->getParsedBodyParam('index')]]></code>
<code><![CDATA[$request->getParsedBodyParam('on_delete')]]></code>
<code><![CDATA[$request->getParsedBodyParam('on_update')]]></code>
<code><![CDATA[$request->getParsedBodyParam('selected_page')]]></code>
<code><![CDATA[$request->getParsedBodyParam('selected_value')]]></code>
<code><![CDATA[$request->getParsedBodyParam('selected_value')]]></code>
<code><![CDATA[$request->getParsedBodyParam('selected_value')]]></code>
<code><![CDATA[$request->getParsedBodyParam('value')]]></code>
<code><![CDATA[$request->getQueryParam('db')]]></code>
<code><![CDATA[$request->getQueryParam('db')]]></code>
<code><![CDATA[$request->getQueryParam('db')]]></code>
<code><![CDATA[$table]]></code>
<code><![CDATA[$table]]></code>
</MixedArgument>
<MixedArrayAccess>
<code><![CDATA[$position['dbName']]]></code>
@ -909,19 +877,20 @@
</MixedArrayAccess>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$db]]></code>
<code><![CDATA[$dialog]]></code>
<code><![CDATA[$operation]]></code>
<code><![CDATA[$page]]></code>
<code><![CDATA[$position]]></code>
<code><![CDATA[$table]]></code>
</MixedAssignment>
<MixedOperand>
<code><![CDATA[$position['dbName']]]></code>
<code><![CDATA[$position['tableName']]]></code>
</MixedOperand>
<PossiblyNullArgument>
<code><![CDATA[$page]]></code>
<code><![CDATA[$db]]></code>
<code><![CDATA[$db]]></code>
<code><![CDATA[$db]]></code>
<code><![CDATA[$db]]></code>
<code><![CDATA[$db]]></code>
<code><![CDATA[$db]]></code>
<code><![CDATA[$table]]></code>
</PossiblyNullArgument>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response]]></code>
@ -1044,7 +1013,6 @@
<file src="src/Controllers/Database/MultiTableQuery/QueryController.php">
<MixedArgument>
<code><![CDATA[$request->getParam('db')]]></code>
<code><![CDATA[$request->getParsedBodyParam('sql_query')]]></code>
</MixedArgument>
<PossiblyUnusedMethod>
<code><![CDATA[__construct]]></code>
@ -1229,13 +1197,9 @@
<code><![CDATA[$GLOBALS['back']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$delimiter]]></code>
</MixedArgument>
<MixedAssignment>
<code><![CDATA[$GLOBALS['back']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$delimiter]]></code>
</MixedAssignment>
<PossiblyUnusedMethod>
<code><![CDATA[__construct]]></code>
@ -1247,9 +1211,6 @@
</PossiblyUnusedMethod>
</file>
<file src="src/Controllers/Database/Structure/AddPrefixTableController.php">
<MixedOperand>
<code><![CDATA[$request->getParsedBodyParam('add_prefix', '')]]></code>
</MixedOperand>
<PossiblyUnusedMethod>
<code><![CDATA[__construct]]></code>
</PossiblyUnusedMethod>
@ -1281,21 +1242,11 @@
</DeprecatedMethod>
</file>
<file src="src/Controllers/Database/Structure/CopyTableController.php">
<MixedArgument>
<code><![CDATA[$request->getParsedBodyParam('what')]]></code>
</MixedArgument>
<PossiblyUnusedMethod>
<code><![CDATA[__construct]]></code>
</PossiblyUnusedMethod>
</file>
<file src="src/Controllers/Database/Structure/CopyTableWithPrefixController.php">
<MixedAssignment>
<code><![CDATA[$fromPrefix]]></code>
<code><![CDATA[$toPrefix]]></code>
</MixedAssignment>
<MixedOperand>
<code><![CDATA[$toPrefix]]></code>
</MixedOperand>
<PossiblyUnusedMethod>
<code><![CDATA[__construct]]></code>
</PossiblyUnusedMethod>
@ -1396,13 +1347,6 @@
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Database/Structure/ReplacePrefixController.php">
<MixedAssignment>
<code><![CDATA[$fromPrefix]]></code>
<code><![CDATA[$toPrefix]]></code>
</MixedAssignment>
<MixedOperand>
<code><![CDATA[$toPrefix]]></code>
</MixedOperand>
<PossiblyUnusedMethod>
<code><![CDATA[__construct]]></code>
</PossiblyUnusedMethod>
@ -1446,7 +1390,6 @@
<code><![CDATA[$replicaInfo['Ignore_Table']]]></code>
<code><![CDATA[$replicaInfo['Wild_Do_Table']]]></code>
<code><![CDATA[$replicaInfo['Wild_Ignore_Table']]]></code>
<code><![CDATA[$request->getParsedBodyParam('primary_connection')]]></code>
<code><![CDATA[$truename]]></code>
</MixedArgument>
<MixedArrayAccess>
@ -1502,9 +1445,6 @@
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$request->getParsedBodyParam('selected')]]></code>
<code><![CDATA[$request->getParsedBodyParam('table')]]></code>
<code><![CDATA[$request->getParsedBodyParam('version')]]></code>
<code><![CDATA[$request->getParsedBodyParam('version')]]></code>
</MixedArgument>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
@ -1588,15 +1528,8 @@
<code><![CDATA[$GLOBALS['sql_query']]]></code>
<code><![CDATA[$GLOBALS['sql_query']]]></code>
<code><![CDATA[$GLOBALS['sql_query']]]></code>
<code><![CDATA[$allrows]]></code>
<code><![CDATA[$allrows]]></code>
<code><![CDATA[$dbSelect]]></code>
<code><![CDATA[$limitFrom]]></code>
<code><![CDATA[$limitFrom]]></code>
<code><![CDATA[$limitTo]]></code>
<code><![CDATA[$limitTo]]></code>
<code><![CDATA[$rememberTemplate]]></code>
<code><![CDATA[$request->getParsedBodyParam('filename_template')]]></code>
</MixedArgument>
<MixedArgumentTypeCoercion>
<code><![CDATA[$GLOBALS['table_data']]]></code>
@ -1716,10 +1649,7 @@
<code><![CDATA[$GLOBALS['xml_export_views']]]></code>
<code><![CDATA[$GLOBALS['xml_structure_or_data']]]></code>
<code><![CDATA[$GLOBALS['yaml_structure_or_data']]]></code>
<code><![CDATA[$allrows]]></code>
<code><![CDATA[$dbSelect]]></code>
<code><![CDATA[$limitFrom]]></code>
<code><![CDATA[$limitTo]]></code>
<code><![CDATA[$rememberTemplate]]></code>
<code><![CDATA[$tableNames]]></code>
<code><![CDATA[$tableStructure]]></code>
@ -1878,7 +1808,6 @@
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$GLOBALS['show_query']]]></code>
<code><![CDATA[Current::$database]]></code>
</MixedAssignment>
<PossiblyNullArgument>
<code><![CDATA[$this->config->get('TempDir')]]></code>
@ -1942,7 +1871,7 @@
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
<PropertyTypeCoercion>
<code><![CDATA[(string) $request->getParsedBodyParam('import_type')]]></code>
<code><![CDATA[$request->getParsedBodyParamAsString('import_type', '')]]></code>
</PropertyTypeCoercion>
<RiskyTruthyFalsyComparison>
<code><![CDATA[empty($GLOBALS['goto'])]]></code>
@ -1987,20 +1916,6 @@
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/NavigationController.php">
<MixedArgument>
<code><![CDATA[$dbName]]></code>
<code><![CDATA[$dbName]]></code>
<code><![CDATA[$dbName]]></code>
<code><![CDATA[$itemName]]></code>
<code><![CDATA[$itemName]]></code>
<code><![CDATA[$itemType]]></code>
<code><![CDATA[$itemType]]></code>
</MixedArgument>
<MixedAssignment>
<code><![CDATA[$dbName]]></code>
<code><![CDATA[$itemName]]></code>
<code><![CDATA[$itemType]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
@ -2016,9 +1931,6 @@
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Normalization/FirstNormalForm/FirstStepController.php">
<MixedAssignment>
<code><![CDATA[$normalizeTo]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
@ -2049,18 +1961,6 @@
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Normalization/MoveRepeatingGroup.php">
<MixedArgument>
<code><![CDATA[$newColumn]]></code>
<code><![CDATA[$newTable]]></code>
<code><![CDATA[$primaryColumns]]></code>
<code><![CDATA[$repeatingColumns]]></code>
</MixedArgument>
<MixedAssignment>
<code><![CDATA[$newColumn]]></code>
<code><![CDATA[$newTable]]></code>
<code><![CDATA[$primaryColumns]]></code>
<code><![CDATA[$repeatingColumns]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
@ -2073,8 +1973,6 @@
<file src="src/Controllers/Normalization/SecondNormalForm/CreateNewTablesController.php">
<MixedArgument>
<code><![CDATA[$partialDependencies]]></code>
<code><![CDATA[$request->getParsedBodyParam('newTablesName')]]></code>
<code><![CDATA[$request->getParsedBodyParam('pd')]]></code>
<code><![CDATA[$tablesName]]></code>
</MixedArgument>
<MixedAssignment>
@ -2093,7 +1991,6 @@
<file src="src/Controllers/Normalization/SecondNormalForm/NewTablesController.php">
<MixedArgument>
<code><![CDATA[$partialDependencies]]></code>
<code><![CDATA[$request->getParsedBodyParam('pd')]]></code>
</MixedArgument>
<MixedAssignment>
<code><![CDATA[$partialDependencies]]></code>
@ -2105,7 +2002,6 @@
<file src="src/Controllers/Normalization/ThirdNormalForm/CreateNewTablesController.php">
<MixedArgument>
<code><![CDATA[$newtables]]></code>
<code><![CDATA[$request->getParsedBodyParam('newTables')]]></code>
</MixedArgument>
<MixedAssignment>
<code><![CDATA[$newtables]]></code>
@ -2128,8 +2024,6 @@
<file src="src/Controllers/Normalization/ThirdNormalForm/NewTablesController.php">
<MixedArgument>
<code><![CDATA[$dependencies]]></code>
<code><![CDATA[$request->getParsedBodyParam('pd')]]></code>
<code><![CDATA[$request->getParsedBodyParam('tables')]]></code>
<code><![CDATA[$tables]]></code>
</MixedArgument>
<MixedAssignment>
@ -2147,19 +2041,12 @@
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$dbCollation]]></code>
</MixedArgument>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$dbCollation]]></code>
</MixedAssignment>
<PossiblyUnusedMethod>
<code><![CDATA[__construct]]></code>
</PossiblyUnusedMethod>
<RiskyTruthyFalsyComparison>
<code><![CDATA[empty($dbCollation)]]></code>
</RiskyTruthyFalsyComparison>
</file>
<file src="src/Controllers/Operations/DatabaseController.php">
<ArgumentTypeCoercion>
@ -2173,7 +2060,6 @@
<code><![CDATA[$GLOBALS['single_table']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$request->getParsedBodyParam('comment')]]></code>
<code><![CDATA[Current::$database]]></code>
<code><![CDATA[Current::$database]]></code>
<code><![CDATA[Current::$database]]></code>
@ -2250,15 +2136,9 @@
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['hash']]]></code>
<code><![CDATA[$GLOBALS['tabHash']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$GLOBALS['tabHash']]]></code>
</MixedArgument>
<MixedAssignment>
<code><![CDATA[$GLOBALS['hash']]]></code>
<code><![CDATA[$GLOBALS['tabHash']]]></code>
<code><![CDATA[$GLOBALS['tabHash']]]></code>
</MixedAssignment>
<PossiblyUnusedMethod>
<code><![CDATA[__construct]]></code>
@ -2270,15 +2150,9 @@
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['hash']]]></code>
<code><![CDATA[$GLOBALS['tabHash']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$GLOBALS['tabHash']]]></code>
</MixedArgument>
<MixedAssignment>
<code><![CDATA[$GLOBALS['hash']]]></code>
<code><![CDATA[$GLOBALS['tabHash']]]></code>
<code><![CDATA[$GLOBALS['tabHash']]]></code>
</MixedAssignment>
<PossiblyUnusedMethod>
<code><![CDATA[__construct]]></code>
@ -2290,15 +2164,9 @@
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['hash']]]></code>
<code><![CDATA[$GLOBALS['tabHash']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$GLOBALS['tabHash']]]></code>
</MixedArgument>
<MixedAssignment>
<code><![CDATA[$GLOBALS['hash']]]></code>
<code><![CDATA[$GLOBALS['tabHash']]]></code>
<code><![CDATA[$GLOBALS['tabHash']]]></code>
</MixedAssignment>
<PossiblyUnusedMethod>
<code><![CDATA[__construct]]></code>
@ -2310,15 +2178,9 @@
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['hash']]]></code>
<code><![CDATA[$GLOBALS['tabHash']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$GLOBALS['tabHash']]]></code>
</MixedArgument>
<MixedAssignment>
<code><![CDATA[$GLOBALS['hash']]]></code>
<code><![CDATA[$GLOBALS['tabHash']]]></code>
<code><![CDATA[$GLOBALS['tabHash']]]></code>
</MixedAssignment>
<PossiblyUnusedMethod>
<code><![CDATA[__construct]]></code>
@ -2334,8 +2196,6 @@
<MixedArgument>
<code><![CDATA[$configuration['ThemeDefault']]]></code>
<code><![CDATA[$configuration['ThemeDefault']]]></code>
<code><![CDATA[$json]]></code>
<code><![CDATA[$returnUrl]]></code>
</MixedArgument>
<MixedArgumentTypeCoercion>
<code><![CDATA[$key]]></code>
@ -2344,9 +2204,7 @@
<code><![CDATA[$GLOBALS['query']]]></code>
<code><![CDATA[$_POST[str_replace('/', '-', (string) $k)]]]></code>
<code><![CDATA[$configuration]]></code>
<code><![CDATA[$json]]></code>
<code><![CDATA[$redirectParams['lang']]]></code>
<code><![CDATA[$returnUrl]]></code>
<code><![CDATA[$v]]></code>
<code><![CDATA[$val]]></code>
</MixedAssignment>
@ -2387,15 +2245,9 @@
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['hash']]]></code>
<code><![CDATA[$GLOBALS['tabHash']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$GLOBALS['tabHash']]]></code>
</MixedArgument>
<MixedAssignment>
<code><![CDATA[$GLOBALS['hash']]]></code>
<code><![CDATA[$GLOBALS['tabHash']]]></code>
<code><![CDATA[$GLOBALS['tabHash']]]></code>
</MixedAssignment>
<PossiblyUnusedMethod>
<code><![CDATA[__construct]]></code>
@ -2407,15 +2259,9 @@
</DeprecatedMethod>
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['hash']]]></code>
<code><![CDATA[$GLOBALS['tabHash']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$GLOBALS['tabHash']]]></code>
</MixedArgument>
<MixedAssignment>
<code><![CDATA[$GLOBALS['hash']]]></code>
<code><![CDATA[$GLOBALS['tabHash']]]></code>
<code><![CDATA[$GLOBALS['tabHash']]]></code>
</MixedAssignment>
<PossiblyUnusedMethod>
<code><![CDATA[__construct]]></code>
@ -2425,9 +2271,6 @@
<DeprecatedMethod>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<MixedArgument>
<code><![CDATA[$request->getParsedBodyParam('2fa_configure')]]></code>
</MixedArgument>
<PossiblyUnusedMethod>
<code><![CDATA[__construct]]></code>
</PossiblyUnusedMethod>
@ -2436,14 +2279,6 @@
<DeprecatedMethod>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<MixedArgument>
<code><![CDATA[$log]]></code>
<code><![CDATA[$log ?? '']]></code>
</MixedArgument>
<MixedAssignment>
<code><![CDATA[$log]]></code>
<code><![CDATA[$urlParams['log']]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
@ -2460,9 +2295,6 @@
<DeprecatedMethod>
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<MixedAssignment>
<code><![CDATA[$dbCollation]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
@ -2504,7 +2336,6 @@
<code><![CDATA[$replicaInfo['Do_DB']]]></code>
<code><![CDATA[$replicaInfo['Do_DB']]]></code>
<code><![CDATA[$replicaInfo['Ignore_DB']]]></code>
<code><![CDATA[$request->getParsedBodyParam('primary_connection')]]></code>
</MixedArgument>
<MixedArgumentTypeCoercion>
<code><![CDATA[['db' => $database['SCHEMA_NAME']]]]></code>
@ -2618,11 +2449,6 @@
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$dbName ?? '']]></code>
<code><![CDATA[$request->getParsedBodyParam('old_hostname')]]></code>
<code><![CDATA[$request->getParsedBodyParam('old_hostname', '')]]></code>
<code><![CDATA[$request->getParsedBodyParam('old_username')]]></code>
<code><![CDATA[$request->getParsedBodyParam('old_username', '')]]></code>
<code><![CDATA[$request->getParsedBodyParam('userGroup', '')]]></code>
<code><![CDATA[$request->getQueryParam('initial')]]></code>
<code><![CDATA[$urlDbname ?? '']]></code>
<code><![CDATA[$urlDbname ?? '']]></code>
@ -2656,9 +2482,6 @@
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$replicaInfo['status']]]></code>
<code><![CDATA[$request->getParsedBodyParam('hostname', '')]]></code>
<code><![CDATA[$request->getParsedBodyParam('pma_pw', '')]]></code>
<code><![CDATA[$request->getParsedBodyParam('username', '')]]></code>
</MixedArgument>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
@ -2695,12 +2518,8 @@
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$requiredData]]></code>
</MixedArgument>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$requiredData]]></code>
</MixedAssignment>
<PossiblyUnusedMethod>
<code><![CDATA[__construct]]></code>
@ -2721,10 +2540,6 @@
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$request->getParsedBodyParam('varName')]]></code>
<code><![CDATA[$request->getParsedBodyParam('varValue')]]></code>
</MixedArgument>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</MixedAssignment>
@ -2736,10 +2551,6 @@
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$request->getParsedBodyParam('database', '')]]></code>
<code><![CDATA[$request->getParsedBodyParam('query', '')]]></code>
</MixedArgument>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</MixedAssignment>
@ -2809,8 +2620,6 @@
</file>
<file src="src/Controllers/Server/Status/StatusController.php">
<MixedArgument>
<code><![CDATA[$primaryConnection]]></code>
<code><![CDATA[$primaryConnection]]></code>
<code><![CDATA[$this->data->status['Aborted_clients']]]></code>
<code><![CDATA[$this->data->status['Aborted_clients'] * $hourFactor]]></code>
<code><![CDATA[$this->data->status['Aborted_clients'] * 100 / $this->data->status['Connections']]]></code>
@ -2831,7 +2640,6 @@
<MixedAssignment>
<code><![CDATA[$hourFactor]]></code>
<code><![CDATA[$hourFactor]]></code>
<code><![CDATA[$primaryConnection]]></code>
</MixedAssignment>
<MixedOperand>
<code><![CDATA[$this->data->status['Aborted_clients']]]></code>
@ -2894,12 +2702,6 @@
</UnusedVariable>
</file>
<file src="src/Controllers/Server/UserGroupsController.php">
<MixedArgument>
<code><![CDATA[$request->getParsedBodyParam('userGroup')]]></code>
<code><![CDATA[$request->getParsedBodyParam('userGroup')]]></code>
<code><![CDATA[$request->getParsedBodyParam('userGroup')]]></code>
<code><![CDATA[$request->getParsedBodyParam('userGroup')]]></code>
</MixedArgument>
<PossiblyUnusedMethod>
<code><![CDATA[__construct]]></code>
</PossiblyUnusedMethod>
@ -2981,10 +2783,6 @@
</PossiblyUnusedMethod>
</file>
<file src="src/Controllers/Sql/EnumValuesController.php">
<MixedAssignment>
<code><![CDATA[$column]]></code>
<code><![CDATA[$currValue]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
@ -2993,27 +2791,11 @@
<MixedArrayAccess>
<code><![CDATA[$_SESSION['tmpval']['relational_display']]]></code>
</MixedArrayAccess>
<MixedAssignment>
<code><![CDATA[$column]]></code>
<code><![CDATA[$currValue]]></code>
<code><![CDATA[$currValue]]></code>
<code><![CDATA[$relationKeyOrDisplayColumn]]></code>
</MixedAssignment>
<PossiblyUnusedMethod>
<code><![CDATA[__construct]]></code>
</PossiblyUnusedMethod>
</file>
<file src="src/Controllers/Sql/SetValuesController.php">
<MixedArgument>
<code><![CDATA[$column]]></code>
<code><![CDATA[$currentValue]]></code>
<code><![CDATA[$whereClause]]></code>
</MixedArgument>
<MixedAssignment>
<code><![CDATA[$column]]></code>
<code><![CDATA[$currentValue]]></code>
<code><![CDATA[$whereClause]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
@ -3206,10 +2988,6 @@
<code><![CDATA[$_POST['field_transformation'][$fieldindex]]]></code>
<code><![CDATA[$_POST['field_transformation_options'][$fieldindex]]]></code>
</MixedArgument>
<MixedAssignment>
<code><![CDATA[$numFields]]></code>
<code><![CDATA[$origNumFields]]></code>
</MixedAssignment>
<PossiblyInvalidArgument>
<code><![CDATA[$_POST['field_input_transformation'][$fieldindex]]]></code>
<code><![CDATA[$_POST['field_input_transformation_options'][$fieldindex]]]></code>
@ -3265,13 +3043,11 @@
<MixedArgument>
<code><![CDATA[$GLOBALS['disp_message'] ?? null]]></code>
<code><![CDATA[$GLOBALS['disp_query'] ?? null]]></code>
<code><![CDATA[$GLOBALS['sql_query']]]></code>
<code><![CDATA[$row]]></code>
</MixedArgument>
<MixedAssignment>
<code><![CDATA[$GLOBALS['disp_message']]]></code>
<code><![CDATA[$GLOBALS['disp_query']]]></code>
<code><![CDATA[$GLOBALS['sql_query']]]></code>
<code><![CDATA[$row]]></code>
</MixedAssignment>
<PossiblyInvalidIterator>
@ -3455,15 +3231,8 @@
<InvalidArrayOffset>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$indexName]]></code>
<code><![CDATA[$indexName]]></code>
<code><![CDATA[$oldIndexName]]></code>
</MixedArgument>
<MixedAssignment>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$indexName]]></code>
<code><![CDATA[$oldIndexName]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response]]></code>
@ -3660,12 +3429,8 @@
<code><![CDATA[$multiEditFuncs[$key] ?? '']]></code>
<code><![CDATA[$multiEditSalt[$key] ?? null]]></code>
<code><![CDATA[$oneWhereClause]]></code>
<code><![CDATA[$relFieldsList]]></code>
<code><![CDATA[$relationField]]></code>
<code><![CDATA[$relationFieldValue]]></code>
<code><![CDATA[$request->getParsedBodyParam('db')]]></code>
<code><![CDATA[$request->getParsedBodyParam('table')]]></code>
<code><![CDATA[$request->getParsedBodyParam('transform_fields_list')]]></code>
</MixedArgument>
<MixedArrayAccess>
<code><![CDATA[$extraData['relations']]]></code>
@ -3694,7 +3459,6 @@
<code><![CDATA[$GLOBALS['unsaved_values']]]></code>
<code><![CDATA[$GLOBALS['unsaved_values'][$rowNumber]]]></code>
<code><![CDATA[$GLOBALS['urlParams']['where_clause'][]]]></code>
<code><![CDATA[$afterInsert]]></code>
<code><![CDATA[$clauseIsUnique]]></code>
<code><![CDATA[$columnName]]></code>
<code><![CDATA[$columnName]]></code>
@ -3712,7 +3476,6 @@
<code><![CDATA[$multiEditSalt]]></code>
<code><![CDATA[$multiEditVirtual]]></code>
<code><![CDATA[$oneWhereClause]]></code>
<code><![CDATA[$relFieldsList]]></code>
<code><![CDATA[$relationField]]></code>
<code><![CDATA[$relationFieldValue]]></code>
<code><![CDATA[$submitType]]></code>
@ -3776,13 +3539,11 @@
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$delimiter]]></code>
<code><![CDATA[$request->getQueryParam('sql_query', true)]]></code>
</MixedArgument>
<MixedAssignment>
<code><![CDATA[$GLOBALS['back']]]></code>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$delimiter]]></code>
</MixedAssignment>
</file>
<file src="src/Controllers/Table/Structure/BrowseController.php">
@ -3806,9 +3567,6 @@
</RiskyTruthyFalsyComparison>
</file>
<file src="src/Controllers/Table/Structure/CentralColumnsAddController.php">
<MixedArgument>
<code><![CDATA[$request->getParsedBodyParam('table')]]></code>
</MixedArgument>
<PossiblyUnusedMethod>
<code><![CDATA[__construct]]></code>
</PossiblyUnusedMethod>
@ -4108,9 +3866,6 @@
</RiskyTruthyFalsyComparison>
</file>
<file src="src/Controllers/TableController.php">
<MixedArgument>
<code><![CDATA[$request->getParsedBodyParam('db')]]></code>
</MixedArgument>
<PossiblyUnusedMethod>
<code><![CDATA[__construct]]></code>
</PossiblyUnusedMethod>
@ -4203,17 +3958,9 @@
</InvalidArrayOffset>
<MixedArgument>
<code><![CDATA[$message->getDisplay()]]></code>
<code><![CDATA[$password]]></code>
<code><![CDATA[$pmaPw]]></code>
<code><![CDATA[$pmaPw2]]></code>
<code><![CDATA[$request->getParsedBodyParam('authentication_plugin')]]></code>
</MixedArgument>
<MixedAssignment>
<code><![CDATA[$GLOBALS['change_password_message']]]></code>
<code><![CDATA[$noPass]]></code>
<code><![CDATA[$password]]></code>
<code><![CDATA[$pmaPw]]></code>
<code><![CDATA[$pmaPw2]]></code>
</MixedAssignment>
<MixedMethodCall>
<code><![CDATA[getDisplay]]></code>

26
src/Controllers/BrowseForeignersController.php
View File

@ -24,22 +24,14 @@ final class BrowseForeignersController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
/** @var string|null $database */
$database = $request->getParsedBodyParam('db');
/** @var string|null $table */
$table = $request->getParsedBodyParam('table');
/** @var string|null $field */
$field = $request->getParsedBodyParam('field');
/** @var string $fieldKey */
$fieldKey = $request->getParsedBodyParam('fieldkey', '');
/** @var string $data */
$data = $request->getParsedBodyParam('data', '');
/** @var string|null $foreignShowAll */
$foreignShowAll = $request->getParsedBodyParam('foreign_showAll');
/** @var string $foreignFilter */
$foreignFilter = $request->getParsedBodyParam('foreign_filter', '');
/** @var string|null $rownumber */
$rownumber = $request->getParsedBodyParam('rownumber');
$database = $request->getParsedBodyParamAsStringOrNull('db');
$table = $request->getParsedBodyParamAsStringOrNull('table');
$field = $request->getParsedBodyParamAsStringOrNull('field');
$fieldKey = $request->getParsedBodyParamAsString('fieldkey', '');
$data = $request->getParsedBodyParamAsString('data', '');
$foreignShowAll = $request->getParsedBodyParamAsStringOrNull('foreign_showAll');
$foreignFilter = $request->getParsedBodyParamAsString('foreign_filter', '');
$rownumber = $request->getParsedBodyParamAsStringOrNull('rownumber');
if (! isset($database, $table, $field)) {
return $this->response->response();
@ -50,7 +42,7 @@ final class BrowseForeignersController implements InvocableController
$header->disableMenuAndConsole();
$header->setBodyId('body_browse_foreigners');
$pos = (int) $request->getParsedBodyParam('pos');
$pos = (int) $request->getParsedBodyParamAsStringOrNull('pos');
$foreignLimit = $this->browseForeigners->getForeignLimit($foreignShowAll, $pos);
$foreignData = $this->relation->getForeignData(
$this->relation->getForeigners($database, $table),

15
src/Controllers/Console/Bookmark/AddController.php
View File

@ -12,7 +12,6 @@ use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\ResponseRenderer;
use function __;
use function is_string;
final class AddController implements InvocableController
{
@ -24,16 +23,10 @@ final class AddController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$db = $request->getParsedBodyParam('db');
$label = $request->getParsedBodyParam('label');
$bookmarkQuery = $request->getParsedBodyParam('bookmark_query');
$shared = $request->getParsedBodyParam('shared');
if (! is_string($label) || ! is_string($db) || ! is_string($bookmarkQuery) || ! is_string($shared)) {
$this->response->addJSON('message', __('Incomplete params'));
return $this->response->response();
}
$db = $request->getParsedBodyParamAsString('db');
$label = $request->getParsedBodyParamAsString('label');
$bookmarkQuery = $request->getParsedBodyParamAsString('bookmark_query');
$shared = $request->getParsedBodyParamAsString('shared');
$bookmark = $this->bookmarkRepository->createBookmark(
$bookmarkQuery,

2
src/Controllers/Database/CentralColumns/PopulateColumnsController.php
View File

@ -23,7 +23,7 @@ final class PopulateColumnsController implements InvocableController
{
$columns = $this->centralColumns->getColumnsNotInCentralList(
Current::$database,
$request->getParsedBodyParam('selectedTable'),
$request->getParsedBodyParamAsString('selectedTable'),
);
$this->response->render('database/central_columns/populate_columns', ['columns' => $columns]);

63
src/Controllers/Database/DesignerController.php
View File

@ -41,12 +41,12 @@ final class DesignerController implements InvocableController
$GLOBALS['message'] ??= null;
$GLOBALS['errorUrl'] ??= null;
$db = $request->getParsedBodyParam('db');
$table = $request->getParsedBodyParam('table');
$db = $request->getParsedBodyParamAsStringOrNull('db');
$table = $request->getParsedBodyParamAsStringOrNull('table');
if ($request->hasBodyParam('dialog')) {
$html = '';
$dialog = $request->getParsedBodyParam('dialog');
$dialog = $request->getParsedBodyParamAsString('dialog');
if ($dialog === 'edit') {
$html = $this->databaseDesigner->getHtmlForEditOrDeletePages($db, 'editPage');
} elseif ($dialog === 'delete') {
@ -56,7 +56,7 @@ final class DesignerController implements InvocableController
} elseif ($dialog === 'export') {
$html = $this->databaseDesigner->getHtmlForSchemaExport(
$db,
(int) $request->getParsedBodyParam('selected_page'),
(int) $request->getParsedBodyParamAsStringOrNull('selected_page'),
);
} elseif ($dialog === 'add_table') {
// Pass the db and table to the getTablesInfo so we only have the table we asked for
@ -85,65 +85,74 @@ final class DesignerController implements InvocableController
}
if ($request->hasBodyParam('operation')) {
$operation = $request->getParsedBodyParam('operation');
$operation = $request->getParsedBodyParamAsString('operation');
if ($operation === 'deletePage') {
$success = $this->designerCommon->deletePage($request->getParsedBodyParam('selected_page'));
$success = $this->designerCommon->deletePage(
(int) $request->getParsedBodyParamAsString('selected_page'),
);
$this->response->setRequestStatus($success);
} elseif ($operation === 'savePage') {
if ($request->getParsedBodyParam('save_page') === 'same') {
$page = $request->getParsedBodyParam('selected_page');
} elseif ($this->designerCommon->getPageExists($request->getParsedBodyParam('selected_value'))) {
if ($request->getParsedBodyParamAsString('save_page') === 'same') {
$page = $request->getParsedBodyParamAsString('selected_page');
} elseif (
$this->designerCommon->getPageExists(
$request->getParsedBodyParamAsString('selected_value'),
)
) {
$this->response->addJSON(
'message',
sprintf(
/* l10n: The user tries to save a page with an existing name in Designer */
__('There already exists a page named "%s" please rename it to something else.'),
htmlspecialchars($request->getParsedBodyParam('selected_value')),
htmlspecialchars($request->getParsedBodyParamAsString('selected_value')),
),
);
$this->response->setRequestStatus(false);
return $this->response->response();
} else {
$page = $this->designerCommon->createNewPage($request->getParsedBodyParam('selected_value'), $db);
$page = $this->designerCommon->createNewPage(
$request->getParsedBodyParamAsString('selected_value'),
$db,
);
$this->response->addJSON('id', $page);
}
$success = $this->designerCommon->saveTablePositions($page);
$success = $this->designerCommon->saveTablePositions((int) $page);
$this->response->setRequestStatus($success);
} elseif ($operation === 'setDisplayField') {
[
$success,
$GLOBALS['message'],
] = $this->designerCommon->saveDisplayField($db, $table, $request->getParsedBodyParam('field'));
] = $this->designerCommon->saveDisplayField($db, $table, $request->getParsedBodyParamAsString('field'));
$this->response->setRequestStatus($success);
$this->response->addJSON('message', $GLOBALS['message']);
} elseif ($operation === 'addNewRelation') {
[$success, $GLOBALS['message']] = $this->designerCommon->addNewRelation(
$request->getParsedBodyParam('T1'),
$request->getParsedBodyParam('F1'),
$request->getParsedBodyParam('T2'),
$request->getParsedBodyParam('F2'),
$request->getParsedBodyParam('on_delete'),
$request->getParsedBodyParam('on_update'),
$request->getParsedBodyParam('DB1'),
$request->getParsedBodyParam('DB2'),
$request->getParsedBodyParamAsString('T1'),
$request->getParsedBodyParamAsString('F1'),
$request->getParsedBodyParamAsString('T2'),
$request->getParsedBodyParamAsString('F2'),
$request->getParsedBodyParamAsString('on_delete'),
$request->getParsedBodyParamAsString('on_update'),
$request->getParsedBodyParamAsString('DB1'),
$request->getParsedBodyParamAsString('DB2'),
);
$this->response->setRequestStatus($success);
$this->response->addJSON('message', $GLOBALS['message']);
} elseif ($operation === 'removeRelation') {
[$success, $GLOBALS['message']] = $this->designerCommon->removeRelation(
$request->getParsedBodyParam('T1'),
$request->getParsedBodyParam('F1'),
$request->getParsedBodyParam('T2'),
$request->getParsedBodyParam('F2'),
$request->getParsedBodyParamAsString('T1'),
$request->getParsedBodyParamAsString('F1'),
$request->getParsedBodyParamAsString('T2'),
$request->getParsedBodyParamAsString('F2'),
);
$this->response->setRequestStatus($success);
$this->response->addJSON('message', $GLOBALS['message']);
} elseif ($operation === 'save_setting_value') {
$success = $this->designerCommon->saveSetting(
$request->getParsedBodyParam('index'),
$request->getParsedBodyParam('value'),
$request->getParsedBodyParamAsString('index'),
$request->getParsedBodyParamAsString('value'),
);
$this->response->setRequestStatus($success);
}

2
src/Controllers/Database/MultiTableQuery/QueryController.php
View File

@ -19,7 +19,7 @@ final class QueryController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$this->response->addHTML(MultiTableQuery::displayResults(
$request->getParsedBodyParam('sql_query'),
$request->getParsedBodyParamAsString('sql_query'),
$request->getParam('db'),
));

2
src/Controllers/Database/SqlController.php
View File

@ -76,7 +76,7 @@ class SqlController implements InvocableController
*/
$GLOBALS['goto'] = Url::getFromRoute('/database/sql');
$GLOBALS['back'] = $GLOBALS['goto'];
$delimiter = $request->getParsedBodyParam('delimiter', ';');
$delimiter = $request->getParsedBodyParamAsString('delimiter', ';');
$this->response->addHTML($this->sqlQueryForm->getHtml(
Current::$database,

5
src/Controllers/Database/SqlFormatController.php
View File

@ -21,9 +21,8 @@ final class SqlFormatController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
/** @var string $query */
$query = $request->getParsedBodyParam('sql', '');
if ($request->getParsedBodyParam('formatSingleLine') === 'true') {
$query = $request->getParsedBodyParamAsString('sql', '');
if ($request->getParsedBodyParamAsString('formatSingleLine') === 'true') {
$this->response->addJSON(['sql' => Formatter::format($query, ['line_ending' => ' ', 'indentation' => ''])]);
} else {
$this->response->addJSON(['sql' => Formatter::format($query)]);

2
src/Controllers/Database/Structure/AddPrefixTableController.php
View File

@ -31,7 +31,7 @@ final class AddPrefixTableController implements InvocableController
$this->dbi->selectDb(Current::$database);
foreach ($selected as $selectedValue) {
$newTableName = $request->getParsedBodyParam('add_prefix', '') . $selectedValue;
$newTableName = $request->getParsedBodyParamAsString('add_prefix', '') . $selectedValue;
$aQuery = 'ALTER TABLE ' . Util::backquote($selectedValue) . ' RENAME ' . Util::backquote($newTableName);
$GLOBALS['sql_query'] .= $aQuery . ';' . "\n";

5
src/Controllers/Database/Structure/CopyTableController.php
View File

@ -30,8 +30,7 @@ final class CopyTableController implements InvocableController
{
/** @var string[] $selected */
$selected = $request->getParsedBodyParam('selected', []);
/** @var string $targetDb */
$targetDb = $request->getParsedBodyParam('target_db');
$targetDb = $request->getParsedBodyParamAsString('target_db');
$userPrivileges = $this->userPrivilegesFactory->getPrivileges();
@ -41,7 +40,7 @@ final class CopyTableController implements InvocableController
$selectedValue,
$targetDb,
$selectedValue,
MoveScope::from($request->getParsedBodyParam('what')),
MoveScope::from($request->getParsedBodyParamAsString('what')),
MoveMode::SingleTable,
$request->getParsedBodyParam('drop_if_exists') === 'true',
);

6
src/Controllers/Database/Structure/CopyTableWithPrefixController.php
View File

@ -29,13 +29,13 @@ final class CopyTableWithPrefixController implements InvocableController
{
/** @var string[] $selected */
$selected = $request->getParsedBodyParam('selected', []);
$fromPrefix = $request->getParsedBodyParam('from_prefix');
$toPrefix = $request->getParsedBodyParam('to_prefix');
$fromPrefix = $request->getParsedBodyParamAsString('from_prefix', '');
$toPrefix = $request->getParsedBodyParamAsString('to_prefix');
$dropIfExists = $request->getParsedBodyParam('drop_if_exists') === 'true';
foreach ($selected as $selectedValue) {
$newTableName = $toPrefix . mb_substr($selectedValue, mb_strlen((string) $fromPrefix));
$newTableName = $toPrefix . mb_substr($selectedValue, mb_strlen($fromPrefix));
$this->tableMover->moveCopy(
Current::$database,

6
src/Controllers/Database/Structure/ReplacePrefixController.php
View File

@ -32,15 +32,15 @@ final class ReplacePrefixController implements InvocableController
{
/** @var string[] $selected */
$selected = $request->getParsedBodyParam('selected', []);
$fromPrefix = $request->getParsedBodyParam('from_prefix', '');
$toPrefix = $request->getParsedBodyParam('to_prefix', '');
$fromPrefix = $request->getParsedBodyParamAsString('from_prefix', '');
$toPrefix = $request->getParsedBodyParamAsString('to_prefix', '');
$GLOBALS['sql_query'] = '';
$this->dbi->selectDb(Current::$database);
foreach ($selected as $selectedValue) {
$subFromPrefix = mb_substr($selectedValue, 0, mb_strlen((string) $fromPrefix));
$subFromPrefix = mb_substr($selectedValue, 0, mb_strlen($fromPrefix));
if ($subFromPrefix === $fromPrefix) {
$newTableName = $toPrefix . mb_substr($selectedValue, mb_strlen($fromPrefix));

2
src/Controllers/Database/StructureController.php
View File

@ -165,7 +165,7 @@ final class StructureController implements InvocableController
]);
}
$this->replicationInfo->load($request->getParsedBodyParam('primary_connection'));
$this->replicationInfo->load($request->getParsedBodyParamAsStringOrNull('primary_connection'));
$replicaInfo = $this->replicationInfo->getReplicaInfo();
$this->pageSettings->init('DbStructure');

6
src/Controllers/Database/TrackingController.php
View File

@ -72,7 +72,7 @@ final class TrackingController implements InvocableController
$isSystemSchema = Utilities::isSystemSchema(Current::$database);
if ($request->hasBodyParam('delete_tracking') && $request->hasBodyParam('table')) {
$this->tracking->deleteTracking(Current::$database, $request->getParsedBodyParam('table'));
$this->tracking->deleteTracking(Current::$database, $request->getParsedBodyParamAsString('table'));
$this->response->addHTML(Message::success(
__('Tracking data deleted successfully.'),
)->getDisplay());
@ -80,14 +80,14 @@ final class TrackingController implements InvocableController
$this->tracking->createTrackingForMultipleTables(
Current::$database,
$request->getParsedBodyParam('selected'),
$request->getParsedBodyParam('version'),
$request->getParsedBodyParamAsString('version'),
);
$this->response->addHTML(Message::success(
sprintf(
__(
'Version %1$s was created for selected tables, tracking is active for them.',
),
htmlspecialchars($request->getParsedBodyParam('version')),
htmlspecialchars($request->getParsedBodyParamAsString('version')),
),
)->getDisplay());
} elseif ($request->hasBodyParam('submit_mult')) {

9
src/Controllers/ErrorReportController.php
View File

@ -41,12 +41,9 @@ final class ErrorReportController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
/** @var string $exceptionType */
$exceptionType = $request->getParsedBodyParam('exception_type', '');
/** @var string|null $automatic */
$automatic = $request->getParsedBodyParam('automatic');
/** @var string|null $alwaysSend */
$alwaysSend = $request->getParsedBodyParam('always_send');
$exceptionType = $request->getParsedBodyParamAsString('exception_type', '');
$automatic = $request->getParsedBodyParamAsStringOrNull('automatic');
$alwaysSend = $request->getParsedBodyParamAsStringOrNull('always_send');
if (! in_array($exceptionType, ['js', 'php'], true)) {
return $this->response->response();

31
src/Controllers/Export/ExportController.php
View File

@ -70,23 +70,16 @@ final class ExportController implements InvocableController
/** @var array<string, string> $postParams */
$postParams = $request->getParsedBody();
/** @var string $whatParam */
$whatParam = $request->getParsedBodyParam('what', '');
/** @var string|null $quickOrCustom */
$quickOrCustom = $request->getParsedBodyParam('quick_or_custom');
/** @var string|null $outputFormat */
$outputFormat = $request->getParsedBodyParam('output_format');
/** @var string $compressionParam */
$compressionParam = $request->getParsedBodyParam('compression', '');
/** @var string|null $asSeparateFiles */
$asSeparateFiles = $request->getParsedBodyParam('as_separate_files');
/** @var string|null $quickExportOnServer */
$quickExportOnServer = $request->getParsedBodyParam('quick_export_onserver');
/** @var string|null $onServerParam */
$onServerParam = $request->getParsedBodyParam('onserver');
$whatParam = $request->getParsedBodyParamAsString('what', '');
$quickOrCustom = $request->getParsedBodyParamAsStringOrNull('quick_or_custom');
$outputFormat = $request->getParsedBodyParamAsStringOrNull('output_format');
$compressionParam = $request->getParsedBodyParamAsString('compression', '');
$asSeparateFiles = $request->getParsedBodyParamAsStringOrNull('as_separate_files');
$quickExportOnServer = $request->getParsedBodyParamAsStringOrNull('quick_export_onserver');
$onServerParam = $request->getParsedBodyParamAsStringOrNull('onserver');
/** @var array|null $aliasesParam */
$aliasesParam = $request->getParsedBodyParam('aliases');
$structureOrDataForced = (bool) $request->getParsedBodyParam('structure_or_data_forced');
$structureOrDataForced = (bool) $request->getParsedBodyParamAsStringOrNull('structure_or_data_forced');
$rememberTemplate = $request->getParsedBodyParam('remember_template');
$dbSelect = $request->getParsedBodyParam('db_select');
$tableStructure = $request->getParsedBodyParam('table_structure');
@ -251,7 +244,7 @@ final class ExportController implements InvocableController
$rememberTemplate,
$exportPlugin,
$GLOBALS['compression'],
$request->getParsedBodyParam('filename_template'),
$request->getParsedBodyParamAsString('filename_template'),
);
}
@ -439,9 +432,9 @@ final class ExportController implements InvocableController
} else {
// We export just one table
$allrows = $request->getParsedBodyParam('allrows', '');
$limitTo = $request->getParsedBodyParam('limit_to', '0');
$limitFrom = $request->getParsedBodyParam('limit_from', '0');
$allrows = $request->getParsedBodyParamAsString('allrows', '');
$limitTo = $request->getParsedBodyParamAsString('limit_to', '0');
$limitFrom = $request->getParsedBodyParamAsString('limit_from', '0');
if ($lockTables) {
try {

12
src/Controllers/Export/Template/CreateController.php
View File

@ -28,14 +28,10 @@ final class CreateController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
/** @var string $exportType */
$exportType = $request->getParsedBodyParam('exportType', '');
/** @var string $templateName */
$templateName = $request->getParsedBodyParam('templateName', '');
/** @var string $templateData */
$templateData = $request->getParsedBodyParam('templateData', '');
/** @var string|null $templateId */
$templateId = $request->getParsedBodyParam('template_id');
$exportType = $request->getParsedBodyParamAsString('exportType', '');
$templateName = $request->getParsedBodyParamAsString('templateName', '');
$templateData = $request->getParsedBodyParamAsString('templateData', '');
$templateId = $request->getParsedBodyParamAsStringOrNull('template_id');
$exportTemplatesFeature = $this->relation->getRelationParameters()->exportTemplatesFeature;
if ($exportTemplatesFeature === null) {

2
src/Controllers/Export/Template/DeleteController.php
View File

@ -23,7 +23,7 @@ final class DeleteController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$templateId = (int) $request->getParsedBodyParam('templateId');
$templateId = (int) $request->getParsedBodyParamAsStringOrNull('templateId');
$exportTemplatesFeature = $this->relation->getRelationParameters()->exportTemplatesFeature;
if ($exportTemplatesFeature === null) {

2
src/Controllers/Export/Template/LoadController.php
View File

@ -24,7 +24,7 @@ final class LoadController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$templateId = (int) $request->getParsedBodyParam('templateId');
$templateId = (int) $request->getParsedBodyParamAsStringOrNull('templateId');
$exportTemplatesFeature = $this->relation->getRelationParameters()->exportTemplatesFeature;
if ($exportTemplatesFeature === null) {

5
src/Controllers/Export/Template/UpdateController.php
View File

@ -24,9 +24,8 @@ final class UpdateController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$templateId = (int) $request->getParsedBodyParam('templateId');
/** @var string $templateData */
$templateData = $request->getParsedBodyParam('templateData', '');
$templateId = (int) $request->getParsedBodyParamAsStringOrNull('templateId');
$templateData = $request->getParsedBodyParamAsString('templateData', '');
$exportTemplatesFeature = $this->relation->getRelationParameters()->exportTemplatesFeature;
if ($exportTemplatesFeature === null) {

12
src/Controllers/GisDataEditorController.php
View File

@ -45,16 +45,12 @@ final class GisDataEditorController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
/** @var string|null $field */
$field = $request->getParsedBodyParam('field');
$field = $request->getParsedBodyParamAsStringOrNull('field');
/** @var array|null $gisDataParam */
$gisDataParam = $request->getParsedBodyParam('gis_data');
/** @var string $type */
$type = $request->getParsedBodyParam('type', 'GEOMETRY');
/** @var string|null $value */
$value = $request->getParsedBodyParam('value');
/** @var string|null $inputName */
$inputName = $request->getParsedBodyParam('input_name');
$type = $request->getParsedBodyParamAsString('type', 'GEOMETRY');
$value = $request->getParsedBodyParamAsStringOrNull('value');
$inputName = $request->getParsedBodyParamAsStringOrNull('input_name');
if (! isset($field)) {
return $this->response->response();

2
src/Controllers/HomeController.php
View File

@ -78,7 +78,7 @@ final class HomeController implements InvocableController
// This is for $cfg['ShowDatabasesNavigationAsTree'] = false;
// See: https://github.com/phpmyadmin/phpmyadmin/issues/16520
// The DB is defined here and sent to the JS front-end to refresh the DB tree
Current::$database = $request->getParsedBodyParam('db', '');
Current::$database = $request->getParsedBodyParamAsString('db', '');
Current::$table = '';
$GLOBALS['show_query'] = '1';
$GLOBALS['errorUrl'] = Url::getFromRoute('/');

26
src/Controllers/Import/ImportController.php
View File

@ -29,7 +29,6 @@ use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use PhpMyAdmin\Utils\ForeignKey;
use Throwable;
use Webmozart\Assert\Assert;
use function __;
use function _ngettext;
@ -71,14 +70,14 @@ final class ImportController implements InvocableController
$GLOBALS['error'] ??= null;
$GLOBALS['result'] ??= null;
ImportSettings::$charsetOfFile = (string) $request->getParsedBodyParam('charset_of_file');
$format = $request->getParsedBodyParam('format', '');
ImportSettings::$importType = (string) $request->getParsedBodyParam('import_type');
ImportSettings::$charsetOfFile = $request->getParsedBodyParamAsString('charset_of_file', '');
$format = $request->getParsedBodyParamAsString('format', '');
ImportSettings::$importType = $request->getParsedBodyParamAsString('import_type', '');
$GLOBALS['is_js_confirmed'] = $request->getParsedBodyParam('is_js_confirmed');
$GLOBALS['message_to_show'] = $request->getParsedBodyParam('message_to_show');
$GLOBALS['noplugin'] = $request->getParsedBodyParam('noplugin');
ImportSettings::$skipQueries = (int) $request->getParsedBodyParam('skip_queries');
ImportSettings::$localImportFile = (string) $request->getParsedBodyParam('local_import_file');
ImportSettings::$skipQueries = (int) $request->getParsedBodyParamAsStringOrNull('skip_queries');
ImportSettings::$localImportFile = $request->getParsedBodyParamAsString('local_import_file', '');
$GLOBALS['show_as_php'] = $request->getParsedBodyParam('show_as_php');
// reset import messages for ajax request
@ -189,7 +188,6 @@ final class ImportController implements InvocableController
$this->response->addJSON('console_message_id', $consoleMessageId);
}
Assert::string($format);
$importFormat = ImportFormat::tryFrom($format);
if ($importFormat === null) {
$this->response->setRequestStatus(false);
@ -262,8 +260,8 @@ final class ImportController implements InvocableController
$GLOBALS['result'] = false;
// Bookmark Support: get a query back from bookmark if required
$idBookmark = (int) $request->getParsedBodyParam('id_bookmark');
$actionBookmark = (int) $request->getParsedBodyParam('action_bookmark');
$idBookmark = (int) $request->getParsedBodyParamAsStringOrNull('id_bookmark');
$actionBookmark = (int) $request->getParsedBodyParamAsStringOrNull('action_bookmark');
if ($idBookmark !== 0) {
switch ($actionBookmark) {
case 0: // bookmarked query that have to be run
@ -469,7 +467,7 @@ final class ImportController implements InvocableController
// Something to skip? (because timeout has passed)
if (! $GLOBALS['error'] && $request->hasBodyParam('skip')) {
$originalSkip = $skip = (int) $request->getParsedBodyParam('skip');
$originalSkip = $skip = (int) $request->getParsedBodyParamAsStringOrNull('skip');
while ($skip > 0 && ! ImportSettings::$finished) {
$this->import->getNextChunk(
$importHandle ?? null,
@ -677,8 +675,8 @@ final class ImportController implements InvocableController
$relation->getRelationParameters()->bookmarkFeature,
Current::$database,
$config->selectedServer['user'],
$request->getParsedBodyParam('sql_query'),
$request->getParsedBodyParam('bkm_label'),
$request->getParsedBodyParamAsString('sql_query'),
$request->getParsedBodyParamAsString('bkm_label'),
$request->hasBodyParam('bkm_replace'),
);
}
@ -705,8 +703,8 @@ final class ImportController implements InvocableController
$relation->getRelationParameters()->bookmarkFeature,
Current::$database,
$config->selectedServer['user'],
$request->getParsedBodyParam('sql_query'),
$request->getParsedBodyParam('bkm_label'),
$request->getParsedBodyParamAsString('sql_query'),
$request->getParsedBodyParamAsString('bkm_label'),
$request->hasBodyParam('bkm_replace'),
);
}

3
src/Controllers/Import/SimulateDmlController.php
View File

@ -42,8 +42,7 @@ final class SimulateDmlController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
/** @var string $sqlDelimiter */
$sqlDelimiter = $request->getParsedBodyParam('sql_delimiter', '');
$sqlDelimiter = $request->getParsedBodyParamAsString('sql_delimiter', '');
$parser = $this->createParser($GLOBALS['sql_query'], $sqlDelimiter);
$this->process($parser);

4
src/Controllers/LintController.php
View File

@ -44,10 +44,8 @@ final class LintController implements InvocableController
*
* The client, which will receive the JSON response will decode the message and
* and any HTML fragments that are displayed to the user will be encoded anyway.
*
* @var string $sqlQuery
*/
$sqlQuery = $request->getParsedBodyParam('sql_query', '');
$sqlQuery = $request->getParsedBodyParamAsString('sql_query', '');
$options = $request->getParsedBodyParam('options', []);
$editorType = is_array($options) ? ($options['editorType'] ?? null) : null;

8
src/Controllers/NavigationController.php
View File

@ -56,11 +56,11 @@ final class NavigationController implements InvocableController
$relationParameters = $this->relation->getRelationParameters();
if ($relationParameters->navigationItemsHidingFeature !== null) {
$itemName = $request->getParsedBodyParam('itemName', '');
$itemType = $request->getParsedBodyParam('itemType', '');
$dbName = $request->getParsedBodyParam('dbName', '');
$itemName = $request->getParsedBodyParamAsString('itemName', '');
$itemType = $request->getParsedBodyParamAsString('itemType', '');
$dbName = $request->getParsedBodyParamAsString('dbName', '');
if ($request->getParsedBodyParam('hideNavItem') !== null) {
if ($request->hasBodyParam('hideNavItem')) {
if ($itemName !== '' && $itemType !== '' && $dbName !== '') {
$this->navigation->hideNavigationItem($itemName, $itemType, $dbName);
}

2
src/Controllers/Normalization/CreateNewColumnController.php
View File

@ -28,7 +28,7 @@ final class CreateNewColumnController implements InvocableController
{
$userPrivileges = $this->userPrivilegesFactory->getPrivileges();
$numFields = min(4096, (int) $request->getParsedBodyParam('numFields'));
$numFields = min(4096, (int) $request->getParsedBodyParamAsStringOrNull('numFields'));
$html = $this->normalization->getHtmlForCreateNewColumn(
$userPrivileges,
$numFields,

2
src/Controllers/Normalization/FirstNormalForm/FirstStepController.php
View File

@ -26,7 +26,7 @@ final class FirstStepController implements InvocableController
$this->response->addScriptFiles(['normalization.js', 'vendor/jquery/jquery.uitablefilter.js']);
$normalForm = '1nf';
$normalizeTo = $request->getParsedBodyParam('normalizeTo');
$normalizeTo = $request->getParsedBodyParamAsString('normalizeTo', '');
if (in_array($normalizeTo, ['1nf', '2nf', '3nf'], true)) {
$normalForm = $normalizeTo;
}

8
src/Controllers/Normalization/MoveRepeatingGroup.php
View File

@ -21,10 +21,10 @@ final class MoveRepeatingGroup implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$repeatingColumns = $request->getParsedBodyParam('repeatingColumns');
$newTable = $request->getParsedBodyParam('newTable');
$newColumn = $request->getParsedBodyParam('newColumn');
$primaryColumns = $request->getParsedBodyParam('primary_columns');
$repeatingColumns = $request->getParsedBodyParamAsString('repeatingColumns');
$newTable = $request->getParsedBodyParamAsString('newTable');
$newColumn = $request->getParsedBodyParamAsString('newColumn');
$primaryColumns = $request->getParsedBodyParamAsString('primary_columns');
$res = $this->normalization->moveRepeatingGroup(
$repeatingColumns,
$primaryColumns,

4
src/Controllers/Normalization/SecondNormalForm/CreateNewTablesController.php
View File

@ -23,8 +23,8 @@ final class CreateNewTablesController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$partialDependencies = json_decode($request->getParsedBodyParam('pd'), true);
$tablesName = json_decode($request->getParsedBodyParam('newTablesName'));
$partialDependencies = json_decode($request->getParsedBodyParamAsString('pd'), true);
$tablesName = json_decode($request->getParsedBodyParamAsString('newTablesName'));
$res = $this->normalization->createNewTablesFor2NF(
$partialDependencies,
$tablesName,

2
src/Controllers/Normalization/SecondNormalForm/NewTablesController.php
View File

@ -23,7 +23,7 @@ final class NewTablesController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$partialDependencies = json_decode($request->getParsedBodyParam('pd'), true);
$partialDependencies = json_decode($request->getParsedBodyParamAsString('pd'), true);
$html = $this->normalization->getHtmlForNewTables2NF($partialDependencies, Current::$table);
$this->response->addHTML($html);

2
src/Controllers/Normalization/ThirdNormalForm/CreateNewTablesController.php
View File

@ -23,7 +23,7 @@ final class CreateNewTablesController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$newtables = json_decode($request->getParsedBodyParam('newTables'), true);
$newtables = json_decode($request->getParsedBodyParamAsString('newTables'), true);
$res = $this->normalization->createNewTablesFor3NF($newtables, Current::$database);
$this->response->addJSON($res);

4
src/Controllers/Normalization/ThirdNormalForm/NewTablesController.php
View File

@ -23,8 +23,8 @@ final class NewTablesController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$dependencies = json_decode($request->getParsedBodyParam('pd'));
$tables = json_decode($request->getParsedBodyParam('tables'), true);
$dependencies = json_decode($request->getParsedBodyParamAsString('pd'));
$tables = json_decode($request->getParsedBodyParamAsString('tables'), true);
$newTables = $this->normalization->getHtmlForNewTables3NF($dependencies, $tables, Current::$database);
$this->response->addJSON($newTables);

4
src/Controllers/Operations/Database/CollationController.php
View File

@ -38,8 +38,8 @@ final class CollationController implements InvocableController
return $this->response->response();
}
$dbCollation = $request->getParsedBodyParam('db_collation') ?? '';
if (empty($dbCollation)) {
$dbCollation = $request->getParsedBodyParamAsString('db_collation', '');
if ($dbCollation === '') {
$this->response->setRequestStatus(false);
$this->response->addJSON('message', Message::error(__('No collation provided.')));

2
src/Controllers/Operations/DatabaseController.php
View File

@ -222,7 +222,7 @@ final class DatabaseController implements InvocableController
* (must be done before displaying the menu tabs)
*/
if ($request->hasBodyParam('comment')) {
$this->relation->setDbComment(Current::$database, $request->getParsedBodyParam('comment'));
$this->relation->setDbComment(Current::$database, $request->getParsedBodyParamAsString('comment'));
}
if (! $this->response->checkParameters(['db'])) {

4
src/Controllers/Preferences/ExportController.php
View File

@ -36,7 +36,6 @@ final class ExportController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['error'] ??= null;
$GLOBALS['tabHash'] ??= null;
$GLOBALS['hash'] ??= null;
$configFile = new ConfigFile($this->config->baseSettings);
@ -63,8 +62,7 @@ final class ExportController implements InvocableController
if ($result === true) {
// reload config
$this->config->loadUserPreferences($this->themeManager);
$GLOBALS['tabHash'] = $request->getParsedBodyParam('tab_hash');
$GLOBALS['hash'] = ltrim($GLOBALS['tabHash'], '#');
$GLOBALS['hash'] = ltrim($request->getParsedBodyParamAsString('tab_hash'), '#');
$this->userPreferences->redirect('index.php?route=/preferences/export', null, $GLOBALS['hash']);
return $this->response->response();

4
src/Controllers/Preferences/FeaturesController.php
View File

@ -36,7 +36,6 @@ final class FeaturesController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['error'] ??= null;
$GLOBALS['tabHash'] ??= null;
$GLOBALS['hash'] ??= null;
$configFile = new ConfigFile($this->config->baseSettings);
@ -63,8 +62,7 @@ final class FeaturesController implements InvocableController
if ($result === true) {
// reload config
$this->config->loadUserPreferences($this->themeManager);
$GLOBALS['tabHash'] = $request->getParsedBodyParam('tab_hash');
$GLOBALS['hash'] = ltrim($GLOBALS['tabHash'], '#');
$GLOBALS['hash'] = ltrim($request->getParsedBodyParamAsString('tab_hash'), '#');
$this->userPreferences->redirect('index.php?route=/preferences/features', null, $GLOBALS['hash']);
return $this->response->response();

4
src/Controllers/Preferences/ImportController.php
View File

@ -36,7 +36,6 @@ final class ImportController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['error'] ??= null;
$GLOBALS['tabHash'] ??= null;
$GLOBALS['hash'] ??= null;
$configFile = new ConfigFile($this->config->baseSettings);
@ -63,8 +62,7 @@ final class ImportController implements InvocableController
if ($result === true) {
// reload config
$this->config->loadUserPreferences($this->themeManager);
$GLOBALS['tabHash'] = $request->getParsedBodyParam('tab_hash');
$GLOBALS['hash'] = ltrim($GLOBALS['tabHash'], '#');
$GLOBALS['hash'] = ltrim($request->getParsedBodyParamAsString('tab_hash'), '#');
$this->userPreferences->redirect('index.php?route=/preferences/import', null, $GLOBALS['hash']);
return $this->response->response();

4
src/Controllers/Preferences/MainPanelController.php
View File

@ -36,7 +36,6 @@ final class MainPanelController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['error'] ??= null;
$GLOBALS['tabHash'] ??= null;
$GLOBALS['hash'] ??= null;
$configFile = new ConfigFile($this->config->baseSettings);
@ -63,8 +62,7 @@ final class MainPanelController implements InvocableController
if ($result === true) {
// reload config
$this->config->loadUserPreferences($this->themeManager);
$GLOBALS['tabHash'] = $request->getParsedBodyParam('tab_hash');
$GLOBALS['hash'] = ltrim($GLOBALS['tabHash'], '#');
$GLOBALS['hash'] = ltrim($request->getParsedBodyParamAsString('tab_hash'), '#');
$this->userPreferences->redirect('index.php?route=/preferences/main-panel', null, $GLOBALS['hash']);
return $this->response->response();

6
src/Controllers/Preferences/ManageController.php
View File

@ -126,14 +126,14 @@ final class ManageController implements InvocableController
}
} else {
// read from POST value (json)
$json = $request->getParsedBodyParam('json');
$json = $request->getParsedBodyParamAsString('json');
}
// hide header message
$_SESSION['userprefs_autoload'] = true;
$configuration = json_decode($json, true);
$returnUrl = $request->getParsedBodyParam('return_url');
$returnUrl = $request->getParsedBodyParamAsStringOrNull('return_url');
if (! is_array($configuration)) {
if (! isset($GLOBALS['error'])) {
$GLOBALS['error'] = __('Could not import configuration');
@ -201,7 +201,7 @@ final class ManageController implements InvocableController
// save settings
$result = $this->userPreferences->save($configFile->getConfigArray());
if ($result === true) {
if ($returnUrl) {
if ($returnUrl !== null && $returnUrl !== '') {
$GLOBALS['query'] = Util::splitURLQuery($returnUrl);
$returnUrl = parse_url($returnUrl, PHP_URL_PATH);

4
src/Controllers/Preferences/NavigationController.php
View File

@ -36,7 +36,6 @@ final class NavigationController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['error'] ??= null;
$GLOBALS['tabHash'] ??= null;
$GLOBALS['hash'] ??= null;
$configFile = new ConfigFile($this->config->baseSettings);
@ -63,8 +62,7 @@ final class NavigationController implements InvocableController
if ($result === true) {
// reload config
$this->config->loadUserPreferences($this->themeManager);
$GLOBALS['tabHash'] = $request->getParsedBodyParam('tab_hash');
$GLOBALS['hash'] = ltrim($GLOBALS['tabHash'], '#');
$GLOBALS['hash'] = ltrim($request->getParsedBodyParamAsString('tab_hash'), '#');
$this->userPreferences->redirect('index.php?route=/preferences/navigation', null, $GLOBALS['hash']);
return $this->response->response();

4
src/Controllers/Preferences/SqlController.php
View File

@ -36,7 +36,6 @@ final class SqlController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['error'] ??= null;
$GLOBALS['tabHash'] ??= null;
$GLOBALS['hash'] ??= null;
$configFile = new ConfigFile($this->config->baseSettings);
@ -63,8 +62,7 @@ final class SqlController implements InvocableController
if ($result === true) {
// reload config
$this->config->loadUserPreferences($this->themeManager);
$GLOBALS['tabHash'] = $request->getParsedBodyParam('tab_hash');
$GLOBALS['hash'] = ltrim($GLOBALS['tabHash'], '#');
$GLOBALS['hash'] = ltrim($request->getParsedBodyParamAsString('tab_hash'), '#');
$this->userPreferences->redirect('index.php?route=/preferences/sql', null, $GLOBALS['hash']);
return $this->response->response();

2
src/Controllers/Preferences/TwoFactorController.php
View File

@ -47,7 +47,7 @@ final class TwoFactorController implements InvocableController
Message::rawNotice(__('Two-factor authentication has been removed.'))->getDisplay(),
);
} elseif ($request->hasBodyParam('2fa_configure')) {
if (! $twoFactor->configure($request, $request->getParsedBodyParam('2fa_configure'))) {
if (! $twoFactor->configure($request, $request->getParsedBodyParamAsString('2fa_configure'))) {
$this->response->render('preferences/two_factor/configure', [
'form' => $twoFactor->setup($request),
'configure' => $request->getParsedBodyParam('2fa_configure'),

6
src/Controllers/SchemaExportController.php
View File

@ -16,7 +16,6 @@ use PhpMyAdmin\Message;
use PhpMyAdmin\ResponseRenderer;
use function __;
use function is_string;
use function mb_strlen;
/**
@ -34,9 +33,8 @@ final class SchemaExportController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$db = DatabaseName::tryFrom($request->getParsedBodyParam('db'));
/** @var mixed $exportType */
$exportType = $request->getParsedBodyParam('export_type');
if ($db === null || ! is_string($exportType) || $exportType === '') {
$exportType = $request->getParsedBodyParamAsString('export_type');
if ($db === null || $exportType === '') {
$errorMessage = __('Missing parameter:') . ($db === null ? ' db' : ' export_type')
. MySQLDocumentation::showDocumentation('faq', 'faqmissingparameters', true)
. '[br]';

6
src/Controllers/Server/BinlogController.php
View File

@ -36,8 +36,8 @@ final class BinlogController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$log = $request->getParsedBodyParam('log');
$position = (int) $request->getParsedBodyParam('pos', 0);
$log = $request->getParsedBodyParamAsString('log');
$position = (int) $request->getParsedBodyParamAsString('pos', '');
$GLOBALS['errorUrl'] = Url::getFromRoute('/');
@ -57,7 +57,7 @@ final class BinlogController implements InvocableController
}
$config = Config::getInstance();
$sqlQuery = $this->getSqlQuery($log ?? '', $position, $config->settings['MaxRows']);
$sqlQuery = $this->getSqlQuery($log, $position, $config->settings['MaxRows']);
$result = $this->dbi->query($sqlQuery);
$numRows = $result->numRows();

6
src/Controllers/Server/Databases/CreateController.php
View File

@ -33,10 +33,10 @@ final class CreateController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$newDb = $request->getParsedBodyParam('new_db');
$dbCollation = $request->getParsedBodyParam('db_collation');
$newDb = $request->getParsedBodyParamAsString('new_db');
$dbCollation = $request->getParsedBodyParamAsStringOrNull('db_collation');
if (! is_string($newDb) || $newDb === '' || ! $request->isAjax()) {
if ($newDb === '' || ! $request->isAjax()) {
$this->response->addJSON(['message' => Message::error()]);
return $this->response->response();

2
src/Controllers/Server/DatabasesController.php
View File

@ -90,7 +90,7 @@ final class DatabasesController implements InvocableController
}
$replicationInfo = new ReplicationInfo($this->dbi);
$replicationInfo->load($request->getParsedBodyParam('primary_connection'));
$replicationInfo->load($request->getParsedBodyParamAsStringOrNull('primary_connection'));
$primaryInfo = $replicationInfo->getPrimaryInfo();
$replicaInfo = $replicationInfo->getReplicaInfo();

6
src/Controllers/Server/Privileges/AccountLockController.php
View File

@ -29,10 +29,8 @@ final class AccountLockController implements InvocableController
return $this->response->response();
}
/** @var string $userName */
$userName = $request->getParsedBodyParam('username');
/** @var string $hostName */
$hostName = $request->getParsedBodyParam('hostname');
$userName = $request->getParsedBodyParamAsString('username');
$hostName = $request->getParsedBodyParamAsString('hostname');
try {
$this->accountLocking->lock($userName, $hostName);

6
src/Controllers/Server/Privileges/AccountUnlockController.php
View File

@ -29,10 +29,8 @@ final class AccountUnlockController implements InvocableController
return $this->response->response();
}
/** @var string $userName */
$userName = $request->getParsedBodyParam('username');
/** @var string $hostName */
$hostName = $request->getParsedBodyParam('hostname');
$userName = $request->getParsedBodyParamAsString('username');
$hostName = $request->getParsedBodyParamAsString('hostname');
try {
$this->accountLocking->unlock($userName, $hostName);

13
src/Controllers/Server/PrivilegesController.php
View File

@ -144,8 +144,8 @@ final class PrivilegesController implements InvocableController
* Changes / copies a user, part I
*/
$password = $serverPrivileges->getDataForChangeOrCopyUser(
$request->getParsedBodyParam('old_username', ''),
$request->getParsedBodyParam('old_hostname', ''),
$request->getParsedBodyParamAsString('old_username', ''),
$request->getParsedBodyParamAsString('old_hostname', ''),
);
/**
@ -173,8 +173,8 @@ final class PrivilegesController implements InvocableController
$queries,
$GLOBALS['username'],
$GLOBALS['hostname'],
$request->getParsedBodyParam('old_username'),
$request->getParsedBodyParam('old_hostname'),
$request->getParsedBodyParamAsString('old_username'),
$request->getParsedBodyParamAsString('old_hostname'),
);
}
@ -217,7 +217,10 @@ final class PrivilegesController implements InvocableController
$request->hasBodyParam('changeUserGroup') && $relationParameters->configurableMenusFeature !== null
&& $this->dbi->isSuperUser() && $this->dbi->isCreateUser()
) {
$serverPrivileges->setUserGroup($GLOBALS['username'] ?? '', $request->getParsedBodyParam('userGroup', ''));
$serverPrivileges->setUserGroup(
$GLOBALS['username'] ?? '',
$request->getParsedBodyParamAsString('userGroup', ''),
);
$GLOBALS['message'] = Message::success();
}

31
src/Controllers/Server/ReplicationController.php
View File

@ -35,7 +35,7 @@ final class ReplicationController implements InvocableController
$GLOBALS['urlParams'] ??= null;
$GLOBALS['errorUrl'] ??= null;
$hasReplicaClearScreen = (bool) $request->getParsedBodyParam('replica_clear_screen');
$hasReplicaClearScreen = (bool) $request->getParsedBodyParamAsStringOrNull('replica_clear_screen');
$replicaConfigure = $request->getParsedBodyParam('replica_configure');
$primaryConfigure = $request->getParsedBodyParam('primary_configure');
@ -46,8 +46,7 @@ final class ReplicationController implements InvocableController
}
$replicationInfo = new ReplicationInfo($this->dbi);
/** @var string|null $primaryConnection */
$primaryConnection = $request->getParsedBodyParam('primary_connection');
$primaryConnection = $request->getParsedBodyParamAsStringOrNull('primary_connection');
$replicationInfo->load($primaryConnection);
$primaryInfo = $replicationInfo->getPrimaryInfo();
@ -61,12 +60,9 @@ final class ReplicationController implements InvocableController
}
if ($this->dbi->isSuperUser()) {
/** @var string|null $srReplicaAction */
$srReplicaAction = $request->getParsedBodyParam('sr_replica_action');
/** @var string|int $srSkipErrorsCount */
$srSkipErrorsCount = $request->getParsedBodyParam('sr_skip_errors_count', 1);
/** @var string|null $srReplicaControlParam */
$srReplicaControlParam = $request->getParsedBodyParam('sr_replica_control_param');
$srReplicaAction = $request->getParsedBodyParamAsStringOrNull('sr_replica_action');
$srSkipErrorsCount = $request->getParsedBodyParamAsStringOrNull('sr_skip_errors_count', '1');
$srReplicaControlParam = $request->getParsedBodyParamAsStringOrNull('sr_replica_control_param');
$this->replicationGui->handleControlRequest(
$request->getParsedBodyParam('sr_take_action') !== null,
@ -76,22 +72,19 @@ final class ReplicationController implements InvocableController
$request->getParsedBodyParam('sr_replica_skip_error') !== null,
(int) $srSkipErrorsCount,
$srReplicaControlParam,
$request->getParsedBodyParam('username', ''),
$request->getParsedBodyParam('pma_pw', ''),
$request->getParsedBodyParam('hostname', ''),
(int) $request->getParsedBodyParam('text_port'),
$request->getParsedBodyParamAsString('username', ''),
$request->getParsedBodyParamAsString('pma_pw', ''),
$request->getParsedBodyParamAsString('hostname', ''),
(int) $request->getParsedBodyParamAsString('text_port'),
);
}
$errorMessages = $this->replicationGui->getHtmlForErrorMessage();
if ($primaryInfo['status']) {
/** @var string|null $primaryAddUser */
$primaryAddUser = $request->getParsedBodyParam('primary_add_user');
/** @var string $username */
$username = $request->getParsedBodyParam('username');
/** @var string $hostname */
$hostname = $request->getParsedBodyParam('hostname');
$primaryAddUser = $request->getParsedBodyParamAsStringOrNull('primary_add_user');
$username = $request->getParsedBodyParamAsString('username');
$hostname = $request->getParsedBodyParamAsString('hostname');
$primaryReplicationHtml = $this->replicationGui->getHtmlForPrimaryReplication(
$primaryConnection,

2
src/Controllers/Server/Status/Monitor/ChartingDataController.php
View File

@ -31,7 +31,7 @@ final class ChartingDataController extends AbstractController implements Invocab
{
$GLOBALS['errorUrl'] ??= null;
$requiredData = $request->getParsedBodyParam('requiredData', '');
$requiredData = $request->getParsedBodyParamAsString('requiredData', '');
$GLOBALS['errorUrl'] = Url::getFromRoute('/');
if ($this->dbi->isSuperUser()) {

8
src/Controllers/Server/Status/Monitor/GeneralLogController.php
View File

@ -42,10 +42,10 @@ final class GeneralLogController extends AbstractController implements Invocable
}
$data = $this->monitor->getJsonForLogDataTypeGeneral(
(int) $request->getParsedBodyParam('time_start'),
(int) $request->getParsedBodyParam('time_end'),
(bool) $request->getParsedBodyParam('limitTypes'),
(bool) $request->getParsedBodyParam('removeVariables'),
(int) $request->getParsedBodyParamAsStringOrNull('time_start'),
(int) $request->getParsedBodyParamAsStringOrNull('time_end'),
(bool) $request->getParsedBodyParamAsStringOrNull('limitTypes'),
(bool) $request->getParsedBodyParamAsStringOrNull('removeVariables'),
);
if ($data === null) {
$this->response->setRequestStatus(false);

4
src/Controllers/Server/Status/Monitor/LogVarsController.php
View File

@ -43,8 +43,8 @@ final class LogVarsController extends AbstractController implements InvocableCon
$this->response->addJSON([
'message' => $this->monitor->getJsonForLoggingVars(
$request->getParsedBodyParam('varName'),
$request->getParsedBodyParam('varValue'),
$request->getParsedBodyParamAsStringOrNull('varName'),
$request->getParsedBodyParamAsStringOrNull('varValue'),
),
]);

4
src/Controllers/Server/Status/Monitor/QueryAnalyzerController.php
View File

@ -43,8 +43,8 @@ final class QueryAnalyzerController extends AbstractController implements Invoca
$this->response->addJSON([
'message' => $this->monitor->getJsonForQueryAnalyzer(
$request->getParsedBodyParam('database', ''),
$request->getParsedBodyParam('query', ''),
$request->getParsedBodyParamAsString('database', ''),
$request->getParsedBodyParamAsString('query', ''),
),
]);

4
src/Controllers/Server/Status/Monitor/SlowLogController.php
View File

@ -42,8 +42,8 @@ final class SlowLogController extends AbstractController implements InvocableCon
}
$data = $this->monitor->getJsonForLogDataTypeSlow(
(int) $request->getParsedBodyParam('time_start'),
(int) $request->getParsedBodyParam('time_end'),
(int) $request->getParsedBodyParamAsStringOrNull('time_start'),
(int) $request->getParsedBodyParamAsStringOrNull('time_end'),
);
if ($data === null) {
$this->response->setRequestStatus(false);

4
src/Controllers/Server/Status/Processes/RefreshController.php
View File

@ -33,8 +33,8 @@ final class RefreshController extends AbstractController implements InvocableCon
$this->response->render('server/status/processes/list', $this->processes->getList(
$request->hasBodyParam('showExecuting'),
$request->hasBodyParam('full'),
(string) $request->getParsedBodyParam('order_by_field', ''),
(string) $request->getParsedBodyParam('sort_order', ''),
$request->getParsedBodyParamAsString('order_by_field', ''),
$request->getParsedBodyParamAsString('sort_order', ''),
));
return $this->response->response();

4
src/Controllers/Server/Status/ProcessesController.php
View File

@ -32,8 +32,8 @@ final class ProcessesController extends AbstractController implements InvocableC
$showExecuting = $request->hasBodyParam('showExecuting');
$full = $request->getParsedBodyParam('full') === '1';
$orderByField = (string) $request->getParsedBodyParam('order_by_field', '');
$sortOrder = (string) $request->getParsedBodyParam('sort_order', '');
$orderByField = $request->getParsedBodyParamAsString('order_by_field', '');
$sortOrder = $request->getParsedBodyParamAsString('sort_order', '');
if ($this->dbi->isSuperUser()) {
$this->dbi->selectDb('mysql');

2
src/Controllers/Server/Status/StatusController.php
View File

@ -70,7 +70,7 @@ final class StatusController extends AbstractController implements InvocableCont
$traffic = $this->getTrafficInfo();
$connections = $this->getConnectionsInfo();
$primaryConnection = $request->getParsedBodyParam('primary_connection');
$primaryConnection = $request->getParsedBodyParamAsStringOrNull('primary_connection');
if ($primaryInfo['status']) {
$replication .= $this->replicationGui->getHtmlForReplicationStatusTable($primaryConnection, 'primary');

8
src/Controllers/Server/UserGroupsController.php
View File

@ -64,21 +64,21 @@ final class UserGroupsController implements InvocableController
* Add a new user group
*/
if ($request->hasBodyParam('addUserGroupSubmit')) {
UserGroups::edit($configurableMenusFeature, $request->getParsedBodyParam('userGroup'), true);
UserGroups::edit($configurableMenusFeature, $request->getParsedBodyParamAsString('userGroup'), true);
}
/**
* Update a user group
*/
if ($request->hasBodyParam('editUserGroupSubmit')) {
UserGroups::edit($configurableMenusFeature, $request->getParsedBodyParam('userGroup'));
UserGroups::edit($configurableMenusFeature, $request->getParsedBodyParamAsString('userGroup'));
}
if ($request->hasBodyParam('viewUsers')) {
// Display users belonging to a user group
$this->response->addHTML(UserGroups::getHtmlForListingUsersofAGroup(
$configurableMenusFeature,
$request->getParsedBodyParam('userGroup'),
$request->getParsedBodyParamAsString('userGroup'),
));
}
@ -89,7 +89,7 @@ final class UserGroupsController implements InvocableController
// Display edit user group dialog
$this->response->addHTML(UserGroups::getHtmlToEditUserGroup(
$configurableMenusFeature,
$request->getParsedBodyParam('userGroup'),
$request->getParsedBodyParamAsStringOrNull('userGroup'),
));
} else {
// Display user groups table

2
src/Controllers/Server/Variables/SetVariableController.php
View File

@ -41,7 +41,7 @@ final class SetVariableController implements InvocableController
return $this->response->response();
}
$value = (string) $request->getParsedBodyParam('varValue');
$value = $request->getParsedBodyParamAsString('varValue', '');
$variableName = $this->getName($request->getAttribute('routeVars'));
$matches = [];
$variableType = ServerVariablesProvider::getImplementation()->getVariableType($variableName);

11
src/Controllers/Setup/ValidateController.php
View File

@ -20,7 +20,6 @@ use function __;
use function explode;
use function file_exists;
use function implode;
use function is_string;
use function json_decode;
use function json_encode;
use function sprintf;
@ -52,13 +51,11 @@ final class ValidateController implements InvocableController
$response = $response->withHeader($name, $value);
}
/** @var mixed $id */
$id = $request->getParsedBodyParam('id');
$vids = explode(',', is_string($id) ? $id : '');
$id = $request->getParsedBodyParamAsString('id', '');
$vids = explode(',', $id);
/** @var mixed $valuesParam */
$valuesParam = $request->getParsedBodyParam('values');
$values = json_decode(is_string($valuesParam) ? $valuesParam : '');
$valuesParam = $request->getParsedBodyParamAsString('values', '');
$values = json_decode($valuesParam);
if (! $values instanceof stdClass) {
return $response->write((string) json_encode(['success' => false, 'message' => __('Wrong data')]));
}

3
src/Controllers/Sql/ColumnPreferencesController.php
View File

@ -29,8 +29,7 @@ final class ColumnPreferencesController implements InvocableController
$tableObject = $this->dbi->getTable(Current::$database, Current::$table);
$status = false;
/** @var string|null $tableCreateTime */
$tableCreateTime = $request->getParsedBodyParam('table_create_time');
$tableCreateTime = $request->getParsedBodyParamAsStringOrNull('table_create_time');
// set column order
$colorder = $request->getParsedBodyParam('col_order');

8
src/Controllers/Sql/EnumValuesController.php
View File

@ -28,9 +28,9 @@ final class EnumValuesController implements InvocableController
*/
public function __invoke(ServerRequest $request): Response
{
$column = $request->getParsedBodyParam('column');
$currValue = $request->getParsedBodyParam('curr_value');
$values = $this->sql->getValuesForColumn(Current::$database, Current::$table, (string) $column);
$column = $request->getParsedBodyParamAsString('column', '');
$currValue = $request->getParsedBodyParamAsString('curr_value', '');
$values = $this->sql->getValuesForColumn(Current::$database, Current::$table, $column);
if ($values === null) {
$this->response->addJSON('message', __('Error in processing request'));
@ -41,7 +41,7 @@ final class EnumValuesController implements InvocableController
$dropdown = $this->template->render('sql/enum_column_dropdown', [
'values' => $values,
'selected_values' => [(string) $currValue],
'selected_values' => [$currValue],
]);
$this->response->addJSON('dropdown', $dropdown);

10
src/Controllers/Sql/RelationalValuesController.php
View File

@ -24,20 +24,20 @@ final class RelationalValuesController implements InvocableController
*/
public function __invoke(ServerRequest $request): Response
{
$column = $request->getParsedBodyParam('column');
$relationKeyOrDisplayColumn = $request->getParsedBodyParam('relation_key_or_display_column');
$column = $request->getParsedBodyParamAsString('column', '');
$relationKeyOrDisplayColumn = $request->getParsedBodyParamAsStringOrNull('relation_key_or_display_column');
if ($_SESSION['tmpval']['relational_display'] === 'D' && $relationKeyOrDisplayColumn !== null) {
$currValue = $relationKeyOrDisplayColumn;
} else {
$currValue = $request->getParsedBodyParam('curr_value');
$currValue = $request->getParsedBodyParamAsString('curr_value', '');
}
$dropdown = $this->sql->getHtmlForRelationalColumnDropdown(
Current::$database,
Current::$table,
(string) $column,
(string) $currValue,
$column,
$currValue,
);
$this->response->addJSON('dropdown', $dropdown);

8
src/Controllers/Sql/SetValuesController.php
View File

@ -29,9 +29,9 @@ final class SetValuesController implements InvocableController
*/
public function __invoke(ServerRequest $request): Response
{
$column = $request->getParsedBodyParam('column');
$currentValue = $request->getParsedBodyParam('curr_value');
$whereClause = $request->getParsedBodyParam('where_clause');
$column = $request->getParsedBodyParamAsString('column');
$currentValue = $request->getParsedBodyParamAsString('curr_value');
$whereClause = $request->getParsedBodyParamAsStringOrNull('where_clause');
$values = $this->sql->getValuesForColumn(Current::$database, Current::$table, $column);
@ -43,7 +43,7 @@ final class SetValuesController implements InvocableController
}
// If the $currentValue was truncated, we should fetch the correct full values from the table.
if ($request->hasBodyParam('get_full_values') && ! empty($whereClause)) {
if ($request->hasBodyParam('get_full_values') && $whereClause !== null && $whereClause !== '') {
$currentValue = $this->sql->getFullValuesForSetColumn(
Current::$database,
Current::$table,

3
src/Controllers/Table/AddFieldController.php
View File

@ -52,8 +52,7 @@ final class AddFieldController implements InvocableController
$GLOBALS['errorUrl'] ??= null;
$GLOBALS['message'] ??= null;
/** @var string|null $numberOfFields */
$numberOfFields = $request->getParsedBodyParam('num_fields');
$numberOfFields = $request->getParsedBodyParamAsStringOrNull('num_fields');
$this->response->addScriptFiles(['table/structure.js']);

6
src/Controllers/Table/CreateController.php
View File

@ -161,11 +161,11 @@ final class CreateController implements InvocableController
*/
private function getNumberOfFieldsFromRequest(ServerRequest $request): int
{
$origNumFields = $request->getParsedBodyParam('orig_num_fields');
$numFields = $request->getParsedBodyParam('num_fields');
$origNumFields = $request->getParsedBodyParamAsStringOrNull('orig_num_fields');
$numFields = $request->getParsedBodyParamAsStringOrNull('num_fields');
if ($request->hasBodyParam('submit_num_fields')) { // adding new fields
$numberOfFields = (int) $origNumFields + (int) $request->getParsedBodyParam('added_fields');
$numberOfFields = (int) $origNumFields + (int) $request->getParsedBodyParamAsStringOrNull('added_fields');
} elseif ($origNumFields !== null) { // retaining existing fields
$numberOfFields = (int) $origNumFields;
} elseif ($numFields !== null && (int) $numFields > 0) { // new table with specified number of fields

2
src/Controllers/Table/DeleteRowsController.php
View File

@ -79,7 +79,7 @@ final class DeleteRowsController implements InvocableController
}
if ($request->hasBodyParam('original_sql_query')) {
$GLOBALS['sql_query'] = $request->getParsedBodyParam('original_sql_query', '');
$GLOBALS['sql_query'] = $request->getParsedBodyParamAsString('original_sql_query', '');
}
$this->response->addHTML($sql->executeQueryAndSendQueryResponse(

10
src/Controllers/Table/FindReplaceController.php
View File

@ -98,12 +98,12 @@ final class FindReplaceController implements InvocableController
$this->loadTableInfo();
$connectionCharSet = (string) $this->dbi->fetchValue('SELECT @@character_set_connection');
$useRegex = (bool) $request->getParsedBodyParam('useRegex');
$replaceWith = (string) $request->getParsedBodyParam('replaceWith');
$columnIndex = (int) $request->getParsedBodyParam('columnIndex');
$useRegex = (bool) $request->getParsedBodyParamAsStringOrNull('useRegex');
$replaceWith = $request->getParsedBodyParamAsString('replaceWith', '');
$columnIndex = (int) $request->getParsedBodyParamAsStringOrNull('columnIndex');
if ($request->hasBodyParam('find')) {
$find = (string) $request->getParsedBodyParam('find');
$find = $request->getParsedBodyParamAsString('find', '');
$preview = $this->getReplacePreview($columnIndex, $find, $replaceWith, $useRegex, $connectionCharSet);
$this->response->addJSON('preview', $preview);
@ -113,7 +113,7 @@ final class FindReplaceController implements InvocableController
$this->response->addScriptFiles(['table/find_replace.js']);
if ($request->hasBodyParam('replace')) {
$findString = (string) $request->getParsedBodyParam('findString');
$findString = $request->getParsedBodyParamAsString('findString', '');
$this->replace($columnIndex, $findString, $replaceWith, $useRegex, $connectionCharSet);
$this->response->addHTML(
Generator::getMessage(

4
src/Controllers/Table/IndexRenameController.php
View File

@ -80,8 +80,8 @@ final class IndexRenameController implements InvocableController
return $this->response->response();
}
$oldIndexName = $request->getParsedBodyParam('old_index');
$indexName = $request->getParsedBodyParam('index');
$oldIndexName = $request->getParsedBodyParamAsStringOrNull('old_index');
$indexName = $request->getParsedBodyParamAsString('index');
if ($oldIndexName === null) {
$index = $this->dbi->getTable($databaseName->getName(), $tableName->getName())->getIndex($indexName);

10
src/Controllers/Table/ReplaceController.php
View File

@ -72,7 +72,7 @@ final class ReplaceController implements InvocableController
$this->response->addScriptFiles(['makegrid.js', 'sql.js', 'gis_data_editor.js']);
$afterInsert = $request->getParsedBodyParam('after_insert');
$afterInsert = $request->getParsedBodyParamAsStringOrNull('after_insert');
if (in_array($afterInsert, ['new_insert', 'same_insert', 'edit_next'], true)) {
$GLOBALS['urlParams']['after_insert'] = $afterInsert;
$whereClause = $request->getParsedBodyParam('where_clause');
@ -379,7 +379,7 @@ final class ReplaceController implements InvocableController
/** @param string[][] $mimeMap */
private function doTransformations(array $mimeMap, ServerRequest $request): void
{
$relFieldsList = $request->getParsedBodyParam('rel_fields_list', '');
$relFieldsList = $request->getParsedBodyParamAsString('rel_fields_list', '');
if ($relFieldsList !== '') {
$foreigners = $this->relation->getForeigners(Current::$database, Current::$table);
@ -410,7 +410,7 @@ final class ReplaceController implements InvocableController
if ($request->getParsedBodyParam('do_transformations') == true) {
$editedValues = [];
parse_str($request->getParsedBodyParam('transform_fields_list'), $editedValues);
parse_str($request->getParsedBodyParamAsString('transform_fields_list'), $editedValues);
if (! isset($extraData)) {
$extraData = [];
@ -448,8 +448,8 @@ final class ReplaceController implements InvocableController
/**Get the total row count of the table*/
$tableObj = new Table(
$request->getParsedBodyParam('table'),
$request->getParsedBodyParam('db'),
$request->getParsedBodyParamAsString('table'),
$request->getParsedBodyParamAsString('db'),
$this->dbi,
);
$extraData['row_count'] = $tableObj->countRecords();

2
src/Controllers/Table/SqlController.php
View File

@ -92,7 +92,7 @@ class SqlController implements InvocableController
*/
$GLOBALS['goto'] = Url::getFromRoute('/table/sql');
$GLOBALS['back'] = Url::getFromRoute('/table/sql');
$delimiter = $request->getParsedBodyParam('delimiter', ';');
$delimiter = $request->getParsedBodyParamAsString('delimiter', ';');
$this->response->addHTML($this->sqlQueryForm->getHtml(
Current::$database,

4
src/Controllers/Table/Structure/AddKeyController.php
View File

@ -17,7 +17,7 @@ final class AddKeyController extends AbstractIndexController implements Invocabl
{
$GLOBALS['reload'] = true;
$keyType = $this->getKeyType($request->getParsedBodyParam('key_type'));
$keyType = $this->getKeyType($request->getParsedBodyParamAsStringOrNull('key_type'));
if ($keyType === '') {
$this->response->setRequestStatus(false);
$this->response->addJSON('message', __('Invalid request parameter.'));
@ -29,7 +29,7 @@ final class AddKeyController extends AbstractIndexController implements Invocabl
}
/** @psalm-return 'FULLTEXT'|'INDEX'|'PRIMARY'|'SPATIAL'|'UNIQUE'|'' */
private function getKeyType(mixed $keyType): string
private function getKeyType(string|null $keyType): string
{
return in_array($keyType, ['FULLTEXT', 'INDEX', 'PRIMARY', 'SPATIAL', 'UNIQUE'], true) ? $keyType : '';
}

2
src/Controllers/Table/Structure/CentralColumnsAddController.php
View File

@ -45,7 +45,7 @@ final class CentralColumnsAddController implements InvocableController
DatabaseName::from($request->getParsedBodyParam('db')),
$selected,
false,
$request->getParsedBodyParam('table'),
$request->getParsedBodyParamAsString('table'),
);
if ($centralColsError instanceof Message) {

3
src/Controllers/Table/Structure/PrimaryController.php
View File

@ -52,8 +52,7 @@ final class PrimaryController implements InvocableController
$this->dbi->selectDb(Current::$database);
$hasPrimary = $this->hasPrimaryKey();
/** @var string|null $deletionConfirmed */
$deletionConfirmed = $request->getParsedBodyParam('mult_btn');
$deletionConfirmed = $request->getParsedBodyParamAsStringOrNull('mult_btn');
if ($hasPrimary && $deletionConfirmed === null) {
if (! $this->response->checkParameters(['db', 'table'])) {

18
src/Controllers/Table/TrackingController.php
View File

@ -101,12 +101,10 @@ final class TrackingController implements InvocableController
$GLOBALS['urlParams']['goto'] = Url::getFromRoute('/table/tracking');
$GLOBALS['urlParams']['back'] = Url::getFromRoute('/table/tracking');
/** @var string $versionParam */
$versionParam = $request->getParsedBodyParam('version');
/** @var string $tableParam */
$tableParam = $request->getParsedBodyParam('table');
$versionParam = $request->getParsedBodyParamAsString('version', '');
$tableParam = $request->getParsedBodyParamAsString('table', '');
$logType = LogType::tryFrom((string) $request->getParsedBodyParam('log_type')) ?? LogType::SchemaAndData;
$logType = LogType::tryFrom($request->getParsedBodyParamAsString('log_type', '')) ?? LogType::SchemaAndData;
$message = '';
$sqlDump = '';
@ -127,8 +125,7 @@ final class TrackingController implements InvocableController
);
$dateTo = $this->validateDateTimeParam($request->getParsedBodyParam('date_to', $trackedData->dateTo));
/** @var string $users */
$users = $request->getParsedBodyParam('users', '*');
$users = $request->getParsedBodyParamAsString('users', '*');
$filterUsers = array_map(trim(...), explode(',', $users));
@ -162,7 +159,7 @@ final class TrackingController implements InvocableController
$versionParam,
$trackedData->ddlog,
TrackedDataType::DDL,
(int) $request->getParsedBodyParam('delete_ddlog'),
(int) $request->getParsedBodyParamAsStringOrNull('delete_ddlog'),
);
// After deletion reload data from the database
$trackedData = $this->tracking->getTrackedData(Current::$database, Current::$table, $versionParam);
@ -173,7 +170,7 @@ final class TrackingController implements InvocableController
$versionParam,
$trackedData->dmlog,
TrackedDataType::DML,
(int) $request->getParsedBodyParam('delete_dmlog'),
(int) $request->getParsedBodyParamAsStringOrNull('delete_dmlog'),
);
// After deletion reload data from the database
$trackedData = $this->tracking->getTrackedData(Current::$database, Current::$table, $versionParam);
@ -237,8 +234,7 @@ final class TrackingController implements InvocableController
}
if ($request->hasBodyParam('snapshot')) {
/** @var string $db */
$db = $request->getParsedBodyParam('db');
$db = $request->getParsedBodyParamAsString('db');
$schemaSnapshot = $this->tracking->getHtmlForSchemaSnapshot(
$db,
$tableParam,

2
src/Controllers/TableController.php
View File

@ -25,7 +25,7 @@ final class TableController implements InvocableController
return $this->response->response();
}
$this->response->addJSON(['tables' => $this->dbi->getTables($request->getParsedBodyParam('db'))]);
$this->response->addJSON(['tables' => $this->dbi->getTables($request->getParsedBodyParamAsString('db'))]);
return $this->response->response();
}

11
src/Controllers/ThemeSetController.php
View File

@ -12,8 +12,6 @@ use PhpMyAdmin\Theme\ThemeManager;
use PhpMyAdmin\Url;
use PhpMyAdmin\UserPreferences;
use function is_string;
final class ThemeSetController implements InvocableController
{
public function __construct(
@ -25,8 +23,8 @@ final class ThemeSetController implements InvocableController
public function __invoke(ServerRequest $request): Response
{
$theme = $request->getParsedBodyParam('set_theme');
if (! Config::getInstance()->settings['ThemeManager'] || ! is_string($theme) || $theme === '') {
$theme = $request->getParsedBodyParamAsString('set_theme');
if (! Config::getInstance()->settings['ThemeManager'] || $theme === '') {
if ($request->isAjax()) {
$this->response->addJSON('themeColorMode', '');
@ -40,9 +38,8 @@ final class ThemeSetController implements InvocableController
$this->themeManager->setActiveTheme($theme);
/** @var mixed $themeColorMode */
$themeColorMode = $request->getParsedBodyParam('themeColorMode');
if (is_string($themeColorMode) && $themeColorMode !== '') {
$themeColorMode = $request->getParsedBodyParamAsString('themeColorMode');
if ($themeColorMode !== '') {
$this->themeManager->theme->setColorMode($themeColorMode);
}

13
src/Controllers/UserPasswordController.php
View File

@ -53,27 +53,28 @@ final class UserPasswordController implements InvocableController
return $this->response->response();
}
$noPass = $request->getParsedBodyParam('nopass');
$pmaPw = $request->getParsedBodyParam('pma_pw');
$pmaPw2 = $request->getParsedBodyParam('pma_pw2');
$noPass = $request->getParsedBodyParamAsStringOrNull('nopass');
/**
* If the "change password" form has been submitted, checks for valid values
* and submit the query or logout
*/
if ($noPass !== null) {
$password = $noPass == '1' ? '' : $pmaPw;
$pmaPw = $request->getParsedBodyParamAsString('pma_pw');
$pmaPw2 = $request->getParsedBodyParamAsString('pma_pw2');
$password = $noPass === '1' ? '' : $pmaPw;
$GLOBALS['change_password_message'] = $this->userPassword->setChangePasswordMsg(
$pmaPw,
$pmaPw2,
(bool) $noPass,
$noPass === '1',
);
$message = $GLOBALS['change_password_message']['msg'];
if (! $GLOBALS['change_password_message']['error']) {
$sqlQuery = $this->userPassword->changePassword(
$password,
$request->getParsedBodyParam('authentication_plugin'),
$request->getParsedBodyParamAsStringOrNull('authentication_plugin'),
);
if ($request->isAjax()) {

16
src/Plugins/Import/ImportCsv.php
View File

@ -171,15 +171,15 @@ class ImportCsv extends AbstractImportCsv
{
$this->replace = $request->getParsedBodyParam('csv_replace') !== null;
$this->ignore = $request->getParsedBodyParam('csv_ignore') !== null;
$this->terminated = (string) $request->getParsedBodyParam('csv_terminated');
$this->enclosed = (string) $request->getParsedBodyParam('csv_enclosed');
$this->escaped = (string) $request->getParsedBodyParam('csv_escaped');
$this->newLine = (string) $request->getParsedBodyParam('csv_new_line');
$this->columns = (string) $request->getParsedBodyParam('csv_columns');
$this->maxLines = min(0, (int) $request->getParsedBodyParam('csv_partial_import'));
$this->terminated = $request->getParsedBodyParamAsString('csv_terminated', '');
$this->enclosed = $request->getParsedBodyParamAsString('csv_enclosed', '');
$this->escaped = $request->getParsedBodyParamAsString('csv_escaped', '');
$this->newLine = $request->getParsedBodyParamAsString('csv_new_line', '');
$this->columns = $request->getParsedBodyParamAsString('csv_columns', '');
$this->maxLines = min(0, (int) $request->getParsedBodyParamAsStringOrNull('csv_partial_import'));
$this->csvHasColumnNames = $request->getParsedBodyParam('csv_col_names') !== null;
$this->newDatabaseName = (string) $request->getParsedBodyParam('csv_new_db_name');
$this->newTableName = (string) $request->getParsedBodyParam('csv_new_tbl_name');
$this->newDatabaseName = $request->getParsedBodyParamAsString('csv_new_db_name', '');
$this->newTableName = $request->getParsedBodyParamAsString('csv_new_tbl_name', '');
}
/**

10
src/Plugins/Import/ImportLdi.php
View File

@ -99,11 +99,11 @@ class ImportLdi extends AbstractImportCsv
$this->localOption = $request->getParsedBodyParam('ldi_local_option') !== null;
$this->replace = $request->getParsedBodyParam('ldi_replace') !== null;
$this->ignore = $request->getParsedBodyParam('ldi_ignore') !== null;
$this->terminated = (string) $request->getParsedBodyParam('ldi_terminated');
$this->enclosed = (string) $request->getParsedBodyParam('ldi_enclosed');
$this->escaped = (string) $request->getParsedBodyParam('ldi_escaped');
$this->newLine = (string) $request->getParsedBodyParam('ldi_new_line');
$this->columns = (string) $request->getParsedBodyParam('ldi_columns');
$this->terminated = $request->getParsedBodyParamAsString('ldi_terminated', '');
$this->enclosed = $request->getParsedBodyParamAsString('ldi_enclosed', '');
$this->escaped = $request->getParsedBodyParamAsString('ldi_escaped', '');
$this->newLine = $request->getParsedBodyParamAsString('ldi_new_line', '');
$this->columns = $request->getParsedBodyParamAsString('ldi_columns', '');
}
/**

22
tests/unit/Controllers/BrowseForeignersControllerTest.php
View File

@ -10,7 +10,7 @@ use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\BrowseForeignersController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Http\Factory\ServerRequestFactory;
use PhpMyAdmin\Template;
use PhpMyAdmin\Tests\AbstractTestCase;
use PhpMyAdmin\Tests\Stubs\ResponseRenderer;
@ -27,16 +27,16 @@ final class BrowseForeignersControllerTest extends AbstractTestCase
$config = Config::getInstance();
$config->selectedServer['DisableIS'] = true;
$request = self::createStub(ServerRequest::class);
$request->method('getParsedBodyParam')->willReturnMap([
['db', null, 'sakila'],
['table', null, 'film_actor'],
['field', null, 'actor_id'],
['fieldkey', '', ''],
['data', '', ''],
['foreign_showAll', null, null],
['foreign_filter', '', ''],
]);
$request = ServerRequestFactory::create()->createServerRequest('POST', 'https://example.com/')
->withParsedBody([
'db' => 'sakila',
'table' => 'film_actor',
'field' => 'actor_id',
'fieldkey' => '',
'data' => '',
'foreign_showAll' => null,
'foreign_filter' => '',
]);
$dbiDummy = $this->createDbiDummy();
$dbiDummy->removeDefaultResults();

5
tests/unit/Controllers/CheckRelationsControllerTest.php
View File

@ -42,11 +42,6 @@ class CheckRelationsControllerTest extends AbstractTestCase
Current::$table = '';
$request = self::createStub(ServerRequest::class);
$request->method('getParsedBodyParam')->willReturnMap([
['create_pmadb', null, null],
['fixall_pmadb', null, null],
['fix_pmadb', null, null],
]);
$response = new ResponseRenderer();
Config::getInstance()->selectedServer['pmadb'] = '';

38
tests/unit/Controllers/Console/Bookmark/AddControllerTest.php
View File

@ -4,12 +4,14 @@ declare(strict_types=1);
namespace PhpMyAdmin\Tests\Controllers\Console\Bookmark;
use InvalidArgumentException;
use PhpMyAdmin\Bookmarks\BookmarkRepository;
use PhpMyAdmin\Config;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\ConfigStorage\RelationParameters;
use PhpMyAdmin\Controllers\Console\Bookmark\AddController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Http\Factory\ServerRequestFactory;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Tests\AbstractTestCase;
use PhpMyAdmin\Tests\Stubs\ResponseRenderer;
@ -24,18 +26,18 @@ class AddControllerTest extends AbstractTestCase
$dbi = $this->createDatabaseInterface();
DatabaseInterface::$instance = $dbi;
$response = new ResponseRenderer();
$request = self::createStub(ServerRequest::class);
$request->method('getParsedBodyParam')->willReturnMap([
['db', null, null],
['label', null, null],
['bookmark_query', null, null],
['shared', null, null],
]);
$request = ServerRequestFactory::create()->createServerRequest('POST', 'https://example.com/')
->withParsedBody([
'db' => null,
'label' => null,
'bookmark_query' => null,
'shared' => null,
]);
$relation = new Relation($dbi);
$bookmarkRepository = new BookmarkRepository($dbi, $relation);
$controller = new AddController($response, $bookmarkRepository);
$this->expectException(InvalidArgumentException::class);
$controller($request);
self::assertSame(['message' => 'Incomplete params'], $response->getJSONResult());
}
public function testWithoutRelationParameters(): void
@ -46,12 +48,6 @@ class AddControllerTest extends AbstractTestCase
DatabaseInterface::$instance = $dbi;
$response = new ResponseRenderer();
$request = self::createStub(ServerRequest::class);
$request->method('getParsedBodyParam')->willReturnMap([
['db', null, 'test'],
['label', null, 'test'],
['bookmark_query', null, 'test'],
['shared', null, 'test'],
]);
$relation = new Relation($dbi);
$bookmarkRepository = new BookmarkRepository($dbi, $relation);
$controller = new AddController($response, $bookmarkRepository);
@ -79,13 +75,13 @@ class AddControllerTest extends AbstractTestCase
$dbi = $this->createDatabaseInterface($dbiDummy);
DatabaseInterface::$instance = $dbi;
$response = new ResponseRenderer();
$request = self::createStub(ServerRequest::class);
$request->method('getParsedBodyParam')->willReturnMap([
['db', null, 'test_db'],
['label', null, 'test_label'],
['bookmark_query', null, 'test_query'],
['shared', null, 'true'],
]);
$request = ServerRequestFactory::create()->createServerRequest('POST', 'https://example.com/')
->withParsedBody([
'db' => 'test_db',
'label' => 'test_label',
'bookmark_query' => 'test_query',
'shared' => 'true',
]);
$relation = new Relation($dbi);
$bookmarkRepository = new BookmarkRepository($dbi, $relation);
$controller = new AddController($response, $bookmarkRepository);

16
tests/unit/Controllers/Export/Template/CreateControllerTest.php
View File

@ -11,7 +11,7 @@ use PhpMyAdmin\Controllers\Export\Template\CreateController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Export\Template as ExportTemplate;
use PhpMyAdmin\Export\TemplateModel;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Http\Factory\ServerRequestFactory;
use PhpMyAdmin\Template;
use PhpMyAdmin\Tests\AbstractTestCase;
use PhpMyAdmin\Tests\Stubs\DbiDummy;
@ -48,13 +48,13 @@ class CreateControllerTest extends AbstractTestCase
$response = new ResponseRenderer();
$template = new Template();
$request = self::createStub(ServerRequest::class);
$request->method('getParsedBodyParam')->willReturnMap([
['exportType', '', 'type'],
['templateName', '', 'name'],
['templateData', '', 'data'],
['template_id', null, null],
]);
$request = ServerRequestFactory::create()->createServerRequest('POST', 'https://example.com/')
->withParsedBody([
'exportType' => 'type',
'templateName' => 'name',
'templateData' => 'data',
'template_id' => null,
]);
(new CreateController(
$response,

1
tests/unit/Controllers/Export/Template/DeleteControllerTest.php
View File

@ -37,7 +37,6 @@ class DeleteControllerTest extends AbstractTestCase
$response = new ResponseRenderer();
$request = self::createStub(ServerRequest::class);
$request->method('getParsedBodyParam')->willReturn('1');
(new DeleteController(
$response,

6
tests/unit/Controllers/Export/Template/LoadControllerTest.php
View File

@ -10,7 +10,7 @@ use PhpMyAdmin\ConfigStorage\RelationParameters;
use PhpMyAdmin\Controllers\Export\Template\LoadController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Export\TemplateModel;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Http\Factory\ServerRequestFactory;
use PhpMyAdmin\Tests\AbstractTestCase;
use PhpMyAdmin\Tests\Stubs\DbiDummy;
use PhpMyAdmin\Tests\Stubs\ResponseRenderer;
@ -45,8 +45,8 @@ class LoadControllerTest extends AbstractTestCase
Config::getInstance()->selectedServer['user'] = 'user';
$response = new ResponseRenderer();
$request = self::createStub(ServerRequest::class);
$request->method('getParsedBodyParam')->willReturn('1');
$request = ServerRequestFactory::create()->createServerRequest('POST', 'https://example.com/')
->withParsedBody(['templateId' => '1']);
(new LoadController(
$response,

4
tests/unit/Controllers/Export/Template/UpdateControllerTest.php
View File

@ -37,10 +37,6 @@ class UpdateControllerTest extends AbstractTestCase
$response = new ResponseRenderer();
$request = self::createStub(ServerRequest::class);
$request->method('getParsedBodyParam')->willReturnMap([
['templateId', null, '1'],
['templateData', '', 'data'],
]);
(new UpdateController(
$response,

14
tests/unit/Controllers/LintControllerTest.php
View File

@ -8,6 +8,7 @@ use Fig\Http\Message\StatusCodeInterface;
use PhpMyAdmin\Controllers\LintController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Http\Factory\ResponseFactory;
use PhpMyAdmin\Http\Factory\ServerRequestFactory;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Tests\AbstractTestCase;
use PHPUnit\Framework\Attributes\CoversClass;
@ -95,13 +96,12 @@ final class LintControllerTest extends AbstractTestCase
]);
self::assertNotFalse($expectedJson);
$request = self::createStub(ServerRequest::class);
$request->method('isAjax')->willReturn(true);
$request->method('getParsedBodyParam')->willReturnMap([
['sql_query', '', 'SELECT * FROM `actor` WHEREE `actor_id` = 1'],
['options', null, null],
]);
$request = ServerRequestFactory::create()->createServerRequest('POST', 'https://example.com/')
->withParsedBody([
'ajax_request' => '1',
'sql_query' => 'SELECT * FROM `actor` WHEREE `actor_id` = 1',
'options' => null,
]);
$response = $this->getLintController()($request);
self::assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());

1
tests/unit/Controllers/Normalization/CreateNewColumnControllerTest.php
View File

@ -34,7 +34,6 @@ class CreateNewColumnControllerTest extends AbstractTestCase
$response = new ResponseRenderer();
$template = new Template();
$request = self::createStub(ServerRequest::class);
$request->method('getParsedBodyParam')->willReturnMap([['numFields', null, '1']]);
$controller = new CreateNewColumnController(
$response,

6
tests/unit/Controllers/Normalization/FirstNormalForm/FirstStepControllerTest.php
View File

@ -8,7 +8,7 @@ use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\Normalization\FirstNormalForm\FirstStepController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Http\Factory\ServerRequestFactory;
use PhpMyAdmin\Normalization;
use PhpMyAdmin\Template;
use PhpMyAdmin\Tests\AbstractTestCase;
@ -36,8 +36,8 @@ class FirstStepControllerTest extends AbstractTestCase
DatabaseInterface::$instance = $dbi;
$response = new ResponseRenderer();
$template = new Template();
$request = self::createStub(ServerRequest::class);
$request->method('getParsedBodyParam')->willReturnMap([['normalizeTo', null, $normalizeTo]]);
$request = ServerRequestFactory::create()->createServerRequest('POST', 'https://example.com/')
->withParsedBody(['normalizeTo' => $normalizeTo]);
$controller = new FirstStepController(
$response,

16
tests/unit/Controllers/Normalization/MoveRepeatingGroupTest.php
View File

@ -8,7 +8,7 @@ use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\Normalization\MoveRepeatingGroup;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Http\Factory\ServerRequestFactory;
use PhpMyAdmin\Message;
use PhpMyAdmin\Normalization;
use PhpMyAdmin\Template;
@ -39,13 +39,13 @@ class MoveRepeatingGroupTest extends AbstractTestCase
DatabaseInterface::$instance = $dbi;
$response = new ResponseRenderer();
$template = new Template();
$request = self::createStub(ServerRequest::class);
$request->method('getParsedBodyParam')->willReturnMap([
['repeatingColumns', null, 'col1, col2'],
['newTable', null, 'new_table'],
['newColumn', null, 'new_column'],
['primary_columns', null, 'id,col1'],
]);
$request = ServerRequestFactory::create()->createServerRequest('POST', 'https://example.com/')
->withParsedBody([
'repeatingColumns' => 'col1, col2',
'newTable' => 'new_table',
'newColumn' => 'new_column',
'primary_columns' => 'id,col1',
]);
$controller = new MoveRepeatingGroup(
$response,

12
tests/unit/Controllers/Normalization/SecondNormalForm/CreateNewTablesControllerTest.php
View File

@ -8,7 +8,7 @@ use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\Normalization\SecondNormalForm\CreateNewTablesController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Http\Factory\ServerRequestFactory;
use PhpMyAdmin\Normalization;
use PhpMyAdmin\Template;
use PhpMyAdmin\Tests\AbstractTestCase;
@ -36,11 +36,11 @@ class CreateNewTablesControllerTest extends AbstractTestCase
DatabaseInterface::$instance = $dbi;
$response = new ResponseRenderer();
$template = new Template();
$request = self::createStub(ServerRequest::class);
$request->method('getParsedBodyParam')->willReturnMap([
['pd', null, json_encode(['ID, task' => [], 'task' => ['timestamp']])],
['newTablesName', null, json_encode(['ID, task' => 'batch_log2', 'task' => 'table2'])],
]);
$request = ServerRequestFactory::create()->createServerRequest('POST', 'https://example.com/')
->withParsedBody([
'pd' => json_encode(['ID, task' => [], 'task' => ['timestamp']]),
'newTablesName' => json_encode(['ID, task' => 'batch_log2', 'task' => 'table2']),
]);
$controller = new CreateNewTablesController(
$response,

10
tests/unit/Controllers/Normalization/SecondNormalForm/NewTablesControllerTest.php
View File

@ -8,7 +8,7 @@ use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\Normalization\SecondNormalForm\NewTablesController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Http\Factory\ServerRequestFactory;
use PhpMyAdmin\Normalization;
use PhpMyAdmin\Template;
use PhpMyAdmin\Tests\AbstractTestCase;
@ -30,10 +30,10 @@ class NewTablesControllerTest extends AbstractTestCase
DatabaseInterface::$instance = $dbi;
$response = new ResponseRenderer();
$template = new Template();
$request = self::createStub(ServerRequest::class);
$request->method('getParsedBodyParam')->willReturnMap([
['pd', null, json_encode(['ID, task' => [], 'task' => ['timestamp']])],
]);
$request = ServerRequestFactory::create()->createServerRequest('POST', 'https://example.com/')
->withParsedBody([
'pd' => json_encode(['ID, task' => [], 'task' => ['timestamp']]),
]);
$controller = new NewTablesController(
$response,
new Normalization($dbi, new Relation($dbi), new Transformations(), $template),

6
tests/unit/Controllers/Normalization/ThirdNormalForm/CreateNewTablesControllerTest.php
View File

@ -8,7 +8,7 @@ use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\Normalization\ThirdNormalForm\CreateNewTablesController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Http\Factory\ServerRequestFactory;
use PhpMyAdmin\Normalization;
use PhpMyAdmin\Template;
use PhpMyAdmin\Tests\AbstractTestCase;
@ -53,8 +53,8 @@ class CreateNewTablesControllerTest extends AbstractTestCase
DatabaseInterface::$instance = $dbi;
$response = new ResponseRenderer();
$template = new Template();
$request = self::createStub(ServerRequest::class);
$request->method('getParsedBodyParam')->willReturnMap([['newTables', null, $newTables]]);
$request = ServerRequestFactory::create()->createServerRequest('POST', 'https://example.com/')
->withParsedBody(['newTables' => $newTables]);
$controller = new CreateNewTablesController(
$response,

9
tests/unit/Controllers/Normalization/ThirdNormalForm/NewTablesControllerTest.php
View File

@ -8,7 +8,7 @@ use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Controllers\Normalization\ThirdNormalForm\NewTablesController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Http\Factory\ServerRequestFactory;
use PhpMyAdmin\Normalization;
use PhpMyAdmin\Template;
use PhpMyAdmin\Tests\AbstractTestCase;
@ -39,8 +39,11 @@ class NewTablesControllerTest extends AbstractTestCase
DatabaseInterface::$instance = $dbi;
$response = new ResponseRenderer();
$template = new Template();
$request = self::createStub(ServerRequest::class);
$request->method('getParsedBodyParam')->willReturnMap([['tables', null, $tables], ['pd', null, $pd]]);
$request = ServerRequestFactory::create()->createServerRequest('POST', 'https://example.com/')
->withParsedBody([
'tables' => $tables,
'pd' => $pd,
]);
$controller = new NewTablesController(
$response,

6
tests/unit/Controllers/SchemaExportControllerTest.php
View File

@ -9,7 +9,7 @@ use PhpMyAdmin\Controllers\SchemaExportController;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Export\Export;
use PhpMyAdmin\Http\Factory\ResponseFactory;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Http\Factory\ServerRequestFactory;
use PhpMyAdmin\Tests\AbstractTestCase;
use PhpMyAdmin\Tests\Stubs\ResponseRenderer;
use PHPUnit\Framework\Attributes\CoversClass;
@ -26,8 +26,8 @@ final class SchemaExportControllerTest extends AbstractTestCase
{
DatabaseInterface::$instance = $this->createDatabaseInterface();
$request = self::createStub(ServerRequest::class);
$request->method('getParsedBodyParam')->willReturnMap([['db', null, 'test_db'], ['export_type', null, 'svg']]);
$request = ServerRequestFactory::create()->createServerRequest('POST', 'https://example.com/')
->withParsedBody(['db' => 'test_db', 'export_type' => 'svg']);
$export = self::createStub(Export::class);
$export->method('getExportSchemaInfo')->willReturn([
'fileName' => 'file.svg',

9
tests/unit/Controllers/Server/BinlogControllerTest.php
View File

@ -8,7 +8,7 @@ use PhpMyAdmin\Config;
use PhpMyAdmin\Controllers\Server\BinlogController;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Http\Factory\ServerRequestFactory;
use PhpMyAdmin\Tests\AbstractTestCase;
use PhpMyAdmin\Tests\Stubs\DbiDummy;
use PhpMyAdmin\Tests\Stubs\ResponseRenderer;
@ -50,8 +50,11 @@ class BinlogControllerTest extends AbstractTestCase
$controller = new BinlogController($response, DatabaseInterface::getInstance());
$request = self::createStub(ServerRequest::class);
$request->method('getParsedBodyParam')->willReturnMap([['log', null, 'index1'], ['pos', 0, '3']]);
$request = ServerRequestFactory::create()->createServerRequest('POST', 'https://example.com/')
->withParsedBody([
'log' => 'index1',
'pos' => '3',
]);
$this->dummyDbi->addSelectDb('mysql');
$controller($request);
$this->dummyDbi->assertAllSelectsConsumed();

Some files were not shown because too many files have changed in this diff Show More