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

Merge pull request #19175 from MauricioFauth/controller-response

Browse Source 
Change InvocableController to always return a Response object
This commit is contained in:
Maurício Meneghini Fauth 2024-05-24 10:47:18 -03:00 committed by GitHub
commit ff47ba8e62
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
217 changed files with 1039 additions and 1099 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/services_controllers.php
View File

@ -1165,10 +1165,7 @@ return [
],
Table\Structure\AddKeyController::class => [
'class' => Table\Structure\AddKeyController::class,
'arguments' => [
'$sqlController' => '@' . Sql\SqlController::class,
'$structureController' => '@' . Table\StructureController::class,
],
'arguments' => ['@response', '@' . Table\StructureController::class, '@table_indexes'],
],
Table\Structure\BrowseController::class => [
'class' => Table\Structure\BrowseController::class,

5
phpstan-baseline.neon
View File

@ -4880,11 +4880,6 @@ parameters:
count: 1
path: src/Controllers/Table/SqlController.php
-
message: "#^Parameter \\#3 \\$selectedColumns of static method PhpMyAdmin\\\\Query\\\\Generator\\:\\:getAddIndexSql\\(\\) expects array\\<string\\>, array given\\.$#"
count: 1
path: src/Controllers/Table/Structure/AbstractIndexController.php
-
message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
count: 1

233
psalm-baseline.xml
View File

@ -808,7 +808,7 @@
</file>
<file src="src/Controllers/BrowseForeignersController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/CheckRelationsController.php">
@ -816,17 +816,17 @@
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/CollationConnectionController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/ColumnController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Console/Bookmark/AddController.php">
@ -835,12 +835,12 @@
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Console/Bookmark/RefreshController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Database/CentralColumns/PopulateColumnsController.php">
@ -972,7 +972,7 @@
<code><![CDATA[$page]]></code>
</PossiblyNullArgument>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Database/EventsController.php">
@ -1006,7 +1006,7 @@
<code><![CDATA[isSuccess]]></code>
</PossiblyNullReference>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
<RiskyTruthyFalsyComparison>
<code><![CDATA[empty($_GET['export_item'])]]></code>
@ -1059,9 +1059,6 @@
<PossiblyUnusedMethod>
<code><![CDATA[__construct]]></code>
</PossiblyUnusedMethod>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
</PossiblyUnusedReturnValue>
<RiskyTruthyFalsyComparison>
<code><![CDATA[empty($GLOBALS['table_select'])]]></code>
</RiskyTruthyFalsyComparison>
@ -1103,7 +1100,7 @@
</file>
<file src="src/Controllers/Database/MultiTableQuery/TablesController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Database/MultiTableQueryController.php">
@ -1116,7 +1113,7 @@
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Database/RoutinesController.php">
@ -1215,7 +1212,7 @@
<code><![CDATA[isSuccess]]></code>
</PossiblyNullReference>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
<RedundantCondition>
<code><![CDATA[! $GLOBALS['errors']]]></code>
@ -1291,9 +1288,6 @@
<PossiblyUnusedMethod>
<code><![CDATA[__construct]]></code>
</PossiblyUnusedMethod>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Database/SqlFormatController.php">
<PossiblyUnusedMethod>
@ -1446,7 +1440,7 @@
<code><![CDATA[$rowCount]]></code>
</PossiblyNullArgument>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Database/Structure/ReplacePrefixController.php">
@ -1565,9 +1559,6 @@
<code><![CDATA[$currentTable['TABLE_NAME']]]></code>
<code><![CDATA[$currentTable['TABLE_ROWS']]]></code>
</MixedOperand>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
</PossiblyUnusedReturnValue>
<RiskyTruthyFalsyComparison>
<code><![CDATA[$checkTime]]></code>
<code><![CDATA[$createTime]]></code>
@ -1596,7 +1587,7 @@
</file>
<file src="src/Controllers/DatabaseController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/ErrorReportController.php">
@ -1866,7 +1857,7 @@
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Export/Template/DeleteController.php">
@ -1874,7 +1865,7 @@
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Export/Template/LoadController.php">
@ -1882,7 +1873,7 @@
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Export/Template/UpdateController.php">
@ -1890,7 +1881,7 @@
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/GitInfoController.php">
@ -1980,11 +1971,14 @@
<code><![CDATA[$bookmarkVariables]]></code>
<code><![CDATA[$consoleMessageId]]></code>
</MixedAssignment>
<MixedInferredReturnType>
<code><![CDATA[Response]]></code>
</MixedInferredReturnType>
<PossiblyInvalidPropertyAssignmentValue>
<code><![CDATA[$memoryLimit / 8]]></code>
</PossiblyInvalidPropertyAssignmentValue>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
<PropertyTypeCoercion>
<code><![CDATA[(string) $request->getParsedBodyParam('import_type')]]></code>
@ -2029,12 +2023,12 @@
</file>
<file src="src/Controllers/LogoutController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Navigation/UpdateNavWidthConfigController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/NavigationController.php">
@ -2053,17 +2047,17 @@
<code><![CDATA[$itemType]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Normalization/AddNewPrimaryController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Normalization/CreateNewColumnController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Normalization/FirstNormalForm/FirstStepController.php">
@ -2071,32 +2065,32 @@
<code><![CDATA[$normalizeTo]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Normalization/FirstNormalForm/FourthStepController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Normalization/FirstNormalForm/SecondStepController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Normalization/FirstNormalForm/ThirdStepController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Normalization/GetColumnsController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Normalization/MainController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Normalization/MoveRepeatingGroup.php">
@ -2113,12 +2107,12 @@
<code><![CDATA[$repeatingColumns]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Normalization/PartialDependenciesController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Normalization/SecondNormalForm/CreateNewTablesController.php">
@ -2133,12 +2127,12 @@
<code><![CDATA[$tablesName]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Normalization/SecondNormalForm/FirstStepController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Normalization/SecondNormalForm/NewTablesController.php">
@ -2150,7 +2144,7 @@
<code><![CDATA[$partialDependencies]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Normalization/ThirdNormalForm/CreateNewTablesController.php">
@ -2162,7 +2156,7 @@
<code><![CDATA[$newtables]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Normalization/ThirdNormalForm/FirstStepController.php">
@ -2173,7 +2167,7 @@
<code><![CDATA[$tables]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Normalization/ThirdNormalForm/NewTablesController.php">
@ -2188,7 +2182,7 @@
<code><![CDATA[$tables]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Operations/Database/CollationController.php">
@ -2267,7 +2261,7 @@
<code><![CDATA[$GLOBALS['message_to_show']]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
<RiskyTruthyFalsyComparison>
<code><![CDATA[empty($GLOBALS['message_to_show'])]]></code>
@ -2496,7 +2490,7 @@
<code><![CDATA[$urlParams['log']]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Server/CollationsController.php">
@ -2504,7 +2498,7 @@
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Server/Databases/CreateController.php">
@ -2515,7 +2509,7 @@
<code><![CDATA[$dbCollation]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Server/Databases/DestroyController.php">
@ -2535,7 +2529,7 @@
<code><![CDATA[$database]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Server/DatabasesController.php">
@ -2588,12 +2582,12 @@
<code><![CDATA[$key]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Server/EnginesController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Server/ExportController.php">
@ -2648,17 +2642,17 @@
</file>
<file src="src/Controllers/Server/PluginsController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Server/Privileges/AccountLockController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Server/Privileges/AccountUnlockController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Server/PrivilegesController.php">
@ -2690,7 +2684,7 @@
<code><![CDATA[$GLOBALS['sql_query']]]></code>
</PossiblyInvalidArgument>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
<RedundantConditionGivenDocblockType>
<code><![CDATA[! empty($GLOBALS['message']) && $GLOBALS['message'] instanceof Message]]></code>
@ -2723,7 +2717,7 @@
</file>
<file src="src/Controllers/Server/ShowEngineController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Server/SqlController.php">
@ -2739,7 +2733,7 @@
</file>
<file src="src/Controllers/Server/Status/AdvisorController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Server/Status/Monitor/ChartingDataController.php">
@ -2765,7 +2759,7 @@
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Server/Status/Monitor/LogVarsController.php">
@ -2780,7 +2774,7 @@
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Server/Status/Monitor/QueryAnalyzerController.php">
@ -2795,7 +2789,7 @@
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Server/Status/Monitor/SlowLogController.php">
@ -2806,12 +2800,12 @@
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Server/Status/MonitorController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Server/Status/Processes/KillController.php">
@ -2821,12 +2815,12 @@
</file>
<file src="src/Controllers/Server/Status/Processes/RefreshController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Server/Status/ProcessesController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Server/Status/QueriesController.php">
@ -2855,7 +2849,7 @@
<code><![CDATA[str_replace(['Com_', '_'], ['', ' '], $key)]]></code>
</PossiblyInvalidCast>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Server/Status/StatusController.php">
@ -2900,7 +2894,7 @@
<code><![CDATA[$this->data->status['Uptime']]]></code>
</MixedOperand>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Server/Status/VariablesController.php">
@ -2933,7 +2927,7 @@
<code><![CDATA[$this->data->variables['thread_cache_size']]]></code>
</MixedOperand>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
<UnusedForeachValue>
<code><![CDATA[$linkUrl]]></code>
@ -2990,7 +2984,7 @@
<code><![CDATA[$filterValue]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Setup/HomeController.php">
@ -3037,7 +3031,7 @@
<code><![CDATA[$currValue]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Sql/RelationalValuesController.php">
@ -3066,7 +3060,7 @@
<code><![CDATA[$whereClause]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Sql/SqlController.php">
@ -3113,9 +3107,6 @@
<MixedOperand>
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</MixedOperand>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
</PossiblyUnusedReturnValue>
<RiskyTruthyFalsyComparison>
<code><![CDATA[empty($GLOBALS['back'])]]></code>
<code><![CDATA[empty($GLOBALS['goto'])]]></code>
@ -3158,7 +3149,7 @@
<code><![CDATA[$mimetype]]></code>
</PossiblyInvalidCast>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Table/ChangeController.php">
@ -3201,9 +3192,6 @@
<PossiblyNullArgument>
<code><![CDATA[$isUpload]]></code>
</PossiblyNullArgument>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
</PossiblyUnusedReturnValue>
<RiskyTruthyFalsyComparison>
<code><![CDATA[$currentRow]]></code>
<code><![CDATA[empty($GLOBALS['disp_message'])]]></code>
@ -3221,7 +3209,7 @@
<code><![CDATA[$rowsToDelete]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Table/ChartController.php">
@ -3253,7 +3241,7 @@
<code><![CDATA[$statement->limit->rowCount]]></code>
</PossiblyInvalidOperand>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Table/CreateController.php">
@ -3291,7 +3279,7 @@
<code><![CDATA[$mimetype]]></code>
</PossiblyInvalidCast>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Table/DeleteConfirmController.php">
@ -3305,7 +3293,7 @@
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Table/DeleteRowsController.php">
@ -3335,7 +3323,7 @@
<code><![CDATA[$selected]]></code>
</PossiblyInvalidIterator>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
<RiskyTruthyFalsyComparison>
<code><![CDATA[empty($_REQUEST['pos'])]]></code>
@ -3343,7 +3331,7 @@
</file>
<file src="src/Controllers/Table/DropColumnConfirmationController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Table/DropColumnController.php">
@ -3365,7 +3353,7 @@
<code><![CDATA[$selected]]></code>
</PossiblyInvalidIterator>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
<RiskyTruthyFalsyComparison>
<code><![CDATA[$message->isError()]]></code>
@ -3398,9 +3386,6 @@
<PossiblyNullArgument>
<code><![CDATA[$parser->list]]></code>
</PossiblyNullArgument>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
</PossiblyUnusedReturnValue>
<RiskyTruthyFalsyComparison>
<code><![CDATA[empty($GLOBALS['sql_query'])]]></code>
<code><![CDATA[empty($GLOBALS['where_clause'])]]></code>
@ -3416,7 +3401,7 @@
<code><![CDATA[$GLOBALS['where_clause']]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Table/FindReplaceController.php">
@ -3458,7 +3443,7 @@
<code><![CDATA[$row]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Table/GisVisualizationController.php">
@ -3505,7 +3490,7 @@
<code><![CDATA[$_SESSION[$GLOBALS['SESSION_KEY']]]]></code>
</PossiblyInvalidArrayOffset>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Table/IndexRenameController.php">
@ -3526,7 +3511,7 @@
<code><![CDATA[$oldIndexName]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Table/IndexesController.php">
@ -3562,7 +3547,7 @@
</file>
<file src="src/Controllers/Table/Maintenance/AnalyzeController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
<RiskyTruthyFalsyComparison>
<code><![CDATA[$this->config->get('DisableMultiTableMaintenance')]]></code>
@ -3570,7 +3555,7 @@
</file>
<file src="src/Controllers/Table/Maintenance/CheckController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
<RiskyTruthyFalsyComparison>
<code><![CDATA[$this->config->get('DisableMultiTableMaintenance')]]></code>
@ -3578,7 +3563,7 @@
</file>
<file src="src/Controllers/Table/Maintenance/ChecksumController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
<RiskyTruthyFalsyComparison>
<code><![CDATA[$this->config->get('DisableMultiTableMaintenance')]]></code>
@ -3586,7 +3571,7 @@
</file>
<file src="src/Controllers/Table/Maintenance/OptimizeController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
<RiskyTruthyFalsyComparison>
<code><![CDATA[$this->config->get('DisableMultiTableMaintenance')]]></code>
@ -3594,7 +3579,7 @@
</file>
<file src="src/Controllers/Table/Maintenance/RepairController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
<RiskyTruthyFalsyComparison>
<code><![CDATA[$this->config->get('DisableMultiTableMaintenance')]]></code>
@ -3605,7 +3590,7 @@
<code><![CDATA[$query]]></code>
</MixedArgument>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Table/Partition/CheckController.php">
@ -3613,7 +3598,7 @@
<code><![CDATA[$query]]></code>
</MixedArgument>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Table/Partition/DropController.php">
@ -3622,7 +3607,7 @@
<code><![CDATA[$query]]></code>
</MixedArgument>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Table/Partition/OptimizeController.php">
@ -3630,12 +3615,12 @@
<code><![CDATA[$query]]></code>
</MixedArgument>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Table/Partition/RebuildController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Table/Partition/RepairController.php">
@ -3643,12 +3628,12 @@
<code><![CDATA[$query]]></code>
</MixedArgument>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Table/Partition/TruncateController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Table/PrivilegesController.php">
@ -3656,12 +3641,12 @@
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Table/RecentFavoriteController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Table/RelationController.php">
@ -3805,7 +3790,7 @@
<code><![CDATA[$extraData]]></code>
</PossiblyUndefinedVariable>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
<RiskyTruthyFalsyComparison>
<code><![CDATA[empty($GLOBALS['query'])]]></code>
@ -3834,7 +3819,7 @@
<code><![CDATA[$_POST['column']]]></code>
</PossiblyInvalidCast>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
<RedundantCastGivenDocblockType>
<code><![CDATA[(int) $config->settings['MaxRows']]]></code>
@ -3861,19 +3846,6 @@
<code><![CDATA[$GLOBALS['errorUrl']]]></code>
<code><![CDATA[$delimiter]]></code>
</MixedAssignment>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Table/Structure/AbstractIndexController.php">
<MixedArgumentTypeCoercion>
<code><![CDATA[$selected]]></code>
</MixedArgumentTypeCoercion>
</file>
<file src="src/Controllers/Table/Structure/AddKeyController.php">
<PossiblyUnusedMethod>
<code><![CDATA[__construct]]></code>
</PossiblyUnusedMethod>
</file>
<file src="src/Controllers/Table/Structure/BrowseController.php">
<MixedArgument>
@ -4060,7 +4032,7 @@
<code><![CDATA[$_POST['field_virtuality'][$i]]]></code>
</PossiblyInvalidOperand>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
<RiskyTruthyFalsyComparison>
<code><![CDATA[empty($_POST['field_adjust_privileges'][$i])]]></code>
@ -4069,12 +4041,12 @@
</file>
<file src="src/Controllers/Table/Structure/SpatialController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Table/Structure/UniqueController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Table/StructureController.php">
@ -4114,9 +4086,6 @@
<PossiblyNullOperand>
<code><![CDATA[$showTable['Rows']]]></code>
</PossiblyNullOperand>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
</PossiblyUnusedReturnValue>
<RiskyTruthyFalsyComparison>
<code><![CDATA[empty($showTable['Data_length'])]]></code>
<code><![CDATA[empty($showTable['Index_length'])]]></code>
@ -4187,7 +4156,7 @@
<code><![CDATA[$_POST['where_clause']]]></code>
</PossiblyInvalidOperand>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
<RedundantCastGivenDocblockType>
<code><![CDATA[(int) $config->settings['maxRowPlotLimit']]]></code>
@ -4214,7 +4183,7 @@
<code><![CDATA[Config::getInstance()]]></code>
</DeprecatedMethod>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/ThemesController.php">
@ -4224,7 +4193,7 @@
</file>
<file src="src/Controllers/Transformation/OverviewController.php">
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
</file>
<file src="src/Controllers/Transformation/WrapperController.php">
@ -4269,7 +4238,7 @@
<code><![CDATA[isSuccess]]></code>
</PossiblyNullReference>
<PossiblyUnusedReturnValue>
<code><![CDATA[Response|null]]></code>
<code><![CDATA[Response]]></code>
</PossiblyUnusedReturnValue>
<RiskyTruthyFalsyComparison>
<code><![CDATA[empty($_POST['editor_process_add'])]]></code>

40
resources/templates/table/structure/display_structure.twig
View File

@ -136,11 +136,9 @@
{% if type == 'text' or type == 'blob' or tbl_storage_engine == 'ARCHIVE' or (primary and primary.hasColumn(field_name)) %}
<span class="{{ hide_structure_actions ? 'dropdown-item-text' : 'nav-link px-1' }} disabled">{{ get_icon('bd_primary', t('Primary')) }}</span>
{% else %}
<a rel="samepage" class="{{ hide_structure_actions ? 'dropdown-item' : 'nav-link px-1' }} ajax add_key d-print-none add_primary_key_anchor" href="{{ url('/table/structure/add-key') }}" data-post="{{ get_common({
'db': db,
'table': table,
'sql_query': 'ALTER TABLE ' ~ backquote(table) ~ (primary ? ' DROP PRIMARY KEY,') ~ ' ADD PRIMARY KEY(' ~ backquote(row.field) ~ ');',
'message_to_show': t('A primary key has been added on %s.')|format(row.field|e)
<a rel="samepage" class="{{ hide_structure_actions ? 'dropdown-item' : 'nav-link px-1' }} ajax add_key d-print-none add_primary_key_anchor" href="{{ url('/table/structure/add-key', {'db': db, 'table': table}) }}" data-post="{{ get_common({
'selected_fld': [row.field],
'key_type': 'PRIMARY',
}, '', false) }}">
{{ get_icon('b_primary', t('Primary')) }}
</a>
@ -151,11 +149,9 @@
{% if type == 'text' or type == 'blob' or tbl_storage_engine == 'ARCHIVE' %}
<span class="{{ hide_structure_actions ? 'dropdown-item-text' : 'nav-link px-1' }} disabled">{{ get_icon('bd_unique', t('Unique')) }}</span>
{% else %}
<a rel="samepage" class="{{ hide_structure_actions ? 'dropdown-item' : 'nav-link px-1' }} ajax add_key d-print-none add_unique_anchor" href="{{ url('/table/structure/add-key') }}" data-post="{{ get_common({
'db': db,
'table': table,
'sql_query': 'ALTER TABLE ' ~ backquote(table) ~ ' ADD UNIQUE(' ~ backquote(row.field) ~ ');',
'message_to_show': t('An index has been added on %s.')|format(row.field|e)
<a rel="samepage" class="{{ hide_structure_actions ? 'dropdown-item' : 'nav-link px-1' }} ajax add_key d-print-none add_unique_anchor" href="{{ url('/table/structure/add-key', {'db': db, 'table': table}) }}" data-post="{{ get_common({
'selected_fld': [row.field],
'key_type': 'UNIQUE',
}, '', false) }}">
{{ get_icon('b_unique', t('Unique')) }}
</a>
@ -166,11 +162,9 @@
{% if type == 'text' or type == 'blob' or tbl_storage_engine == 'ARCHIVE' %}
<span class="{{ hide_structure_actions ? 'dropdown-item-text' : 'nav-link px-1' }} disabled">{{ get_icon('bd_index', t('Index')) }}</span>
{% else %}
<a rel="samepage" class="{{ hide_structure_actions ? 'dropdown-item' : 'nav-link px-1' }} ajax add_key d-print-none add_index_anchor" href="{{ url('/table/structure/add-key') }}" data-post="{{ get_common({
'db': db,
'table': table,
'sql_query': 'ALTER TABLE ' ~ backquote(table) ~ ' ADD INDEX(' ~ backquote(row.field) ~ ');',
'message_to_show': t('An index has been added on %s.')|format(row.field|e)
<a rel="samepage" class="{{ hide_structure_actions ? 'dropdown-item' : 'nav-link px-1' }} ajax add_key d-print-none add_index_anchor" href="{{ url('/table/structure/add-key', {'db': db, 'table': table}) }}" data-post="{{ get_common({
'selected_fld': [row.field],
'key_type': 'INDEX',
}, '', false) }}">
{{ get_icon('b_index', t('Index')) }}
</a>
@ -191,11 +185,9 @@
{% if type == 'text' or type == 'blob' or tbl_storage_engine == 'ARCHIVE' or (type not in spatial_types and (tbl_storage_engine == 'MYISAM' or mysql_int_version >= 50705)) %}
<span class="{{ hide_structure_actions ? 'dropdown-item-text' : 'nav-link px-1' }} disabled">{{ get_icon('bd_spatial', t('Spatial')) }}</span>
{% else %}
<a rel="samepage" class="{{ hide_structure_actions ? 'dropdown-item' : 'nav-link px-1' }} ajax add_key d-print-none add_spatial_anchor" href="{{ url('/table/structure/add-key') }}" data-post="{{ get_common({
'db': db,
'table': table,
'sql_query': 'ALTER TABLE ' ~ backquote(table) ~ ' ADD SPATIAL(' ~ backquote(row.field) ~ ');',
'message_to_show': t('An index has been added on %s.')|format(row.field|e)
<a rel="samepage" class="{{ hide_structure_actions ? 'dropdown-item' : 'nav-link px-1' }} ajax add_key d-print-none add_spatial_anchor" href="{{ url('/table/structure/add-key', {'db': db, 'table': table}) }}" data-post="{{ get_common({
'selected_fld': [row.field],
'key_type': 'SPATIAL',
}, '', false) }}">
{{ get_icon('b_spatial', t('Spatial')) }}
</a>
@ -210,11 +202,9 @@
or tbl_storage_engine == 'MARIA'
or (tbl_storage_engine == 'INNODB' and mysql_int_version >= 50604)
) and ('text' in type or 'char' in type) %}
<a rel="samepage" class="{{ hide_structure_actions ? 'dropdown-item' : 'nav-link px-1' }} ajax add_key add_fulltext_anchor" href="{{ url('/table/structure/add-key') }}" data-post="{{ get_common({
'db': db,
'table': table,
'sql_query': 'ALTER TABLE ' ~ backquote(table) ~ ' ADD FULLTEXT(' ~ backquote(row.field) ~ ');',
'message_to_show': t('An index has been added on %s.')|format(row.field|e)
<a rel="samepage" class="{{ hide_structure_actions ? 'dropdown-item' : 'nav-link px-1' }} ajax add_key add_fulltext_anchor" href="{{ url('/table/structure/add-key', {'db': db, 'table': table}) }}" data-post="{{ get_common({
'selected_fld': [row.field],
'key_type': 'FULLTEXT',
}, '', false) }}">
{{ get_icon('b_ftext', t('Fulltext')) }}
</a>

