Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1129750eeedc9af19ca8d35e1221d8ae1710c801 https://github.com/phpmyadmin/phpmyadmin/commit/1129750eeedc9af19ca8d35e1221... Author: Maurício Meneghini Fauth mauricio@fauth.dev Date: 2023-12-24 (Sun, 12 December 2023) -03:00

Changed paths: M phpstan-baseline.neon M psalm-baseline.xml M psalm.xml M resources/templates/navigation/main.twig M src/Config.php M src/Config/ConfigFile.php M src/ConfigStorage/Relation.php M src/Controllers/AbstractController.php M src/Controllers/Database/Structure/FavoriteTableController.php M src/Controllers/HomeController.php M src/Controllers/Operations/DatabaseController.php M src/Controllers/Preferences/ExportController.php M src/Controllers/Preferences/FeaturesController.php M src/Controllers/Preferences/ImportController.php M src/Controllers/Preferences/MainPanelController.php M src/Controllers/Preferences/NavigationController.php M src/Controllers/Preferences/SqlController.php M src/Controllers/Server/DatabasesController.php M src/Current.php M src/Database/Designer.php M src/DatabaseInterface.php M src/Display/Results.php M src/ErrorHandler.php M src/Favorites/RecentFavoriteTables.php M src/Footer.php M src/Header.php M src/Http/Middleware/CurrentServerGlobalSetting.php M src/Http/Middleware/LoginCookieValiditySetting.php M src/Http/Middleware/ZeroConfPostConnection.php M src/Navigation/Navigation.php M src/Navigation/NavigationTree.php M src/Plugins/Auth/AuthenticationCookie.php M src/Plugins/Schema/ExportRelationSchema.php M src/Server/Select.php M src/Sql.php M src/SqlQueryForm.php M src/Table/Table.php M src/Theme/ThemeManager.php M src/Url.php M src/UserPreferences.php M src/Utils/SessionCache.php M tests/bootstrap-static.php M tests/classes/AbstractTestCase.php M tests/classes/Advisory/AdvisorTest.php M tests/classes/BookmarkTest.php M tests/classes/CheckUserPrivilegesTest.php M tests/classes/Config/ConfigFileTest.php M tests/classes/Config/FormDisplayTest.php M tests/classes/Config/FormTest.php M tests/classes/Config/Forms/FormListTest.php M tests/classes/Config/PageSettingsTest.php M tests/classes/Config/ServerConfigChecksTest.php M tests/classes/ConfigStorage/RelationTest.php M tests/classes/ConfigTest.php M tests/classes/Controllers/BrowseForeignersControllerTest.php M tests/classes/Controllers/CheckRelationsControllerTest.php M tests/classes/Controllers/Console/Bookmark/AddControllerTest.php M tests/classes/Controllers/Database/EventsControllerTest.php M tests/classes/Controllers/Database/MultiTableQuery/TablesControllerTest.php M tests/classes/Controllers/Database/PrivilegesControllerTest.php M tests/classes/Controllers/Database/RoutinesControllerTest.php M tests/classes/Controllers/Database/Structure/FavoriteTableControllerTest.php M tests/classes/Controllers/Database/Structure/RealRowCountControllerTest.php M tests/classes/Controllers/Database/StructureControllerTest.php M tests/classes/Controllers/Export/ExportControllerTest.php M tests/classes/Controllers/Export/Template/CreateControllerTest.php M tests/classes/Controllers/Export/Template/DeleteControllerTest.php M tests/classes/Controllers/Export/Template/LoadControllerTest.php M tests/classes/Controllers/Export/Template/UpdateControllerTest.php M tests/classes/Controllers/GisDataEditorControllerTest.php M tests/classes/Controllers/Import/ImportControllerTest.php M tests/classes/Controllers/NavigationControllerTest.php M tests/classes/Controllers/Normalization/MainControllerTest.php M tests/classes/Controllers/Operations/TableControllerTest.php M tests/classes/Controllers/Server/BinlogControllerTest.php M tests/classes/Controllers/Server/CollationsControllerTest.php M tests/classes/Controllers/Server/Databases/CreateControllerTest.php M tests/classes/Controllers/Server/Databases/DestroyControllerTest.php M tests/classes/Controllers/Server/DatabasesControllerTest.php M tests/classes/Controllers/Server/EnginesControllerTest.php M tests/classes/Controllers/Server/PluginsControllerTest.php M tests/classes/Controllers/Server/Privileges/AccountLockControllerTest.php M tests/classes/Controllers/Server/Privileges/AccountUnlockControllerTest.php M tests/classes/Controllers/Server/PrivilegesControllerTest.php M tests/classes/Controllers/Server/ShowEngineControllerTest.php M tests/classes/Controllers/Server/Status/AdvisorControllerTest.php M tests/classes/Controllers/Server/Status/Monitor/GeneralLogControllerTest.php M tests/classes/Controllers/Server/Status/Monitor/LogVarsControllerTest.php M tests/classes/Controllers/Server/Status/Monitor/SlowLogControllerTest.php M tests/classes/Controllers/Server/Status/MonitorControllerTest.php M tests/classes/Controllers/Server/Status/Processes/RefreshControllerTest.php M tests/classes/Controllers/Server/Status/ProcessesControllerTest.php M tests/classes/Controllers/Server/Status/QueriesControllerTest.php M tests/classes/Controllers/Server/Status/StatusControllerTest.php M tests/classes/Controllers/Server/Status/VariablesControllerTest.php M tests/classes/Controllers/Server/VariablesControllerTest.php M tests/classes/Controllers/Sql/EnumValuesControllerTest.php M tests/classes/Controllers/Sql/SetValuesControllerTest.php M tests/classes/Controllers/Table/ChangeRowsControllerTest.php M tests/classes/Controllers/Table/ExportRowsControllerTest.php M tests/classes/Controllers/Table/FindReplaceControllerTest.php M tests/classes/Controllers/Table/GisVisualizationControllerTest.php M tests/classes/Controllers/Table/ImportControllerTest.php M tests/classes/Controllers/Table/IndexRenameControllerTest.php M tests/classes/Controllers/Table/IndexesControllerTest.php M tests/classes/Controllers/Table/PrivilegesControllerTest.php M tests/classes/Controllers/Table/RecentFavoriteControllerTest.php M tests/classes/Controllers/Table/RelationControllerTest.php M tests/classes/Controllers/Table/ReplaceControllerTest.php M tests/classes/Controllers/Table/SearchControllerTest.php M tests/classes/Controllers/Table/SqlControllerTest.php M tests/classes/Controllers/Table/Structure/ChangeControllerTest.php M tests/classes/Controllers/Table/Structure/SaveControllerTest.php M tests/classes/Controllers/Table/StructureControllerTest.php M tests/classes/Controllers/Table/TrackingControllerTest.php M tests/classes/Controllers/Table/ZoomSearchControllerTest.php M tests/classes/Controllers/Transformation/OverviewControllerTest.php M tests/classes/Controllers/Triggers/IndexControllerTest.php M tests/classes/CoreTest.php M tests/classes/Database/CentralColumnsTest.php M tests/classes/Database/Designer/CommonTest.php M tests/classes/Database/DesignerTest.php M tests/classes/Database/EventsTest.php M tests/classes/Database/RoutinesTest.php M tests/classes/Database/SearchTest.php M tests/classes/DatabaseInterfaceTest.php M tests/classes/Dbal/DbiDummyTest.php M tests/classes/Display/ResultsTest.php M tests/classes/Engines/BdbTest.php M tests/classes/Engines/BinlogTest.php M tests/classes/Engines/InnodbTest.php M tests/classes/Engines/MemoryTest.php M tests/classes/Engines/MrgMyisamTest.php M tests/classes/Engines/MyisamTest.php M tests/classes/Engines/NdbclusterTest.php M tests/classes/Engines/PbxtTest.php M tests/classes/Engines/PerformanceSchemaTest.php M tests/classes/ErrorHandlerTest.php M tests/classes/ErrorReportTest.php M tests/classes/Export/ExportTest.php M tests/classes/Export/OptionsTest.php M tests/classes/FooterTest.php M tests/classes/HeaderTest.php M tests/classes/Html/GeneratorTest.php M tests/classes/Html/MySQLDocumentationTest.php M tests/classes/Import/ImportTest.php M tests/classes/InsertEditTest.php M tests/classes/ListDatabaseTest.php M tests/classes/MenuTest.php M tests/classes/Navigation/NavigationTest.php M tests/classes/Navigation/NavigationTreeTest.php M tests/classes/Navigation/Nodes/NodeDatabaseChildTest.php M tests/classes/NormalizationTest.php M tests/classes/OperationsTest.php M tests/classes/Partitioning/PartitionTest.php M tests/classes/Plugins/Auth/AuthenticationConfigTest.php M tests/classes/Plugins/Auth/AuthenticationCookieTest.php M tests/classes/Plugins/Auth/AuthenticationHttpTest.php M tests/classes/Plugins/Auth/AuthenticationSignonTest.php M tests/classes/Plugins/Export/ExportCodegenTest.php M tests/classes/Plugins/Export/ExportCsvTest.php M tests/classes/Plugins/Export/ExportExcelTest.php M tests/classes/Plugins/Export/ExportHtmlwordTest.php M tests/classes/Plugins/Export/ExportJsonTest.php M tests/classes/Plugins/Export/ExportLatexTest.php M tests/classes/Plugins/Export/ExportMediawikiTest.php M tests/classes/Plugins/Export/ExportOdsTest.php M tests/classes/Plugins/Export/ExportOdtTest.php M tests/classes/Plugins/Export/ExportPdfTest.php M tests/classes/Plugins/Export/ExportPhparrayTest.php M tests/classes/Plugins/Export/ExportSqlTest.php M tests/classes/Plugins/Export/ExportTexytextTest.php M tests/classes/Plugins/Export/ExportXmlTest.php M tests/classes/Plugins/Export/ExportYamlTest.php M tests/classes/Plugins/Export/Helpers/TablePropertyTest.php M tests/classes/Plugins/Import/ImportCsvTest.php M tests/classes/Plugins/Import/ImportLdiTest.php M tests/classes/Plugins/Import/ImportMediawikiTest.php M tests/classes/Plugins/Import/ImportOdsTest.php M tests/classes/Plugins/Import/ImportShpTest.php M tests/classes/Plugins/Import/ImportSqlTest.php M tests/classes/Plugins/Import/ImportXmlTest.php M tests/classes/Plugins/Schema/DiaRelationSchemaTest.php M tests/classes/Plugins/Schema/EpsRelationSchemaTest.php M tests/classes/Plugins/Schema/PdfRelationSchemaTest.php M tests/classes/Plugins/Schema/SvgRelationSchemaTest.php M tests/classes/Plugins/Transformations/TransformationPluginsTest.php M tests/classes/Plugins/TwoFactor/WebAuthnTest.php M tests/classes/PluginsTest.php M tests/classes/ProfilingTest.php M tests/classes/Replication/ReplicationGuiTest.php M tests/classes/ResponseRendererTest.php M tests/classes/SanitizeTest.php M tests/classes/Server/PluginsTest.php M tests/classes/Server/PrivilegesTest.php M tests/classes/Server/SelectTest.php M tests/classes/Setup/ConfigGeneratorTest.php M tests/classes/Setup/FormProcessingTest.php M tests/classes/SqlQueryFormTest.php M tests/classes/SqlTest.php M tests/classes/StorageEngineTest.php M tests/classes/Stubs/ResponseRenderer.php M tests/classes/SystemDatabaseTest.php M tests/classes/Table/ColumnsDefinitionTest.php M tests/classes/Table/IndexesTest.php M tests/classes/Table/TableTest.php M tests/classes/Theme/ThemeManagerTest.php M tests/classes/Theme/ThemeTest.php M tests/classes/Tracking/TrackerTest.php M tests/classes/Tracking/TrackingTest.php M tests/classes/TransformationsTest.php M tests/classes/Triggers/TriggersTest.php M tests/classes/TwoFactorTest.php M tests/classes/UrlTest.php M tests/classes/UserPreferencesTest.php M tests/classes/UtilTest.php M tests/classes/Utils/ForeignKeyTest.php M tests/classes/Utils/SessionCacheTest.php

