From 50bc4ab37f743208dee320fca9d84922c9deff47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Mon, 20 Jan 2020 13:20:01 -0300 Subject: [PATCH 1/6] Remove useless PHP docs for functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- libraries/classes/Charsets/Charset.php | 12 ------ libraries/classes/Charsets/Collation.php | 24 ------------ .../classes/Command/AdvisoryRulesCommand.php | 3 -- libraries/classes/Common.php | 9 ----- .../Controllers/ChangeLogController.php | 3 -- .../Database/CentralColumnsController.php | 3 -- .../Database/DesignerController.php | 3 -- .../Controllers/Database/EventsController.php | 3 -- .../Controllers/Database/ExportController.php | 3 -- .../Controllers/Database/ImportController.php | 3 -- .../Database/MultiTableQueryController.php | 3 -- .../Database/OperationsController.php | 3 -- .../Database/QueryByExampleController.php | 3 -- .../Controllers/Database/SearchController.php | 3 -- .../Controllers/Database/SqlController.php | 3 -- .../Database/TrackingController.php | 3 -- .../Database/TriggersController.php | 3 -- .../Controllers/ErrorReportController.php | 3 -- .../classes/Controllers/ExportController.php | 3 -- .../classes/Controllers/HomeController.php | 3 -- .../classes/Controllers/ImportController.php | 3 -- .../Controllers/ImportStatusController.php | 3 -- .../classes/Controllers/LicenseController.php | 3 -- .../classes/Controllers/LogoutController.php | 3 -- .../Controllers/NavigationController.php | 3 -- .../Controllers/NormalizationController.php | 3 -- .../classes/Controllers/PhpInfoController.php | 3 -- .../Preferences/FormsController.php | 3 -- .../Preferences/ManageController.php | 3 -- .../Preferences/TwoFactorController.php | 3 -- .../Controllers/SchemaExportController.php | 3 -- .../Controllers/Server/ExportController.php | 3 -- .../Controllers/Server/ImportController.php | 3 -- .../Server/PrivilegesController.php | 3 -- .../Server/Status/AdvisorController.php | 3 -- .../Server/Status/StatusController.php | 9 ----- .../Server/UserGroupsController.php | 3 -- .../classes/Controllers/SqlController.php | 9 ----- .../Controllers/Table/AddFieldController.php | 3 -- .../Controllers/Table/ChangeController.php | 3 -- .../Controllers/Table/CreateController.php | 3 -- .../Controllers/Table/ExportController.php | 3 -- .../Table/FindReplaceController.php | 9 ----- .../Controllers/Table/GetFieldController.php | 3 -- .../Table/GisVisualizationController.php | 3 -- .../Controllers/Table/ImportController.php | 3 -- .../Controllers/Table/IndexesController.php | 3 -- .../Table/OperationsController.php | 3 -- .../Table/RecentFavoriteController.php | 3 -- .../Controllers/Table/ReplaceController.php | 3 -- .../Controllers/Table/RowActionController.php | 3 -- .../Controllers/Table/SqlController.php | 3 -- .../Controllers/Table/StructureController.php | 3 -- .../Controllers/Table/TrackingController.php | 3 -- .../Controllers/Table/TriggersController.php | 3 -- .../Table/ZoomSearchController.php | 3 -- .../classes/Controllers/ThemesController.php | 3 -- .../TransformationWrapperController.php | 3 -- .../Controllers/UserPasswordController.php | 3 -- .../Controllers/VersionCheckController.php | 3 -- .../Controllers/ViewCreateController.php | 3 -- .../Controllers/ViewOperationsController.php | 3 -- libraries/classes/Header.php | 3 -- .../classes/Plugins/TwoFactor/Application.php | 3 -- libraries/classes/ReplicationInfo.php | 3 -- libraries/classes/Server/Plugin.php | 39 ------------------- libraries/classes/TwoFactor.php | 9 ----- libraries/classes/UserPreferencesHeader.php | 6 --- phpcs.xml.dist | 4 +- test/classes/Charsets/CharsetTest.php | 3 -- test/classes/Charsets/CollationTest.php | 3 -- test/classes/CharsetsTest.php | 6 --- test/classes/Config/Forms/FormListTest.php | 3 -- .../Database/PrivilegesControllerTest.php | 3 -- .../Server/BinlogControllerTest.php | 3 -- .../Server/CollationsControllerTest.php | 3 -- .../Server/DatabasesControllerTest.php | 6 --- .../Server/EnginesControllerTest.php | 6 --- .../Server/Status/AdvisorControllerTest.php | 6 --- .../Server/Status/MonitorControllerTest.php | 18 --------- .../Server/Status/ProcessesControllerTest.php | 9 ----- .../Server/Status/QueriesControllerTest.php | 6 --- .../Server/Status/StatusControllerTest.php | 6 --- .../Server/Status/VariablesControllerTest.php | 6 --- .../Server/VariablesControllerTest.php | 6 --- .../Table/FindReplaceControllerTest.php | 6 --- .../Table/PrivilegesControllerTest.php | 3 -- .../TransformationOverviewControllerTest.php | 3 -- test/classes/EncodingTest.php | 6 --- test/classes/ErrorReportTest.php | 12 ------ test/classes/FileListingTest.php | 15 ------- test/classes/LanguageTest.php | 3 -- test/classes/Server/PluginTest.php | 3 -- test/classes/Server/PluginsTest.php | 6 --- test/classes/Stubs/DbiDummy.php | 3 -- test/classes/Table/SearchTest.php | 9 ----- test/classes/TwoFactorTest.php | 3 -- test/classes/Utils/HttpRequestTest.php | 3 -- test/classes/ZipExtensionTest.php | 3 -- test/selenium/LoginTest.php | 3 -- test/selenium/Table/CreateTest.php | 3 -- test/selenium/XssTest.php | 3 -- 102 files changed, 3 insertions(+), 484 deletions(-) diff --git a/libraries/classes/Charsets/Charset.php b/libraries/classes/Charsets/Charset.php index 93da8b13c0..9b28a12e86 100644 --- a/libraries/classes/Charsets/Charset.php +++ b/libraries/classes/Charsets/Charset.php @@ -76,33 +76,21 @@ final class Charset ); } - /** - * @return string - */ public function getName(): string { return $this->name; } - /** - * @return string - */ public function getDescription(): string { return $this->description; } - /** - * @return string - */ public function getDefaultCollation(): string { return $this->defaultCollation; } - /** - * @return int - */ public function getMaxLength(): int { return $this->maxLength; diff --git a/libraries/classes/Charsets/Collation.php b/libraries/classes/Charsets/Collation.php index 2e17544110..cba8631970 100644 --- a/libraries/classes/Charsets/Collation.php +++ b/libraries/classes/Charsets/Collation.php @@ -117,65 +117,41 @@ final class Collation ); } - /** - * @return string - */ public function getName(): string { return $this->name; } - /** - * @return string - */ public function getDescription(): string { return $this->description; } - /** - * @return string - */ public function getCharset(): string { return $this->charset; } - /** - * @return int - */ public function getId(): int { return $this->id; } - /** - * @return bool - */ public function isDefault(): bool { return $this->isDefault; } - /** - * @return bool - */ public function isCompiled(): bool { return $this->isCompiled; } - /** - * @return int - */ public function getSortLength(): int { return $this->sortLength; } - /** - * @return string - */ public function getPadAttribute(): string { return $this->padAttribute; diff --git a/libraries/classes/Command/AdvisoryRulesCommand.php b/libraries/classes/Command/AdvisoryRulesCommand.php index f58b24e73e..b312297734 100644 --- a/libraries/classes/Command/AdvisoryRulesCommand.php +++ b/libraries/classes/Command/AdvisoryRulesCommand.php @@ -29,9 +29,6 @@ class AdvisoryRulesCommand extends Command /** @var array */ private $locations = []; - /** - * @return void - */ protected function configure(): void { $this->setDescription('Translates advisory rules to Gettext format'); diff --git a/libraries/classes/Common.php b/libraries/classes/Common.php index 371d1d10c0..dbb4d62cea 100644 --- a/libraries/classes/Common.php +++ b/libraries/classes/Common.php @@ -13,9 +13,6 @@ namespace PhpMyAdmin; */ final class Common { - /** - * @return void - */ public static function server(): void { global $db, $table, $url_query, $viewing_mode, $err_url, $is_grantuser, $is_createuser, $dbi; @@ -50,9 +47,6 @@ final class Common } } - /** - * @return void - */ public static function database(): void { global $cfg, $db, $is_show_stats, $db_is_system_schema, $err_url; @@ -188,9 +182,6 @@ final class Common $url_query = Url::getCommon(['db' => $db]); } - /** - * @return void - */ public static function table(): void { global $db, $table, $db_is_system_schema, $url_query, $url_params, $cfg, $dbi, $err_url, $err_url_0; diff --git a/libraries/classes/Controllers/ChangeLogController.php b/libraries/classes/Controllers/ChangeLogController.php index 64748f9c07..b1ee95e203 100644 --- a/libraries/classes/Controllers/ChangeLogController.php +++ b/libraries/classes/Controllers/ChangeLogController.php @@ -13,9 +13,6 @@ namespace PhpMyAdmin\Controllers; */ class ChangeLogController extends AbstractController { - /** - * @return void - */ public function index(): void { $this->response->disable(); diff --git a/libraries/classes/Controllers/Database/CentralColumnsController.php b/libraries/classes/Controllers/Database/CentralColumnsController.php index 38f8d0400e..1c13096699 100644 --- a/libraries/classes/Controllers/Database/CentralColumnsController.php +++ b/libraries/classes/Controllers/Database/CentralColumnsController.php @@ -38,9 +38,6 @@ class CentralColumnsController extends AbstractController $this->centralColumns = $centralColumns; } - /** - * @return void - */ public function index(): void { global $cfg, $db, $message, $pos, $num_cols; diff --git a/libraries/classes/Controllers/Database/DesignerController.php b/libraries/classes/Controllers/Database/DesignerController.php index 044aa42101..50de290c90 100644 --- a/libraries/classes/Controllers/Database/DesignerController.php +++ b/libraries/classes/Controllers/Database/DesignerController.php @@ -46,9 +46,6 @@ class DesignerController extends AbstractController $this->designerCommon = $designerCommon; } - /** - * @return void - */ public function index(): void { global $db, $script_display_field, $tab_column, $tables_all_keys, $tables_pk_or_unique_keys; diff --git a/libraries/classes/Controllers/Database/EventsController.php b/libraries/classes/Controllers/Database/EventsController.php index 72703f08c9..4faf49d9e8 100644 --- a/libraries/classes/Controllers/Database/EventsController.php +++ b/libraries/classes/Controllers/Database/EventsController.php @@ -20,9 +20,6 @@ use PhpMyAdmin\Util; */ class EventsController extends AbstractController { - /** - * @return void - */ public function index(): void { global $_PMA_RTE, $table, $db, $tables, $num_tables, $total_num_tables, $sub_part, $errors, $titles; diff --git a/libraries/classes/Controllers/Database/ExportController.php b/libraries/classes/Controllers/Database/ExportController.php index 0e5de68040..2537f02e52 100644 --- a/libraries/classes/Controllers/Database/ExportController.php +++ b/libraries/classes/Controllers/Database/ExportController.php @@ -38,9 +38,6 @@ final class ExportController extends AbstractController $this->export = $export; } - /** - * @return void - */ public function index(): void { global $db, $table, $url_query, $sub_part, $url_params, $sql_query; diff --git a/libraries/classes/Controllers/Database/ImportController.php b/libraries/classes/Controllers/Database/ImportController.php index 58096f76e7..9ae182b513 100644 --- a/libraries/classes/Controllers/Database/ImportController.php +++ b/libraries/classes/Controllers/Database/ImportController.php @@ -16,9 +16,6 @@ use PhpMyAdmin\Util; */ final class ImportController extends AbstractController { - /** - * @return void - */ public function index(): void { global $db, $max_upload_size, $table, $tables, $num_tables, $total_num_tables, $is_show_stats; diff --git a/libraries/classes/Controllers/Database/MultiTableQueryController.php b/libraries/classes/Controllers/Database/MultiTableQueryController.php index 280f55209e..adb6361bbe 100644 --- a/libraries/classes/Controllers/Database/MultiTableQueryController.php +++ b/libraries/classes/Controllers/Database/MultiTableQueryController.php @@ -17,9 +17,6 @@ use PhpMyAdmin\Database\MultiTableQuery; */ class MultiTableQueryController extends AbstractController { - /** - * @return string - */ public function index(): string { $header = $this->response->getHeader(); diff --git a/libraries/classes/Controllers/Database/OperationsController.php b/libraries/classes/Controllers/Database/OperationsController.php index 51b42e0e1e..356128b8da 100644 --- a/libraries/classes/Controllers/Database/OperationsController.php +++ b/libraries/classes/Controllers/Database/OperationsController.php @@ -68,9 +68,6 @@ class OperationsController extends AbstractController $this->relationCleanup = $relationCleanup; } - /** - * @return void - */ public function index(): void { global $cfg, $db, $server, $url_query, $sql_query, $move, $message, $tables_full; diff --git a/libraries/classes/Controllers/Database/QueryByExampleController.php b/libraries/classes/Controllers/Database/QueryByExampleController.php index e783074220..2bb5e900ae 100644 --- a/libraries/classes/Controllers/Database/QueryByExampleController.php +++ b/libraries/classes/Controllers/Database/QueryByExampleController.php @@ -41,9 +41,6 @@ class QueryByExampleController extends AbstractController $this->relation = $relation; } - /** - * @return void - */ public function index(): void { global $db, $pmaThemeImage, $url_query, $savedSearchList, $savedSearch, $currentSearchId; diff --git a/libraries/classes/Controllers/Database/SearchController.php b/libraries/classes/Controllers/Database/SearchController.php index 5223e6e0e3..3cc681c14c 100644 --- a/libraries/classes/Controllers/Database/SearchController.php +++ b/libraries/classes/Controllers/Database/SearchController.php @@ -17,9 +17,6 @@ use PhpMyAdmin\Util; */ class SearchController extends AbstractController { - /** - * @return void - */ public function index(): void { global $cfg, $db, $err_url, $url_query, $url_params, $tables, $num_tables, $total_num_tables, $sub_part; diff --git a/libraries/classes/Controllers/Database/SqlController.php b/libraries/classes/Controllers/Database/SqlController.php index c679fd104a..1523455336 100644 --- a/libraries/classes/Controllers/Database/SqlController.php +++ b/libraries/classes/Controllers/Database/SqlController.php @@ -37,9 +37,6 @@ class SqlController extends AbstractController $this->sqlQueryForm = $sqlQueryForm; } - /** - * @return void - */ public function index(): void { global $goto, $back; diff --git a/libraries/classes/Controllers/Database/TrackingController.php b/libraries/classes/Controllers/Database/TrackingController.php index 5703d173f2..f770a17f98 100644 --- a/libraries/classes/Controllers/Database/TrackingController.php +++ b/libraries/classes/Controllers/Database/TrackingController.php @@ -41,9 +41,6 @@ class TrackingController extends AbstractController $this->tracking = $tracking; } - /** - * @return void - */ public function index(): void { global $db, $pmaThemeImage, $text_dir, $url_query, $url_params, $tables, $num_tables, $pos, $data, $cfg; diff --git a/libraries/classes/Controllers/Database/TriggersController.php b/libraries/classes/Controllers/Database/TriggersController.php index 6399a400ee..bb93cb37d2 100644 --- a/libraries/classes/Controllers/Database/TriggersController.php +++ b/libraries/classes/Controllers/Database/TriggersController.php @@ -20,9 +20,6 @@ use PhpMyAdmin\Util; */ class TriggersController extends AbstractController { - /** - * @return void - */ public function index(): void { global $_PMA_RTE, $db, $table, $tables, $num_tables, $total_num_tables, $sub_part, $is_show_stats; diff --git a/libraries/classes/Controllers/ErrorReportController.php b/libraries/classes/Controllers/ErrorReportController.php index 158b154deb..dc1ecc3e87 100644 --- a/libraries/classes/Controllers/ErrorReportController.php +++ b/libraries/classes/Controllers/ErrorReportController.php @@ -48,9 +48,6 @@ class ErrorReportController extends AbstractController $this->errorHandler = $errorHandler; } - /** - * @return void - */ public function index(): void { global $cfg; diff --git a/libraries/classes/Controllers/ExportController.php b/libraries/classes/Controllers/ExportController.php index 46d32ecbdd..fe04b3de9a 100644 --- a/libraries/classes/Controllers/ExportController.php +++ b/libraries/classes/Controllers/ExportController.php @@ -50,9 +50,6 @@ final class ExportController extends AbstractController $this->relation = $relation; } - /** - * @return void - */ public function index(): void { global $containerBuilder, $db, $export_type, $filename_template, $sql_query, $err_url, $message; diff --git a/libraries/classes/Controllers/HomeController.php b/libraries/classes/Controllers/HomeController.php index 78ded8d75e..a42da3009f 100644 --- a/libraries/classes/Controllers/HomeController.php +++ b/libraries/classes/Controllers/HomeController.php @@ -355,9 +355,6 @@ class HomeController extends AbstractController ))->display(); } - /** - * @return void - */ private function checkRequirements(): void { global $cfg, $server, $lang; diff --git a/libraries/classes/Controllers/ImportController.php b/libraries/classes/Controllers/ImportController.php index 42716e74de..633c7e83dd 100644 --- a/libraries/classes/Controllers/ImportController.php +++ b/libraries/classes/Controllers/ImportController.php @@ -50,9 +50,6 @@ final class ImportController extends AbstractController $this->sql = $sql; } - /** - * @return void - */ public function index(): void { global $cfg, $collation_connection, $db, $import_type, $pmaThemeImage, $table, $goto, $display_query; diff --git a/libraries/classes/Controllers/ImportStatusController.php b/libraries/classes/Controllers/ImportStatusController.php index 8554ffb18e..8f699e380a 100644 --- a/libraries/classes/Controllers/ImportStatusController.php +++ b/libraries/classes/Controllers/ImportStatusController.php @@ -29,9 +29,6 @@ class ImportStatusController $this->template = $template; } - /** - * @return void - */ public function index(): void { global $SESSION_KEY, $upload_id, $plugins, $timestamp; diff --git a/libraries/classes/Controllers/LicenseController.php b/libraries/classes/Controllers/LicenseController.php index 89ef057aef..736c73fc0b 100644 --- a/libraries/classes/Controllers/LicenseController.php +++ b/libraries/classes/Controllers/LicenseController.php @@ -15,9 +15,6 @@ namespace PhpMyAdmin\Controllers; */ class LicenseController extends AbstractController { - /** - * @return void - */ public function index(): void { $this->response->disable(); diff --git a/libraries/classes/Controllers/LogoutController.php b/libraries/classes/Controllers/LogoutController.php index e57cc849de..167b3175e2 100644 --- a/libraries/classes/Controllers/LogoutController.php +++ b/libraries/classes/Controllers/LogoutController.php @@ -14,9 +14,6 @@ use PhpMyAdmin\Plugins\AuthenticationPlugin; */ class LogoutController { - /** - * @return void - */ public function index(): void { global $auth_plugin, $token_mismatch; diff --git a/libraries/classes/Controllers/NavigationController.php b/libraries/classes/Controllers/NavigationController.php index 43b6c9944d..33a27cbfec 100644 --- a/libraries/classes/Controllers/NavigationController.php +++ b/libraries/classes/Controllers/NavigationController.php @@ -49,9 +49,6 @@ class NavigationController extends AbstractController $this->relation = $relation; } - /** - * @return void - */ public function index(): void { if (! $this->response->isAjax()) { diff --git a/libraries/classes/Controllers/NormalizationController.php b/libraries/classes/Controllers/NormalizationController.php index 65e9b8975e..aeecdbb9ac 100644 --- a/libraries/classes/Controllers/NormalizationController.php +++ b/libraries/classes/Controllers/NormalizationController.php @@ -35,9 +35,6 @@ class NormalizationController extends AbstractController $this->normalization = $normalization; } - /** - * @return void - */ public function index(): void { global $db, $table; diff --git a/libraries/classes/Controllers/PhpInfoController.php b/libraries/classes/Controllers/PhpInfoController.php index 2bbf7860d3..7e7b0fbec2 100644 --- a/libraries/classes/Controllers/PhpInfoController.php +++ b/libraries/classes/Controllers/PhpInfoController.php @@ -15,9 +15,6 @@ namespace PhpMyAdmin\Controllers; */ class PhpInfoController extends AbstractController { - /** - * @return void - */ public function index(): void { global $cfg; diff --git a/libraries/classes/Controllers/Preferences/FormsController.php b/libraries/classes/Controllers/Preferences/FormsController.php index 95daa7856e..431b1354ae 100644 --- a/libraries/classes/Controllers/Preferences/FormsController.php +++ b/libraries/classes/Controllers/Preferences/FormsController.php @@ -52,9 +52,6 @@ class FormsController extends AbstractController $this->relation = $relation; } - /** - * @return void - */ public function index(): void { global $cf, $form_param, $form_class, $form_display, $url_params, $error, $tabHash, $hash; diff --git a/libraries/classes/Controllers/Preferences/ManageController.php b/libraries/classes/Controllers/Preferences/ManageController.php index 40a07ccabf..095c6b0090 100644 --- a/libraries/classes/Controllers/Preferences/ManageController.php +++ b/libraries/classes/Controllers/Preferences/ManageController.php @@ -53,9 +53,6 @@ class ManageController extends AbstractController $this->relation = $relation; } - /** - * @return void - */ public function index(): void { global $cf, $error, $filename, $import_handle, $json, $PMA_Config, $lang, $max_upload_size; diff --git a/libraries/classes/Controllers/Preferences/TwoFactorController.php b/libraries/classes/Controllers/Preferences/TwoFactorController.php index 98e403c4b9..0f5ed01e39 100644 --- a/libraries/classes/Controllers/Preferences/TwoFactorController.php +++ b/libraries/classes/Controllers/Preferences/TwoFactorController.php @@ -35,9 +35,6 @@ class TwoFactorController extends AbstractController $this->relation = $relation; } - /** - * @return void - */ public function index(): void { global $cfg; diff --git a/libraries/classes/Controllers/SchemaExportController.php b/libraries/classes/Controllers/SchemaExportController.php index 4e33661fae..a0eed82c1e 100644 --- a/libraries/classes/Controllers/SchemaExportController.php +++ b/libraries/classes/Controllers/SchemaExportController.php @@ -33,9 +33,6 @@ class SchemaExportController $this->relation = $relation; } - /** - * @return void - */ public function index(): void { global $cfgRelation; diff --git a/libraries/classes/Controllers/Server/ExportController.php b/libraries/classes/Controllers/Server/ExportController.php index 616d50c939..05b77a070a 100644 --- a/libraries/classes/Controllers/Server/ExportController.php +++ b/libraries/classes/Controllers/Server/ExportController.php @@ -34,9 +34,6 @@ final class ExportController extends AbstractController $this->export = $export; } - /** - * @return void - */ public function index(): void { global $db, $table, $sql_query, $num_tables, $unlim_num_rows; diff --git a/libraries/classes/Controllers/Server/ImportController.php b/libraries/classes/Controllers/Server/ImportController.php index eced9c6fbb..0c591c88cb 100644 --- a/libraries/classes/Controllers/Server/ImportController.php +++ b/libraries/classes/Controllers/Server/ImportController.php @@ -16,9 +16,6 @@ use PhpMyAdmin\Display\Import; */ final class ImportController extends AbstractController { - /** - * @return void - */ public function index(): void { global $db, $max_upload_size, $table; diff --git a/libraries/classes/Controllers/Server/PrivilegesController.php b/libraries/classes/Controllers/Server/PrivilegesController.php index 54deca1be5..5388f6285f 100644 --- a/libraries/classes/Controllers/Server/PrivilegesController.php +++ b/libraries/classes/Controllers/Server/PrivilegesController.php @@ -46,9 +46,6 @@ class PrivilegesController extends AbstractController $this->relation = $relation; } - /** - * @return void - */ public function index(): void { global $db, $table, $err_url, $message, $pmaThemeImage, $text_dir, $url_query, $post_patterns; diff --git a/libraries/classes/Controllers/Server/Status/AdvisorController.php b/libraries/classes/Controllers/Server/Status/AdvisorController.php index 7debcbbb3e..2ae2edd596 100644 --- a/libraries/classes/Controllers/Server/Status/AdvisorController.php +++ b/libraries/classes/Controllers/Server/Status/AdvisorController.php @@ -39,9 +39,6 @@ class AdvisorController extends AbstractController $this->advisor = $advisor; } - /** - * @return string - */ public function index(): string { $scripts = $this->response->getHeader()->getScripts(); diff --git a/libraries/classes/Controllers/Server/Status/StatusController.php b/libraries/classes/Controllers/Server/Status/StatusController.php index 4e324a0984..2d92406649 100644 --- a/libraries/classes/Controllers/Server/Status/StatusController.php +++ b/libraries/classes/Controllers/Server/Status/StatusController.php @@ -39,9 +39,6 @@ class StatusController extends AbstractController $this->replicationGui = $replicationGui; } - /** - * @return string - */ public function index(): string { global $replication_info; @@ -88,9 +85,6 @@ class StatusController extends AbstractController ]); } - /** - * @return int - */ private function getStartTime(): int { return (int) $this->dbi->fetchValue( @@ -250,9 +244,6 @@ class StatusController extends AbstractController ]; } - /** - * @return string - */ private function getReplicationInfo(): string { global $replication_info, $replication_types; diff --git a/libraries/classes/Controllers/Server/UserGroupsController.php b/libraries/classes/Controllers/Server/UserGroupsController.php index 9a6a79b1fc..48545473bc 100644 --- a/libraries/classes/Controllers/Server/UserGroupsController.php +++ b/libraries/classes/Controllers/Server/UserGroupsController.php @@ -38,9 +38,6 @@ class UserGroupsController extends AbstractController $this->relation = $relation; } - /** - * @return void - */ public function index(): void { $cfgRelation = $this->relation->getRelationsParam(); diff --git a/libraries/classes/Controllers/SqlController.php b/libraries/classes/Controllers/SqlController.php index 2bcd33ffd2..b3a66e31b4 100644 --- a/libraries/classes/Controllers/SqlController.php +++ b/libraries/classes/Controllers/SqlController.php @@ -49,9 +49,6 @@ class SqlController extends AbstractController $this->checkUserPrivileges = $checkUserPrivileges; } - /** - * @return void - */ public function index(): void { global $cfg, $db, $display_query, $pmaThemeImage, $sql_query, $table, $message; @@ -295,9 +292,6 @@ class SqlController extends AbstractController $this->response->addJSON('select', $select); } - /** - * @return void - */ public function getDefaultForeignKeyCheckValue(): void { $this->checkUserPrivileges->getPrivileges(); @@ -308,9 +302,6 @@ class SqlController extends AbstractController ); } - /** - * @return void - */ public function setColumnOrderOrVisibility(): void { global $db, $table; diff --git a/libraries/classes/Controllers/Table/AddFieldController.php b/libraries/classes/Controllers/Table/AddFieldController.php index 0dceb1033e..66d78f27b7 100644 --- a/libraries/classes/Controllers/Table/AddFieldController.php +++ b/libraries/classes/Controllers/Table/AddFieldController.php @@ -54,9 +54,6 @@ class AddFieldController extends AbstractController $this->config = $config; } - /** - * @return void - */ public function index(): void { global $err_url, $message, $action, $active_page, $sql_query; diff --git a/libraries/classes/Controllers/Table/ChangeController.php b/libraries/classes/Controllers/Table/ChangeController.php index 7399ca4662..fb42773a79 100644 --- a/libraries/classes/Controllers/Table/ChangeController.php +++ b/libraries/classes/Controllers/Table/ChangeController.php @@ -52,9 +52,6 @@ class ChangeController extends AbstractController $this->relation = $relation; } - /** - * @return void - */ public function index(): void { global $cfg, $is_upload, $db, $table, $text_dir, $disp_message, $url_params; diff --git a/libraries/classes/Controllers/Table/CreateController.php b/libraries/classes/Controllers/Table/CreateController.php index 458f71ab25..1893752009 100644 --- a/libraries/classes/Controllers/Table/CreateController.php +++ b/libraries/classes/Controllers/Table/CreateController.php @@ -53,9 +53,6 @@ class CreateController extends AbstractController $this->config = $config; } - /** - * @return void - */ public function index(): void { global $num_fields, $action, $sql_query, $result, $db, $table; diff --git a/libraries/classes/Controllers/Table/ExportController.php b/libraries/classes/Controllers/Table/ExportController.php index 7f0a0ab64b..5d9d8c6279 100644 --- a/libraries/classes/Controllers/Table/ExportController.php +++ b/libraries/classes/Controllers/Table/ExportController.php @@ -54,9 +54,6 @@ class ExportController extends AbstractController $this->relation = $relation; } - /** - * @return void - */ public function index(): void { global $db, $url_query, $url_params, $table, $export_page_title, $replaces; diff --git a/libraries/classes/Controllers/Table/FindReplaceController.php b/libraries/classes/Controllers/Table/FindReplaceController.php index 895a264c83..b78fa177d2 100644 --- a/libraries/classes/Controllers/Table/FindReplaceController.php +++ b/libraries/classes/Controllers/Table/FindReplaceController.php @@ -55,9 +55,6 @@ class FindReplaceController extends AbstractController ); } - /** - * @return void - */ public function index(): void { Common::table(); @@ -161,9 +158,6 @@ class FindReplaceController extends AbstractController ); } - /** - * @return void - */ public function findAction(): void { $useRegex = array_key_exists('useRegex', $_POST) @@ -179,9 +173,6 @@ class FindReplaceController extends AbstractController $this->response->addJSON('preview', $preview); } - /** - * @return void - */ public function replaceAction(): void { $this->replace( diff --git a/libraries/classes/Controllers/Table/GetFieldController.php b/libraries/classes/Controllers/Table/GetFieldController.php index 4dcbc5e3a0..1f07eb4a21 100644 --- a/libraries/classes/Controllers/Table/GetFieldController.php +++ b/libraries/classes/Controllers/Table/GetFieldController.php @@ -19,9 +19,6 @@ use function ini_set; */ class GetFieldController extends AbstractController { - /** - * @return void - */ public function index(): void { global $db, $table; diff --git a/libraries/classes/Controllers/Table/GisVisualizationController.php b/libraries/classes/Controllers/Table/GisVisualizationController.php index d30686307d..48906689cd 100644 --- a/libraries/classes/Controllers/Table/GisVisualizationController.php +++ b/libraries/classes/Controllers/Table/GisVisualizationController.php @@ -25,9 +25,6 @@ final class GisVisualizationController extends AbstractController */ protected $visualization; - /** - * @return void - */ public function index(): void { global $cfg, $url_params; diff --git a/libraries/classes/Controllers/Table/ImportController.php b/libraries/classes/Controllers/Table/ImportController.php index ac46f95256..2869028505 100644 --- a/libraries/classes/Controllers/Table/ImportController.php +++ b/libraries/classes/Controllers/Table/ImportController.php @@ -16,9 +16,6 @@ use PhpMyAdmin\Url; */ final class ImportController extends AbstractController { - /** - * @return void - */ public function index(): void { global $db, $max_upload_size, $table, $url_query, $url_params; diff --git a/libraries/classes/Controllers/Table/IndexesController.php b/libraries/classes/Controllers/Table/IndexesController.php index 0da5e917a9..a74eefdb9d 100644 --- a/libraries/classes/Controllers/Table/IndexesController.php +++ b/libraries/classes/Controllers/Table/IndexesController.php @@ -19,9 +19,6 @@ use PhpMyAdmin\Response; */ class IndexesController extends AbstractController { - /** - * @return void - */ public function index(): void { if (! isset($_POST['create_edit_table'])) { diff --git a/libraries/classes/Controllers/Table/OperationsController.php b/libraries/classes/Controllers/Table/OperationsController.php index 8f20d69389..f505198f07 100644 --- a/libraries/classes/Controllers/Table/OperationsController.php +++ b/libraries/classes/Controllers/Table/OperationsController.php @@ -61,9 +61,6 @@ class OperationsController extends AbstractController $this->relation = $relation; } - /** - * @return void - */ public function index(): void { global $containerBuilder, $url_query, $url_params, $reread_info, $tbl_is_view, $tbl_storage_engine; diff --git a/libraries/classes/Controllers/Table/RecentFavoriteController.php b/libraries/classes/Controllers/Table/RecentFavoriteController.php index 910e9c456c..5c8fff0d4e 100644 --- a/libraries/classes/Controllers/Table/RecentFavoriteController.php +++ b/libraries/classes/Controllers/Table/RecentFavoriteController.php @@ -16,9 +16,6 @@ use PhpMyAdmin\RecentFavoriteTable; */ class RecentFavoriteController extends AbstractController { - /** - * @return void - */ public function index(): void { global $containerBuilder; diff --git a/libraries/classes/Controllers/Table/ReplaceController.php b/libraries/classes/Controllers/Table/ReplaceController.php index e81601a143..9fbcaa7305 100644 --- a/libraries/classes/Controllers/Table/ReplaceController.php +++ b/libraries/classes/Controllers/Table/ReplaceController.php @@ -65,9 +65,6 @@ final class ReplaceController extends AbstractController $this->relation = $relation; } - /** - * @return void - */ public function index(): void { global $containerBuilder, $db, $table, $url_params, $message; diff --git a/libraries/classes/Controllers/Table/RowActionController.php b/libraries/classes/Controllers/Table/RowActionController.php index 59194e558b..98d318eda7 100644 --- a/libraries/classes/Controllers/Table/RowActionController.php +++ b/libraries/classes/Controllers/Table/RowActionController.php @@ -16,9 +16,6 @@ use PhpMyAdmin\Url; */ class RowActionController extends AbstractController { - /** - * @return void - */ public function index(): void { global $containerBuilder, $db, $goto, $pmaThemeImage, $sql_query, $table; diff --git a/libraries/classes/Controllers/Table/SqlController.php b/libraries/classes/Controllers/Table/SqlController.php index b40371b39b..c2d5c74aa3 100644 --- a/libraries/classes/Controllers/Table/SqlController.php +++ b/libraries/classes/Controllers/Table/SqlController.php @@ -38,9 +38,6 @@ final class SqlController extends AbstractController $this->sqlQueryForm = $sqlQueryForm; } - /** - * @return void - */ public function index(): void { global $url_query, $err_url, $goto, $back; diff --git a/libraries/classes/Controllers/Table/StructureController.php b/libraries/classes/Controllers/Table/StructureController.php index fe730194b1..a226abaf22 100644 --- a/libraries/classes/Controllers/Table/StructureController.php +++ b/libraries/classes/Controllers/Table/StructureController.php @@ -101,9 +101,6 @@ class StructureController extends AbstractController $this->table_obj = $this->dbi->getTable($this->db, $this->table); } - /** - * @return void - */ public function index(): void { global $containerBuilder, $sql_query, $reread_info, $showtable; diff --git a/libraries/classes/Controllers/Table/TrackingController.php b/libraries/classes/Controllers/Table/TrackingController.php index b88d735421..5baa36fd45 100644 --- a/libraries/classes/Controllers/Table/TrackingController.php +++ b/libraries/classes/Controllers/Table/TrackingController.php @@ -43,9 +43,6 @@ final class TrackingController extends AbstractController $this->tracking = $tracking; } - /** - * @return void - */ public function index(): void { global $pmaThemeImage, $text_dir, $url_query, $url_params, $msg; diff --git a/libraries/classes/Controllers/Table/TriggersController.php b/libraries/classes/Controllers/Table/TriggersController.php index 54af08203b..999ab1c442 100644 --- a/libraries/classes/Controllers/Table/TriggersController.php +++ b/libraries/classes/Controllers/Table/TriggersController.php @@ -18,9 +18,6 @@ use PhpMyAdmin\Util; */ class TriggersController extends AbstractController { - /** - * @return void - */ public function index(): void { global $_PMA_RTE, $db, $table, $tables, $num_tables, $total_num_tables, $sub_part, $is_show_stats; diff --git a/libraries/classes/Controllers/Table/ZoomSearchController.php b/libraries/classes/Controllers/Table/ZoomSearchController.php index fe78adf72e..d855cf2374 100644 --- a/libraries/classes/Controllers/Table/ZoomSearchController.php +++ b/libraries/classes/Controllers/Table/ZoomSearchController.php @@ -71,9 +71,6 @@ class ZoomSearchController extends AbstractController $this->_loadTableInfo(); } - /** - * @return void - */ public function index(): void { global $goto; diff --git a/libraries/classes/Controllers/ThemesController.php b/libraries/classes/Controllers/ThemesController.php index c9cf24d443..018a6980f6 100644 --- a/libraries/classes/Controllers/ThemesController.php +++ b/libraries/classes/Controllers/ThemesController.php @@ -15,9 +15,6 @@ use PhpMyAdmin\ThemeManager; */ class ThemesController extends AbstractController { - /** - * @return string - */ public function index(): string { $this->response->getFooter()->setMinimal(); diff --git a/libraries/classes/Controllers/TransformationWrapperController.php b/libraries/classes/Controllers/TransformationWrapperController.php index a074743ba0..0f74d8e3b8 100644 --- a/libraries/classes/Controllers/TransformationWrapperController.php +++ b/libraries/classes/Controllers/TransformationWrapperController.php @@ -54,9 +54,6 @@ class TransformationWrapperController extends AbstractController $this->relation = $relation; } - /** - * @return void - */ public function index(): void { global $cn, $db, $table, $transform_key, $request_params, $size_params, $where_clause, $row; diff --git a/libraries/classes/Controllers/UserPasswordController.php b/libraries/classes/Controllers/UserPasswordController.php index e60c712142..0e030ee9a4 100644 --- a/libraries/classes/Controllers/UserPasswordController.php +++ b/libraries/classes/Controllers/UserPasswordController.php @@ -37,9 +37,6 @@ class UserPasswordController extends AbstractController $this->userPassword = $userPassword; } - /** - * @return void - */ public function index(): void { global $cfg, $hostname, $username, $password, $change_password_message, $msg; diff --git a/libraries/classes/Controllers/VersionCheckController.php b/libraries/classes/Controllers/VersionCheckController.php index 7aff1f2c0b..f0fe520ce7 100644 --- a/libraries/classes/Controllers/VersionCheckController.php +++ b/libraries/classes/Controllers/VersionCheckController.php @@ -16,9 +16,6 @@ use PhpMyAdmin\VersionInformation; */ class VersionCheckController extends AbstractController { - /** - * @return void - */ public function index(): void { $_GET['ajax_request'] = 'true'; diff --git a/libraries/classes/Controllers/ViewCreateController.php b/libraries/classes/Controllers/ViewCreateController.php index 6c678a47b8..6e8e99940a 100644 --- a/libraries/classes/Controllers/ViewCreateController.php +++ b/libraries/classes/Controllers/ViewCreateController.php @@ -21,9 +21,6 @@ use PhpMyAdmin\Util; */ class ViewCreateController extends AbstractController { - /** - * @return void - */ public function index(): void { global $text_dir, $url_params, $view_algorithm_options, $view_with_options, $view_security_options; diff --git a/libraries/classes/Controllers/ViewOperationsController.php b/libraries/classes/Controllers/ViewOperationsController.php index 6e50428d9f..6247c4285a 100644 --- a/libraries/classes/Controllers/ViewOperationsController.php +++ b/libraries/classes/Controllers/ViewOperationsController.php @@ -39,9 +39,6 @@ class ViewOperationsController extends AbstractController $this->operations = $operations; } - /** - * @return void - */ public function index(): void { global $sql_query, $url_query, $url_params, $reload, $result, $warning_messages; diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php index 659fff0ab1..7371b4ffc6 100644 --- a/libraries/classes/Header.php +++ b/libraries/classes/Header.php @@ -695,9 +695,6 @@ class Header return 'v=' . urlencode(PMA_VERSION); } - /** - * @return string - */ private function getVariablesForJavaScript(): string { global $cfg, $pmaThemeImage; diff --git a/libraries/classes/Plugins/TwoFactor/Application.php b/libraries/classes/Plugins/TwoFactor/Application.php index cc5a93a828..e5da1379c7 100644 --- a/libraries/classes/Plugins/TwoFactor/Application.php +++ b/libraries/classes/Plugins/TwoFactor/Application.php @@ -51,9 +51,6 @@ class Application extends TwoFactorPlugin } } - /** - * @return Google2FA - */ public function getGoogle2fa(): Google2FA { return $this->_google2fa; diff --git a/libraries/classes/ReplicationInfo.php b/libraries/classes/ReplicationInfo.php index 6c31b1a050..ea0a946530 100644 --- a/libraries/classes/ReplicationInfo.php +++ b/libraries/classes/ReplicationInfo.php @@ -11,9 +11,6 @@ namespace PhpMyAdmin; */ final class ReplicationInfo { - /** - * @return void - */ public static function load(): void { global $dbi, $url_params; diff --git a/libraries/classes/Server/Plugin.php b/libraries/classes/Server/Plugin.php index db1641263a..d15d596a70 100644 --- a/libraries/classes/Server/Plugin.php +++ b/libraries/classes/Server/Plugin.php @@ -171,105 +171,66 @@ final class Plugin ]; } - /** - * @return string - */ public function getName(): string { return $this->name; } - /** - * @return string|null - */ public function getVersion(): ?string { return $this->version; } - /** - * @return string - */ public function getStatus(): string { return $this->status; } - /** - * @return string - */ public function getType(): string { return $this->type; } - /** - * @return string|null - */ public function getTypeVersion(): ?string { return $this->typeVersion; } - /** - * @return string|null - */ public function getLibrary(): ?string { return $this->library; } - /** - * @return string|null - */ public function getLibraryVersion(): ?string { return $this->libraryVersion; } - /** - * @return string|null - */ public function getAuthor(): ?string { return $this->author; } - /** - * @return string|null - */ public function getDescription(): ?string { return $this->description; } - /** - * @return string - */ public function getLicense(): string { return $this->license; } - /** - * @return string|null - */ public function getLoadOption(): ?string { return $this->loadOption; } - /** - * @return string|null - */ public function getMaturity(): ?string { return $this->maturity; } - /** - * @return string|null - */ public function getAuthVersion(): ?string { return $this->authVersion; diff --git a/libraries/classes/TwoFactor.php b/libraries/classes/TwoFactor.php index 05de9b4d53..9929e35b88 100644 --- a/libraries/classes/TwoFactor.php +++ b/libraries/classes/TwoFactor.php @@ -95,17 +95,11 @@ class TwoFactor return $result; } - /** - * @return bool - */ public function isWritable(): bool { return $this->_writable; } - /** - * @return TwoFactorPlugin - */ public function getBackend(): TwoFactorPlugin { return $this->_backend; @@ -119,9 +113,6 @@ class TwoFactor return $this->_available; } - /** - * @return bool - */ public function showSubmit(): bool { $backend = $this->_backend; diff --git a/libraries/classes/UserPreferencesHeader.php b/libraries/classes/UserPreferencesHeader.php index 455753d24d..820292f045 100644 --- a/libraries/classes/UserPreferencesHeader.php +++ b/libraries/classes/UserPreferencesHeader.php @@ -86,9 +86,6 @@ class UserPreferencesHeader ) . '
'; } - /** - * @return string - */ protected static function displayTabsWithIcon(): string { $form_param = $_GET['form'] ?? null; @@ -115,9 +112,6 @@ class UserPreferencesHeader return $content; } - /** - * @return string|null - */ protected static function displayConfigurationSavedMessage(): ?string { // show "configuration saved" message and reload navigation panel if needed diff --git a/phpcs.xml.dist b/phpcs.xml.dist index d2d94a1adb..587382ac19 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -4,7 +4,9 @@ name="phpMyAdmin" xsi:noNamespaceSchemaLocation="vendor/squizlabs/php_codesniffer/phpcs.xsd" > - + + + 4 diff --git a/test/classes/Charsets/CharsetTest.php b/test/classes/Charsets/CharsetTest.php index 1048d1e240..5a9e7bdacf 100644 --- a/test/classes/Charsets/CharsetTest.php +++ b/test/classes/Charsets/CharsetTest.php @@ -14,9 +14,6 @@ use PHPUnit\Framework\TestCase; */ class CharsetTest extends TestCase { - /** - * @return void - */ public function testFromServer(): void { $serverCharset = [ diff --git a/test/classes/Charsets/CollationTest.php b/test/classes/Charsets/CollationTest.php index 7d17f7912a..c7fddb9ee5 100644 --- a/test/classes/Charsets/CollationTest.php +++ b/test/classes/Charsets/CollationTest.php @@ -14,9 +14,6 @@ use PHPUnit\Framework\TestCase; */ class CollationTest extends TestCase { - /** - * @return void - */ public function testFromServer(): void { $serverCollation = [ diff --git a/test/classes/CharsetsTest.php b/test/classes/CharsetsTest.php index db95c655c1..2afcf6a605 100644 --- a/test/classes/CharsetsTest.php +++ b/test/classes/CharsetsTest.php @@ -18,18 +18,12 @@ use PHPUnit\Framework\TestCase; */ class CharsetsTest extends TestCase { - /** - * @return void - */ protected function setUp(): void { $GLOBALS['cfg']['DBG']['sql'] = false; $GLOBALS['cfg']['Server']['DisableIS'] = false; } - /** - * @return void - */ public function testFindCollationByName(): void { $this->assertNull(Charsets::findCollationByName( diff --git a/test/classes/Config/Forms/FormListTest.php b/test/classes/Config/Forms/FormListTest.php index 516b805fbb..9612919aee 100644 --- a/test/classes/Config/Forms/FormListTest.php +++ b/test/classes/Config/Forms/FormListTest.php @@ -19,9 +19,6 @@ use PhpMyAdmin\Tests\PmaTestCase; */ class FormListTest extends PmaTestCase { - /** - * @return void - */ protected function setUp(): void { $GLOBALS['PMA_Config'] = new Config(); diff --git a/test/classes/Controllers/Database/PrivilegesControllerTest.php b/test/classes/Controllers/Database/PrivilegesControllerTest.php index 3dbf56b5cb..729cc0df94 100644 --- a/test/classes/Controllers/Database/PrivilegesControllerTest.php +++ b/test/classes/Controllers/Database/PrivilegesControllerTest.php @@ -18,9 +18,6 @@ use PhpMyAdmin\Url; */ class PrivilegesControllerTest extends PmaTestCase { - /** - * @return void - */ public function testIndex(): void { global $dbi, $db, $server, $cfg, $PMA_PHP_SELF, $is_grantuser, $is_createuser; diff --git a/test/classes/Controllers/Server/BinlogControllerTest.php b/test/classes/Controllers/Server/BinlogControllerTest.php index ec7ac86ade..1de9a5333c 100644 --- a/test/classes/Controllers/Server/BinlogControllerTest.php +++ b/test/classes/Controllers/Server/BinlogControllerTest.php @@ -47,9 +47,6 @@ class BinlogControllerTest extends TestCase Util::cacheSet('profiling_supported', true); } - /** - * @return void - */ public function testIndex(): void { $binaryLogs = [ diff --git a/test/classes/Controllers/Server/CollationsControllerTest.php b/test/classes/Controllers/Server/CollationsControllerTest.php index 36c21b4312..c090d8b124 100644 --- a/test/classes/Controllers/Server/CollationsControllerTest.php +++ b/test/classes/Controllers/Server/CollationsControllerTest.php @@ -38,9 +38,6 @@ class CollationsControllerTest extends TestCase $GLOBALS['cfg']['Server']['DisableIS'] = false; } - /** - * @return void - */ public function testIndexAction(): void { $controller = new CollationsController( diff --git a/test/classes/Controllers/Server/DatabasesControllerTest.php b/test/classes/Controllers/Server/DatabasesControllerTest.php index 0d5134df52..57c30adcfb 100644 --- a/test/classes/Controllers/Server/DatabasesControllerTest.php +++ b/test/classes/Controllers/Server/DatabasesControllerTest.php @@ -24,9 +24,6 @@ use stdClass; */ class DatabasesControllerTest extends TestCase { - /** - * @return void - */ protected function setUp(): void { $GLOBALS['PMA_Config'] = new Config(); @@ -41,9 +38,6 @@ class DatabasesControllerTest extends TestCase $GLOBALS['text_dir'] = 'text_dir'; } - /** - * @return void - */ public function testIndexAction(): void { global $cfg, $dblist, $is_create_db_priv; diff --git a/test/classes/Controllers/Server/EnginesControllerTest.php b/test/classes/Controllers/Server/EnginesControllerTest.php index 31cf8b9c6a..c525ed3498 100644 --- a/test/classes/Controllers/Server/EnginesControllerTest.php +++ b/test/classes/Controllers/Server/EnginesControllerTest.php @@ -40,9 +40,6 @@ class EnginesControllerTest extends TestCase $GLOBALS['cfg']['Server']['DisableIS'] = false; } - /** - * @return void - */ public function testIndex(): void { $controller = new EnginesController( @@ -89,9 +86,6 @@ class EnginesControllerTest extends TestCase ); } - /** - * @return void - */ public function testShow(): void { $controller = new EnginesController( diff --git a/test/classes/Controllers/Server/Status/AdvisorControllerTest.php b/test/classes/Controllers/Server/Status/AdvisorControllerTest.php index b6e03f664d..6b52a5395c 100644 --- a/test/classes/Controllers/Server/Status/AdvisorControllerTest.php +++ b/test/classes/Controllers/Server/Status/AdvisorControllerTest.php @@ -26,9 +26,6 @@ use Symfony\Component\ExpressionLanguage\ExpressionLanguage; */ class AdvisorControllerTest extends TestCase { - /** - * @return void - */ protected function setUp(): void { $GLOBALS['PMA_Config'] = new Config(); @@ -98,9 +95,6 @@ class AdvisorControllerTest extends TestCase $GLOBALS['dbi'] = $dbi; } - /** - * @return void - */ public function testIndex(): void { $controller = new AdvisorController( diff --git a/test/classes/Controllers/Server/Status/MonitorControllerTest.php b/test/classes/Controllers/Server/Status/MonitorControllerTest.php index 952d9a8298..7d5773b4cb 100644 --- a/test/classes/Controllers/Server/Status/MonitorControllerTest.php +++ b/test/classes/Controllers/Server/Status/MonitorControllerTest.php @@ -27,9 +27,6 @@ class MonitorControllerTest extends TestCase */ private $data; - /** - * @return void - */ protected function setUp(): void { $GLOBALS['PMA_Config'] = new Config(); @@ -49,9 +46,6 @@ class MonitorControllerTest extends TestCase $this->data = new Data(); } - /** - * @return void - */ public function testIndex(): void { $controller = new MonitorController( @@ -147,9 +141,6 @@ class MonitorControllerTest extends TestCase ); } - /** - * @return void - */ public function testLogDataTypeSlow(): void { $response = Response::getInstance(); @@ -197,9 +188,6 @@ class MonitorControllerTest extends TestCase ); } - /** - * @return void - */ public function testLogDataTypeGeneral(): void { $value = [ @@ -256,9 +244,6 @@ class MonitorControllerTest extends TestCase ); } - /** - * @return void - */ public function testLoggingVars(): void { $value = [ @@ -290,9 +275,6 @@ class MonitorControllerTest extends TestCase ); } - /** - * @return void - */ public function testQueryAnalyzer(): void { global $cached_affected_rows; diff --git a/test/classes/Controllers/Server/Status/ProcessesControllerTest.php b/test/classes/Controllers/Server/Status/ProcessesControllerTest.php index af736865ea..f59ed1047e 100644 --- a/test/classes/Controllers/Server/Status/ProcessesControllerTest.php +++ b/test/classes/Controllers/Server/Status/ProcessesControllerTest.php @@ -27,9 +27,6 @@ class ProcessesControllerTest extends TestCase */ private $data; - /** - * @return void - */ protected function setUp(): void { $GLOBALS['PMA_Config'] = new Config(); @@ -101,9 +98,6 @@ class ProcessesControllerTest extends TestCase $this->data = new Data(); } - /** - * @return void - */ public function testIndex(): void { $controller = new ProcessesController( @@ -213,9 +207,6 @@ class ProcessesControllerTest extends TestCase ); } - /** - * @return void - */ public function testRefresh(): void { $process = [ diff --git a/test/classes/Controllers/Server/Status/QueriesControllerTest.php b/test/classes/Controllers/Server/Status/QueriesControllerTest.php index 5df04989d4..fa118c3f4e 100644 --- a/test/classes/Controllers/Server/Status/QueriesControllerTest.php +++ b/test/classes/Controllers/Server/Status/QueriesControllerTest.php @@ -27,9 +27,6 @@ class QueriesControllerTest extends TestCase */ private $data; - /** - * @return void - */ protected function setUp(): void { $GLOBALS['PMA_Config'] = new Config(); @@ -110,9 +107,6 @@ class QueriesControllerTest extends TestCase ]; } - /** - * @return void - */ public function testIndex(): void { $controller = new QueriesController( diff --git a/test/classes/Controllers/Server/Status/StatusControllerTest.php b/test/classes/Controllers/Server/Status/StatusControllerTest.php index c78f6b339e..a8ddb0d8fe 100644 --- a/test/classes/Controllers/Server/Status/StatusControllerTest.php +++ b/test/classes/Controllers/Server/Status/StatusControllerTest.php @@ -23,9 +23,6 @@ use PHPUnit\Framework\TestCase; */ class StatusControllerTest extends TestCase { - /** - * @return void - */ protected function setUp(): void { $GLOBALS['PMA_Config'] = new Config(); @@ -123,9 +120,6 @@ class StatusControllerTest extends TestCase $GLOBALS['dbi'] = $dbi; } - /** - * @return void - */ public function testIndex(): void { $data = new Data(); diff --git a/test/classes/Controllers/Server/Status/VariablesControllerTest.php b/test/classes/Controllers/Server/Status/VariablesControllerTest.php index 829f5d5bb6..dad22a88c8 100644 --- a/test/classes/Controllers/Server/Status/VariablesControllerTest.php +++ b/test/classes/Controllers/Server/Status/VariablesControllerTest.php @@ -26,9 +26,6 @@ class VariablesControllerTest extends TestCase */ private $data; - /** - * @return void - */ protected function setUp(): void { $GLOBALS['PMA_Config'] = new Config(); @@ -126,9 +123,6 @@ class VariablesControllerTest extends TestCase $this->data = new Data(); } - /** - * @return void - */ public function testIndex(): void { $controller = new VariablesController( diff --git a/test/classes/Controllers/Server/VariablesControllerTest.php b/test/classes/Controllers/Server/VariablesControllerTest.php index bef58acf81..cf2263c7a8 100644 --- a/test/classes/Controllers/Server/VariablesControllerTest.php +++ b/test/classes/Controllers/Server/VariablesControllerTest.php @@ -26,9 +26,6 @@ use Williamdes\MariaDBMySQLKBS\SlimData as KBSlimData; */ class VariablesControllerTest extends TestCase { - /** - * @return void - */ protected function setUp(): void { $GLOBALS['PMA_Config'] = new Config(); @@ -83,9 +80,6 @@ class VariablesControllerTest extends TestCase $GLOBALS['dbi'] = $dbi; } - /** - * @return void - */ public function testIndex(): void { $controller = new VariablesController( diff --git a/test/classes/Controllers/Table/FindReplaceControllerTest.php b/test/classes/Controllers/Table/FindReplaceControllerTest.php index 1b7a8d6f0e..c66c6014b6 100644 --- a/test/classes/Controllers/Table/FindReplaceControllerTest.php +++ b/test/classes/Controllers/Table/FindReplaceControllerTest.php @@ -19,9 +19,6 @@ use PHPUnit\Framework\TestCase; */ class FindReplaceControllerTest extends TestCase { - /** - * @return void - */ protected function setUp(): void { $GLOBALS['PMA_Config'] = new Config(); @@ -74,9 +71,6 @@ class FindReplaceControllerTest extends TestCase $GLOBALS['dbi'] = $dbi; } - /** - * @return void - */ public function testReplace(): void { $tableSearch = new FindReplaceController( diff --git a/test/classes/Controllers/Table/PrivilegesControllerTest.php b/test/classes/Controllers/Table/PrivilegesControllerTest.php index 87cbb5adf7..f84fa86393 100644 --- a/test/classes/Controllers/Table/PrivilegesControllerTest.php +++ b/test/classes/Controllers/Table/PrivilegesControllerTest.php @@ -18,9 +18,6 @@ use PhpMyAdmin\Url; */ class PrivilegesControllerTest extends PmaTestCase { - /** - * @return void - */ public function testIndex(): void { global $dbi, $db, $table, $server, $cfg, $PMA_PHP_SELF, $is_grantuser, $is_createuser; diff --git a/test/classes/Controllers/TransformationOverviewControllerTest.php b/test/classes/Controllers/TransformationOverviewControllerTest.php index 87a18fd506..48fda76186 100644 --- a/test/classes/Controllers/TransformationOverviewControllerTest.php +++ b/test/classes/Controllers/TransformationOverviewControllerTest.php @@ -38,9 +38,6 @@ class TransformationOverviewControllerTest extends TestCase $GLOBALS['PMA_PHP_SELF'] = 'index.php'; } - /** - * @return void - */ public function testIndexAction(): void { $controller = new TransformationOverviewController( diff --git a/test/classes/EncodingTest.php b/test/classes/EncodingTest.php index 94872e4939..69bc58ec29 100644 --- a/test/classes/EncodingTest.php +++ b/test/classes/EncodingTest.php @@ -18,17 +18,11 @@ use PHPUnit\Framework\TestCase; */ class EncodingTest extends TestCase { - /** - * @return void - */ protected function setUp(): void { Encoding::initEngine(); } - /** - * @return void - */ protected function tearDown(): void { Encoding::initEngine(); diff --git a/test/classes/ErrorReportTest.php b/test/classes/ErrorReportTest.php index 60021d4c62..b03829af3a 100644 --- a/test/classes/ErrorReportTest.php +++ b/test/classes/ErrorReportTest.php @@ -30,9 +30,6 @@ class ErrorReportTest extends TestCase */ private $errorReport; - /** - * @return void - */ protected function setUp(): void { $GLOBALS['server'] = 1; @@ -60,9 +57,6 @@ class ErrorReportTest extends TestCase $this->errorReport->setSubmissionUrl('http://localhost'); } - /** - * @return void - */ public function testGetData(): void { $actual = $this->errorReport->getData('unknown'); @@ -116,9 +110,6 @@ class ErrorReportTest extends TestCase $this->assertEquals($report, $actual); } - /** - * @return void - */ public function testSend(): void { $submissionUrl = 'http://localhost'; @@ -146,9 +137,6 @@ class ErrorReportTest extends TestCase $this->assertEquals($return, $this->errorReport->send($report)); } - /** - * @return void - */ public function testGetForm(): void { $_POST['exception'] = []; diff --git a/test/classes/FileListingTest.php b/test/classes/FileListingTest.php index ced12eb5f6..e89066a3ec 100644 --- a/test/classes/FileListingTest.php +++ b/test/classes/FileListingTest.php @@ -20,17 +20,11 @@ class FileListingTest extends TestCase */ private $fileListing; - /** - * @return void - */ protected function setUp(): void { $this->fileListing = new FileListing(); } - /** - * @return void - */ public function testGetDirContent(): void { $this->assertFalse($this->fileListing->getDirContent('nonexistent directory')); @@ -46,9 +40,6 @@ class FileListingTest extends TestCase ); } - /** - * @return void - */ public function testGetFileSelectOptions(): void { $fixturesDir = ROOT_PATH . 'test/classes/_data/file_listing'; @@ -98,9 +89,6 @@ HTML; ); } - /** - * @return void - */ public function testSupportedDecompressionsEmptyList(): void { $GLOBALS['cfg']['ZipDump'] = false; @@ -122,9 +110,6 @@ HTML; $this->assertEquals('gz|bz2|zip', $this->fileListing->supportedDecompressions()); } - /** - * @return void - */ public function testSupportedDecompressionsPartial(): void { $GLOBALS['cfg']['ZipDump'] = true; diff --git a/test/classes/LanguageTest.php b/test/classes/LanguageTest.php index a3df8fbc60..1db9a2b3b9 100644 --- a/test/classes/LanguageTest.php +++ b/test/classes/LanguageTest.php @@ -37,9 +37,6 @@ class LanguageTest extends PmaTestCase $this->manager = new LanguageManager(); } - /** - * @return void - */ protected function tearDown(): void { // Ensure we have English locale after tests diff --git a/test/classes/Server/PluginTest.php b/test/classes/Server/PluginTest.php index 845360b84c..c7725af9d0 100644 --- a/test/classes/Server/PluginTest.php +++ b/test/classes/Server/PluginTest.php @@ -14,9 +14,6 @@ use PHPUnit\Framework\TestCase; */ class PluginTest extends TestCase { - /** - * @return Plugin - */ public function testFromState(): Plugin { $plugin = Plugin::fromState([ diff --git a/test/classes/Server/PluginsTest.php b/test/classes/Server/PluginsTest.php index dfa25d1d4a..81a9e3365f 100644 --- a/test/classes/Server/PluginsTest.php +++ b/test/classes/Server/PluginsTest.php @@ -20,9 +20,6 @@ class PluginsTest extends TestCase */ private $plugins; - /** - * @return void - */ public function testGetAll(): void { $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000; @@ -55,9 +52,6 @@ class PluginsTest extends TestCase ], $plugin->toArray()); } - /** - * @return void - */ public function testGetAllWithoutInformationSchema(): void { $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000; diff --git a/test/classes/Stubs/DbiDummy.php b/test/classes/Stubs/DbiDummy.php index 92da06407f..1e4b47e357 100644 --- a/test/classes/Stubs/DbiDummy.php +++ b/test/classes/Stubs/DbiDummy.php @@ -480,9 +480,6 @@ class DbiDummy implements DbiExtension } } - /** - * @return void - */ private function init(): void { /** diff --git a/test/classes/Table/SearchTest.php b/test/classes/Table/SearchTest.php index 29f7b4fc06..af7359db80 100644 --- a/test/classes/Table/SearchTest.php +++ b/test/classes/Table/SearchTest.php @@ -17,9 +17,6 @@ class SearchTest extends TestCase /** @var Search */ private $search; - /** - * @return void - */ protected function setUp(): void { global $dbi; @@ -27,9 +24,6 @@ class SearchTest extends TestCase $this->search = new Search($dbi); } - /** - * @return void - */ public function testBuildSqlQuery(): void { $_POST['distinct'] = true; @@ -107,9 +101,6 @@ class SearchTest extends TestCase ); } - /** - * @return void - */ public function testBuildSqlQueryWithWhereClause(): void { $_POST['zoom_submit'] = true; diff --git a/test/classes/TwoFactorTest.php b/test/classes/TwoFactorTest.php index 887fe3160a..b1e8e93e73 100644 --- a/test/classes/TwoFactorTest.php +++ b/test/classes/TwoFactorTest.php @@ -20,9 +20,6 @@ use Samyoul\U2F\U2FServer\SignRequest; */ class TwoFactorTest extends PmaTestCase { - /** - * @return void - */ protected function setUp(): void { $GLOBALS['server'] = 1; diff --git a/test/classes/Utils/HttpRequestTest.php b/test/classes/Utils/HttpRequestTest.php index 0c295f42d7..f9b8c88c3a 100644 --- a/test/classes/Utils/HttpRequestTest.php +++ b/test/classes/Utils/HttpRequestTest.php @@ -22,9 +22,6 @@ class HttpRequestTest extends PmaTestCase */ private $httpRequest; - /** - * @return void - */ protected function setUp(): void { $this->httpRequest = new HttpRequest(); diff --git a/test/classes/ZipExtensionTest.php b/test/classes/ZipExtensionTest.php index ca28a6d08b..e66c0b1014 100644 --- a/test/classes/ZipExtensionTest.php +++ b/test/classes/ZipExtensionTest.php @@ -24,9 +24,6 @@ class ZipExtensionTest extends PmaTestCase */ private $zipExtension; - /** - * @return void - */ protected function setUp(): void { $this->zipExtension = new ZipExtension(); diff --git a/test/selenium/LoginTest.php b/test/selenium/LoginTest.php index 01230d9ae7..5a98770921 100644 --- a/test/selenium/LoginTest.php +++ b/test/selenium/LoginTest.php @@ -18,9 +18,6 @@ namespace PhpMyAdmin\Tests\Selenium; */ class LoginTest extends TestBase { - /** - * @return void - */ protected function setUp(): void { parent::setUp(); diff --git a/test/selenium/Table/CreateTest.php b/test/selenium/Table/CreateTest.php index b16df08680..ce42a15ca6 100644 --- a/test/selenium/Table/CreateTest.php +++ b/test/selenium/Table/CreateTest.php @@ -20,9 +20,6 @@ use PhpMyAdmin\Tests\Selenium\TestBase; */ class CreateTest extends TestBase { - /** - * @return void - */ protected function setUp(): void { parent::setUp(); diff --git a/test/selenium/XssTest.php b/test/selenium/XssTest.php index 77b5425d4c..bee3eeff39 100644 --- a/test/selenium/XssTest.php +++ b/test/selenium/XssTest.php @@ -18,9 +18,6 @@ namespace PhpMyAdmin\Tests\Selenium; */ class XssTest extends TestBase { - /** - * @return void - */ protected function setUp(): void { parent::setUp(); From 88cfde2bed8b0b9a16221633a11b672dbdc8d41c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Mon, 20 Jan 2020 13:33:38 -0300 Subject: [PATCH 2/6] Remove empty comments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- .../classes/Config/ServerConfigChecks.php | 27 ------------------- .../Abs/ExternalTransformationsPlugin.php | 1 - libraries/classes/ReplicationInfo.php | 1 - libraries/classes/Table.php | 1 - libraries/common.inc.php | 5 ---- libraries/config.default.php | 3 --- setup/config.php | 6 ----- 7 files changed, 44 deletions(-) diff --git a/libraries/classes/Config/ServerConfigChecks.php b/libraries/classes/Config/ServerConfigChecks.php index 5b0b3b8eab..dc8a761569 100644 --- a/libraries/classes/Config/ServerConfigChecks.php +++ b/libraries/classes/Config/ServerConfigChecks.php @@ -63,10 +63,8 @@ class ServerConfigChecks $blowfishSecret ); - // // $cfg['AllowArbitraryServer'] // should be disabled - // if ($this->cfg->getValue('AllowArbitraryServer')) { $sAllowArbitraryServerWarn = sprintf( __( @@ -100,10 +98,8 @@ class ServerConfigChecks . 'your server.' ); - // // $cfg['SaveDir'] // should not be world-accessible - // if ($this->cfg->getValue('SaveDir') != '') { SetupIndex::messagesSet( 'notice', @@ -113,10 +109,8 @@ class ServerConfigChecks ); } - // // $cfg['TempDir'] // should not be world-accessible - // if ($this->cfg->getValue('TempDir') != '') { SetupIndex::messagesSet( 'notice', @@ -161,10 +155,8 @@ class ServerConfigChecks $blowfishSecretSet ); - // // $cfg['Servers'][$i]['ssl'] // should be enabled if possible - // if (! $this->cfg->getValue('Servers/' . $i . '/ssl')) { $title = Descriptions::get('Servers/1/ssl') . ' (' . $serverName . ')'; SetupIndex::messagesSet( @@ -190,10 +182,8 @@ class ServerConfigChecks '[/a]' )); - // // $cfg['Servers'][$i]['auth_type'] // warn about full user credentials if 'auth_type' is 'config' - // if ($this->cfg->getValue('Servers/' . $i . '/auth_type') == 'config' && $this->cfg->getValue('Servers/' . $i . '/user') != '' && $this->cfg->getValue('Servers/' . $i . '/password') != '' @@ -219,11 +209,9 @@ class ServerConfigChecks ); } - // // $cfg['Servers'][$i]['AllowRoot'] // $cfg['Servers'][$i]['AllowNoPassword'] // serious security flaw - // if ($this->cfg->getValue('Servers/' . $i . '/AllowRoot') && $this->cfg->getValue('Servers/' . $i . '/AllowNoPassword') ) { @@ -307,10 +295,8 @@ class ServerConfigChecks */ protected function performConfigChecksServersZipdump() { - // // $cfg['ZipDump'] // requires zip_open in import - // if ($this->cfg->getValue('ZipDump') && ! $this->functionExists('zip_open')) { SetupIndex::messagesSet( 'error', @@ -328,10 +314,8 @@ class ServerConfigChecks ); } - // // $cfg['ZipDump'] // requires gzcompress in export - // if ($this->cfg->getValue('ZipDump') && ! $this->functionExists('gzcompress')) { SetupIndex::messagesSet( 'error', @@ -364,10 +348,8 @@ class ServerConfigChecks $blowfishSecretSet, $blowfishSecret ) { - // // $cfg['blowfish_secret'] // it's required for 'cookie' authentication - // if ($cookieAuthUsed) { if ($blowfishSecretSet) { // 'cookie' auth used, blowfish_secret was generated @@ -422,7 +404,6 @@ class ServerConfigChecks */ protected function performConfigChecksLoginCookie() { - // // $cfg['LoginCookieValidity'] // value greater than session.gc_maxlifetime will cause // random session invalidation after that time @@ -448,10 +429,8 @@ class ServerConfigChecks ); } - // // $cfg['LoginCookieValidity'] // should be at most 1800 (30 min) - // if ($loginCookieValidity > 1800) { SetupIndex::messagesSet( 'notice', @@ -469,11 +448,9 @@ class ServerConfigChecks ); } - // // $cfg['LoginCookieValidity'] // $cfg['LoginCookieStore'] // LoginCookieValidity must be less or equal to LoginCookieStore - // if (($this->cfg->getValue('LoginCookieStore') != 0) && ($loginCookieValidity > $this->cfg->getValue('LoginCookieStore')) ) { @@ -503,10 +480,8 @@ class ServerConfigChecks */ protected function performConfigChecksServerBZipdump() { - // // $cfg['BZipDump'] // requires bzip2 functions - // if ($this->cfg->getValue('BZipDump') && (! $this->functionExists('bzopen') || ! $this->functionExists('bzcompress')) ) { @@ -542,10 +517,8 @@ class ServerConfigChecks */ protected function performConfigChecksServerGZipdump() { - // // $cfg['GZipDump'] // requires zlib functions - // if ($this->cfg->getValue('GZipDump') && (! $this->functionExists('gzopen') || ! $this->functionExists('gzencode')) ) { diff --git a/libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php index 7c83e431bb..5c77727c04 100644 --- a/libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php @@ -79,7 +79,6 @@ abstract class ExternalTransformationsPlugin extends TransformationsPlugin $allowed_programs = []; - // // WARNING: // // It's up to administrator to allow anything here. Note that users may diff --git a/libraries/classes/ReplicationInfo.php b/libraries/classes/ReplicationInfo.php index ea0a946530..abfb3a516e 100644 --- a/libraries/classes/ReplicationInfo.php +++ b/libraries/classes/ReplicationInfo.php @@ -113,7 +113,6 @@ final class ReplicationInfo */ // TODO change to regexp or something, to allow for negative match. // To e.g. highlight 'Last_Error' - // $slave_variables_alerts = [ 'Slave_IO_Running' => 'No', 'Slave_SQL_Running' => 'No', diff --git a/libraries/classes/Table.php b/libraries/classes/Table.php index 60993b77bd..1a11034af9 100644 --- a/libraries/classes/Table.php +++ b/libraries/classes/Table.php @@ -516,7 +516,6 @@ class Table // // MySQL permits a non-standard syntax for FLOAT and DOUBLE, // see https://dev.mysql.com/doc/refman/5.5/en/floating-point-types.html - // $pattern = '@^(DATE|TINYBLOB|TINYTEXT|BLOB|TEXT|' . 'MEDIUMBLOB|MEDIUMTEXT|LONGBLOB|LONGTEXT|SERIAL|BOOLEAN|UUID)$@i'; if (strlen($length) !== 0 && ! preg_match($pattern, $type)) { diff --git a/libraries/common.inc.php b/libraries/common.inc.php index e95615717c..ee17a3e0a4 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -121,12 +121,10 @@ Core::checkExtensions(); */ Core::configure(); -/******************************************************************************/ /* start procedural code label_start_procedural */ Core::cleanupPathInfo(); -/******************************************************************************/ /* parsing configuration file LABEL_parsing_config_file */ /** @var bool $isConfigLoading Indication for the error handler */ @@ -287,7 +285,6 @@ if (Core::isValid($_POST['sql_query'])) { //$_REQUEST['server']; // checked later in this file //$_REQUEST['lang']; // checked by LABEL_loading_language_file -/******************************************************************************/ /* loading language file LABEL_loading_language_file */ /** @@ -309,7 +306,6 @@ Core::checkConfiguration(); /* Check request for possible attacks */ Core::checkRequest(); -/******************************************************************************/ /* setup servers LABEL_setup_servers */ $PMA_Config->checkServers(); @@ -328,7 +324,6 @@ $diMigration->setGlobal('url_params', ['server' => $containerBuilder->getParamet */ $PMA_Config->enableBc(); -/******************************************************************************/ /* setup themes LABEL_theme_setup */ ThemeManager::initializeTheme(); diff --git a/libraries/config.default.php b/libraries/config.default.php index 485ac97076..862d547627 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -2651,9 +2651,6 @@ $cfg['ThemeDefault'] = 'pmahomme'; */ $cfg['ThemePerServer'] = false; -/******************************************************************************* - * - */ /** * Default query for table diff --git a/setup/config.php b/setup/config.php index 928ae37825..951387d8e4 100644 --- a/setup/config.php +++ b/setup/config.php @@ -34,25 +34,19 @@ if (isset($_POST['eol'])) { } if (Core::ifSetOr($_POST['submit_clear'], '')) { - // // Clear current config and return to main page - // $GLOBALS['ConfigFile']->resetConfigData(); // drop post data $response->generateHeader303('index.php' . Url::getCommonRaw()); exit; } elseif (Core::ifSetOr($_POST['submit_download'], '')) { - // // Output generated config file - // Core::downloadHeader('config.inc.php', 'text/plain'); $response->disable(); echo ConfigGenerator::getConfigFile($GLOBALS['ConfigFile']); exit; } else { - // // Show generated config file in a