2
src/Application.php
View File

@ -136,7 +136,7 @@ class Application
$runner->run();
}
public function handle(ServerRequest $request): Response|null
public function handle(ServerRequest $request): Response
{
return Routing::callControllerForRoute(
$request,

6
src/Controllers/BrowseForeignersController.php
View File

@ -22,7 +22,7 @@ final class BrowseForeignersController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
/** @var string|null $database */
$database = $request->getParsedBodyParam('db');
@ -40,7 +40,7 @@ final class BrowseForeignersController implements InvocableController
$foreignFilter = $request->getParsedBodyParam('foreign_filter', '');
if (! isset($database, $table, $field)) {
return null;
return $this->response->response();
}
$this->response->setMinimalFooter();
@ -68,6 +68,6 @@ final class BrowseForeignersController implements InvocableController
$data,
));
return null;
return $this->response->response();
}
}

4
src/Controllers/CheckRelationsController.php
View File

@ -23,7 +23,7 @@ final class CheckRelationsController implements InvocableController
{
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$cfgStorageDbName = $this->relation->getConfigurationStorageDbName();
@ -57,6 +57,6 @@ final class CheckRelationsController implements InvocableController
'are_config_storage_tables_defined' => $this->relation->arePmadbTablesDefined(),
]);
return null;
return $this->response->response();
}
}

