Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 78a33f1ff124d102b067e21d1b9b58f31a16c166 https://github.com/phpmyadmin/phpmyadmin/commit/78a33f1ff124d102b067e21d1b9b... Author: Maurício Meneghini Fauth <mauricio@fauth.dev> Date: 2023-08-20 (Sun, 08 August 2023) -03:00 Changed paths: M libraries/classes/Config.php M libraries/classes/Middleware/Authentication.php M libraries/classes/Middleware/DatabaseServerVersionChecking.php M libraries/classes/Middleware/LoginCookieValiditySetting.php M libraries/classes/Middleware/ResponseRendererLoading.php M libraries/classes/Middleware/SqlDelimiterSetting.php M test/classes/ConfigTest.php Log Message: ----------- Add the Config::hasSelectedServer() method Avoids the need of checking if $GLOBALS['cfg']['Server'] is empty. Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> Commit: 0f31d662742fb3c45e93d924874e015e9b5e2d8d https://github.com/phpmyadmin/phpmyadmin/commit/0f31d662742fb3c45e93d924874e... Author: Maurício Meneghini Fauth <mauricio@fauth.dev> Date: 2023-08-20 (Sun, 08 August 2023) -03:00 Changed paths: M libraries/classes/Config.php M libraries/classes/Config/Settings/Server.php M libraries/classes/ConfigStorage/Relation.php M libraries/classes/Console.php M libraries/classes/Controllers/Console/Bookmark/AddController.php M libraries/classes/Controllers/Database/ImportController.php M libraries/classes/Controllers/Database/OperationsController.php M libraries/classes/Controllers/Database/RoutinesController.php M libraries/classes/Controllers/Database/Structure/FavoriteTableController.php M libraries/classes/Controllers/Database/StructureController.php M libraries/classes/Controllers/Database/TrackingController.php M libraries/classes/Controllers/Export/Template/CreateController.php M libraries/classes/Controllers/Export/Template/DeleteController.php M libraries/classes/Controllers/Export/Template/LoadController.php M libraries/classes/Controllers/Export/Template/UpdateController.php M libraries/classes/Controllers/HomeController.php M libraries/classes/Controllers/Import/ImportController.php M libraries/classes/Controllers/Preferences/ExportController.php M libraries/classes/Controllers/Preferences/FeaturesController.php M libraries/classes/Controllers/Preferences/ImportController.php M libraries/classes/Controllers/Preferences/MainPanelController.php M libraries/classes/Controllers/Preferences/NavigationController.php M libraries/classes/Controllers/Preferences/SqlController.php M libraries/classes/Controllers/Preferences/TwoFactorController.php M libraries/classes/Controllers/Server/CollationsController.php M libraries/classes/Controllers/Server/Databases/CreateController.php M libraries/classes/Controllers/Server/DatabasesController.php M libraries/classes/Controllers/Server/ImportController.php M libraries/classes/Controllers/Table/ImportController.php M libraries/classes/Controllers/Table/OperationsController.php M libraries/classes/Controllers/Table/StructureController.php M libraries/classes/Controllers/UserPasswordController.php M libraries/classes/Database/CentralColumns.php M libraries/classes/Database/Designer.php M libraries/classes/Database/Designer/Common.php M libraries/classes/Database/Events.php M libraries/classes/Database/Routines.php M libraries/classes/DatabaseInterface.php M libraries/classes/Export/Options.php M libraries/classes/Footer.php M libraries/classes/Header.php M libraries/classes/Html/Generator.php M libraries/classes/Import/Import.php M libraries/classes/IpAllowDeny.php M libraries/classes/ListDatabase.php M libraries/classes/Menu.php M libraries/classes/Middleware/Authentication.php M libraries/classes/Navigation/Navigation.php M libraries/classes/Navigation/NavigationTree.php M libraries/classes/Navigation/Nodes/Node.php M libraries/classes/Navigation/Nodes/NodeDatabase.php M libraries/classes/Navigation/Nodes/NodeTable.php M libraries/classes/Normalization.php M libraries/classes/Plugins/Auth/AuthenticationConfig.php M libraries/classes/Plugins/Auth/AuthenticationCookie.php M libraries/classes/Plugins/Auth/AuthenticationHttp.php M libraries/classes/Plugins/Auth/AuthenticationSignon.php M libraries/classes/Plugins/AuthenticationPlugin.php M libraries/classes/Plugins/AuthenticationPluginFactory.php M libraries/classes/Plugins/Export/ExportLatex.php M libraries/classes/Plugins/Export/ExportSql.php M libraries/classes/Plugins/Export/ExportXml.php M libraries/classes/RecentFavoriteTable.php M libraries/classes/Server/Plugins.php M libraries/classes/Server/Status/Data.php M libraries/classes/Sql.php M libraries/classes/SqlQueryForm.php M libraries/classes/Table.php M libraries/classes/Table/ColumnsDefinition.php M libraries/classes/Tracking/Tracker.php M libraries/classes/Tracking/Tracking.php M libraries/classes/Triggers/Triggers.php M libraries/classes/UserPreferences.php M libraries/classes/Util.php M libraries/classes/Utils/SessionCache.php M phpstan-baseline.neon M psalm-baseline.xml M psalm.xml M test/classes/BookmarkTest.php M test/classes/CheckUserPrivilegesTest.php M test/classes/Config/PageSettingsTest.php M test/classes/Config/Settings/ServerTest.php M test/classes/ConfigStorage/RelationTest.php M test/classes/ConfigTest.php M test/classes/Controllers/BrowseForeignersControllerTest.php M test/classes/Controllers/Console/Bookmark/AddControllerTest.php M test/classes/Controllers/Database/EventsControllerTest.php M test/classes/Controllers/Database/PrivilegesControllerTest.php M test/classes/Controllers/Database/RoutinesControllerTest.php M test/classes/Controllers/Database/Structure/RealRowCountControllerTest.php M test/classes/Controllers/Database/StructureControllerTest.php M test/classes/Controllers/Export/Template/CreateControllerTest.php M test/classes/Controllers/Export/Template/DeleteControllerTest.php M test/classes/Controllers/Export/Template/LoadControllerTest.php M test/classes/Controllers/Export/Template/UpdateControllerTest.php M test/classes/Controllers/Import/ImportControllerTest.php M test/classes/Controllers/NavigationControllerTest.php M test/classes/Controllers/Normalization/AddNewPrimaryControllerTest.php M test/classes/Controllers/Normalization/CreateNewColumnControllerTest.php M test/classes/Controllers/Server/BinlogControllerTest.php M test/classes/Controllers/Server/CollationsControllerTest.php M test/classes/Controllers/Server/Databases/CreateControllerTest.php M test/classes/Controllers/Server/DatabasesControllerTest.php M test/classes/Controllers/Server/EnginesControllerTest.php M test/classes/Controllers/Server/PluginsControllerTest.php M test/classes/Controllers/Server/PrivilegesControllerTest.php M test/classes/Controllers/Server/ShowEngineControllerTest.php M test/classes/Controllers/Server/Status/AdvisorControllerTest.php M test/classes/Controllers/Server/Status/Monitor/GeneralLogControllerTest.php M test/classes/Controllers/Server/Status/Monitor/LogVarsControllerTest.php M test/classes/Controllers/Server/Status/Monitor/QueryAnalyzerControllerTest.php M test/classes/Controllers/Server/Status/Monitor/SlowLogControllerTest.php M test/classes/Controllers/Server/Status/MonitorControllerTest.php M test/classes/Controllers/Server/Status/Processes/RefreshControllerTest.php M test/classes/Controllers/Server/Status/ProcessesControllerTest.php M test/classes/Controllers/Server/Status/QueriesControllerTest.php M test/classes/Controllers/Server/Status/StatusControllerTest.php M test/classes/Controllers/Server/Status/VariablesControllerTest.php M test/classes/Controllers/Server/VariablesControllerTest.php M test/classes/Controllers/Table/AddFieldControllerTest.php M test/classes/Controllers/Table/CreateControllerTest.php M test/classes/Controllers/Table/DeleteRowsControllerTest.php M test/classes/Controllers/Table/ExportControllerTest.php M test/classes/Controllers/Table/FindReplaceControllerTest.php M test/classes/Controllers/Table/ImportControllerTest.php M test/classes/Controllers/Table/IndexesControllerTest.php M test/classes/Controllers/Table/PrivilegesControllerTest.php M test/classes/Controllers/Table/RelationControllerTest.php M test/classes/Controllers/Table/ReplaceControllerTest.php M test/classes/Controllers/Table/SearchControllerTest.php M test/classes/Controllers/Table/SqlControllerTest.php M test/classes/Controllers/Table/Structure/ChangeControllerTest.php M test/classes/Controllers/Table/StructureControllerTest.php M test/classes/Controllers/Table/TrackingControllerTest.php M test/classes/Controllers/Table/ZoomSearchControllerTest.php M test/classes/Controllers/Triggers/IndexControllerTest.php M test/classes/Database/CentralColumnsTest.php M test/classes/Database/Designer/CommonTest.php M test/classes/Database/EventsTest.php M test/classes/Database/RoutinesTest.php M test/classes/DatabaseInterfaceTest.php M test/classes/Display/ResultsTest.php M test/classes/Export/ExportTest.php M test/classes/Export/OptionsTest.php M test/classes/FooterTest.php M test/classes/HeaderTest.php M test/classes/Html/GeneratorTest.php M test/classes/IpAllowDenyTest.php M test/classes/ListDatabaseTest.php M test/classes/MenuTest.php M test/classes/Navigation/NavigationTest.php M test/classes/Navigation/NavigationTreeTest.php M test/classes/Navigation/Nodes/NodeDatabaseTest.php M test/classes/Navigation/Nodes/NodeTest.php M test/classes/NormalizationTest.php M test/classes/Plugins/Auth/AuthenticationConfigTest.php M test/classes/Plugins/Auth/AuthenticationCookieTest.php M test/classes/Plugins/Auth/AuthenticationHttpTest.php M test/classes/Plugins/Auth/AuthenticationSignonTest.php M test/classes/Plugins/AuthenticationPluginFactoryTest.php M test/classes/Plugins/Export/ExportHtmlwordTest.php M test/classes/Plugins/Export/ExportLatexTest.php M test/classes/Plugins/Export/ExportOdtTest.php M test/classes/Plugins/Export/ExportSqlTest.php M test/classes/Plugins/Export/ExportTexytextTest.php M test/classes/Plugins/Export/ExportXmlTest.php M test/classes/Plugins/Import/ImportCsvTest.php M test/classes/Plugins/Import/ImportLdiTest.php M test/classes/Plugins/Import/ImportMediawikiTest.php M test/classes/Plugins/Import/ImportOdsTest.php M test/classes/Plugins/Import/ImportShpTest.php M test/classes/Plugins/Import/ImportSqlTest.php M test/classes/Plugins/Import/ImportXmlTest.php M test/classes/Plugins/Schema/DiaRelationSchemaTest.php M test/classes/Plugins/Schema/EpsRelationSchemaTest.php M test/classes/Plugins/Schema/PdfRelationSchemaTest.php M test/classes/Plugins/Schema/SvgRelationSchemaTest.php M test/classes/Server/PluginsTest.php M test/classes/Server/PrivilegesTest.php M test/classes/SqlQueryFormTest.php M test/classes/SqlTest.php M test/classes/SystemDatabaseTest.php M test/classes/Table/ColumnsDefinitionTest.php M test/classes/Table/IndexesTest.php M test/classes/TableTest.php M test/classes/Tracking/TrackerTest.php M test/classes/Tracking/TrackingTest.php M test/classes/TransformationsTest.php M test/classes/Triggers/TriggersTest.php M test/classes/TwoFactorTest.php M test/classes/UserPreferencesTest.php M test/classes/UtilTest.php M test/classes/Utils/SessionCacheTest.php Log Message: ----------- Replace $GLOBALS['cfg']['Server'] with Config::$selectedServer Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> Commit: 719ec0aafd827ce2d704155d57925d828a945102 https://github.com/phpmyadmin/phpmyadmin/commit/719ec0aafd827ce2d704155d5792... Author: Maurício Meneghini Fauth <mauricio@fauth.dev> Date: 2023-08-20 (Sun, 08 August 2023) -03:00 Changed paths: M libraries/classes/Config.php M libraries/classes/Config/Settings/Server.php M libraries/classes/ConfigStorage/Relation.php M libraries/classes/Console.php M libraries/classes/Controllers/Console/Bookmark/AddController.php M libraries/classes/Controllers/Database/ImportController.php M libraries/classes/Controllers/Database/OperationsController.php M libraries/classes/Controllers/Database/RoutinesController.php M libraries/classes/Controllers/Database/Structure/FavoriteTableController.php M libraries/classes/Controllers/Database/StructureController.php M libraries/classes/Controllers/Database/TrackingController.php M libraries/classes/Controllers/Export/Template/CreateController.php M libraries/classes/Controllers/Export/Template/DeleteController.php M libraries/classes/Controllers/Export/Template/LoadController.php M libraries/classes/Controllers/Export/Template/UpdateController.php M libraries/classes/Controllers/HomeController.php M libraries/classes/Controllers/Import/ImportController.php M libraries/classes/Controllers/Preferences/ExportController.php M libraries/classes/Controllers/Preferences/FeaturesController.php M libraries/classes/Controllers/Preferences/ImportController.php M libraries/classes/Controllers/Preferences/MainPanelController.php M libraries/classes/Controllers/Preferences/NavigationController.php M libraries/classes/Controllers/Preferences/SqlController.php M libraries/classes/Controllers/Preferences/TwoFactorController.php M libraries/classes/Controllers/Server/CollationsController.php M libraries/classes/Controllers/Server/Databases/CreateController.php M libraries/classes/Controllers/Server/DatabasesController.php M libraries/classes/Controllers/Server/ImportController.php M libraries/classes/Controllers/Table/ImportController.php M libraries/classes/Controllers/Table/OperationsController.php M libraries/classes/Controllers/Table/StructureController.php M libraries/classes/Controllers/UserPasswordController.php M libraries/classes/Database/CentralColumns.php M libraries/classes/Database/Designer.php M libraries/classes/Database/Designer/Common.php M libraries/classes/Database/Events.php M libraries/classes/Database/Routines.php M libraries/classes/DatabaseInterface.php M libraries/classes/Export/Options.php M libraries/classes/Footer.php M libraries/classes/Header.php M libraries/classes/Html/Generator.php M libraries/classes/Import/Import.php M libraries/classes/IpAllowDeny.php M libraries/classes/ListDatabase.php M libraries/classes/Menu.php M libraries/classes/Middleware/Authentication.php M libraries/classes/Middleware/DatabaseServerVersionChecking.php M libraries/classes/Middleware/LoginCookieValiditySetting.php M libraries/classes/Middleware/ResponseRendererLoading.php M libraries/classes/Middleware/SqlDelimiterSetting.php M libraries/classes/Navigation/Navigation.php M libraries/classes/Navigation/NavigationTree.php M libraries/classes/Navigation/Nodes/Node.php M libraries/classes/Navigation/Nodes/NodeDatabase.php M libraries/classes/Navigation/Nodes/NodeTable.php M libraries/classes/Normalization.php M libraries/classes/Plugins/Auth/AuthenticationConfig.php M libraries/classes/Plugins/Auth/AuthenticationCookie.php M libraries/classes/Plugins/Auth/AuthenticationHttp.php M libraries/classes/Plugins/Auth/AuthenticationSignon.php M libraries/classes/Plugins/AuthenticationPlugin.php M libraries/classes/Plugins/AuthenticationPluginFactory.php M libraries/classes/Plugins/Export/ExportLatex.php M libraries/classes/Plugins/Export/ExportSql.php M libraries/classes/Plugins/Export/ExportXml.php M libraries/classes/RecentFavoriteTable.php M libraries/classes/Server/Plugins.php M libraries/classes/Server/Status/Data.php M libraries/classes/Sql.php M libraries/classes/SqlQueryForm.php M libraries/classes/Table.php M libraries/classes/Table/ColumnsDefinition.php M libraries/classes/Tracking/Tracker.php M libraries/classes/Tracking/Tracking.php M libraries/classes/Triggers/Triggers.php M libraries/classes/UserPreferences.php M libraries/classes/Util.php M libraries/classes/Utils/SessionCache.php M phpstan-baseline.neon M psalm-baseline.xml M psalm.xml M test/classes/BookmarkTest.php M test/classes/CheckUserPrivilegesTest.php M test/classes/Config/PageSettingsTest.php M test/classes/Config/Settings/ServerTest.php M test/classes/ConfigStorage/RelationTest.php M test/classes/ConfigTest.php M test/classes/Controllers/BrowseForeignersControllerTest.php M test/classes/Controllers/Console/Bookmark/AddControllerTest.php M test/classes/Controllers/Database/EventsControllerTest.php M test/classes/Controllers/Database/PrivilegesControllerTest.php M test/classes/Controllers/Database/RoutinesControllerTest.php M test/classes/Controllers/Database/Structure/RealRowCountControllerTest.php M test/classes/Controllers/Database/StructureControllerTest.php M test/classes/Controllers/Export/Template/CreateControllerTest.php M test/classes/Controllers/Export/Template/DeleteControllerTest.php M test/classes/Controllers/Export/Template/LoadControllerTest.php M test/classes/Controllers/Export/Template/UpdateControllerTest.php M test/classes/Controllers/Import/ImportControllerTest.php M test/classes/Controllers/NavigationControllerTest.php M test/classes/Controllers/Normalization/AddNewPrimaryControllerTest.php M test/classes/Controllers/Normalization/CreateNewColumnControllerTest.php M test/classes/Controllers/Server/BinlogControllerTest.php M test/classes/Controllers/Server/CollationsControllerTest.php M test/classes/Controllers/Server/Databases/CreateControllerTest.php M test/classes/Controllers/Server/DatabasesControllerTest.php M test/classes/Controllers/Server/EnginesControllerTest.php M test/classes/Controllers/Server/PluginsControllerTest.php M test/classes/Controllers/Server/PrivilegesControllerTest.php M test/classes/Controllers/Server/ShowEngineControllerTest.php M test/classes/Controllers/Server/Status/AdvisorControllerTest.php M test/classes/Controllers/Server/Status/Monitor/GeneralLogControllerTest.php M test/classes/Controllers/Server/Status/Monitor/LogVarsControllerTest.php M test/classes/Controllers/Server/Status/Monitor/QueryAnalyzerControllerTest.php M test/classes/Controllers/Server/Status/Monitor/SlowLogControllerTest.php M test/classes/Controllers/Server/Status/MonitorControllerTest.php M test/classes/Controllers/Server/Status/Processes/RefreshControllerTest.php M test/classes/Controllers/Server/Status/ProcessesControllerTest.php M test/classes/Controllers/Server/Status/QueriesControllerTest.php M test/classes/Controllers/Server/Status/StatusControllerTest.php M test/classes/Controllers/Server/Status/VariablesControllerTest.php M test/classes/Controllers/Server/VariablesControllerTest.php M test/classes/Controllers/Table/AddFieldControllerTest.php M test/classes/Controllers/Table/CreateControllerTest.php M test/classes/Controllers/Table/DeleteRowsControllerTest.php M test/classes/Controllers/Table/ExportControllerTest.php M test/classes/Controllers/Table/FindReplaceControllerTest.php M test/classes/Controllers/Table/ImportControllerTest.php M test/classes/Controllers/Table/IndexesControllerTest.php M test/classes/Controllers/Table/PrivilegesControllerTest.php M test/classes/Controllers/Table/RelationControllerTest.php M test/classes/Controllers/Table/ReplaceControllerTest.php M test/classes/Controllers/Table/SearchControllerTest.php M test/classes/Controllers/Table/SqlControllerTest.php M test/classes/Controllers/Table/Structure/ChangeControllerTest.php M test/classes/Controllers/Table/StructureControllerTest.php M test/classes/Controllers/Table/TrackingControllerTest.php M test/classes/Controllers/Table/ZoomSearchControllerTest.php M test/classes/Controllers/Triggers/IndexControllerTest.php M test/classes/Database/CentralColumnsTest.php M test/classes/Database/Designer/CommonTest.php M test/classes/Database/EventsTest.php M test/classes/Database/RoutinesTest.php M test/classes/DatabaseInterfaceTest.php M test/classes/Display/ResultsTest.php M test/classes/Export/ExportTest.php M test/classes/Export/OptionsTest.php M test/classes/FooterTest.php M test/classes/HeaderTest.php M test/classes/Html/GeneratorTest.php M test/classes/IpAllowDenyTest.php M test/classes/ListDatabaseTest.php M test/classes/MenuTest.php M test/classes/Navigation/NavigationTest.php M test/classes/Navigation/NavigationTreeTest.php M test/classes/Navigation/Nodes/NodeDatabaseTest.php M test/classes/Navigation/Nodes/NodeTest.php M test/classes/NormalizationTest.php M test/classes/Plugins/Auth/AuthenticationConfigTest.php M test/classes/Plugins/Auth/AuthenticationCookieTest.php M test/classes/Plugins/Auth/AuthenticationHttpTest.php M test/classes/Plugins/Auth/AuthenticationSignonTest.php M test/classes/Plugins/AuthenticationPluginFactoryTest.php M test/classes/Plugins/Export/ExportHtmlwordTest.php M test/classes/Plugins/Export/ExportLatexTest.php M test/classes/Plugins/Export/ExportOdtTest.php M test/classes/Plugins/Export/ExportSqlTest.php M test/classes/Plugins/Export/ExportTexytextTest.php M test/classes/Plugins/Export/ExportXmlTest.php M test/classes/Plugins/Import/ImportCsvTest.php M test/classes/Plugins/Import/ImportLdiTest.php M test/classes/Plugins/Import/ImportMediawikiTest.php M test/classes/Plugins/Import/ImportOdsTest.php M test/classes/Plugins/Import/ImportShpTest.php M test/classes/Plugins/Import/ImportSqlTest.php M test/classes/Plugins/Import/ImportXmlTest.php M test/classes/Plugins/Schema/DiaRelationSchemaTest.php M test/classes/Plugins/Schema/EpsRelationSchemaTest.php M test/classes/Plugins/Schema/PdfRelationSchemaTest.php M test/classes/Plugins/Schema/SvgRelationSchemaTest.php M test/classes/Server/PluginsTest.php M test/classes/Server/PrivilegesTest.php M test/classes/SqlQueryFormTest.php M test/classes/SqlTest.php M test/classes/SystemDatabaseTest.php M test/classes/Table/ColumnsDefinitionTest.php M test/classes/Table/IndexesTest.php M test/classes/TableTest.php M test/classes/Tracking/TrackerTest.php M test/classes/Tracking/TrackingTest.php M test/classes/TransformationsTest.php M test/classes/Triggers/TriggersTest.php M test/classes/TwoFactorTest.php M test/classes/UserPreferencesTest.php M test/classes/UtilTest.php M test/classes/Utils/SessionCacheTest.php Log Message: ----------- Merge pull request #18638 from MauricioFauth/selected-server-config Replace `$GLOBALS['cfg']['Server']` with `Config::$selectedServer`