Log Message: ----------- Replace server global with Current::$server

Signed-off-by: Maurício Meneghini Fauth mauricio@fauth.dev

Commit: 98ee8f7158d8fdd9033c567f88c6521e7c1d54fb https://github.com/phpmyadmin/phpmyadmin/commit/98ee8f7158d8fdd9033c567f88c6... Author: Maurício Meneghini Fauth mauricio@fauth.dev Date: 2023-12-24 (Sun, 12 December 2023) -03:00

Changed paths: M phpstan-baseline.neon M psalm-baseline.xml M psalm.xml M resources/templates/navigation/main.twig M src/Config.php M src/Config/ConfigFile.php M src/ConfigStorage/Relation.php M src/Controllers/AbstractController.php M src/Controllers/Database/Structure/FavoriteTableController.php M src/Controllers/HomeController.php M src/Controllers/Operations/DatabaseController.php M src/Controllers/Preferences/ExportController.php M src/Controllers/Preferences/FeaturesController.php M src/Controllers/Preferences/ImportController.php M src/Controllers/Preferences/MainPanelController.php M src/Controllers/Preferences/NavigationController.php M src/Controllers/Preferences/SqlController.php M src/Controllers/Server/DatabasesController.php M src/Current.php M src/Database/Designer.php M src/DatabaseInterface.php M src/Display/Results.php M src/ErrorHandler.php M src/Favorites/RecentFavoriteTables.php M src/Footer.php M src/Header.php M src/Http/Middleware/CurrentServerGlobalSetting.php M src/Http/Middleware/LoginCookieValiditySetting.php M src/Http/Middleware/ZeroConfPostConnection.php M src/Navigation/Navigation.php M src/Navigation/NavigationTree.php M src/Plugins/Auth/AuthenticationCookie.php M src/Plugins/Schema/ExportRelationSchema.php M src/Server/Select.php M src/Sql.php M src/SqlQueryForm.php M src/Table/Table.php M src/Theme/ThemeManager.php M src/Url.php M src/UserPreferences.php M src/Utils/SessionCache.php M tests/bootstrap-static.php M tests/classes/AbstractTestCase.php M tests/classes/Advisory/AdvisorTest.php M tests/classes/BookmarkTest.php M tests/classes/CheckUserPrivilegesTest.php M tests/classes/Config/ConfigFileTest.php M tests/classes/Config/FormDisplayTest.php M tests/classes/Config/FormTest.php M tests/classes/Config/Forms/FormListTest.php M tests/classes/Config/PageSettingsTest.php M tests/classes/Config/ServerConfigChecksTest.php M tests/classes/ConfigStorage/RelationTest.php M tests/classes/ConfigTest.php M tests/classes/Controllers/BrowseForeignersControllerTest.php M tests/classes/Controllers/CheckRelationsControllerTest.php M tests/classes/Controllers/Console/Bookmark/AddControllerTest.php M tests/classes/Controllers/Database/EventsControllerTest.php M tests/classes/Controllers/Database/MultiTableQuery/TablesControllerTest.php M tests/classes/Controllers/Database/PrivilegesControllerTest.php M tests/classes/Controllers/Database/RoutinesControllerTest.php M tests/classes/Controllers/Database/Structure/FavoriteTableControllerTest.php M tests/classes/Controllers/Database/Structure/RealRowCountControllerTest.php M tests/classes/Controllers/Database/StructureControllerTest.php M tests/classes/Controllers/Export/ExportControllerTest.php M tests/classes/Controllers/Export/Template/CreateControllerTest.php M tests/classes/Controllers/Export/Template/DeleteControllerTest.php M tests/classes/Controllers/Export/Template/LoadControllerTest.php M tests/classes/Controllers/Export/Template/UpdateControllerTest.php M tests/classes/Controllers/GisDataEditorControllerTest.php M tests/classes/Controllers/Import/ImportControllerTest.php M tests/classes/Controllers/NavigationControllerTest.php M tests/classes/Controllers/Normalization/MainControllerTest.php M tests/classes/Controllers/Operations/TableControllerTest.php M tests/classes/Controllers/Server/BinlogControllerTest.php M tests/classes/Controllers/Server/CollationsControllerTest.php M tests/classes/Controllers/Server/Databases/CreateControllerTest.php M tests/classes/Controllers/Server/Databases/DestroyControllerTest.php M tests/classes/Controllers/Server/DatabasesControllerTest.php M tests/classes/Controllers/Server/EnginesControllerTest.php M tests/classes/Controllers/Server/PluginsControllerTest.php M tests/classes/Controllers/Server/Privileges/AccountLockControllerTest.php M tests/classes/Controllers/Server/Privileges/AccountUnlockControllerTest.php M tests/classes/Controllers/Server/PrivilegesControllerTest.php M tests/classes/Controllers/Server/ShowEngineControllerTest.php M tests/classes/Controllers/Server/Status/AdvisorControllerTest.php M tests/classes/Controllers/Server/Status/Monitor/GeneralLogControllerTest.php M tests/classes/Controllers/Server/Status/Monitor/LogVarsControllerTest.php M tests/classes/Controllers/Server/Status/Monitor/SlowLogControllerTest.php M tests/classes/Controllers/Server/Status/MonitorControllerTest.php M tests/classes/Controllers/Server/Status/Processes/RefreshControllerTest.php M tests/classes/Controllers/Server/Status/ProcessesControllerTest.php M tests/classes/Controllers/Server/Status/QueriesControllerTest.php M tests/classes/Controllers/Server/Status/StatusControllerTest.php M tests/classes/Controllers/Server/Status/VariablesControllerTest.php M tests/classes/Controllers/Server/VariablesControllerTest.php M tests/classes/Controllers/Sql/EnumValuesControllerTest.php M tests/classes/Controllers/Sql/SetValuesControllerTest.php M tests/classes/Controllers/Table/ChangeRowsControllerTest.php M tests/classes/Controllers/Table/ExportRowsControllerTest.php M tests/classes/Controllers/Table/FindReplaceControllerTest.php M tests/classes/Controllers/Table/GisVisualizationControllerTest.php M tests/classes/Controllers/Table/ImportControllerTest.php M tests/classes/Controllers/Table/IndexRenameControllerTest.php M tests/classes/Controllers/Table/IndexesControllerTest.php M tests/classes/Controllers/Table/PrivilegesControllerTest.php M tests/classes/Controllers/Table/RecentFavoriteControllerTest.php M tests/classes/Controllers/Table/RelationControllerTest.php M tests/classes/Controllers/Table/ReplaceControllerTest.php M tests/classes/Controllers/Table/SearchControllerTest.php M tests/classes/Controllers/Table/SqlControllerTest.php M tests/classes/Controllers/Table/Structure/ChangeControllerTest.php M tests/classes/Controllers/Table/Structure/SaveControllerTest.php M tests/classes/Controllers/Table/StructureControllerTest.php M tests/classes/Controllers/Table/TrackingControllerTest.php M tests/classes/Controllers/Table/ZoomSearchControllerTest.php M tests/classes/Controllers/Transformation/OverviewControllerTest.php M tests/classes/Controllers/Triggers/IndexControllerTest.php M tests/classes/CoreTest.php M tests/classes/Database/CentralColumnsTest.php M tests/classes/Database/Designer/CommonTest.php M tests/classes/Database/DesignerTest.php M tests/classes/Database/EventsTest.php M tests/classes/Database/RoutinesTest.php M tests/classes/Database/SearchTest.php M tests/classes/DatabaseInterfaceTest.php M tests/classes/Dbal/DbiDummyTest.php M tests/classes/Display/ResultsTest.php M tests/classes/Engines/BdbTest.php M tests/classes/Engines/BinlogTest.php M tests/classes/Engines/InnodbTest.php M tests/classes/Engines/MemoryTest.php M tests/classes/Engines/MrgMyisamTest.php M tests/classes/Engines/MyisamTest.php M tests/classes/Engines/NdbclusterTest.php M tests/classes/Engines/PbxtTest.php M tests/classes/Engines/PerformanceSchemaTest.php M tests/classes/ErrorHandlerTest.php M tests/classes/ErrorReportTest.php M tests/classes/Export/ExportTest.php M tests/classes/Export/OptionsTest.php M tests/classes/FooterTest.php M tests/classes/HeaderTest.php M tests/classes/Html/GeneratorTest.php M tests/classes/Html/MySQLDocumentationTest.php M tests/classes/Import/ImportTest.php M tests/classes/InsertEditTest.php M tests/classes/ListDatabaseTest.php M tests/classes/MenuTest.php M tests/classes/Navigation/NavigationTest.php M tests/classes/Navigation/NavigationTreeTest.php M tests/classes/Navigation/Nodes/NodeDatabaseChildTest.php M tests/classes/NormalizationTest.php M tests/classes/OperationsTest.php M tests/classes/Partitioning/PartitionTest.php M tests/classes/Plugins/Auth/AuthenticationConfigTest.php M tests/classes/Plugins/Auth/AuthenticationCookieTest.php M tests/classes/Plugins/Auth/AuthenticationHttpTest.php M tests/classes/Plugins/Auth/AuthenticationSignonTest.php M tests/classes/Plugins/Export/ExportCodegenTest.php M tests/classes/Plugins/Export/ExportCsvTest.php M tests/classes/Plugins/Export/ExportExcelTest.php M tests/classes/Plugins/Export/ExportHtmlwordTest.php M tests/classes/Plugins/Export/ExportJsonTest.php M tests/classes/Plugins/Export/ExportLatexTest.php M tests/classes/Plugins/Export/ExportMediawikiTest.php M tests/classes/Plugins/Export/ExportOdsTest.php M tests/classes/Plugins/Export/ExportOdtTest.php M tests/classes/Plugins/Export/ExportPdfTest.php M tests/classes/Plugins/Export/ExportPhparrayTest.php M tests/classes/Plugins/Export/ExportSqlTest.php M tests/classes/Plugins/Export/ExportTexytextTest.php M tests/classes/Plugins/Export/ExportXmlTest.php M tests/classes/Plugins/Export/ExportYamlTest.php M tests/classes/Plugins/Export/Helpers/TablePropertyTest.php M tests/classes/Plugins/Import/ImportCsvTest.php M tests/classes/Plugins/Import/ImportLdiTest.php M tests/classes/Plugins/Import/ImportMediawikiTest.php M tests/classes/Plugins/Import/ImportOdsTest.php M tests/classes/Plugins/Import/ImportShpTest.php M tests/classes/Plugins/Import/ImportSqlTest.php M tests/classes/Plugins/Import/ImportXmlTest.php M tests/classes/Plugins/Schema/DiaRelationSchemaTest.php M tests/classes/Plugins/Schema/EpsRelationSchemaTest.php M tests/classes/Plugins/Schema/PdfRelationSchemaTest.php M tests/classes/Plugins/Schema/SvgRelationSchemaTest.php M tests/classes/Plugins/Transformations/TransformationPluginsTest.php M tests/classes/Plugins/TwoFactor/WebAuthnTest.php M tests/classes/PluginsTest.php M tests/classes/ProfilingTest.php M tests/classes/Replication/ReplicationGuiTest.php M tests/classes/ResponseRendererTest.php M tests/classes/SanitizeTest.php M tests/classes/Server/PluginsTest.php M tests/classes/Server/PrivilegesTest.php M tests/classes/Server/SelectTest.php M tests/classes/Setup/ConfigGeneratorTest.php M tests/classes/Setup/FormProcessingTest.php M tests/classes/SqlQueryFormTest.php M tests/classes/SqlTest.php M tests/classes/StorageEngineTest.php M tests/classes/Stubs/ResponseRenderer.php M tests/classes/SystemDatabaseTest.php M tests/classes/Table/ColumnsDefinitionTest.php M tests/classes/Table/IndexesTest.php M tests/classes/Table/TableTest.php M tests/classes/Theme/ThemeManagerTest.php M tests/classes/Theme/ThemeTest.php M tests/classes/Tracking/TrackerTest.php M tests/classes/Tracking/TrackingTest.php M tests/classes/TransformationsTest.php M tests/classes/Triggers/TriggersTest.php M tests/classes/TwoFactorTest.php M tests/classes/UrlTest.php M tests/classes/UserPreferencesTest.php M tests/classes/UtilTest.php M tests/classes/Utils/ForeignKeyTest.php M tests/classes/Utils/SessionCacheTest.php

Log Message: ----------- Merge pull request #18862 from MauricioFauth/server-global

Replace server global with Current::$server