4
src/Controllers/CollationConnectionController.php
View File

@ -16,7 +16,7 @@ final class CollationConnectionController implements InvocableController
{
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$this->config->setUserValue(
null,
@ -27,6 +27,6 @@ final class CollationConnectionController implements InvocableController
$this->response->redirect('index.php?route=/' . Url::getCommonRaw([], '&'));
return null;
return $this->response->response();
}
}

6
src/Controllers/ColumnController.php
View File

@ -16,7 +16,7 @@ final class ColumnController implements InvocableController
{
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
/** @var string|null $db */
$db = $request->getParsedBodyParam('db');
@ -27,11 +27,11 @@ final class ColumnController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON(['message' => Message::error()]);
return null;
return $this->response->response();
}
$this->response->addJSON(['columns' => $this->dbi->getColumnNames($db, $table)]);
return null;
return $this->response->response();
}
}

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

@ -22,7 +22,7 @@ final class AddController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$db = $request->getParsedBodyParam('db');
$label = $request->getParsedBodyParam('label');
@ -32,7 +32,7 @@ final class AddController implements InvocableController
if (! is_string($label) || ! is_string($db) || ! is_string($bookmarkQuery) || ! is_string($shared)) {
$this->response->addJSON('message', __('Incomplete params'));
return null;
return $this->response->response();
}
$bookmark = $this->bookmarkRepository->createBookmark(
@ -45,7 +45,7 @@ final class AddController implements InvocableController
if ($bookmark === false || ! $bookmark->save()) {
$this->response->addJSON('message', __('Failed'));
return null;
return $this->response->response();
}
$bookmarkFields = [
@ -59,6 +59,6 @@ final class AddController implements InvocableController
$this->response->addJSON('data', $bookmarkFields);
$this->response->addJSON('isShared', $shared === 'true');
return null;
return $this->response->response();
}
}

4
src/Controllers/Console/Bookmark/RefreshController.php
View File

@ -16,10 +16,10 @@ final class RefreshController implements InvocableController
{
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$this->response->addJSON('console_message_bookmark', $this->console->getBookmarkContent());
return null;
return $this->response->response();
}
}

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

@ -19,7 +19,7 @@ final class PopulateColumnsController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$columns = $this->centralColumns->getColumnsNotInCentralList(
Current::$database,
@ -27,6 +27,6 @@ final class PopulateColumnsController implements InvocableController
);
$this->response->render('database/central_columns/populate_columns', ['columns' => $columns]);
return null;
return $this->response->response();
}
}

12
src/Controllers/Database/CentralColumnsController.php
View File

@ -32,7 +32,7 @@ final class CentralColumnsController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['message'] ??= null;
$db = DatabaseName::from($request->getParam('db'));
@ -52,7 +52,7 @@ final class CentralColumnsController implements InvocableController
$db,
));
return null;
return $this->response->response();
}
if ($request->hasBodyParam('add_new_column')) {
@ -76,7 +76,7 @@ final class CentralColumnsController implements InvocableController
$request->getParsedBodyParam('cur_table', ''),
));
return null;
return $this->response->response();
}
if ($request->hasBodyParam('add_column')) {
@ -100,7 +100,7 @@ final class CentralColumnsController implements InvocableController
'db' => $request->getParsedBodyParam('db'),
]);
return null;
return $this->response->response();
}
if ($request->hasBodyParam('multi_edit_central_column_save')) {
@ -150,12 +150,12 @@ final class CentralColumnsController implements InvocableController
sprintf(__('Showing rows %1$s - %2$s.'), $pos + 1, $pos + $numberOfColumns),
);
if (! isset($tmpMsg) || $tmpMsg === true) {
return null;
return $this->response->response();
}
$GLOBALS['message'] = $tmpMsg;
return null;
return $this->response->response();
}
public function main(string $totalRows, string $position, DatabaseName $db): void

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

@ -28,10 +28,10 @@ final class DataDictionaryController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
if (! $this->response->checkParameters(['db'], true)) {
return null;
return $this->response->response();
}
$relationParameters = $this->relation->getRelationParameters();
@ -110,6 +110,6 @@ final class DataDictionaryController implements InvocableController
'tables' => $tables,
]);
return null;
return $this->response->response();
}
}

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

@ -37,7 +37,7 @@ final class DesignerController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['message'] ??= null;
$GLOBALS['errorUrl'] ??= null;
@ -83,7 +83,7 @@ final class DesignerController implements InvocableController
$this->response->addHTML($html);
}
return null;
return $this->response->response();
}
if ($request->hasBodyParam('operation')) {
@ -105,7 +105,7 @@ final class DesignerController implements InvocableController
);
$this->response->setRequestStatus(false);
return null;
return $this->response->response();
} else {
$page = $this->designerCommon->createNewPage($request->getParsedBodyParam('selected_value'), $db);
$this->response->addJSON('id', $page);
@ -150,11 +150,11 @@ final class DesignerController implements InvocableController
$this->response->setRequestStatus($success);
}
return null;
return $this->response->response();
}
if (! $this->response->checkParameters(['db'])) {
return null;
return $this->response->response();
}
$GLOBALS['errorUrl'] = Util::getScriptNameForOption(
@ -169,12 +169,12 @@ final class DesignerController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', Message::error(__('No databases selected.')));
return null;
return $this->response->response();
}
$this->response->redirectToRoute('/', ['reload' => true, 'message' => __('No databases selected.')]);
return null;
return $this->response->response();
}
$scriptDisplayField = $this->designerCommon->getTablesInfo();
@ -257,6 +257,6 @@ final class DesignerController implements InvocableController
$this->response->addHTML('<div id="PMA_disable_floating_menubar"></div>');
return null;
return $this->response->response();
}
}

20
src/Controllers/Database/EventsController.php
View File

@ -38,7 +38,7 @@ final class EventsController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errors'] ??= null;
$GLOBALS['errorUrl'] ??= null;
@ -47,7 +47,7 @@ final class EventsController implements InvocableController
if (! $request->isAjax()) {
if (! $this->response->checkParameters(['db'])) {
return null;
return $this->response->response();
}
$GLOBALS['errorUrl'] = Util::getScriptNameForOption(
@ -60,7 +60,7 @@ final class EventsController implements InvocableController
if ($databaseName === null || ! $this->dbTableExists->selectDatabase($databaseName)) {
$this->response->redirectToRoute('/', ['reload' => true, 'message' => __('No databases selected.')]);
return null;
return $this->response->response();
}
} elseif (Current::$database !== '') {
$this->dbi->selectDb(Current::$database);
@ -111,7 +111,7 @@ final class EventsController implements InvocableController
$this->response->addJSON('tableType', 'events');
return null;
return $this->response->response();
}
}
@ -184,12 +184,12 @@ final class EventsController implements InvocableController
$this->response->addJSON('message', $editor);
$this->response->addJSON('title', $title);
return null;
return $this->response->response();
}
$this->response->addHTML("\n\n<h2>" . $title . "</h2>\n\n" . $editor);
return null;
return $this->response->response();
}
$message = __('Error in processing request:') . ' ';
@ -203,7 +203,7 @@ final class EventsController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', $message);
return null;
return $this->response->response();
}
$this->response->addHTML($message->getDisplay());
@ -226,7 +226,7 @@ final class EventsController implements InvocableController
$this->response->addJSON('message', $exportData);
$this->response->addJSON('title', $title);
return null;
return $this->response->response();
}
$output = '<div class="container">';
@ -248,7 +248,7 @@ final class EventsController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', $message);
return null;
return $this->response->response();
}
$this->response->addHTML($message->getDisplay());
@ -266,6 +266,6 @@ final class EventsController implements InvocableController
'is_ajax' => $request->isAjax() && empty($_REQUEST['ajax_page_request']),
]);
return null;
return $this->response->response();
}
}

14
src/Controllers/Database/ExportController.php
View File

@ -36,7 +36,7 @@ final class ExportController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['urlParams'] ??= null;
$GLOBALS['table_select'] ??= null;
@ -50,7 +50,7 @@ final class ExportController implements InvocableController
$this->response->addScriptFiles(['export.js']);
if (! $this->response->checkParameters(['db'])) {
return null;
return $this->response->response();
}
$GLOBALS['errorUrl'] = Util::getScriptNameForOption(
@ -65,12 +65,12 @@ final class ExportController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', Message::error(__('No databases selected.')));
return null;
return $this->response->response();
}
$this->response->redirectToRoute('/', ['reload' => true, 'message' => __('No databases selected.')]);
return null;
return $this->response->response();
}
$GLOBALS['urlParams']['goto'] = Url::getFromRoute('/database/export');
@ -84,7 +84,7 @@ final class ExportController implements InvocableController
Message::error(__('No tables found in database.'))->getDisplay(),
);
return null;
return $this->response->response();
}
$selectedTable = $request->getParsedBodyParam('selected_tbl');
@ -150,7 +150,7 @@ final class ExportController implements InvocableController
__('Could not load export plugins, please check your installation!'),
)->getDisplay());
return null;
return $this->response->response();
}
$options = $this->exportOptions->getOptions(
@ -170,6 +170,6 @@ final class ExportController implements InvocableController
'tables' => $tablesForMultiValues,
]));
return null;
return $this->response->response();
}
}

12
src/Controllers/Database/ImportController.php
View File

@ -38,7 +38,7 @@ final class ImportController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['SESSION_KEY'] ??= null;
$GLOBALS['errorUrl'] ??= null;
@ -50,7 +50,7 @@ final class ImportController implements InvocableController
$this->response->addScriptFiles(['import.js']);
if (! $this->response->checkParameters(['db'])) {
return null;
return $this->response->response();
}
$config = Config::getInstance();
@ -63,12 +63,12 @@ final class ImportController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', Message::error(__('No databases selected.')));
return null;
return $this->response->response();
}
$this->response->redirectToRoute('/', ['reload' => true, 'message' => __('No databases selected.')]);
return null;
return $this->response->response();
}
[$GLOBALS['SESSION_KEY'], $uploadId] = Ajax::uploadProgressSetup();
@ -81,7 +81,7 @@ final class ImportController implements InvocableController
'Could not load import plugins, please check your installation!',
))->getDisplay());
return null;
return $this->response->response();
}
$offset = null;
@ -138,6 +138,6 @@ final class ImportController implements InvocableController
'local_files' => Import::getLocalFiles($importList),
]);
return null;
return $this->response->response();
}
}

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

@ -16,13 +16,13 @@ final class QueryController implements InvocableController
{
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$this->response->addHTML(MultiTableQuery::displayResults(
$request->getParsedBodyParam('sql_query'),
$request->getParam('db'),
));
return null;
return $this->response->response();
}
}

4
src/Controllers/Database/MultiTableQuery/TablesController.php
View File

@ -20,7 +20,7 @@ final class TablesController implements InvocableController
{
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
/** @var string[] $tables */
$tables = $request->getQueryParam('tables', []);
@ -37,6 +37,6 @@ final class TablesController implements InvocableController
);
$this->response->addJSON(['foreignKeyConstrains' => $constrains]);
return null;
return $this->response->response();
}
}

4
src/Controllers/Database/MultiTableQueryController.php
View File

@ -25,7 +25,7 @@ final class MultiTableQueryController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$this->response->addScriptFiles(['database/multi_table_query.js', 'database/query_generator.js']);
@ -33,6 +33,6 @@ final class MultiTableQueryController implements InvocableController
$this->response->addHTML($queryInstance->getFormHtml());
return null;
return $this->response->response();
}
}

8
src/Controllers/Database/PrivilegesController.php
View File

@ -35,7 +35,7 @@ final class PrivilegesController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
try {
$db = DatabaseName::from($request->getParam('db'));
@ -45,7 +45,7 @@ final class PrivilegesController implements InvocableController
} catch (InvalidDatabaseName $exception) {
$this->response->addHTML(Message::error($exception->getMessage())->getDisplay());
return null;
return $this->response->response();
}
$this->response->addScriptFiles(['server/privileges.js', 'vendor/zxcvbn-ts.js']);
@ -63,7 +63,7 @@ final class PrivilegesController implements InvocableController
->getDisplay(),
);
return null;
return $this->response->response();
}
if (! $isGrantUser && ! $isCreateUser) {
@ -90,6 +90,6 @@ final class PrivilegesController implements InvocableController
]);
$this->response->render('export_modal', []);
return null;
return $this->response->response();
}
}

42
src/Controllers/Database/RoutinesController.php
View File

@ -47,7 +47,7 @@ final class RoutinesController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errors'] ??= null;
$GLOBALS['errorUrl'] ??= null;
@ -66,7 +66,7 @@ final class RoutinesController implements InvocableController
*/
if (Current::$table !== '' && in_array(Current::$table, $this->dbi->getTables(Current::$database), true)) {
if (! $this->response->checkParameters(['db', 'table'])) {
return null;
return $this->response->response();
}
$GLOBALS['urlParams'] = ['db' => Current::$database, 'table' => Current::$table];
@ -80,20 +80,20 @@ final class RoutinesController implements InvocableController
['reload' => true, 'message' => __('No databases selected.')],
);
return null;
return $this->response->response();
}
$tableName = TableName::tryFrom($request->getParam('table'));
if ($tableName === null || ! $this->dbTableExists->hasTable($databaseName, $tableName)) {
$this->response->redirectToRoute('/', ['reload' => true, 'message' => __('No table selected.')]);
return null;
return $this->response->response();
}
} else {
Current::$table = '';
if (! $this->response->checkParameters(['db'])) {
return null;
return $this->response->response();
}
$GLOBALS['errorUrl'] = Util::getScriptNameForOption(
@ -109,7 +109,7 @@ final class RoutinesController implements InvocableController
['reload' => true, 'message' => __('No databases selected.')],
);
return null;
return $this->response->response();
}
}
} elseif (Current::$database !== '') {
@ -130,7 +130,7 @@ final class RoutinesController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', $output);
return null;
return $this->response->response();
}
$routines = Routines::getDetails(
@ -154,7 +154,7 @@ final class RoutinesController implements InvocableController
$this->response->addJSON('message', $output);
$this->response->addJSON('tableType', 'routines');
return null;
return $this->response->response();
}
}
@ -282,12 +282,12 @@ final class RoutinesController implements InvocableController
);
$this->response->addJSON('type', $routine['item_type']);
return null;
return $this->response->response();
}
$this->response->addHTML("\n\n<h2>" . $title . "</h2>\n\n" . $editor);
return null;
return $this->response->response();
}
$message = __('Error in processing request:') . ' ';
@ -307,7 +307,7 @@ final class RoutinesController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', $message);
return null;
return $this->response->response();
}
$this->response->addHTML($message->getDisplay());
@ -331,12 +331,12 @@ final class RoutinesController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', $message);
return null;
return $this->response->response();
}
$this->response->addHTML($message->getDisplay());
return null;
return $this->response->response();
}
[$output, $message] = $this->routines->handleExecuteRoutine($routine);
@ -347,14 +347,14 @@ final class RoutinesController implements InvocableController
$this->response->addJSON('message', $message->getDisplay() . $output);
$this->response->addJSON('dialog', false);
return null;
return $this->response->response();
}
$this->response->addHTML($message->getDisplay() . $output);
if ($message->isError()) {
// At least one query has failed, so shouldn't
// execute any more queries, so we quit.
return null;
return $this->response->response();
}
} elseif (! empty($_GET['execute_dialog']) && ! empty($_GET['item_name'])) {
/**
@ -378,13 +378,13 @@ final class RoutinesController implements InvocableController
$this->response->addJSON('title', $title);
$this->response->addJSON('dialog', true);
return null;
return $this->response->response();
}
$this->response->addHTML("\n\n<h2>" . __('Execute routine') . "</h2>\n\n");
$this->response->addHTML($form);
return null;
return $this->response->response();
}
if ($request->isAjax()) {
@ -399,7 +399,7 @@ final class RoutinesController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', $message);
return null;
return $this->response->response();
}
}
@ -439,7 +439,7 @@ final class RoutinesController implements InvocableController
$this->response->addJSON('message', $exportData);
$this->response->addJSON('title', $title);
return null;
return $this->response->response();
}
$output = '<div class="container">';
@ -464,7 +464,7 @@ final class RoutinesController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', $message);
return null;
return $this->response->response();
}
$this->response->addHTML($message->getDisplay());
@ -494,6 +494,6 @@ final class RoutinesController implements InvocableController
'has_privilege' => Util::currentUserHasPrivilege('CREATE ROUTINE', Current::$database, Current::$table),
]);
return null;
return $this->response->response();
}
}

16
src/Controllers/Database/SearchController.php
View File

@ -32,7 +32,7 @@ final class SearchController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
$GLOBALS['urlParams'] ??= null;
@ -40,7 +40,7 @@ final class SearchController implements InvocableController
$this->response->addScriptFiles(['database/search.js', 'sql.js', 'makegrid.js']);
if (! $this->response->checkParameters(['db'])) {
return null;
return $this->response->response();
}
$config = Config::getInstance();
@ -53,12 +53,12 @@ final class SearchController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', Message::error(__('No databases selected.')));
return null;
return $this->response->response();
}
$this->response->redirectToRoute('/', ['reload' => true, 'message' => __('No databases selected.')]);
return null;
return $this->response->response();
}
if (! $config->settings['UseDbSearch']) {
@ -70,7 +70,7 @@ final class SearchController implements InvocableController
if ($request->isAjax()) {
$this->response->addJSON('message', Message::error($errorMessage)->getDisplay());
return null;
return $this->response->response();
}
$this->response->render('error/simple', [
@ -78,7 +78,7 @@ final class SearchController implements InvocableController
'back_url' => $GLOBALS['errorUrl'],
]);
return null;
return $this->response->response();
}
$GLOBALS['urlParams']['goto'] = Url::getFromRoute('/database/search');
@ -93,12 +93,12 @@ final class SearchController implements InvocableController
// If we are in an Ajax request, we need to exit after displaying all the HTML
if ($request->isAjax() && empty($_REQUEST['ajax_page_request'])) {
return null;
return $this->response->response();
}
// Display the search form
$this->response->addHTML($databaseSearch->getMainHtml());
return null;
return $this->response->response();
}
}

4
src/Controllers/Database/SqlAutoCompleteController.php
View File

@ -26,7 +26,7 @@ final class SqlAutoCompleteController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$sqlAutocomplete = [];
if ($this->config->settings['EnableAutocompleteForTablesAndColumns']) {
@ -38,7 +38,7 @@ final class SqlAutoCompleteController implements InvocableController
$this->response->addJSON(['tables' => $sqlAutocomplete]);
return null;
return $this->response->response();
}
/** @return string[][][] */

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

@ -34,7 +34,7 @@ class SqlController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['goto'] ??= null;
$GLOBALS['back'] ??= null;
@ -47,7 +47,7 @@ class SqlController implements InvocableController
$this->response->addHTML($this->pageSettings->getHTML());
if (! $this->response->checkParameters(['db'])) {
return null;
return $this->response->response();
}
$GLOBALS['errorUrl'] = Util::getScriptNameForOption(
@ -62,12 +62,12 @@ class SqlController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', Message::error(__('No databases selected.')));
return null;
return $this->response->response();
}
$this->response->redirectToRoute('/', ['reload' => true, 'message' => __('No databases selected.')]);
return null;
return $this->response->response();
}
/**
@ -86,6 +86,6 @@ class SqlController implements InvocableController
htmlspecialchars($delimiter),
));
return null;
return $this->response->response();
}
}

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

@ -19,12 +19,12 @@ final class SqlFormatController implements InvocableController
{
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
/** @var string $query */
$query = $request->getParsedBodyParam('sql', '');
$this->response->addJSON(['sql' => Formatter::format($query)]);
return null;
return $this->response->response();
}
}

4
src/Controllers/Database/Structure/AddPrefixController.php
View File

@ -23,7 +23,7 @@ final class AddPrefixController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
/** @var string[] $selected */
$selected = $request->getParsedBodyParam('selected_tbl', []);
@ -32,7 +32,7 @@ final class AddPrefixController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', __('No table selected.'));
return null;
return $this->response->response();
}
$params = ['db' => Current::$database];

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

@ -21,7 +21,7 @@ final class AddPrefixTableController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
/** @var string[] $selected */
$selected = $request->getParsedBodyParam('selected', []);
@ -40,8 +40,6 @@ final class AddPrefixTableController implements InvocableController
$GLOBALS['message'] = Message::success();
($this->structureController)($request);
return null;
return ($this->structureController)($request);
}
}

8
src/Controllers/Database/Structure/CentralColumns/AddController.php
View File

@ -27,7 +27,7 @@ final class AddController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['message'] ??= null;
@ -37,7 +37,7 @@ final class AddController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', __('No table selected.'));
return null;
return $this->response->response();
}
Assert::allString($selected);
@ -49,8 +49,6 @@ final class AddController implements InvocableController
unset($_POST['submit_mult']);
($this->structureController)($request);
return null;
return ($this->structureController)($request);
}
}

8
src/Controllers/Database/Structure/CentralColumns/MakeConsistentController.php
View File

@ -27,7 +27,7 @@ final class MakeConsistentController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['message'] ??= null;
@ -37,7 +37,7 @@ final class MakeConsistentController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', __('No table selected.'));
return null;
return $this->response->response();
}
Assert::allString($selected);
@ -49,8 +49,6 @@ final class MakeConsistentController implements InvocableController
unset($_POST['submit_mult']);
($this->structureController)($request);
return null;
return ($this->structureController)($request);
}
}

8
src/Controllers/Database/Structure/CentralColumns/RemoveController.php
View File

@ -26,7 +26,7 @@ final class RemoveController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['message'] ??= null;
@ -36,7 +36,7 @@ final class RemoveController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', __('No table selected.'));
return null;
return $this->response->response();
}
Assert::allString($selected);
@ -48,8 +48,6 @@ final class RemoveController implements InvocableController
unset($_POST['submit_mult']);
($this->structureController)($request);
return null;
return ($this->structureController)($request);
}
}

4
src/Controllers/Database/Structure/ChangePrefixFormController.php
View File

@ -23,7 +23,7 @@ final class ChangePrefixFormController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
/** @var string[] $selected */
$selected = $request->getParsedBodyParam('selected_tbl', []);
@ -32,7 +32,7 @@ final class ChangePrefixFormController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', __('No table selected.'));
return null;
return $this->response->response();
}
$route = '/database/structure/replace-prefix';

4
src/Controllers/Database/Structure/CopyFormController.php
View File

@ -24,7 +24,7 @@ final class CopyFormController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
/** @var string[] $selected */
$selected = $request->getParsedBodyParam('selected_tbl', []);
@ -33,7 +33,7 @@ final class CopyFormController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', __('No table selected.'));
return null;
return $this->response->response();
}
$urlParams = ['db' => Current::$database];

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

@ -26,7 +26,7 @@ final class CopyTableController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
/** @var string[] $selected */
$selected = $request->getParsedBodyParam('selected', []);
@ -61,8 +61,6 @@ final class CopyTableController implements InvocableController
$GLOBALS['message'] = Message::success();
($this->structureController)($request);
return null;
return ($this->structureController)($request);
}
}

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

@ -25,7 +25,7 @@ final class CopyTableWithPrefixController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
/** @var string[] $selected */
$selected = $request->getParsedBodyParam('selected', []);
@ -50,8 +50,6 @@ final class CopyTableWithPrefixController implements InvocableController
$GLOBALS['message'] = Message::success();
($this->structureController)($request);
return null;
return ($this->structureController)($request);
}
}

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

@ -22,7 +22,7 @@ final class DropFormController implements InvocableController
{
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
/** @var string[] $selected */
$selected = $request->getParsedBodyParam('selected_tbl', []);
@ -31,7 +31,7 @@ final class DropFormController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', __('No table selected.'));
return null;
return $this->response->response();
}
$fullQueryViews = '';
@ -66,6 +66,6 @@ final class DropFormController implements InvocableController
'is_foreign_key_check' => ForeignKey::isCheckEnabled(),
]);
return null;
return $this->response->response();
}
}

10
src/Controllers/Database/Structure/DropTableController.php
View File

@ -26,7 +26,7 @@ final class DropTableController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['reload'] = $_POST['reload'] ?? $GLOBALS['reload'] ?? null;
$multBtn = $_POST['mult_btn'] ?? '';
@ -38,9 +38,7 @@ final class DropTableController implements InvocableController
unset($_POST['mult_btn']);
($this->structureController)($request);
return null;
return ($this->structureController)($request);
}
$defaultFkCheckValue = ForeignKey::handleDisableCheckInit();
@ -101,8 +99,6 @@ final class DropTableController implements InvocableController
unset($_POST['mult_btn']);
($this->structureController)($request);
return null;
return ($this->structureController)($request);
}
}

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

@ -21,7 +21,7 @@ final class EmptyFormController implements InvocableController
{
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
/** @var string[] $selected */
$selected = $request->getParsedBodyParam('selected_tbl', []);
@ -30,7 +30,7 @@ final class EmptyFormController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', __('No table selected.'));
return null;
return $this->response->response();
}
$fullQuery = '';
@ -48,6 +48,6 @@ final class EmptyFormController implements InvocableController
'is_foreign_key_check' => ForeignKey::isCheckEnabled(),
]);
return null;
return $this->response->response();
}
}

8
src/Controllers/Database/Structure/EmptyTableController.php
View File

@ -39,7 +39,7 @@ final class EmptyTableController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$multBtn = $_POST['mult_btn'] ?? '';
/** @var string[] $selected */
@ -49,7 +49,7 @@ final class EmptyTableController implements InvocableController
$this->flashMessenger->addMessage('success', __('No change'));
$this->response->redirectToRoute('/database/structure', ['db' => Current::$database]);
return null;
return $this->response->response();
}
$defaultFkCheckValue = ForeignKey::handleDisableCheckInit();
@ -90,8 +90,6 @@ final class EmptyTableController implements InvocableController
unset($_POST['mult_btn']);
($this->structureController)($request);
return null;
return ($this->structureController)($request);
}
}

14
src/Controllers/Database/Structure/FavoriteTableController.php
View File

@ -39,12 +39,12 @@ final class FavoriteTableController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
if (Current::$database === '') {
return null;
return $this->response->response();
}
$config = Config::getInstance();
@ -52,7 +52,7 @@ final class FavoriteTableController implements InvocableController
$GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&');
if (! $request->isAjax()) {
return null;
return $this->response->response();
}
$favoriteInstance = RecentFavoriteTables::getInstance(TableType::Favorite);
@ -74,7 +74,7 @@ final class FavoriteTableController implements InvocableController
));
}
return null;
return $this->response->response();
}
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
@ -82,7 +82,7 @@ final class FavoriteTableController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', Message::error(__('No databases selected.')));
return null;
return $this->response->response();
}
$changes = true;
@ -120,7 +120,7 @@ final class FavoriteTableController implements InvocableController
]);
$this->response->addJSON($json);
return null;
return $this->response->response();
}
// Check if current table is already in favorite list.
@ -143,7 +143,7 @@ final class FavoriteTableController implements InvocableController
$this->response->addJSON($json);
return null;
return $this->response->response();
}
/**

12
src/Controllers/Database/Structure/RealRowCountController.php
View File

@ -31,7 +31,7 @@ final class RealRowCountController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
@ -41,7 +41,7 @@ final class RealRowCountController implements InvocableController
];
if (! $this->response->checkParameters(['db'])) {
return null;
return $this->response->response();
}
$GLOBALS['errorUrl'] = Util::getScriptNameForOption(
@ -51,7 +51,7 @@ final class RealRowCountController implements InvocableController
$GLOBALS['errorUrl'] .= Url::getCommon(['db' => Current::$database], '&');
if (! $request->isAjax()) {
return null;
return $this->response->response();
}
$databaseName = DatabaseName::tryFrom($request->getParam('db'));
@ -59,7 +59,7 @@ final class RealRowCountController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', Message::error(__('No databases selected.')));
return null;
return $this->response->response();
}
// If there is a request to update all table's row count.
@ -73,7 +73,7 @@ final class RealRowCountController implements InvocableController
$this->response->addJSON(['real_row_count' => $realRowCount]);
return null;
return $this->response->response();
}
// Array to store the results.
@ -88,6 +88,6 @@ final class RealRowCountController implements InvocableController
$this->response->addJSON(['real_row_count_all' => $realRowCountAll]);
return null;
return $this->response->response();
}
}

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

@ -24,7 +24,7 @@ final class ShowCreateController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
/** @var string[] $selected */
$selected = $request->getParsedBodyParam('selected_tbl', []);
@ -33,7 +33,7 @@ final class ShowCreateController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', __('No table selected.'));
return null;
return $this->response->response();
}
$tables = $this->getShowCreateTables($selected);
@ -42,7 +42,7 @@ final class ShowCreateController implements InvocableController
$this->response->addJSON('message', $showCreate);
return null;
return $this->response->response();
}
/**

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

@ -121,14 +121,14 @@ final class StructureController implements InvocableController
$this->dbIsSystemSchema = true;
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
$parameters = ['sort' => $_REQUEST['sort'] ?? null, 'sort_order' => $_REQUEST['sort_order'] ?? null];
if (! $this->response->checkParameters(['db'])) {
return null;
return $this->response->response();
}
$config = Config::getInstance();
@ -141,12 +141,12 @@ final class StructureController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', Message::error(__('No databases selected.')));
return null;
return $this->response->response();
}
$this->response->redirectToRoute('/', ['reload' => true, 'message' => __('No databases selected.')]);
return null;
return $this->response->response();
}
$this->response->addScriptFiles(['database/structure.js', 'table/change.js']);
@ -208,7 +208,7 @@ final class StructureController implements InvocableController
'create_table_html' => $createTable,
]);
return null;
return $this->response->response();
}
/** @param mixed[] $replicaInfo */

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

@ -38,7 +38,7 @@ final class TrackingController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['urlParams'] ??= null;
$GLOBALS['errorUrl'] ??= null;
@ -46,7 +46,7 @@ final class TrackingController implements InvocableController
$this->response->addScriptFiles(['vendor/jquery/jquery.tablesorter.js', 'database/tracking.js']);
if (! $this->response->checkParameters(['db'])) {
return null;
return $this->response->response();
}
$config = Config::getInstance();
@ -59,12 +59,12 @@ final class TrackingController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', Message::error(__('No databases selected.')));
return null;
return $this->response->response();
}
$this->response->redirectToRoute('/', ['reload' => true, 'message' => __('No databases selected.')]);
return null;
return $this->response->response();
}
$GLOBALS['urlParams']['goto'] = Url::getFromRoute('/table/tracking');
@ -114,7 +114,7 @@ final class TrackingController implements InvocableController
'default_statements' => $config->selectedServer['tracking_default_statements'],
]);
return null;
return $this->response->response();
}
} else {
$this->response->addHTML(Message::notice(
@ -134,7 +134,7 @@ final class TrackingController implements InvocableController
$this->response->render('database/create_table', ['db' => Current::$database]);
}
return null;
return $this->response->response();
}
$this->response->addHTML($this->tracking->getHtmlForDbTrackingTables(
@ -145,7 +145,7 @@ final class TrackingController implements InvocableController
// If available print out database log
if ($trackedData->ddlog === []) {
return null;
return $this->response->response();
}
$log = '';
@ -156,6 +156,6 @@ final class TrackingController implements InvocableController
$this->response->addHTML(Generator::getMessage(__('Database Log'), $log));
return null;
return $this->response->response();
}
}

4
src/Controllers/DatabaseController.php
View File

@ -15,10 +15,10 @@ final class DatabaseController implements InvocableController
{
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$this->response->addJSON(['databases' => $this->dbi->getDatabaseList()]);
return null;
return $this->response->response();
}
}

6
src/Controllers/ErrorReportController.php
View File

@ -39,7 +39,7 @@ final class ErrorReportController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
/** @var string $exceptionType */
$exceptionType = $request->getParsedBodyParam('exception_type', '');
@ -49,7 +49,7 @@ final class ErrorReportController implements InvocableController
$alwaysSend = $request->getParsedBodyParam('always_send');
if (! in_array($exceptionType, ['js', 'php'], true)) {
return null;
return $this->response->response();
}
$config = Config::getInstance();
@ -146,6 +146,6 @@ final class ErrorReportController implements InvocableController
$this->errorHandler->savePreviousErrors();
}
return null;
return $this->response->response();
}
}

8
src/Controllers/Export/CheckTimeOutController.php
View File

@ -15,21 +15,21 @@ final class CheckTimeOutController implements InvocableController
{
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
if (! $request->isAjax()) {
return null;
return $this->response->response();
}
if (isset($_SESSION['pma_export_error'])) {
unset($_SESSION['pma_export_error']);
$this->response->addJSON('message', 'timeout');
return null;
return $this->response->response();
}
$this->response->addJSON('message', 'success');
return null;
return $this->response->response();
}
}

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

@ -47,7 +47,7 @@ final class ExportController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['export_type'] ??= null;
$GLOBALS['errorUrl'] ??= null;
@ -100,7 +100,7 @@ final class ExportController implements InvocableController
$GLOBALS['what'] = Core::securePath($whatParam);
if (! $this->response->checkParameters(['what', 'export_type'])) {
return null;
return $this->response->response();
}
// export class instance, not array of properties, as before
@ -114,7 +114,7 @@ final class ExportController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addHTML(Message::error(__('Bad type!'))->getDisplay());
return null;
return $this->response->response();
}
if ($request->hasBodyParam('sql_backquotes') && $exportPlugin instanceof ExportSql) {
@ -189,7 +189,7 @@ final class ExportController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addHTML(Message::error(__('Bad parameters!'))->getDisplay());
return null;
return $this->response->response();
}
// Merge SQL Query aliases with Export aliases from
@ -276,7 +276,7 @@ final class ExportController implements InvocableController
$location = $this->export->getPageLocationAndSaveMessage($GLOBALS['export_type'], $message);
$this->response->redirect($location);
return null;
return $this->response->response();
}
} elseif ($GLOBALS['asfile']) {
/**
@ -299,9 +299,8 @@ final class ExportController implements InvocableController
);
/** @var DatabaseExportController $controller */
$controller = ContainerBuilder::getContainer()->get(DatabaseExportController::class);
$controller($request);
return null;
return $controller($request);
}
}
@ -487,7 +486,7 @@ final class ExportController implements InvocableController
$location = $this->export->getPageLocationAndSaveMessage($GLOBALS['export_type'], $GLOBALS['message']);
$this->response->redirect($location);
return null;
return $this->response->response();
}
/**
@ -500,7 +499,7 @@ final class ExportController implements InvocableController
Current::$table,
);
return null;
return $this->response->response();
}
// Convert the charset if required.
@ -539,7 +538,7 @@ final class ExportController implements InvocableController
$location = $this->export->getPageLocationAndSaveMessage($GLOBALS['export_type'], $message);
$this->response->redirect($location);
return null;
return $this->response->response();
}
return $this->responseFactory->createResponse()->write($this->export->dumpBuffer);

8
src/Controllers/Export/TablesController.php
View File

@ -20,17 +20,15 @@ final class TablesController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
if (! $request->hasBodyParam('selected_tbl')) {
$this->response->setRequestStatus(false);
$this->response->addJSON('message', __('No table selected.'));
return null;
return $this->response->response();
}
($this->exportController)($request);
return null;
return ($this->exportController)($request);
}
}

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

@ -26,7 +26,7 @@ final class CreateController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
/** @var string $exportType */
$exportType = $request->getParsedBodyParam('exportType', '');
@ -39,7 +39,7 @@ final class CreateController implements InvocableController
$exportTemplatesFeature = $this->relation->getRelationParameters()->exportTemplatesFeature;
if ($exportTemplatesFeature === null) {
return null;
return $this->response->response();
}
$template = ExportTemplate::fromArray([
@ -58,7 +58,7 @@ final class CreateController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', $result);
return null;
return $this->response->response();
}
$templates = $this->model->getAll(
@ -77,6 +77,6 @@ final class CreateController implements InvocableController
]),
);
return null;
return $this->response->response();
}
}

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

@ -21,13 +21,13 @@ final class DeleteController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$templateId = (int) $request->getParsedBodyParam('templateId');
$exportTemplatesFeature = $this->relation->getRelationParameters()->exportTemplatesFeature;
if ($exportTemplatesFeature === null) {
return null;
return $this->response->response();
}
$result = $this->model->delete(
@ -41,11 +41,11 @@ final class DeleteController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', $result);
return null;
return $this->response->response();
}
$this->response->setRequestStatus(true);
return null;
return $this->response->response();
}
}

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

@ -22,13 +22,13 @@ final class LoadController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$templateId = (int) $request->getParsedBodyParam('templateId');
$exportTemplatesFeature = $this->relation->getRelationParameters()->exportTemplatesFeature;
if ($exportTemplatesFeature === null) {
return null;
return $this->response->response();
}
$template = $this->model->load(
@ -42,12 +42,12 @@ final class LoadController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', $template);
return null;
return $this->response->response();
}
$this->response->setRequestStatus(true);
$this->response->addJSON('data', $template->getData());
return null;
return $this->response->response();
}
}

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

@ -22,7 +22,7 @@ final class UpdateController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$templateId = (int) $request->getParsedBodyParam('templateId');
/** @var string $templateData */
@ -30,7 +30,7 @@ final class UpdateController implements InvocableController
$exportTemplatesFeature = $this->relation->getRelationParameters()->exportTemplatesFeature;
if ($exportTemplatesFeature === null) {
return null;
return $this->response->response();
}
$template = ExportTemplate::fromArray([
@ -48,11 +48,11 @@ final class UpdateController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', $result);
return null;
return $this->response->response();
}
$this->response->setRequestStatus(true);
return null;
return $this->response->response();
}
}

10
src/Controllers/GisDataEditorController.php
View File

@ -40,7 +40,7 @@ final class GisDataEditorController implements InvocableController
'GEOMETRYCOLLECTION',
];
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
/** @var string|null $field */
$field = $request->getParsedBodyParam('field');
@ -54,7 +54,7 @@ final class GisDataEditorController implements InvocableController
$inputName = $request->getParsedBodyParam('input_name');
if (! isset($field)) {
return null;
return $this->response->response();
}
// Get data if any posted
@ -66,7 +66,7 @@ final class GisDataEditorController implements InvocableController
// Generate parameters from value passed.
$gisObj = GisFactory::fromType($geomType);
if ($gisObj === null) {
return null;
return $this->response->response();
}
if (isset($value)) {
@ -91,7 +91,7 @@ final class GisDataEditorController implements InvocableController
if ($request->hasBodyParam('generate')) {
$this->response->addJSON(['result' => $result, 'visualization' => $svg, 'openLayers' => $openLayers]);
return null;
return $this->response->response();
}
$templateOutput = $this->template->render('gis_data_editor_form', [
@ -111,7 +111,7 @@ final class GisDataEditorController implements InvocableController
$this->response->addJSON(['gis_editor' => $templateOutput]);
return null;
return $this->response->response();
}
/**

10
src/Controllers/GitInfoController.php
View File

@ -19,16 +19,16 @@ final class GitInfoController implements InvocableController
{
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
if (! $request->isAjax()) {
return null;
return $this->response->response();
}
$git = new Git($this->config->get('ShowGitRevision') ?? true);
if (! $git->isGitRevision()) {
return null;
return $this->response->response();
}
$commit = $git->checkGitRevision();
@ -36,7 +36,7 @@ final class GitInfoController implements InvocableController
if (! $git->hasGitInformation() || $commit === null) {
$this->response->setRequestStatus(false);
return null;
return $this->response->response();
}
$commit['author']['date'] = Util::localisedDate(strtotime($commit['author']['date']));
@ -44,6 +44,6 @@ final class GitInfoController implements InvocableController
$this->response->render('home/git_info', $commit);
return null;
return $this->response->response();
}
}

6
src/Controllers/HomeController.php
View File

@ -59,7 +59,7 @@ final class HomeController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
if ($this->shouldRedirectToDatabaseOrTablePage($request)) {
return $this->redirectToDatabaseOrTablePage($request);
@ -70,7 +70,7 @@ final class HomeController implements InvocableController
$GLOBALS['errorUrl'] ??= null;
if ($request->isAjax() && ! empty($_REQUEST['access_time'])) {
return null;
return $this->response->response();
}
$this->response->addScriptFiles(['home.js']);
@ -250,7 +250,7 @@ final class HomeController implements InvocableController
'errors' => $this->errors,
]);
return null;
return $this->response->response();
}
private function checkRequirements(): void

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

@ -59,7 +59,7 @@ final class ImportController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['goto'] ??= null;
$GLOBALS['display_query'] ??= null;
@ -176,7 +176,7 @@ final class ImportController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', $GLOBALS['message']);
return null; // the footer is displayed automatically
return $this->response->response();
}
// Add console message id to response output
@ -191,7 +191,7 @@ final class ImportController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addHTML(Message::error(__('Incorrect format parameter'))->getDisplay());
return null;
return $this->response->response();
}
if (Current::$table !== '' && Current::$database !== '') {
@ -304,7 +304,7 @@ final class ImportController implements InvocableController
$this->response->addJSON('sql_query', $GLOBALS['import_text']);
$this->response->addJSON('action_bookmark', $actionBookmark);
return null;
return $this->response->response();
}
ImportSettings::$runQuery = false;
@ -325,7 +325,7 @@ final class ImportController implements InvocableController
$this->response->addJSON('action_bookmark', $actionBookmark);
$this->response->addJSON('id_bookmark', $idBookmark);
return null;
return $this->response->response();
}
ImportSettings::$runQuery = false;
@ -408,7 +408,7 @@ final class ImportController implements InvocableController
$this->response->addJSON('message', $errorMessage->getDisplay());
$this->response->addHTML($errorMessage->getDisplay());
return null;
return $this->response->response();
}
$importHandle->setDecompressContent(true);
@ -425,7 +425,7 @@ final class ImportController implements InvocableController
$this->response->addJSON('message', $errorMessage->getDisplay());
$this->response->addHTML($errorMessage->getDisplay());
return null;
return $this->response->response();
}
} elseif (! $GLOBALS['error'] && empty($GLOBALS['import_text'])) {
$GLOBALS['message'] = Message::error(
@ -442,7 +442,7 @@ final class ImportController implements InvocableController
$this->response->addJSON('message', $GLOBALS['message']->getDisplay());
$this->response->addHTML($GLOBALS['message']->getDisplay());
return null;
return $this->response->response();
}
// Convert the file's charset if necessary
@ -635,7 +635,7 @@ final class ImportController implements InvocableController
$_SESSION['Import_message']['go_back_url'],
);
return null;
return $this->response->response();
}
if (Current::$table != $tableFromSql && $tableFromSql !== '') {
@ -677,7 +677,7 @@ final class ImportController implements InvocableController
$this->response->addJSON('ajax_reload', $GLOBALS['ajax_reload']);
$this->response->addHTML($htmlOutput);
return null;
return $this->response->response();
}
if ($request->hasBodyParam('rollback_query')) {
@ -716,6 +716,6 @@ final class ImportController implements InvocableController
include ROOT_PATH . $GLOBALS['goto'];
}
return null;
return $this->response->response();
}
}

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

@ -25,7 +25,7 @@ final class SimulateDmlController implements InvocableController
{
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$error = '';
$errorMsg = __('Only single-table UPDATE and DELETE queries can be simulated.');
@ -77,11 +77,11 @@ final class SimulateDmlController implements InvocableController
$this->response->addJSON('message', $message);
$this->response->addJSON('sql_data', false);
return null;
return $this->response->response();
}
$this->response->addJSON('sql_data', $sqlData);
return null;
return $this->response->response();
}
}

5
src/Controllers/Import/StatusController.php
View File

@ -10,6 +10,7 @@ use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Import\Ajax;
use PhpMyAdmin\Message;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Template;
use function __;
@ -30,7 +31,7 @@ class StatusController implements InvocableController
{
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['SESSION_KEY'] ??= null;
@ -78,6 +79,6 @@ class StatusController implements InvocableController
Ajax::status($request->getQueryParam('id'));
}
return null;
return ResponseRenderer::getInstance()->response();
}
}

2
src/Controllers/InvocableController.php
View File

@ -9,5 +9,5 @@ use PhpMyAdmin\Http\ServerRequest;
interface InvocableController
{
public function __invoke(ServerRequest $request): Response|null;
public function __invoke(ServerRequest $request): Response;
}

5
src/Controllers/LintController.php
View File

@ -9,6 +9,7 @@ use PhpMyAdmin\Http\Factory\ResponseFactory;
use PhpMyAdmin\Http\Response;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Linter;
use PhpMyAdmin\ResponseRenderer;
use function is_array;
use function is_string;
@ -29,10 +30,10 @@ final class LintController implements InvocableController
{
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
if (! $request->isAjax()) {
return null;
return ResponseRenderer::getInstance()->response();
}
/**

9
src/Controllers/LogoutController.php
View File

@ -15,17 +15,18 @@ final class LogoutController implements InvocableController
{
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$responseRenderer = ResponseRenderer::getInstance();
if (! $request->isPost() || $GLOBALS['token_mismatch']) {
ResponseRenderer::getInstance()->redirect('./index.php?route=/');
$responseRenderer->redirect('./index.php?route=/');
return null;
return $responseRenderer->response();
}
$authPlugin = $this->authPluginFactory->create();
$authPlugin->logOut();
return null;
return $responseRenderer->response();
}
}

8
src/Controllers/Navigation/UpdateNavWidthConfigController.php
View File

@ -20,24 +20,24 @@ final class UpdateNavWidthConfigController implements InvocableController
{
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$value = $request->getParsedBodyParam('value');
if (! is_numeric($value) || $value < 0) {
$this->response->setRequestStatus(false);
$this->response->addJSON(['message' => Message::error(__('Unexpected parameter value.'))]);
return null;
return $this->response->response();
}
$result = $this->config->setUserValue(null, 'NavigationWidth', (int) $value);
if ($result === true) {
return null;
return $this->response->response();
}
$this->response->setRequestStatus(false);
$this->response->addJSON(['message' => $result]);
return null;
return $this->response->response();
}
}

14
src/Controllers/NavigationController.php
View File

@ -30,7 +30,7 @@ final class NavigationController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
if (! $request->isAjax()) {
$this->response->addHTML(
@ -39,7 +39,7 @@ final class NavigationController implements InvocableController
)->getDisplay(),
);
return null;
return $this->response->response();
}
if ($request->hasBodyParam('getNaviSettings')) {
@ -47,7 +47,7 @@ final class NavigationController implements InvocableController
$this->response->addHTML($this->pageSettings->getErrorHTML());
$this->response->addJSON('message', $this->pageSettings->getHTML());
return null;
return $this->response->response();
}
if ($request->hasBodyParam('reload')) {
@ -65,7 +65,7 @@ final class NavigationController implements InvocableController
$this->navigation->hideNavigationItem($itemName, $itemType, $dbName);
}
return null;
return $this->response->response();
}
if ($request->hasBodyParam('unhideNavItem')) {
@ -73,7 +73,7 @@ final class NavigationController implements InvocableController
$this->navigation->unhideNavigationItem($itemName, $itemType, $dbName);
}
return null;
return $this->response->response();
}
if ($request->hasBodyParam('showUnhideDialog')) {
@ -84,12 +84,12 @@ final class NavigationController implements InvocableController
);
}
return null;
return $this->response->response();
}
}
$this->response->addJSON('message', $this->navigation->getDisplay());
return null;
return $this->response->response();
}
}

4
src/Controllers/Normalization/AddNewPrimaryController.php
View File

@ -24,7 +24,7 @@ final class AddNewPrimaryController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$userPrivileges = $this->userPrivilegesFactory->getPrivileges();
@ -46,6 +46,6 @@ final class AddNewPrimaryController implements InvocableController
$html .= Url::getHiddenInputs($dbName, $tableName);
$this->response->addHTML($html);
return null;
return $this->response->response();
}
}

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

@ -24,7 +24,7 @@ final class CreateNewColumnController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$userPrivileges = $this->userPrivilegesFactory->getPrivileges();
@ -38,6 +38,6 @@ final class CreateNewColumnController implements InvocableController
$html .= Url::getHiddenInputs(Current::$database, Current::$table);
$this->response->addHTML($html);
return null;
return $this->response->response();
}
}

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

@ -21,7 +21,7 @@ final class FirstStepController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$this->response->addScriptFiles(['normalization.js', 'vendor/jquery/jquery.uitablefilter.js']);
@ -34,6 +34,6 @@ final class FirstStepController implements InvocableController
$html = $this->normalization->getHtmlFor1NFStep1(Current::$database, Current::$table, $normalForm);
$this->response->addHTML($html);
return null;
return $this->response->response();
}
}

4
src/Controllers/Normalization/FirstNormalForm/FourthStepController.php
View File

@ -19,11 +19,11 @@ final class FourthStepController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$res = $this->normalization->getHtmlContentsFor1NFStep4(Current::$database, Current::$table);
$this->response->addJSON($res);
return null;
return $this->response->response();
}
}

4
src/Controllers/Normalization/FirstNormalForm/SecondStepController.php
View File

@ -19,11 +19,11 @@ final class SecondStepController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$res = $this->normalization->getHtmlContentsFor1NFStep2(Current::$database, Current::$table);
$this->response->addJSON($res);
return null;
return $this->response->response();
}
}

4
src/Controllers/Normalization/FirstNormalForm/ThirdStepController.php
View File

@ -19,11 +19,11 @@ final class ThirdStepController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$res = $this->normalization->getHtmlContentsFor1NFStep3(Current::$database, Current::$table);
$this->response->addJSON($res);
return null;
return $this->response->response();
}
}

4
src/Controllers/Normalization/GetColumnsController.php
View File

@ -22,7 +22,7 @@ final class GetColumnsController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$html = '<option selected disabled>' . __('Select one…') . '</option>'
. '<option value="no_such_col">' . __('No such column') . '</option>';
@ -34,6 +34,6 @@ final class GetColumnsController implements InvocableController
);
$this->response->addHTML($html);
return null;
return $this->response->response();
}
}

4
src/Controllers/Normalization/MainController.php
View File

@ -19,7 +19,7 @@ final class MainController implements InvocableController
{
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$this->response->addScriptFiles(['normalization.js', 'vendor/jquery/jquery.uitablefilter.js']);
$this->response->render('table/normalization/normalization', [
@ -27,6 +27,6 @@ final class MainController implements InvocableController
'table' => Current::$table,
]);
return null;
return $this->response->response();
}
}

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

@ -19,7 +19,7 @@ final class MoveRepeatingGroup implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$repeatingColumns = $request->getParsedBodyParam('repeatingColumns');
$newTable = $request->getParsedBodyParam('newTable');
@ -35,6 +35,6 @@ final class MoveRepeatingGroup implements InvocableController
);
$this->response->addJSON($res);
return null;
return $this->response->response();
}
}

4
src/Controllers/Normalization/PartialDependenciesController.php
View File

@ -19,11 +19,11 @@ final class PartialDependenciesController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$html = $this->normalization->findPartialDependencies(Current::$table, Current::$database);
$this->response->addHTML($html);
return null;
return $this->response->response();
}
}

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

@ -21,7 +21,7 @@ final class CreateNewTablesController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$partialDependencies = json_decode($request->getParsedBodyParam('pd'), true);
$tablesName = json_decode($request->getParsedBodyParam('newTablesName'));
@ -33,6 +33,6 @@ final class CreateNewTablesController implements InvocableController
);
$this->response->addJSON($res);
return null;
return $this->response->response();
}
}

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

@ -19,11 +19,11 @@ final class FirstStepController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$res = $this->normalization->getHtmlFor2NFstep1(Current::$database, Current::$table);
$this->response->addJSON($res);
return null;
return $this->response->response();
}
}

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

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

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

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

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

@ -19,12 +19,12 @@ final class FirstStepController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$tables = $request->getParsedBodyParam('tables');
$res = $this->normalization->getHtmlFor3NFstep1(Current::$database, $tables);
$this->response->addJSON($res);
return null;
return $this->response->response();
}
}

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

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

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

@ -30,12 +30,12 @@ final class CollationController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
if (! $request->isAjax()) {
return null;
return $this->response->response();
}
$dbCollation = $request->getParsedBodyParam('db_collation') ?? '';
@ -43,11 +43,11 @@ final class CollationController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', Message::error(__('No collation provided.')));
return null;
return $this->response->response();
}
if (! $this->response->checkParameters(['db'])) {
return null;
return $this->response->response();
}
$GLOBALS['errorUrl'] = Util::getScriptNameForOption(
@ -61,7 +61,7 @@ final class CollationController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', Message::error(__('No databases selected.')));
return null;
return $this->response->response();
}
$sqlQuery = 'ALTER DATABASE ' . Util::backquote(Current::$database)
@ -102,6 +102,6 @@ final class CollationController implements InvocableController
$this->response->setRequestStatus($message->isSuccess());
$this->response->addJSON('message', $message);
return null;
return $this->response->response();
}
}

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

@ -46,7 +46,7 @@ final class DatabaseController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['message'] ??= null;
$GLOBALS['errorUrl'] ??= null;
@ -211,7 +211,7 @@ final class DatabaseController implements InvocableController
);
$this->response->addJSON('db', Current::$database);
return null;
return $this->response->response();
}
}
@ -226,7 +226,7 @@ final class DatabaseController implements InvocableController
}
if (! $this->response->checkParameters(['db'])) {
return null;
return $this->response->response();
}
$config = Config::getInstance();
@ -239,12 +239,12 @@ final class DatabaseController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', Message::error(__('No databases selected.')));
return null;
return $this->response->response();
}
$this->response->redirectToRoute('/', ['reload' => true, 'message' => __('No databases selected.')]);
return null;
return $this->response->response();
}
$GLOBALS['urlParams']['goto'] = Url::getFromRoute('/database/operations');
@ -258,7 +258,7 @@ final class DatabaseController implements InvocableController
$dbCollation = $this->dbi->getDbCollation(Current::$database);
if (Utilities::isSystemSchema(Current::$database)) {
return null;
return $this->response->response();
}
$databaseComment = '';
@ -307,6 +307,6 @@ final class DatabaseController implements InvocableController
'collations' => $collations,
]);
return null;
return $this->response->response();
}
}

26
src/Controllers/Operations/TableController.php
View File

@ -52,7 +52,7 @@ final class TableController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['urlParams'] ??= null;
$GLOBALS['auto_increment'] ??= null;
@ -70,7 +70,7 @@ final class TableController implements InvocableController
$this->response->addScriptFiles(['table/operations.js']);
if (! $this->response->checkParameters(['db', 'table'])) {
return null;
return $this->response->response();
}
$isSystemSchema = Utilities::isSystemSchema(Current::$database);
@ -85,12 +85,12 @@ final class TableController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', Message::error(__('No databases selected.')));
return null;
return $this->response->response();
}
$this->response->redirectToRoute('/', ['reload' => true, 'message' => __('No databases selected.')]);
return null;
return $this->response->response();
}
$tableName = TableName::tryFrom($request->getParam('table'));
@ -99,12 +99,12 @@ final class TableController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', Message::error(__('No table selected.')));
return null;
return $this->response->response();
}
$this->response->redirectToRoute('/', ['reload' => true, 'message' => __('No table selected.')]);
return null;
return $this->response->response();
}
$GLOBALS['urlParams']['goto'] = $GLOBALS['urlParams']['back'] = Url::getFromRoute('/table/operations');
@ -154,7 +154,7 @@ final class TableController implements InvocableController
$message = $this->operations->moveOrCopyTable($userPrivileges, Current::$database, Current::$table);
if (! $request->isAjax()) {
return null;
return $this->response->response();
}
$this->response->addJSON('message', $message);
@ -168,12 +168,12 @@ final class TableController implements InvocableController
$this->response->addJSON('db', Current::$database);
return null;
return $this->response->response();
}
$this->response->setRequestStatus(false);
return null;
return $this->response->response();
}
$newMessage = '';
@ -277,7 +277,7 @@ final class TableController implements InvocableController
Message::error(__('No collation provided.')),
);
return null;
return $this->response->response();
}
}
}
@ -361,7 +361,7 @@ final class TableController implements InvocableController
);
}
return null;
return $this->response->response();
}
} else {
$newMessage = $result
@ -383,7 +383,7 @@ final class TableController implements InvocableController
);
}
return null;
return $this->response->response();
}
}
@ -521,6 +521,6 @@ final class TableController implements InvocableController
'foreigners' => $foreigners,
]);
return null;
return $this->response->response();
}
}

14
src/Controllers/Operations/ViewController.php
View File

@ -37,7 +37,7 @@ final class ViewController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['urlParams'] ??= null;
$tableObject = $this->dbi->getTable(Current::$database, Current::$table);
@ -46,7 +46,7 @@ final class ViewController implements InvocableController
$this->response->addScriptFiles(['table/operations.js']);
if (! $this->response->checkParameters(['db', 'table'])) {
return null;
return $this->response->response();
}
$GLOBALS['urlParams'] = ['db' => Current::$database, 'table' => Current::$table];
@ -62,12 +62,12 @@ final class ViewController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', Message::error(__('No databases selected.')));
return null;
return $this->response->response();
}
$this->response->redirectToRoute('/', ['reload' => true, 'message' => __('No databases selected.')]);
return null;
return $this->response->response();
}
$tableName = TableName::tryFrom($request->getParam('table'));
@ -76,12 +76,12 @@ final class ViewController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addJSON('message', Message::error(__('No table selected.')));
return null;
return $this->response->response();
}
$this->response->redirectToRoute('/', ['reload' => true, 'message' => __('No table selected.')]);
return null;
return $this->response->response();
}
$GLOBALS['urlParams']['goto'] = $GLOBALS['urlParams']['back'] = Url::getFromRoute('/view/operations');
@ -140,6 +140,6 @@ final class ViewController implements InvocableController
'url_params' => $GLOBALS['urlParams'],
]);
return null;
return $this->response->response();
}
}

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

@ -33,7 +33,7 @@ final class ExportController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['error'] ??= null;
$GLOBALS['tabHash'] ??= null;
@ -49,7 +49,7 @@ final class ExportController implements InvocableController
$formDisplay->fixErrors();
$this->response->redirectToRoute('/preferences/export', []);
return null;
return $this->response->response();
}
$GLOBALS['error'] = null;
@ -67,7 +67,7 @@ final class ExportController implements InvocableController
$GLOBALS['hash'] = ltrim($GLOBALS['tabHash'], '#');
$this->userPreferences->redirect('index.php?route=/preferences/export', null, $GLOBALS['hash']);
return null;
return $this->response->response();
}
$GLOBALS['error'] = $result;
@ -100,6 +100,6 @@ final class ExportController implements InvocableController
define('PMA_DISABLE_NAVI_SETTINGS', true);
}
return null;
return $this->response->response();
}
}

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

@ -33,7 +33,7 @@ final class FeaturesController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['error'] ??= null;
$GLOBALS['tabHash'] ??= null;
@ -49,7 +49,7 @@ final class FeaturesController implements InvocableController
$formDisplay->fixErrors();
$this->response->redirectToRoute('/preferences/features', []);
return null;
return $this->response->response();
}
$GLOBALS['error'] = null;
@ -67,7 +67,7 @@ final class FeaturesController implements InvocableController
$GLOBALS['hash'] = ltrim($GLOBALS['tabHash'], '#');
$this->userPreferences->redirect('index.php?route=/preferences/features', null, $GLOBALS['hash']);
return null;
return $this->response->response();
}
$GLOBALS['error'] = $result;
@ -100,6 +100,6 @@ final class FeaturesController implements InvocableController
define('PMA_DISABLE_NAVI_SETTINGS', true);
}
return null;
return $this->response->response();
}
}

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

@ -33,7 +33,7 @@ final class ImportController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['error'] ??= null;
$GLOBALS['tabHash'] ??= null;
@ -49,7 +49,7 @@ final class ImportController implements InvocableController
$formDisplay->fixErrors();
$this->response->redirectToRoute('/preferences/import', []);
return null;
return $this->response->response();
}
$GLOBALS['error'] = null;
@ -67,7 +67,7 @@ final class ImportController implements InvocableController
$GLOBALS['hash'] = ltrim($GLOBALS['tabHash'], '#');
$this->userPreferences->redirect('index.php?route=/preferences/import', null, $GLOBALS['hash']);
return null;
return $this->response->response();
}
$GLOBALS['error'] = $result;
@ -100,6 +100,6 @@ final class ImportController implements InvocableController
define('PMA_DISABLE_NAVI_SETTINGS', true);
}
return null;
return $this->response->response();
}
}

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

@ -33,7 +33,7 @@ final class MainPanelController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['error'] ??= null;
$GLOBALS['tabHash'] ??= null;
@ -49,7 +49,7 @@ final class MainPanelController implements InvocableController
$formDisplay->fixErrors();
$this->response->redirectToRoute('/preferences/main-panel', []);
return null;
return $this->response->response();
}
$GLOBALS['error'] = null;
@ -67,7 +67,7 @@ final class MainPanelController implements InvocableController
$GLOBALS['hash'] = ltrim($GLOBALS['tabHash'], '#');
$this->userPreferences->redirect('index.php?route=/preferences/main-panel', null, $GLOBALS['hash']);
return null;
return $this->response->response();
}
$GLOBALS['error'] = $result;
@ -100,6 +100,6 @@ final class MainPanelController implements InvocableController
define('PMA_DISABLE_NAVI_SETTINGS', true);
}
return null;
return $this->response->response();
}
}

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

@ -56,7 +56,7 @@ final class ManageController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['error'] ??= null;
$GLOBALS['lang'] ??= null;
@ -100,7 +100,7 @@ final class ManageController implements InvocableController
$this->response->addJSON('prefs', json_encode($settings['config_data']));
$this->response->addJSON('mtime', $settings['mtime']);
return null;
return $this->response->response();
}
if ($request->hasBodyParam('submit_import')) {
@ -180,7 +180,7 @@ final class ManageController implements InvocableController
'return_url' => $returnUrl,
]);
return null;
return $this->response->response();
}
// check for ThemeDefault
@ -222,7 +222,7 @@ final class ManageController implements InvocableController
$this->config->loadUserPreferences($this->themeManager);
$this->userPreferences->redirect($returnUrl ?? '', $redirectParams);
return null;
return $this->response->response();
}
$GLOBALS['error'] = $result;
@ -233,12 +233,12 @@ final class ManageController implements InvocableController
$this->config->removeCookie('pma_lang');
$this->userPreferences->redirect('index.php?route=/preferences/manage');
return null;
return $this->response->response();
}
$GLOBALS['error'] = $result;
return null;
return $this->response->response();
}
$relationParameters = $this->relation->getRelationParameters();
@ -270,6 +270,6 @@ final class ManageController implements InvocableController
define('PMA_DISABLE_NAVI_SETTINGS', true);
}
return null;
return $this->response->response();
}
}

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

@ -33,7 +33,7 @@ final class NavigationController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['error'] ??= null;
$GLOBALS['tabHash'] ??= null;
@ -49,7 +49,7 @@ final class NavigationController implements InvocableController
$formDisplay->fixErrors();
$this->response->redirectToRoute('/preferences/navigation', []);
return null;
return $this->response->response();
}
$GLOBALS['error'] = null;
@ -67,7 +67,7 @@ final class NavigationController implements InvocableController
$GLOBALS['hash'] = ltrim($GLOBALS['tabHash'], '#');
$this->userPreferences->redirect('index.php?route=/preferences/navigation', null, $GLOBALS['hash']);
return null;
return $this->response->response();
}
$GLOBALS['error'] = $result;
@ -97,11 +97,11 @@ final class NavigationController implements InvocableController
if ($request->isAjax()) {
$this->response->addJSON('disableNaviSettings', true);
return null;
return $this->response->response();
}
define('PMA_DISABLE_NAVI_SETTINGS', true);
return null;
return $this->response->response();
}
}

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

@ -33,7 +33,7 @@ final class SqlController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['error'] ??= null;
$GLOBALS['tabHash'] ??= null;
@ -49,7 +49,7 @@ final class SqlController implements InvocableController
$formDisplay->fixErrors();
$this->response->redirectToRoute('/preferences/sql', []);
return null;
return $this->response->response();
}
$GLOBALS['error'] = null;
@ -67,7 +67,7 @@ final class SqlController implements InvocableController
$GLOBALS['hash'] = ltrim($GLOBALS['tabHash'], '#');
$this->userPreferences->redirect('index.php?route=/preferences/sql', null, $GLOBALS['hash']);
return null;
return $this->response->response();
}
$GLOBALS['error'] = $result;
@ -100,6 +100,6 @@ final class SqlController implements InvocableController
define('PMA_DISABLE_NAVI_SETTINGS', true);
}
return null;
return $this->response->response();
}
}

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

@ -23,7 +23,7 @@ final class TwoFactorController implements InvocableController
{
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$relationParameters = $this->relation->getRelationParameters();
@ -39,7 +39,7 @@ final class TwoFactorController implements InvocableController
if (! $twoFactor->check($request, true)) {
$this->response->render('preferences/two_factor/confirm', ['form' => $twoFactor->render($request)]);
return null;
return $this->response->response();
}
$twoFactor->configure($request, '');
@ -53,7 +53,7 @@ final class TwoFactorController implements InvocableController
'configure' => $request->getParsedBodyParam('2fa_configure'),
]);
return null;
return $this->response->response();
}
$this->response->addHTML(
@ -78,6 +78,6 @@ final class TwoFactorController implements InvocableController
define('PMA_DISABLE_NAVI_SETTINGS', true);
}
return null;
return $this->response->response();
}
}

6
src/Controllers/SchemaExportController.php
View File

@ -31,7 +31,7 @@ final class SchemaExportController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$db = DatabaseName::tryFrom($request->getParsedBodyParam('db'));
/** @var mixed $exportType */
@ -43,7 +43,7 @@ final class SchemaExportController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addHTML(Message::error($errorMessage)->getDisplay());
return null;
return $this->response->response();
}
/**
@ -55,7 +55,7 @@ final class SchemaExportController implements InvocableController
$this->response->setRequestStatus(false);
$this->response->addHTML(Message::error($exception->getMessage())->getDisplay());
return null;
return $this->response->response();
}
$response = $this->responseFactory->createResponse();

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

@ -34,7 +34,7 @@ final class BinlogController implements InvocableController
$this->binaryLogs = $this->dbi->fetchResult('SHOW MASTER LOGS', 'Log_name');
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$log = $request->getParsedBodyParam('log');
$position = (int) $request->getParsedBodyParam('pos', 0);
@ -98,7 +98,7 @@ final class BinlogController implements InvocableController
'is_full_query' => $isFullQuery,
]);
return null;
return $this->response->response();
}
/**

4
src/Controllers/Server/CollationsController.php
View File

@ -41,7 +41,7 @@ final class CollationsController implements InvocableController
$this->collations = $collations ?? Charsets::getCollations($this->dbi, $config->selectedServer['DisableIS']);
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] = Url::getFromRoute('/');
@ -69,6 +69,6 @@ final class CollationsController implements InvocableController
$this->response->render('server/collations/index', ['charsets' => $charsets]);
return null;
return $this->response->response();
}
}

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

@ -31,7 +31,7 @@ final class CreateController implements InvocableController
{
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$newDb = $request->getParsedBodyParam('new_db');
$dbCollation = $request->getParsedBodyParam('db_collation');
@ -39,7 +39,7 @@ final class CreateController implements InvocableController
if (! is_string($newDb) || $newDb === '' || ! $request->isAjax()) {
$this->response->addJSON(['message' => Message::error()]);
return null;
return $this->response->response();
}
if ($this->dbi->getLowerCaseNames() === 1) {
@ -96,6 +96,6 @@ final class CreateController implements InvocableController
$this->response->addJSON($json);
return null;
return $this->response->response();
}
}

8
src/Controllers/Server/Databases/DestroyController.php
View File

@ -33,7 +33,7 @@ final class DestroyController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['selected'] ??= null;
$GLOBALS['errorUrl'] ??= null;
@ -51,7 +51,7 @@ final class DestroyController implements InvocableController
$this->response->setRequestStatus($message->isSuccess());
$this->response->addJSON($json);
return null;
return $this->response->response();
}
if (
@ -63,7 +63,7 @@ final class DestroyController implements InvocableController
$this->response->setRequestStatus($message->isSuccess());
$this->response->addJSON($json);
return null;
return $this->response->response();
}
$GLOBALS['errorUrl'] = Url::getFromRoute('/server/databases');
@ -93,6 +93,6 @@ final class DestroyController implements InvocableController
$this->response->setRequestStatus($message->isSuccess());
$this->response->addJSON($json);
return null;
return $this->response->response();
}
}

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

@ -66,7 +66,7 @@ final class DatabasesController implements InvocableController
) {
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] ??= null;
@ -166,7 +166,7 @@ final class DatabasesController implements InvocableController
'text_dir' => LanguageManager::$textDir,
]);
return null;
return $this->response->response();
}
/**

4
src/Controllers/Server/EnginesController.php
View File

@ -21,7 +21,7 @@ final class EnginesController implements InvocableController
{
}
public function __invoke(ServerRequest $request): Response|null
public function __invoke(ServerRequest $request): Response
{
$GLOBALS['errorUrl'] = Url::getFromRoute('/');
@ -31,6 +31,6 @@ final class EnginesController implements InvocableController
$this->response->render('server/engines/index', ['engines' => StorageEngine::getStorageEngines()]);
return null;
return $this->response->response();
}
}

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