From 1be42d13de25926f31f654bb5baff811e46f8989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Thu, 1 Jun 2023 13:48:41 -0300 Subject: [PATCH] Create the Identifiers\Identifier interface MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes Dbal\DatabaseName, Dbal\TableName and Triggers\TriggerName to implements the new Identifier\Identifier interface. Moves Dbal\DatabaseName, Dbal\TableName and Triggers\TriggerName to the Identifiers namespace. Renames the tryFromValue() and fromValue() methods to just tryFrom() and from() respectively. Signed-off-by: Maurício Meneghini Fauth --- libraries/classes/Bookmark.php | 2 +- libraries/classes/Common.php | 8 ++-- .../Features/BookmarkFeature.php | 4 +- .../Features/BrowserTransformationFeature.php | 4 +- .../Features/CentralColumnsFeature.php | 4 +- .../Features/ColumnCommentsFeature.php | 4 +- .../Features/ConfigurableMenusFeature.php | 4 +- .../DatabaseDesignerSettingsFeature.php | 4 +- .../ConfigStorage/Features/DisplayFeature.php | 4 +- .../Features/ExportTemplatesFeature.php | 4 +- .../Features/FavoriteTablesFeature.php | 4 +- .../Features/NavigationItemsHidingFeature.php | 4 +- .../ConfigStorage/Features/PdfFeature.php | 4 +- .../Features/RecentlyUsedTablesFeature.php | 4 +- .../Features/RelationFeature.php | 4 +- .../SavedQueryByExampleSearchesFeature.php | 4 +- .../Features/SqlHistoryFeature.php | 4 +- .../Features/TrackingFeature.php | 4 +- .../Features/UiPreferencesFeature.php | 4 +- .../Features/UserPreferencesFeature.php | 4 +- libraries/classes/ConfigStorage/Relation.php | 4 +- .../ConfigStorage/RelationParameters.php | 46 +++++++++---------- .../Controllers/AbstractController.php | 4 +- .../Controllers/CheckRelationsController.php | 4 +- .../Database/OperationsController.php | 8 ++-- .../Database/PrivilegesController.php | 8 ++-- .../Controllers/Export/ExportController.php | 10 ++-- .../Controllers/Import/ImportController.php | 8 ++-- .../Normalization/AddNewPrimaryController.php | 8 ++-- .../Controllers/SchemaExportController.php | 4 +- .../Controllers/Table/AddFieldController.php | 4 +- .../DropColumnConfirmationController.php | 12 ++--- .../Table/Maintenance/AnalyzeController.php | 12 ++--- .../Table/Maintenance/CheckController.php | 12 ++--- .../Table/Maintenance/ChecksumController.php | 12 ++--- .../Table/Maintenance/OptimizeController.php | 12 ++--- .../Table/Maintenance/RepairController.php | 12 ++--- .../Table/Partition/AnalyzeController.php | 12 ++--- .../Table/Partition/CheckController.php | 12 ++--- .../Table/Partition/DropController.php | 12 ++--- .../Table/Partition/OptimizeController.php | 12 ++--- .../Table/Partition/RebuildController.php | 12 ++--- .../Table/Partition/RepairController.php | 12 ++--- .../Table/Partition/TruncateController.php | 12 ++--- .../Table/PrivilegesController.php | 16 +++---- .../Transformation/WrapperController.php | 12 ++--- libraries/classes/CreateAddField.php | 2 +- libraries/classes/DatabaseInterface.php | 2 +- libraries/classes/Dbal/DbalInterface.php | 1 + libraries/classes/Dbal/DbiExtension.php | 1 + libraries/classes/Dbal/DbiMysqli.php | 1 + .../classes/Dbal/InvalidIdentifierName.php | 11 ----- libraries/classes/Export.php | 4 +- libraries/classes/Export/TemplateModel.php | 4 +- .../{Dbal => Identifiers}/DatabaseName.php | 15 +++--- libraries/classes/Identifiers/Identifier.php | 31 +++++++++++++ .../InvalidDatabaseName.php | 4 +- .../classes/Identifiers/InvalidIdentifier.php | 11 +++++ .../InvalidTableName.php | 4 +- .../InvalidTriggerName.php | 6 +-- .../{Dbal => Identifiers}/TableName.php | 15 +++--- .../{Triggers => Identifiers}/TriggerName.php | 16 ++++--- libraries/classes/Operations.php | 2 +- .../classes/Partitioning/Maintenance.php | 4 +- .../Plugins/Schema/Dia/DiaRelationSchema.php | 2 +- .../Plugins/Schema/Eps/EpsRelationSchema.php | 2 +- .../Plugins/Schema/ExportRelationSchema.php | 2 +- .../Plugins/Schema/Pdf/PdfRelationSchema.php | 2 +- .../classes/Plugins/Schema/SchemaDia.php | 2 +- .../classes/Plugins/Schema/SchemaEps.php | 2 +- .../classes/Plugins/Schema/SchemaPdf.php | 2 +- .../classes/Plugins/Schema/SchemaSvg.php | 2 +- .../Plugins/Schema/Svg/SvgRelationSchema.php | 2 +- libraries/classes/Plugins/SchemaPlugin.php | 2 +- libraries/classes/Server/Privileges.php | 4 +- libraries/classes/Sql.php | 4 +- libraries/classes/Table/Indexes.php | 2 +- libraries/classes/Table/Maintenance.php | 4 +- libraries/classes/Tracking/TrackedTable.php | 2 +- .../classes/Tracking/TrackingChecker.php | 4 +- libraries/classes/Triggers/Trigger.php | 7 +-- libraries/classes/UserPreferences.php | 2 +- phpstan-baseline.neon | 2 +- test/classes/BookmarkTest.php | 8 ++-- .../ConfigStorage/RelationParametersTest.php | 2 +- test/classes/ConfigStorage/UserGroupsTest.php | 10 ++-- test/classes/ExportTest.php | 4 +- .../DatabaseNameTest.php | 18 ++++---- .../{Dbal => Identifiers}/TableNameTest.php | 18 ++++---- .../TriggerNameTest.php | 18 ++++---- .../Plugins/Schema/DiaRelationSchemaTest.php | 4 +- .../Plugins/Schema/EpsRelationSchemaTest.php | 4 +- .../Schema/ExportRelationSchemaTest.php | 4 +- .../Plugins/Schema/PdfRelationSchemaTest.php | 4 +- .../Plugins/Schema/SvgRelationSchemaTest.php | 4 +- test/classes/Stubs/DbiDummy.php | 2 +- test/classes/Tracking/TrackingCheckerTest.php | 6 +-- 97 files changed, 354 insertions(+), 311 deletions(-) delete mode 100644 libraries/classes/Dbal/InvalidIdentifierName.php rename libraries/classes/{Dbal => Identifiers}/DatabaseName.php (83%) create mode 100644 libraries/classes/Identifiers/Identifier.php rename libraries/classes/{Dbal => Identifiers}/InvalidDatabaseName.php (87%) create mode 100644 libraries/classes/Identifiers/InvalidIdentifier.php rename libraries/classes/{Dbal => Identifiers}/InvalidTableName.php (87%) rename libraries/classes/{Triggers => Identifiers}/InvalidTriggerName.php (81%) rename libraries/classes/{Dbal => Identifiers}/TableName.php (83%) rename libraries/classes/{Triggers => Identifiers}/TriggerName.php (82%) rename test/classes/{Dbal => Identifiers}/DatabaseNameTest.php (81%) rename test/classes/{Dbal => Identifiers}/TableNameTest.php (82%) rename test/classes/{Triggers => Identifiers}/TriggerNameTest.php (81%) diff --git a/libraries/classes/Bookmark.php b/libraries/classes/Bookmark.php index 4912c58fff..95b68c52eb 100644 --- a/libraries/classes/Bookmark.php +++ b/libraries/classes/Bookmark.php @@ -10,7 +10,7 @@ namespace PhpMyAdmin; use PhpMyAdmin\ConfigStorage\Features\BookmarkFeature; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Dbal\Connection; -use PhpMyAdmin\Dbal\DatabaseName; +use PhpMyAdmin\Identifiers\DatabaseName; use function count; use function preg_match_all; diff --git a/libraries/classes/Common.php b/libraries/classes/Common.php index ea14589dc7..942d11619d 100644 --- a/libraries/classes/Common.php +++ b/libraries/classes/Common.php @@ -8,14 +8,14 @@ use PhpMyAdmin\Config\ConfigFile; use PhpMyAdmin\Config\Settings\Server; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Dbal\Connection; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\TableName; use PhpMyAdmin\Exceptions\AuthenticationPluginException; use PhpMyAdmin\Exceptions\ConfigException; use PhpMyAdmin\Exceptions\MissingExtensionException; use PhpMyAdmin\Exceptions\SessionHandlerException; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Http\ServerRequest; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Plugins\AuthenticationPlugin; use PhpMyAdmin\Plugins\AuthenticationPluginFactory; use PhpMyAdmin\SqlParser\Lexer; @@ -482,8 +482,8 @@ final class Common { $GLOBALS['urlParams'] ??= null; - $db = DatabaseName::tryFromValue($request->getParam('db')); - $table = TableName::tryFromValue($request->getParam('table')); + $db = DatabaseName::tryFrom($request->getParam('db')); + $table = TableName::tryFrom($request->getParam('table')); $GLOBALS['db'] = $db?->getName() ?? ''; $GLOBALS['table'] = $table?->getName() ?? ''; diff --git a/libraries/classes/ConfigStorage/Features/BookmarkFeature.php b/libraries/classes/ConfigStorage/Features/BookmarkFeature.php index 65078147e1..a844b9aaeb 100644 --- a/libraries/classes/ConfigStorage/Features/BookmarkFeature.php +++ b/libraries/classes/ConfigStorage/Features/BookmarkFeature.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin\ConfigStorage\Features; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\TableName; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\TableName; /** @psalm-immutable */ final class BookmarkFeature diff --git a/libraries/classes/ConfigStorage/Features/BrowserTransformationFeature.php b/libraries/classes/ConfigStorage/Features/BrowserTransformationFeature.php index 243a66e8de..7e69d0141b 100644 --- a/libraries/classes/ConfigStorage/Features/BrowserTransformationFeature.php +++ b/libraries/classes/ConfigStorage/Features/BrowserTransformationFeature.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin\ConfigStorage\Features; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\TableName; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\TableName; /** @psalm-immutable */ final class BrowserTransformationFeature diff --git a/libraries/classes/ConfigStorage/Features/CentralColumnsFeature.php b/libraries/classes/ConfigStorage/Features/CentralColumnsFeature.php index 6f088605fc..035c3e2609 100644 --- a/libraries/classes/ConfigStorage/Features/CentralColumnsFeature.php +++ b/libraries/classes/ConfigStorage/Features/CentralColumnsFeature.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin\ConfigStorage\Features; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\TableName; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\TableName; /** @psalm-immutable */ final class CentralColumnsFeature diff --git a/libraries/classes/ConfigStorage/Features/ColumnCommentsFeature.php b/libraries/classes/ConfigStorage/Features/ColumnCommentsFeature.php index 17c71099b0..7b8dedc188 100644 --- a/libraries/classes/ConfigStorage/Features/ColumnCommentsFeature.php +++ b/libraries/classes/ConfigStorage/Features/ColumnCommentsFeature.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin\ConfigStorage\Features; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\TableName; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\TableName; /** @psalm-immutable */ final class ColumnCommentsFeature diff --git a/libraries/classes/ConfigStorage/Features/ConfigurableMenusFeature.php b/libraries/classes/ConfigStorage/Features/ConfigurableMenusFeature.php index 6034338569..a94420cc62 100644 --- a/libraries/classes/ConfigStorage/Features/ConfigurableMenusFeature.php +++ b/libraries/classes/ConfigStorage/Features/ConfigurableMenusFeature.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin\ConfigStorage\Features; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\TableName; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\TableName; /** @psalm-immutable */ final class ConfigurableMenusFeature diff --git a/libraries/classes/ConfigStorage/Features/DatabaseDesignerSettingsFeature.php b/libraries/classes/ConfigStorage/Features/DatabaseDesignerSettingsFeature.php index 90dca401a7..2d62a7b83f 100644 --- a/libraries/classes/ConfigStorage/Features/DatabaseDesignerSettingsFeature.php +++ b/libraries/classes/ConfigStorage/Features/DatabaseDesignerSettingsFeature.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin\ConfigStorage\Features; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\TableName; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\TableName; /** @psalm-immutable */ final class DatabaseDesignerSettingsFeature diff --git a/libraries/classes/ConfigStorage/Features/DisplayFeature.php b/libraries/classes/ConfigStorage/Features/DisplayFeature.php index 936208ac1d..191c25608a 100644 --- a/libraries/classes/ConfigStorage/Features/DisplayFeature.php +++ b/libraries/classes/ConfigStorage/Features/DisplayFeature.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin\ConfigStorage\Features; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\TableName; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\TableName; /** @psalm-immutable */ final class DisplayFeature diff --git a/libraries/classes/ConfigStorage/Features/ExportTemplatesFeature.php b/libraries/classes/ConfigStorage/Features/ExportTemplatesFeature.php index 75f86395f5..dd0912e0c3 100644 --- a/libraries/classes/ConfigStorage/Features/ExportTemplatesFeature.php +++ b/libraries/classes/ConfigStorage/Features/ExportTemplatesFeature.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin\ConfigStorage\Features; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\TableName; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\TableName; /** @psalm-immutable */ final class ExportTemplatesFeature diff --git a/libraries/classes/ConfigStorage/Features/FavoriteTablesFeature.php b/libraries/classes/ConfigStorage/Features/FavoriteTablesFeature.php index 957e6953ba..f910d56395 100644 --- a/libraries/classes/ConfigStorage/Features/FavoriteTablesFeature.php +++ b/libraries/classes/ConfigStorage/Features/FavoriteTablesFeature.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin\ConfigStorage\Features; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\TableName; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\TableName; /** @psalm-immutable */ final class FavoriteTablesFeature diff --git a/libraries/classes/ConfigStorage/Features/NavigationItemsHidingFeature.php b/libraries/classes/ConfigStorage/Features/NavigationItemsHidingFeature.php index 8e0c8e3a93..fd8e27f3a9 100644 --- a/libraries/classes/ConfigStorage/Features/NavigationItemsHidingFeature.php +++ b/libraries/classes/ConfigStorage/Features/NavigationItemsHidingFeature.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin\ConfigStorage\Features; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\TableName; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\TableName; /** @psalm-immutable */ final class NavigationItemsHidingFeature diff --git a/libraries/classes/ConfigStorage/Features/PdfFeature.php b/libraries/classes/ConfigStorage/Features/PdfFeature.php index df0729c7c3..7816635d04 100644 --- a/libraries/classes/ConfigStorage/Features/PdfFeature.php +++ b/libraries/classes/ConfigStorage/Features/PdfFeature.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin\ConfigStorage\Features; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\TableName; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\TableName; /** @psalm-immutable */ final class PdfFeature diff --git a/libraries/classes/ConfigStorage/Features/RecentlyUsedTablesFeature.php b/libraries/classes/ConfigStorage/Features/RecentlyUsedTablesFeature.php index 6a54cb0938..9f60debf3e 100644 --- a/libraries/classes/ConfigStorage/Features/RecentlyUsedTablesFeature.php +++ b/libraries/classes/ConfigStorage/Features/RecentlyUsedTablesFeature.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin\ConfigStorage\Features; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\TableName; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\TableName; /** @psalm-immutable */ final class RecentlyUsedTablesFeature diff --git a/libraries/classes/ConfigStorage/Features/RelationFeature.php b/libraries/classes/ConfigStorage/Features/RelationFeature.php index 15abeb3db9..5dd8c48fc5 100644 --- a/libraries/classes/ConfigStorage/Features/RelationFeature.php +++ b/libraries/classes/ConfigStorage/Features/RelationFeature.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin\ConfigStorage\Features; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\TableName; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\TableName; /** @psalm-immutable */ final class RelationFeature diff --git a/libraries/classes/ConfigStorage/Features/SavedQueryByExampleSearchesFeature.php b/libraries/classes/ConfigStorage/Features/SavedQueryByExampleSearchesFeature.php index e4828e3520..86c894a4e5 100644 --- a/libraries/classes/ConfigStorage/Features/SavedQueryByExampleSearchesFeature.php +++ b/libraries/classes/ConfigStorage/Features/SavedQueryByExampleSearchesFeature.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin\ConfigStorage\Features; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\TableName; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\TableName; /** @psalm-immutable */ final class SavedQueryByExampleSearchesFeature diff --git a/libraries/classes/ConfigStorage/Features/SqlHistoryFeature.php b/libraries/classes/ConfigStorage/Features/SqlHistoryFeature.php index 2a797aa58b..b36375b972 100644 --- a/libraries/classes/ConfigStorage/Features/SqlHistoryFeature.php +++ b/libraries/classes/ConfigStorage/Features/SqlHistoryFeature.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin\ConfigStorage\Features; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\TableName; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\TableName; /** @psalm-immutable */ final class SqlHistoryFeature diff --git a/libraries/classes/ConfigStorage/Features/TrackingFeature.php b/libraries/classes/ConfigStorage/Features/TrackingFeature.php index cb5f254b72..c6f428a49f 100644 --- a/libraries/classes/ConfigStorage/Features/TrackingFeature.php +++ b/libraries/classes/ConfigStorage/Features/TrackingFeature.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin\ConfigStorage\Features; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\TableName; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\TableName; /** @psalm-immutable */ final class TrackingFeature diff --git a/libraries/classes/ConfigStorage/Features/UiPreferencesFeature.php b/libraries/classes/ConfigStorage/Features/UiPreferencesFeature.php index 0dc22bfc9a..8c659df614 100644 --- a/libraries/classes/ConfigStorage/Features/UiPreferencesFeature.php +++ b/libraries/classes/ConfigStorage/Features/UiPreferencesFeature.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin\ConfigStorage\Features; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\TableName; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\TableName; /** @psalm-immutable */ final class UiPreferencesFeature diff --git a/libraries/classes/ConfigStorage/Features/UserPreferencesFeature.php b/libraries/classes/ConfigStorage/Features/UserPreferencesFeature.php index 1cd16fd8ef..ade93926b3 100644 --- a/libraries/classes/ConfigStorage/Features/UserPreferencesFeature.php +++ b/libraries/classes/ConfigStorage/Features/UserPreferencesFeature.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin\ConfigStorage\Features; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\TableName; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\TableName; /** @psalm-immutable */ final class UserPreferencesFeature diff --git a/libraries/classes/ConfigStorage/Relation.php b/libraries/classes/ConfigStorage/Relation.php index 0ec7b66242..9fe5935ce6 100644 --- a/libraries/classes/ConfigStorage/Relation.php +++ b/libraries/classes/ConfigStorage/Relation.php @@ -7,8 +7,8 @@ namespace PhpMyAdmin\ConfigStorage; use PhpMyAdmin\ConfigStorage\Features\PdfFeature; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\Connection; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\TableName; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\InternalRelations; use PhpMyAdmin\RecentFavoriteTable; use PhpMyAdmin\SqlParser\Parser; diff --git a/libraries/classes/ConfigStorage/RelationParameters.php b/libraries/classes/ConfigStorage/RelationParameters.php index 918438250c..6f2d0acbfa 100644 --- a/libraries/classes/ConfigStorage/RelationParameters.php +++ b/libraries/classes/ConfigStorage/RelationParameters.php @@ -22,9 +22,9 @@ use PhpMyAdmin\ConfigStorage\Features\SqlHistoryFeature; use PhpMyAdmin\ConfigStorage\Features\TrackingFeature; use PhpMyAdmin\ConfigStorage\Features\UiPreferencesFeature; use PhpMyAdmin\ConfigStorage\Features\UserPreferencesFeature; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\InvalidDatabaseName; -use PhpMyAdmin\Dbal\TableName; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\InvalidDatabaseName; +use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Version; use function is_string; @@ -66,20 +66,20 @@ final class RelationParameters } try { - $db = DatabaseName::fromValue($params['db'] ?? null); + $db = DatabaseName::from($params['db'] ?? null); } catch (InvalidDatabaseName) { return new self($user, null); } $bookmarkFeature = null; if (isset($params['bookmarkwork'], $params['bookmark']) && $params['bookmarkwork']) { - $bookmark = TableName::tryFromValue($params['bookmark']); + $bookmark = TableName::tryFrom($params['bookmark']); if ($bookmark !== null) { $bookmarkFeature = new BookmarkFeature($db, $bookmark); } } - $columnInfo = TableName::tryFromValue($params['column_info'] ?? null); + $columnInfo = TableName::tryFrom($params['column_info'] ?? null); $browserTransformationFeature = null; if (isset($params['mimework']) && $params['mimework'] && $columnInfo !== null) { $browserTransformationFeature = new BrowserTransformationFeature($db, $columnInfo); @@ -92,7 +92,7 @@ final class RelationParameters $centralColumnsFeature = null; if (isset($params['centralcolumnswork'], $params['central_columns']) && $params['centralcolumnswork']) { - $centralColumns = TableName::tryFromValue($params['central_columns']); + $centralColumns = TableName::tryFrom($params['central_columns']); if ($centralColumns !== null) { $centralColumnsFeature = new CentralColumnsFeature($db, $centralColumns); } @@ -100,8 +100,8 @@ final class RelationParameters $configurableMenusFeature = null; if (isset($params['menuswork'], $params['usergroups'], $params['users']) && $params['menuswork']) { - $userGroups = TableName::tryFromValue($params['usergroups']); - $users = TableName::tryFromValue($params['users']); + $userGroups = TableName::tryFrom($params['usergroups']); + $users = TableName::tryFrom($params['users']); if ($userGroups !== null && $users !== null) { $configurableMenusFeature = new ConfigurableMenusFeature($db, $userGroups, $users); } @@ -109,16 +109,16 @@ final class RelationParameters $databaseDesignerSettingsFeature = null; if (isset($params['designersettingswork'], $params['designer_settings']) && $params['designersettingswork']) { - $designerSettings = TableName::tryFromValue($params['designer_settings']); + $designerSettings = TableName::tryFrom($params['designer_settings']); if ($designerSettings !== null) { $databaseDesignerSettingsFeature = new DatabaseDesignerSettingsFeature($db, $designerSettings); } } - $relation = TableName::tryFromValue($params['relation'] ?? null); + $relation = TableName::tryFrom($params['relation'] ?? null); $displayFeature = null; if (isset($params['displaywork'], $params['table_info']) && $params['displaywork'] && $relation !== null) { - $tableInfo = TableName::tryFromValue($params['table_info']); + $tableInfo = TableName::tryFrom($params['table_info']); if ($tableInfo !== null) { $displayFeature = new DisplayFeature($db, $relation, $tableInfo); } @@ -126,7 +126,7 @@ final class RelationParameters $exportTemplatesFeature = null; if (isset($params['exporttemplateswork'], $params['export_templates']) && $params['exporttemplateswork']) { - $exportTemplates = TableName::tryFromValue($params['export_templates']); + $exportTemplates = TableName::tryFrom($params['export_templates']); if ($exportTemplates !== null) { $exportTemplatesFeature = new ExportTemplatesFeature($db, $exportTemplates); } @@ -134,7 +134,7 @@ final class RelationParameters $favoriteTablesFeature = null; if (isset($params['favoritework'], $params['favorite']) && $params['favoritework']) { - $favorite = TableName::tryFromValue($params['favorite']); + $favorite = TableName::tryFrom($params['favorite']); if ($favorite !== null) { $favoriteTablesFeature = new FavoriteTablesFeature($db, $favorite); } @@ -142,7 +142,7 @@ final class RelationParameters $navigationItemsHidingFeature = null; if (isset($params['navwork'], $params['navigationhiding']) && $params['navwork']) { - $navigationHiding = TableName::tryFromValue($params['navigationhiding']); + $navigationHiding = TableName::tryFrom($params['navigationhiding']); if ($navigationHiding !== null) { $navigationItemsHidingFeature = new NavigationItemsHidingFeature($db, $navigationHiding); } @@ -150,8 +150,8 @@ final class RelationParameters $pdfFeature = null; if (isset($params['pdfwork'], $params['pdf_pages'], $params['table_coords']) && $params['pdfwork']) { - $pdfPages = TableName::tryFromValue($params['pdf_pages']); - $tableCoords = TableName::tryFromValue($params['table_coords']); + $pdfPages = TableName::tryFrom($params['pdf_pages']); + $tableCoords = TableName::tryFrom($params['table_coords']); if ($pdfPages !== null && $tableCoords !== null) { $pdfFeature = new PdfFeature($db, $pdfPages, $tableCoords); } @@ -159,7 +159,7 @@ final class RelationParameters $recentlyUsedTablesFeature = null; if (isset($params['recentwork'], $params['recent']) && $params['recentwork']) { - $recent = TableName::tryFromValue($params['recent']); + $recent = TableName::tryFrom($params['recent']); if ($recent !== null) { $recentlyUsedTablesFeature = new RecentlyUsedTablesFeature($db, $recent); } @@ -172,7 +172,7 @@ final class RelationParameters $savedQueryByExampleSearchesFeature = null; if (isset($params['savedsearcheswork'], $params['savedsearches']) && $params['savedsearcheswork']) { - $savedSearches = TableName::tryFromValue($params['savedsearches']); + $savedSearches = TableName::tryFrom($params['savedsearches']); if ($savedSearches !== null) { $savedQueryByExampleSearchesFeature = new SavedQueryByExampleSearchesFeature($db, $savedSearches); } @@ -180,7 +180,7 @@ final class RelationParameters $sqlHistoryFeature = null; if (isset($params['historywork'], $params['history']) && $params['historywork']) { - $history = TableName::tryFromValue($params['history']); + $history = TableName::tryFrom($params['history']); if ($history !== null) { $sqlHistoryFeature = new SqlHistoryFeature($db, $history); } @@ -188,7 +188,7 @@ final class RelationParameters $trackingFeature = null; if (isset($params['trackingwork'], $params['tracking']) && $params['trackingwork']) { - $tracking = TableName::tryFromValue($params['tracking']); + $tracking = TableName::tryFrom($params['tracking']); if ($tracking !== null) { $trackingFeature = new TrackingFeature($db, $tracking); } @@ -196,7 +196,7 @@ final class RelationParameters $uiPreferencesFeature = null; if (isset($params['uiprefswork'], $params['table_uiprefs']) && $params['uiprefswork']) { - $tableUiPrefs = TableName::tryFromValue($params['table_uiprefs']); + $tableUiPrefs = TableName::tryFrom($params['table_uiprefs']); if ($tableUiPrefs !== null) { $uiPreferencesFeature = new UiPreferencesFeature($db, $tableUiPrefs); } @@ -204,7 +204,7 @@ final class RelationParameters $userPreferencesFeature = null; if (isset($params['userconfigwork'], $params['userconfig']) && $params['userconfigwork']) { - $userConfig = TableName::tryFromValue($params['userconfig']); + $userConfig = TableName::tryFrom($params['userconfig']); if ($userConfig !== null) { $userPreferencesFeature = new UserPreferencesFeature($db, $userConfig); } diff --git a/libraries/classes/Controllers/AbstractController.php b/libraries/classes/Controllers/AbstractController.php index a79bf0bef6..83f8dd5c6b 100644 --- a/libraries/classes/Controllers/AbstractController.php +++ b/libraries/classes/Controllers/AbstractController.php @@ -5,8 +5,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers; use PhpMyAdmin\Core; -use PhpMyAdmin\Dbal\DatabaseName; use PhpMyAdmin\Html\MySQLDocumentation; +use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -45,7 +45,7 @@ abstract class AbstractController } $GLOBALS['is_db'] = false; - $db = DatabaseName::tryFromValue($GLOBALS['db']); + $db = DatabaseName::tryFrom($GLOBALS['db']); if ($db !== null) { $GLOBALS['is_db'] = $GLOBALS['dbi']->selectDb($db->getName()); diff --git a/libraries/classes/Controllers/CheckRelationsController.php b/libraries/classes/Controllers/CheckRelationsController.php index 797a8d76d7..87638967fd 100644 --- a/libraries/classes/Controllers/CheckRelationsController.php +++ b/libraries/classes/Controllers/CheckRelationsController.php @@ -5,8 +5,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers; use PhpMyAdmin\ConfigStorage\Relation; -use PhpMyAdmin\Dbal\DatabaseName; use PhpMyAdmin\Http\ServerRequest; +use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -26,7 +26,7 @@ class CheckRelationsController extends AbstractController { $cfgStorageDbName = $this->relation->getConfigurationStorageDbName(); - $db = DatabaseName::tryFromValue($GLOBALS['db']); + $db = DatabaseName::tryFrom($GLOBALS['db']); // If request for creating the pmadb if ($request->hasBodyParam('create_pmadb') && $this->relation->createPmaDatabase($cfgStorageDbName)) { diff --git a/libraries/classes/Controllers/Database/OperationsController.php b/libraries/classes/Controllers/Database/OperationsController.php index b7fe17fea2..d36d3b4525 100644 --- a/libraries/classes/Controllers/Database/OperationsController.php +++ b/libraries/classes/Controllers/Database/OperationsController.php @@ -10,10 +10,10 @@ use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationCleanup; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\InvalidDatabaseName; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\ServerRequest; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\InvalidDatabaseName; use PhpMyAdmin\Message; use PhpMyAdmin\Operations; use PhpMyAdmin\Plugins; @@ -66,9 +66,9 @@ class OperationsController extends AbstractController $move = $request->hasBodyParam('db_rename'); try { - $newDatabaseName = DatabaseName::fromValue($request->getParsedBodyParam('newname')); + $newDatabaseName = DatabaseName::from($request->getParsedBodyParam('newname')); if ($this->dbi->getLowerCaseNames() === 1) { - $newDatabaseName = DatabaseName::fromValue(mb_strtolower($newDatabaseName->getName())); + $newDatabaseName = DatabaseName::from(mb_strtolower($newDatabaseName->getName())); } } catch (InvalidDatabaseName $exception) { $newDatabaseName = null; diff --git a/libraries/classes/Controllers/Database/PrivilegesController.php b/libraries/classes/Controllers/Database/PrivilegesController.php index 1c621f5e91..f138607d10 100644 --- a/libraries/classes/Controllers/Database/PrivilegesController.php +++ b/libraries/classes/Controllers/Database/PrivilegesController.php @@ -10,9 +10,9 @@ namespace PhpMyAdmin\Controllers\Database; use PhpMyAdmin\CheckUserPrivileges; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\InvalidDatabaseName; use PhpMyAdmin\Http\ServerRequest; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\InvalidDatabaseName; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Privileges; @@ -39,9 +39,9 @@ class PrivilegesController extends AbstractController public function __invoke(ServerRequest $request): void { try { - $db = DatabaseName::fromValue($request->getParam('db')); + $db = DatabaseName::from($request->getParam('db')); if ($this->dbi->getLowerCaseNames() === 1) { - $db = DatabaseName::fromValue(mb_strtolower($db->getName())); + $db = DatabaseName::from(mb_strtolower($db->getName())); } } catch (InvalidDatabaseName $exception) { $this->response->addHTML(Message::error($exception->getMessage())->getDisplay()); diff --git a/libraries/classes/Controllers/Export/ExportController.php b/libraries/classes/Controllers/Export/ExportController.php index b0e90935f9..2647111a80 100644 --- a/libraries/classes/Controllers/Export/ExportController.php +++ b/libraries/classes/Controllers/Export/ExportController.php @@ -7,11 +7,11 @@ namespace PhpMyAdmin\Controllers\Export; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Controllers\Database\ExportController as DatabaseExportController; use PhpMyAdmin\Core; -use PhpMyAdmin\Dbal\DatabaseName; use PhpMyAdmin\Encoding; use PhpMyAdmin\Exceptions\ExportException; use PhpMyAdmin\Export; use PhpMyAdmin\Http\ServerRequest; +use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Message; use PhpMyAdmin\Plugins; use PhpMyAdmin\Plugins\Export\ExportSql; @@ -383,10 +383,10 @@ final class ExportController extends AbstractController } if ($lockTables) { - $this->export->lockTables(DatabaseName::fromValue($GLOBALS['db']), $GLOBALS['tables'], 'READ'); + $this->export->lockTables(DatabaseName::from($GLOBALS['db']), $GLOBALS['tables'], 'READ'); try { $this->export->exportDatabase( - DatabaseName::fromValue($GLOBALS['db']), + DatabaseName::from($GLOBALS['db']), $GLOBALS['tables'], $whatStrucOrData, $tableStructure, @@ -406,7 +406,7 @@ final class ExportController extends AbstractController } } else { $this->export->exportDatabase( - DatabaseName::fromValue($GLOBALS['db']), + DatabaseName::from($GLOBALS['db']), $GLOBALS['tables'], $whatStrucOrData, $tableStructure, @@ -439,7 +439,7 @@ final class ExportController extends AbstractController if ($lockTables) { try { - $this->export->lockTables(DatabaseName::fromValue($GLOBALS['db']), [$GLOBALS['table']], 'READ'); + $this->export->lockTables(DatabaseName::from($GLOBALS['db']), [$GLOBALS['table']], 'READ'); $this->export->exportTable( $GLOBALS['db'], $GLOBALS['table'], diff --git a/libraries/classes/Controllers/Import/ImportController.php b/libraries/classes/Controllers/Import/ImportController.php index 37abdc6b99..22db83905a 100644 --- a/libraries/classes/Controllers/Import/ImportController.php +++ b/libraries/classes/Controllers/Import/ImportController.php @@ -9,11 +9,11 @@ use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Core; use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Dbal\DatabaseName; use PhpMyAdmin\Encoding; use PhpMyAdmin\File; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\ServerRequest; +use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Import; use PhpMyAdmin\Message; use PhpMyAdmin\ParseAnalyze; @@ -317,7 +317,7 @@ final class ImportController extends AbstractController $bookmark = Bookmark::get( $this->dbi, $GLOBALS['cfg']['Server']['user'], - DatabaseName::fromValue($GLOBALS['db']), + DatabaseName::from($GLOBALS['db']), $idBookmark, 'id', $request->hasBodyParam('action_bookmark_all'), @@ -349,7 +349,7 @@ final class ImportController extends AbstractController $bookmark = Bookmark::get( $this->dbi, $GLOBALS['cfg']['Server']['user'], - DatabaseName::fromValue($GLOBALS['db']), + DatabaseName::from($GLOBALS['db']), $idBookmark, ); if (! $bookmark instanceof Bookmark) { @@ -373,7 +373,7 @@ final class ImportController extends AbstractController $bookmark = Bookmark::get( $this->dbi, $GLOBALS['cfg']['Server']['user'], - DatabaseName::fromValue($GLOBALS['db']), + DatabaseName::from($GLOBALS['db']), $idBookmark, ); if (! $bookmark instanceof Bookmark) { diff --git a/libraries/classes/Controllers/Normalization/AddNewPrimaryController.php b/libraries/classes/Controllers/Normalization/AddNewPrimaryController.php index 3afe4d1876..930e250f06 100644 --- a/libraries/classes/Controllers/Normalization/AddNewPrimaryController.php +++ b/libraries/classes/Controllers/Normalization/AddNewPrimaryController.php @@ -5,9 +5,9 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Normalization; use PhpMyAdmin\Controllers\AbstractController; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\TableName; use PhpMyAdmin\Http\ServerRequest; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Normalization; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; @@ -24,8 +24,8 @@ final class AddNewPrimaryController extends AbstractController { $numFields = 1; - $db = DatabaseName::tryFromValue($GLOBALS['db']); - $table = TableName::tryFromValue($GLOBALS['table']); + $db = DatabaseName::tryFrom($GLOBALS['db']); + $table = TableName::tryFrom($GLOBALS['table']); $dbName = isset($db) ? $db->getName() : ''; $tableName = isset($table) ? $table->getName() : ''; diff --git a/libraries/classes/Controllers/SchemaExportController.php b/libraries/classes/Controllers/SchemaExportController.php index 03f3441c1d..7689f60093 100644 --- a/libraries/classes/Controllers/SchemaExportController.php +++ b/libraries/classes/Controllers/SchemaExportController.php @@ -5,11 +5,11 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers; use PhpMyAdmin\Core; -use PhpMyAdmin\Dbal\DatabaseName; use PhpMyAdmin\Exceptions\ExportException; use PhpMyAdmin\Export; use PhpMyAdmin\Html\MySQLDocumentation; use PhpMyAdmin\Http\ServerRequest; +use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; @@ -28,7 +28,7 @@ class SchemaExportController public function __invoke(ServerRequest $request): void { - $db = DatabaseName::tryFromValue($request->getParsedBodyParam('db')); + $db = DatabaseName::tryFrom($request->getParsedBodyParam('db')); /** @var mixed $exportType */ $exportType = $request->getParsedBodyParam('export_type'); if ($db === null || ! is_string($exportType) || $exportType === '') { diff --git a/libraries/classes/Controllers/Table/AddFieldController.php b/libraries/classes/Controllers/Table/AddFieldController.php index 0813db18ff..80bca6cc96 100644 --- a/libraries/classes/Controllers/Table/AddFieldController.php +++ b/libraries/classes/Controllers/Table/AddFieldController.php @@ -9,10 +9,10 @@ use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Core; use PhpMyAdmin\CreateAddField; use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Dbal\DatabaseName; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\ServerRequest; +use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Table\ColumnsDefinition; @@ -105,7 +105,7 @@ class AddFieldController extends AbstractController } $GLOBALS['result'] = $createAddField->tryColumnCreationQuery( - DatabaseName::fromValue($GLOBALS['db']), + DatabaseName::from($GLOBALS['db']), $GLOBALS['sql_query'], $GLOBALS['errorUrl'], ); diff --git a/libraries/classes/Controllers/Table/DropColumnConfirmationController.php b/libraries/classes/Controllers/Table/DropColumnConfirmationController.php index e844e392d4..34fcf9e888 100644 --- a/libraries/classes/Controllers/Table/DropColumnConfirmationController.php +++ b/libraries/classes/Controllers/Table/DropColumnConfirmationController.php @@ -5,11 +5,11 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table; use PhpMyAdmin\Controllers\AbstractController; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\InvalidIdentifierName; -use PhpMyAdmin\Dbal\TableName; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Http\ServerRequest; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\InvalidIdentifier; +use PhpMyAdmin\Identifiers\TableName; use Webmozart\Assert\Assert; use Webmozart\Assert\InvalidArgumentException; @@ -21,10 +21,10 @@ final class DropColumnConfirmationController extends AbstractController { $fields = $request->getParsedBodyParam('selected_fld'); try { - $db = DatabaseName::fromValue($request->getParsedBodyParam('db')); - $table = TableName::fromValue($request->getParsedBodyParam('table')); + $db = DatabaseName::from($request->getParsedBodyParam('db')); + $table = TableName::from($request->getParsedBodyParam('table')); Assert::allStringNotEmpty($fields); - } catch (InvalidIdentifierName $exception) { + } catch (InvalidIdentifier $exception) { $this->sendErrorResponse($exception->getMessage()); return; diff --git a/libraries/classes/Controllers/Table/Maintenance/AnalyzeController.php b/libraries/classes/Controllers/Table/Maintenance/AnalyzeController.php index 78e9844bc7..ae6cb41048 100644 --- a/libraries/classes/Controllers/Table/Maintenance/AnalyzeController.php +++ b/libraries/classes/Controllers/Table/Maintenance/AnalyzeController.php @@ -6,11 +6,11 @@ namespace PhpMyAdmin\Controllers\Table\Maintenance; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\AbstractController; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\InvalidIdentifierName; -use PhpMyAdmin\Dbal\TableName; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\ServerRequest; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\InvalidIdentifier; +use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Table\Maintenance; @@ -48,12 +48,12 @@ final class AnalyzeController extends AbstractController } try { - $database = DatabaseName::fromValue($request->getParam('db')); + $database = DatabaseName::from($request->getParam('db')); $selectedTables = []; foreach ($selectedTablesParam as $table) { - $selectedTables[] = TableName::fromValue($table); + $selectedTables[] = TableName::from($table); } - } catch (InvalidIdentifierName $exception) { + } catch (InvalidIdentifier $exception) { $message = Message::error($exception->getMessage()); $this->response->setRequestStatus(false); $this->response->addJSON('message', $message->getDisplay()); diff --git a/libraries/classes/Controllers/Table/Maintenance/CheckController.php b/libraries/classes/Controllers/Table/Maintenance/CheckController.php index e47a785467..5328e5adaf 100644 --- a/libraries/classes/Controllers/Table/Maintenance/CheckController.php +++ b/libraries/classes/Controllers/Table/Maintenance/CheckController.php @@ -6,11 +6,11 @@ namespace PhpMyAdmin\Controllers\Table\Maintenance; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\AbstractController; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\InvalidIdentifierName; -use PhpMyAdmin\Dbal\TableName; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\ServerRequest; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\InvalidIdentifier; +use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Table\Maintenance; @@ -48,12 +48,12 @@ final class CheckController extends AbstractController } try { - $database = DatabaseName::fromValue($request->getParam('db')); + $database = DatabaseName::from($request->getParam('db')); $selectedTables = []; foreach ($selectedTablesParam as $table) { - $selectedTables[] = TableName::fromValue($table); + $selectedTables[] = TableName::from($table); } - } catch (InvalidIdentifierName $exception) { + } catch (InvalidIdentifier $exception) { $message = Message::error($exception->getMessage()); $this->response->setRequestStatus(false); $this->response->addJSON('message', $message->getDisplay()); diff --git a/libraries/classes/Controllers/Table/Maintenance/ChecksumController.php b/libraries/classes/Controllers/Table/Maintenance/ChecksumController.php index abb11b530d..02a56c12e0 100644 --- a/libraries/classes/Controllers/Table/Maintenance/ChecksumController.php +++ b/libraries/classes/Controllers/Table/Maintenance/ChecksumController.php @@ -6,11 +6,11 @@ namespace PhpMyAdmin\Controllers\Table\Maintenance; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\AbstractController; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\InvalidIdentifierName; -use PhpMyAdmin\Dbal\TableName; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\ServerRequest; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\InvalidIdentifier; +use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Table\Maintenance; @@ -48,12 +48,12 @@ final class ChecksumController extends AbstractController } try { - $database = DatabaseName::fromValue($request->getParam('db')); + $database = DatabaseName::from($request->getParam('db')); $selectedTables = []; foreach ($selectedTablesParam as $table) { - $selectedTables[] = TableName::fromValue($table); + $selectedTables[] = TableName::from($table); } - } catch (InvalidIdentifierName $exception) { + } catch (InvalidIdentifier $exception) { $message = Message::error($exception->getMessage()); $this->response->setRequestStatus(false); $this->response->addJSON('message', $message->getDisplay()); diff --git a/libraries/classes/Controllers/Table/Maintenance/OptimizeController.php b/libraries/classes/Controllers/Table/Maintenance/OptimizeController.php index 6fa6139848..21d6ba1418 100644 --- a/libraries/classes/Controllers/Table/Maintenance/OptimizeController.php +++ b/libraries/classes/Controllers/Table/Maintenance/OptimizeController.php @@ -6,11 +6,11 @@ namespace PhpMyAdmin\Controllers\Table\Maintenance; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\AbstractController; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\InvalidIdentifierName; -use PhpMyAdmin\Dbal\TableName; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\ServerRequest; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\InvalidIdentifier; +use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Table\Maintenance; @@ -48,12 +48,12 @@ final class OptimizeController extends AbstractController } try { - $database = DatabaseName::fromValue($request->getParam('db')); + $database = DatabaseName::from($request->getParam('db')); $selectedTables = []; foreach ($selectedTablesParam as $table) { - $selectedTables[] = TableName::fromValue($table); + $selectedTables[] = TableName::from($table); } - } catch (InvalidIdentifierName $exception) { + } catch (InvalidIdentifier $exception) { $message = Message::error($exception->getMessage()); $this->response->setRequestStatus(false); $this->response->addJSON('message', $message->getDisplay()); diff --git a/libraries/classes/Controllers/Table/Maintenance/RepairController.php b/libraries/classes/Controllers/Table/Maintenance/RepairController.php index 77fd561f3b..47d28d5267 100644 --- a/libraries/classes/Controllers/Table/Maintenance/RepairController.php +++ b/libraries/classes/Controllers/Table/Maintenance/RepairController.php @@ -6,11 +6,11 @@ namespace PhpMyAdmin\Controllers\Table\Maintenance; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\AbstractController; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\InvalidIdentifierName; -use PhpMyAdmin\Dbal\TableName; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\ServerRequest; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\InvalidIdentifier; +use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Table\Maintenance; @@ -48,12 +48,12 @@ final class RepairController extends AbstractController } try { - $database = DatabaseName::fromValue($request->getParam('db')); + $database = DatabaseName::from($request->getParam('db')); $selectedTables = []; foreach ($selectedTablesParam as $table) { - $selectedTables[] = TableName::fromValue($table); + $selectedTables[] = TableName::from($table); } - } catch (InvalidIdentifierName $exception) { + } catch (InvalidIdentifier $exception) { $message = Message::error($exception->getMessage()); $this->response->setRequestStatus(false); $this->response->addJSON('message', $message->getDisplay()); diff --git a/libraries/classes/Controllers/Table/Partition/AnalyzeController.php b/libraries/classes/Controllers/Table/Partition/AnalyzeController.php index 740a522c13..ffb01b2a73 100644 --- a/libraries/classes/Controllers/Table/Partition/AnalyzeController.php +++ b/libraries/classes/Controllers/Table/Partition/AnalyzeController.php @@ -5,11 +5,11 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table\Partition; use PhpMyAdmin\Controllers\AbstractController; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\InvalidIdentifierName; -use PhpMyAdmin\Dbal\TableName; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\ServerRequest; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\InvalidIdentifier; +use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\Partitioning\Maintenance; use PhpMyAdmin\ResponseRenderer; @@ -39,9 +39,9 @@ final class AnalyzeController extends AbstractController try { Assert::stringNotEmpty($partitionName, __('The partition name must be a non-empty string.')); - $database = DatabaseName::fromValue($request->getParam('db')); - $table = TableName::fromValue($request->getParam('table')); - } catch (InvalidIdentifierName | InvalidArgumentException $exception) { + $database = DatabaseName::from($request->getParam('db')); + $table = TableName::from($request->getParam('table')); + } catch (InvalidIdentifier | InvalidArgumentException $exception) { $message = Message::error($exception->getMessage()); $this->response->addHTML($message->getDisplay()); diff --git a/libraries/classes/Controllers/Table/Partition/CheckController.php b/libraries/classes/Controllers/Table/Partition/CheckController.php index 9091770a79..b249388c68 100644 --- a/libraries/classes/Controllers/Table/Partition/CheckController.php +++ b/libraries/classes/Controllers/Table/Partition/CheckController.php @@ -5,11 +5,11 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table\Partition; use PhpMyAdmin\Controllers\AbstractController; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\InvalidIdentifierName; -use PhpMyAdmin\Dbal\TableName; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\ServerRequest; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\InvalidIdentifier; +use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\Partitioning\Maintenance; use PhpMyAdmin\ResponseRenderer; @@ -39,9 +39,9 @@ final class CheckController extends AbstractController try { Assert::stringNotEmpty($partitionName, __('The partition name must be a non-empty string.')); - $database = DatabaseName::fromValue($request->getParam('db')); - $table = TableName::fromValue($request->getParam('table')); - } catch (InvalidIdentifierName | InvalidArgumentException $exception) { + $database = DatabaseName::from($request->getParam('db')); + $table = TableName::from($request->getParam('table')); + } catch (InvalidIdentifier | InvalidArgumentException $exception) { $message = Message::error($exception->getMessage()); $this->response->addHTML($message->getDisplay()); diff --git a/libraries/classes/Controllers/Table/Partition/DropController.php b/libraries/classes/Controllers/Table/Partition/DropController.php index 7fd85ff653..055660ff69 100644 --- a/libraries/classes/Controllers/Table/Partition/DropController.php +++ b/libraries/classes/Controllers/Table/Partition/DropController.php @@ -5,11 +5,11 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table\Partition; use PhpMyAdmin\Controllers\AbstractController; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\InvalidIdentifierName; -use PhpMyAdmin\Dbal\TableName; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\ServerRequest; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\InvalidIdentifier; +use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\Partitioning\Maintenance; use PhpMyAdmin\ResponseRenderer; @@ -39,9 +39,9 @@ final class DropController extends AbstractController try { Assert::stringNotEmpty($partitionName, __('The partition name must be a non-empty string.')); - $database = DatabaseName::fromValue($request->getParam('db')); - $table = TableName::fromValue($request->getParam('table')); - } catch (InvalidIdentifierName | InvalidArgumentException $exception) { + $database = DatabaseName::from($request->getParam('db')); + $table = TableName::from($request->getParam('table')); + } catch (InvalidIdentifier | InvalidArgumentException $exception) { $message = Message::error($exception->getMessage()); $this->response->addHTML($message->getDisplay()); diff --git a/libraries/classes/Controllers/Table/Partition/OptimizeController.php b/libraries/classes/Controllers/Table/Partition/OptimizeController.php index d9c863c37a..89ccae44e1 100644 --- a/libraries/classes/Controllers/Table/Partition/OptimizeController.php +++ b/libraries/classes/Controllers/Table/Partition/OptimizeController.php @@ -5,11 +5,11 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table\Partition; use PhpMyAdmin\Controllers\AbstractController; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\InvalidIdentifierName; -use PhpMyAdmin\Dbal\TableName; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\ServerRequest; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\InvalidIdentifier; +use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\Partitioning\Maintenance; use PhpMyAdmin\ResponseRenderer; @@ -39,9 +39,9 @@ final class OptimizeController extends AbstractController try { Assert::stringNotEmpty($partitionName, __('The partition name must be a non-empty string.')); - $database = DatabaseName::fromValue($request->getParam('db')); - $table = TableName::fromValue($request->getParam('table')); - } catch (InvalidIdentifierName | InvalidArgumentException $exception) { + $database = DatabaseName::from($request->getParam('db')); + $table = TableName::from($request->getParam('table')); + } catch (InvalidIdentifier | InvalidArgumentException $exception) { $message = Message::error($exception->getMessage()); $this->response->addHTML($message->getDisplay()); diff --git a/libraries/classes/Controllers/Table/Partition/RebuildController.php b/libraries/classes/Controllers/Table/Partition/RebuildController.php index a73cca5c4d..cfa0090e55 100644 --- a/libraries/classes/Controllers/Table/Partition/RebuildController.php +++ b/libraries/classes/Controllers/Table/Partition/RebuildController.php @@ -5,11 +5,11 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table\Partition; use PhpMyAdmin\Controllers\AbstractController; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\InvalidIdentifierName; -use PhpMyAdmin\Dbal\TableName; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\ServerRequest; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\InvalidIdentifier; +use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\Partitioning\Maintenance; use PhpMyAdmin\ResponseRenderer; @@ -39,9 +39,9 @@ final class RebuildController extends AbstractController try { Assert::stringNotEmpty($partitionName, __('The partition name must be a non-empty string.')); - $database = DatabaseName::fromValue($request->getParam('db')); - $table = TableName::fromValue($request->getParam('table')); - } catch (InvalidIdentifierName | InvalidArgumentException $exception) { + $database = DatabaseName::from($request->getParam('db')); + $table = TableName::from($request->getParam('table')); + } catch (InvalidIdentifier | InvalidArgumentException $exception) { $message = Message::error($exception->getMessage()); $this->response->addHTML($message->getDisplay()); diff --git a/libraries/classes/Controllers/Table/Partition/RepairController.php b/libraries/classes/Controllers/Table/Partition/RepairController.php index eaaa4aa21d..e337527990 100644 --- a/libraries/classes/Controllers/Table/Partition/RepairController.php +++ b/libraries/classes/Controllers/Table/Partition/RepairController.php @@ -5,11 +5,11 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table\Partition; use PhpMyAdmin\Controllers\AbstractController; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\InvalidIdentifierName; -use PhpMyAdmin\Dbal\TableName; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\ServerRequest; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\InvalidIdentifier; +use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\Partitioning\Maintenance; use PhpMyAdmin\ResponseRenderer; @@ -39,9 +39,9 @@ final class RepairController extends AbstractController try { Assert::stringNotEmpty($partitionName, __('The partition name must be a non-empty string.')); - $database = DatabaseName::fromValue($request->getParam('db')); - $table = TableName::fromValue($request->getParam('table')); - } catch (InvalidIdentifierName | InvalidArgumentException $exception) { + $database = DatabaseName::from($request->getParam('db')); + $table = TableName::from($request->getParam('table')); + } catch (InvalidIdentifier | InvalidArgumentException $exception) { $message = Message::error($exception->getMessage()); $this->response->addHTML($message->getDisplay()); diff --git a/libraries/classes/Controllers/Table/Partition/TruncateController.php b/libraries/classes/Controllers/Table/Partition/TruncateController.php index 376609e460..710e34abc3 100644 --- a/libraries/classes/Controllers/Table/Partition/TruncateController.php +++ b/libraries/classes/Controllers/Table/Partition/TruncateController.php @@ -5,11 +5,11 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Table\Partition; use PhpMyAdmin\Controllers\AbstractController; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\InvalidIdentifierName; -use PhpMyAdmin\Dbal\TableName; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Http\ServerRequest; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\InvalidIdentifier; +use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\Partitioning\Maintenance; use PhpMyAdmin\ResponseRenderer; @@ -39,9 +39,9 @@ final class TruncateController extends AbstractController try { Assert::stringNotEmpty($partitionName, __('The partition name must be a non-empty string.')); - $database = DatabaseName::fromValue($request->getParam('db')); - $table = TableName::fromValue($request->getParam('table')); - } catch (InvalidIdentifierName | InvalidArgumentException $exception) { + $database = DatabaseName::from($request->getParam('db')); + $table = TableName::from($request->getParam('table')); + } catch (InvalidIdentifier | InvalidArgumentException $exception) { $message = Message::error($exception->getMessage()); $this->response->addHTML($message->getDisplay()); diff --git a/libraries/classes/Controllers/Table/PrivilegesController.php b/libraries/classes/Controllers/Table/PrivilegesController.php index 62f03b2148..c033a86b32 100644 --- a/libraries/classes/Controllers/Table/PrivilegesController.php +++ b/libraries/classes/Controllers/Table/PrivilegesController.php @@ -10,10 +10,10 @@ namespace PhpMyAdmin\Controllers\Table; use PhpMyAdmin\CheckUserPrivileges; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\InvalidIdentifierName; -use PhpMyAdmin\Dbal\TableName; use PhpMyAdmin\Http\ServerRequest; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\InvalidIdentifier; +use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Privileges; @@ -40,13 +40,13 @@ class PrivilegesController extends AbstractController public function __invoke(ServerRequest $request): void { try { - $db = DatabaseName::fromValue($request->getParam('db')); - $table = TableName::fromValue($request->getParam('table')); + $db = DatabaseName::from($request->getParam('db')); + $table = TableName::from($request->getParam('table')); if ($this->dbi->getLowerCaseNames() === 1) { - $db = DatabaseName::fromValue(mb_strtolower($db->getName())); - $table = TableName::fromValue(mb_strtolower($table->getName())); + $db = DatabaseName::from(mb_strtolower($db->getName())); + $table = TableName::from(mb_strtolower($table->getName())); } - } catch (InvalidIdentifierName $exception) { + } catch (InvalidIdentifier $exception) { $this->response->addHTML(Message::error($exception->getMessage())->getDisplay()); return; diff --git a/libraries/classes/Controllers/Transformation/WrapperController.php b/libraries/classes/Controllers/Transformation/WrapperController.php index 5df14a2250..9f6d7db825 100644 --- a/libraries/classes/Controllers/Transformation/WrapperController.php +++ b/libraries/classes/Controllers/Transformation/WrapperController.php @@ -8,11 +8,11 @@ use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\AbstractController; use PhpMyAdmin\Core; use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\InvalidIdentifierName; -use PhpMyAdmin\Dbal\TableName; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Http\ServerRequest; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\InvalidIdentifier; +use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Image\ImageWrapper; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; @@ -52,9 +52,9 @@ class WrapperController extends AbstractController $this->response->getHeader()->setIsTransformationWrapper(true); try { - $db = DatabaseName::fromValue($request->getParam('db')); - $table = TableName::fromValue($request->getParam('table')); - } catch (InvalidIdentifierName) { + $db = DatabaseName::from($request->getParam('db')); + $table = TableName::from($request->getParam('table')); + } catch (InvalidIdentifier) { return; } diff --git a/libraries/classes/CreateAddField.php b/libraries/classes/CreateAddField.php index deea126354..eed4c649ff 100644 --- a/libraries/classes/CreateAddField.php +++ b/libraries/classes/CreateAddField.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin; -use PhpMyAdmin\Dbal\DatabaseName; use PhpMyAdmin\Html\Generator; +use PhpMyAdmin\Identifiers\DatabaseName; use function count; use function implode; diff --git a/libraries/classes/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php index 2f4e81aa80..80dc82a039 100644 --- a/libraries/classes/DatabaseInterface.php +++ b/libraries/classes/DatabaseInterface.php @@ -7,7 +7,6 @@ namespace PhpMyAdmin; use PhpMyAdmin\Config\Settings\Server; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Dbal\Connection; -use PhpMyAdmin\Dbal\DatabaseName; use PhpMyAdmin\Dbal\DbalInterface; use PhpMyAdmin\Dbal\DbiExtension; use PhpMyAdmin\Dbal\DbiMysqli; @@ -15,6 +14,7 @@ use PhpMyAdmin\Dbal\ResultInterface; use PhpMyAdmin\Dbal\Statement; use PhpMyAdmin\Dbal\Warning; use PhpMyAdmin\Html\Generator; +use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Query\Cache; use PhpMyAdmin\Query\Compatibility; use PhpMyAdmin\Query\Generator as QueryGenerator; diff --git a/libraries/classes/Dbal/DbalInterface.php b/libraries/classes/Dbal/DbalInterface.php index e5fceb7472..5afcfb6062 100644 --- a/libraries/classes/Dbal/DbalInterface.php +++ b/libraries/classes/Dbal/DbalInterface.php @@ -8,6 +8,7 @@ use PhpMyAdmin\Config\Settings\Server; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\FieldMetadata; +use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\SystemDatabase; use PhpMyAdmin\Table; diff --git a/libraries/classes/Dbal/DbiExtension.php b/libraries/classes/Dbal/DbiExtension.php index 6fbaf25318..efabf2814a 100644 --- a/libraries/classes/Dbal/DbiExtension.php +++ b/libraries/classes/Dbal/DbiExtension.php @@ -8,6 +8,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Dbal; use PhpMyAdmin\Config\Settings\Server; +use PhpMyAdmin\Identifiers\DatabaseName; /** * Contract for every database extension supported by phpMyAdmin diff --git a/libraries/classes/Dbal/DbiMysqli.php b/libraries/classes/Dbal/DbiMysqli.php index 31826b232e..a996cc709d 100644 --- a/libraries/classes/Dbal/DbiMysqli.php +++ b/libraries/classes/Dbal/DbiMysqli.php @@ -11,6 +11,7 @@ use mysqli; use mysqli_sql_exception; use PhpMyAdmin\Config\Settings\Server; use PhpMyAdmin\DatabaseInterface; +use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Query\Utilities; use function __; diff --git a/libraries/classes/Dbal/InvalidIdentifierName.php b/libraries/classes/Dbal/InvalidIdentifierName.php deleted file mode 100644 index 9b5a683476..0000000000 --- a/libraries/classes/Dbal/InvalidIdentifierName.php +++ /dev/null @@ -1,11 +0,0 @@ -dbi->getTables($currentDb); $this->exportDatabase( - DatabaseName::fromValue($currentDb), + DatabaseName::from($currentDb), $tables, $whatStrucOrData, $tables, diff --git a/libraries/classes/Export/TemplateModel.php b/libraries/classes/Export/TemplateModel.php index f8e01dfdab..e743764bff 100644 --- a/libraries/classes/Export/TemplateModel.php +++ b/libraries/classes/Export/TemplateModel.php @@ -6,8 +6,8 @@ namespace PhpMyAdmin\Export; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\Connection; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\TableName; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Util; use function sprintf; diff --git a/libraries/classes/Dbal/DatabaseName.php b/libraries/classes/Identifiers/DatabaseName.php similarity index 83% rename from libraries/classes/Dbal/DatabaseName.php rename to libraries/classes/Identifiers/DatabaseName.php index 81fcd13511..5fc091af76 100644 --- a/libraries/classes/Dbal/DatabaseName.php +++ b/libraries/classes/Identifiers/DatabaseName.php @@ -2,14 +2,13 @@ declare(strict_types=1); -namespace PhpMyAdmin\Dbal; +namespace PhpMyAdmin\Identifiers; -use Stringable; use Webmozart\Assert\Assert; use Webmozart\Assert\InvalidArgumentException; /** @psalm-immutable */ -final class DatabaseName implements Stringable +final class DatabaseName implements Identifier { /** * @see https://dev.mysql.com/doc/refman/en/identifier-length.html @@ -44,13 +43,17 @@ final class DatabaseName implements Stringable $this->name = $name; } - /** @throws InvalidDatabaseName */ - public static function fromValue(mixed $name): self + /** + * @throws InvalidDatabaseName + * + * @psalm-assert non-empty-string $name + */ + public static function from(mixed $name): static { return new self($name); } - public static function tryFromValue(mixed $name): self|null + public static function tryFrom(mixed $name): static|null { try { return new self($name); diff --git a/libraries/classes/Identifiers/Identifier.php b/libraries/classes/Identifiers/Identifier.php new file mode 100644 index 0000000000..834970ccc8 --- /dev/null +++ b/libraries/classes/Identifiers/Identifier.php @@ -0,0 +1,31 @@ +name = $name; } - /** @throws InvalidTableName */ - public static function fromValue(mixed $name): self + /** + * @throws InvalidTableName + * + * @psalm-assert non-empty-string $name + */ + public static function from(mixed $name): static { return new self($name); } - public static function tryFromValue(mixed $name): self|null + public static function tryFrom(mixed $name): static|null { try { return new self($name); diff --git a/libraries/classes/Triggers/TriggerName.php b/libraries/classes/Identifiers/TriggerName.php similarity index 82% rename from libraries/classes/Triggers/TriggerName.php rename to libraries/classes/Identifiers/TriggerName.php index 7214c8b2cc..3ff063e682 100644 --- a/libraries/classes/Triggers/TriggerName.php +++ b/libraries/classes/Identifiers/TriggerName.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace PhpMyAdmin\Triggers; +namespace PhpMyAdmin\Identifiers; -use Stringable; use Webmozart\Assert\Assert; use Webmozart\Assert\InvalidArgumentException; -final class TriggerName implements Stringable +/** @psalm-immutable */ +final class TriggerName implements Identifier { /** * @see https://dev.mysql.com/doc/refman/en/identifier-length.html @@ -43,13 +43,17 @@ final class TriggerName implements Stringable $this->name = $name; } - /** @throws InvalidTriggerName */ - public static function fromValue(mixed $name): self + /** + * @throws InvalidTriggerName + * + * @psalm-assert non-empty-string $name + */ + public static function from(mixed $name): static { return new self($name); } - public static function tryFromValue(mixed $name): self|null + public static function tryFrom(mixed $name): static|null { try { return new self($name); diff --git a/libraries/classes/Operations.php b/libraries/classes/Operations.php index fffde44bcc..653f0bd0ab 100644 --- a/libraries/classes/Operations.php +++ b/libraries/classes/Operations.php @@ -7,8 +7,8 @@ namespace PhpMyAdmin; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Database\Events; use PhpMyAdmin\Database\Routines; -use PhpMyAdmin\Dbal\DatabaseName; use PhpMyAdmin\Engines\Innodb; +use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Partitioning\Partition; use PhpMyAdmin\Plugins\Export\ExportSql; use PhpMyAdmin\Triggers\Triggers; diff --git a/libraries/classes/Partitioning/Maintenance.php b/libraries/classes/Partitioning/Maintenance.php index 46e5ab8f93..f6f010cca2 100644 --- a/libraries/classes/Partitioning/Maintenance.php +++ b/libraries/classes/Partitioning/Maintenance.php @@ -5,8 +5,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Partitioning; use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\TableName; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Util; use function sprintf; diff --git a/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php b/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php index b10c987bf1..42ec45278d 100644 --- a/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php +++ b/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php @@ -7,7 +7,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema\Dia; -use PhpMyAdmin\Dbal\DatabaseName; +use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Plugins\Schema\ExportRelationSchema; use function in_array; diff --git a/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php b/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php index 4a2f76bb35..422e712af4 100644 --- a/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php +++ b/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php @@ -7,7 +7,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema\Eps; -use PhpMyAdmin\Dbal\DatabaseName; +use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Plugins\Schema\ExportRelationSchema; use PhpMyAdmin\Version; diff --git a/libraries/classes/Plugins/Schema/ExportRelationSchema.php b/libraries/classes/Plugins/Schema/ExportRelationSchema.php index e42692acdb..333a8e4297 100644 --- a/libraries/classes/Plugins/Schema/ExportRelationSchema.php +++ b/libraries/classes/Plugins/Schema/ExportRelationSchema.php @@ -9,7 +9,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema; use PhpMyAdmin\ConfigStorage\Relation; -use PhpMyAdmin\Dbal\DatabaseName; +use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Url; use PhpMyAdmin\Util; diff --git a/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php b/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php index 1d2de2b383..b7903bc0a2 100644 --- a/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php +++ b/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php @@ -7,7 +7,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema\Pdf; -use PhpMyAdmin\Dbal\DatabaseName; +use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Pdf as PdfLib; use PhpMyAdmin\Plugins\Schema\ExportRelationSchema; use PhpMyAdmin\Transformations; diff --git a/libraries/classes/Plugins/Schema/SchemaDia.php b/libraries/classes/Plugins/Schema/SchemaDia.php index fd9e63ae5e..858f49d3e3 100644 --- a/libraries/classes/Plugins/Schema/SchemaDia.php +++ b/libraries/classes/Plugins/Schema/SchemaDia.php @@ -7,7 +7,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema; -use PhpMyAdmin\Dbal\DatabaseName; +use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Plugins\Schema\Dia\DiaRelationSchema; use PhpMyAdmin\Plugins\SchemaPlugin; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; diff --git a/libraries/classes/Plugins/Schema/SchemaEps.php b/libraries/classes/Plugins/Schema/SchemaEps.php index f917beea1a..7200f8340b 100644 --- a/libraries/classes/Plugins/Schema/SchemaEps.php +++ b/libraries/classes/Plugins/Schema/SchemaEps.php @@ -7,7 +7,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema; -use PhpMyAdmin\Dbal\DatabaseName; +use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Plugins\Schema\Eps\EpsRelationSchema; use PhpMyAdmin\Plugins\SchemaPlugin; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; diff --git a/libraries/classes/Plugins/Schema/SchemaPdf.php b/libraries/classes/Plugins/Schema/SchemaPdf.php index 3fabb84321..4c886e4e7b 100644 --- a/libraries/classes/Plugins/Schema/SchemaPdf.php +++ b/libraries/classes/Plugins/Schema/SchemaPdf.php @@ -7,7 +7,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema; -use PhpMyAdmin\Dbal\DatabaseName; +use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Plugins\Schema\Pdf\PdfRelationSchema; use PhpMyAdmin\Plugins\SchemaPlugin; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; diff --git a/libraries/classes/Plugins/Schema/SchemaSvg.php b/libraries/classes/Plugins/Schema/SchemaSvg.php index 3073c7095d..948869335a 100644 --- a/libraries/classes/Plugins/Schema/SchemaSvg.php +++ b/libraries/classes/Plugins/Schema/SchemaSvg.php @@ -7,7 +7,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema; -use PhpMyAdmin\Dbal\DatabaseName; +use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Plugins\Schema\Svg\SvgRelationSchema; use PhpMyAdmin\Plugins\SchemaPlugin; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; diff --git a/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php b/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php index 207c00b7dd..8d0bf33003 100644 --- a/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php +++ b/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php @@ -7,7 +7,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema\Svg; -use PhpMyAdmin\Dbal\DatabaseName; +use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Plugins\Schema\ExportRelationSchema; use PhpMyAdmin\Version; diff --git a/libraries/classes/Plugins/SchemaPlugin.php b/libraries/classes/Plugins/SchemaPlugin.php index ddf3c454c7..c0f8ce6d70 100644 --- a/libraries/classes/Plugins/SchemaPlugin.php +++ b/libraries/classes/Plugins/SchemaPlugin.php @@ -7,7 +7,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins; -use PhpMyAdmin\Dbal\DatabaseName; +use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; use PhpMyAdmin\Properties\Plugins\PluginPropertyItem; diff --git a/libraries/classes/Server/Privileges.php b/libraries/classes/Server/Privileges.php index d82ab08946..bc8371379f 100644 --- a/libraries/classes/Server/Privileges.php +++ b/libraries/classes/Server/Privileges.php @@ -13,11 +13,11 @@ use PhpMyAdmin\ConfigStorage\RelationCleanup; use PhpMyAdmin\Database\Routines; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\Connection; -use PhpMyAdmin\Dbal\DatabaseName; use PhpMyAdmin\Dbal\ResultInterface; -use PhpMyAdmin\Dbal\TableName; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Html\MySQLDocumentation; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\Query\Compatibility; use PhpMyAdmin\ResponseRenderer; diff --git a/libraries/classes/Sql.php b/libraries/classes/Sql.php index 4ddee3c8e9..e2568786d7 100644 --- a/libraries/classes/Sql.php +++ b/libraries/classes/Sql.php @@ -7,13 +7,13 @@ namespace PhpMyAdmin; use PhpMyAdmin\ConfigStorage\Features\BookmarkFeature; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationCleanup; -use PhpMyAdmin\Dbal\DatabaseName; use PhpMyAdmin\Dbal\ResultInterface; use PhpMyAdmin\Display\DeleteLinkEnum; use PhpMyAdmin\Display\DisplayParts; use PhpMyAdmin\Display\Results as DisplayResults; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Html\MySQLDocumentation; +use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Query\Generator as QueryGenerator; use PhpMyAdmin\Query\Utilities; use PhpMyAdmin\SqlParser\Components\Expression; @@ -431,7 +431,7 @@ class Sql $bookmark = Bookmark::get( $this->dbi, $GLOBALS['cfg']['Server']['user'], - DatabaseName::fromValue($db), + DatabaseName::from($db), $table, 'label', false, diff --git a/libraries/classes/Table/Indexes.php b/libraries/classes/Table/Indexes.php index a8c5fe02d2..f09263b0f0 100644 --- a/libraries/classes/Table/Indexes.php +++ b/libraries/classes/Table/Indexes.php @@ -8,8 +8,8 @@ use PhpMyAdmin\Common; use PhpMyAdmin\Controllers\Table\StructureController; use PhpMyAdmin\Core; use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Dbal\DatabaseName; use PhpMyAdmin\Html\Generator; +use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Index; use PhpMyAdmin\Message; use PhpMyAdmin\Query\Compatibility; diff --git a/libraries/classes/Table/Maintenance.php b/libraries/classes/Table/Maintenance.php index 651f7f0088..9ee1cf2a06 100644 --- a/libraries/classes/Table/Maintenance.php +++ b/libraries/classes/Table/Maintenance.php @@ -5,9 +5,9 @@ declare(strict_types=1); namespace PhpMyAdmin\Table; use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\TableName; use PhpMyAdmin\Dbal\Warning; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Index; use PhpMyAdmin\Table\Maintenance\Message; use PhpMyAdmin\Util; diff --git a/libraries/classes/Tracking/TrackedTable.php b/libraries/classes/Tracking/TrackedTable.php index 2283481f21..7f661cef2d 100644 --- a/libraries/classes/Tracking/TrackedTable.php +++ b/libraries/classes/Tracking/TrackedTable.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tracking; -use PhpMyAdmin\Dbal\TableName; +use PhpMyAdmin\Identifiers\TableName; final class TrackedTable { diff --git a/libraries/classes/Tracking/TrackingChecker.php b/libraries/classes/Tracking/TrackingChecker.php index 7d6fb8cd13..9cfdf3f491 100644 --- a/libraries/classes/Tracking/TrackingChecker.php +++ b/libraries/classes/Tracking/TrackingChecker.php @@ -9,7 +9,7 @@ use PhpMyAdmin\ConfigStorage\Features\TrackingFeature; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Dbal\Connection; -use PhpMyAdmin\Dbal\TableName; +use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Util; use function array_column; @@ -76,7 +76,7 @@ class TrackingChecker $trackedTables = []; foreach ($this->dbi->queryAsControlUser($sqlQuery) as $row) { - $trackedTable = new TrackedTable(TableName::fromValue($row['table_name']), (bool) $row['tracking_active']); + $trackedTable = new TrackedTable(TableName::from($row['table_name']), (bool) $row['tracking_active']); $trackedTables[$trackedTable->name->getName()] = $trackedTable; } diff --git a/libraries/classes/Triggers/Trigger.php b/libraries/classes/Triggers/Trigger.php index 2dd53fa41c..ba09a12e6f 100644 --- a/libraries/classes/Triggers/Trigger.php +++ b/libraries/classes/Triggers/Trigger.php @@ -4,7 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Triggers; -use PhpMyAdmin\Dbal\TableName; +use PhpMyAdmin\Identifiers\TableName; +use PhpMyAdmin\Identifiers\TriggerName; use Webmozart\Assert\Assert; use Webmozart\Assert\InvalidArgumentException; @@ -31,7 +32,7 @@ final class Trigger $statement = $trigger['Statement'] ?? $trigger['ACTION_STATEMENT'] ?? null; $definer = $trigger['Definer'] ?? $trigger['DEFINER'] ?? null; Assert::string($name); - $name = TriggerName::tryFromValue($name); + $name = TriggerName::tryFrom($name); Assert::notNull($name); Assert::string($timing); $timing = Timing::tryFrom($timing); @@ -40,7 +41,7 @@ final class Trigger $event = Event::tryFrom($event); Assert::notNull($event); Assert::string($table); - $table = TableName::tryFromValue($table); + $table = TableName::tryFrom($table); Assert::notNull($table); Assert::string($statement); Assert::string($definer); diff --git a/libraries/classes/UserPreferences.php b/libraries/classes/UserPreferences.php index 62239ed8a8..2db649aa43 100644 --- a/libraries/classes/UserPreferences.php +++ b/libraries/classes/UserPreferences.php @@ -8,7 +8,7 @@ use PhpMyAdmin\Config\ConfigFile; use PhpMyAdmin\Config\Forms\User\UserFormList; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Dbal\Connection; -use PhpMyAdmin\Dbal\DatabaseName; +use PhpMyAdmin\Identifiers\DatabaseName; use function __; use function array_flip; diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 5525edb615..48caed7c31 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -2731,7 +2731,7 @@ parameters: path: libraries/classes/Database/CentralColumns.php - - message: "#^Parameter \\#1 \\$dbname of method PhpMyAdmin\\\\DatabaseInterface\\:\\:selectDb\\(\\) expects PhpMyAdmin\\\\Dbal\\\\DatabaseName\\|string, mixed given\\.$#" + message: "#^Parameter \\#1 \\$dbname of method PhpMyAdmin\\\\DatabaseInterface\\:\\:selectDb\\(\\) expects PhpMyAdmin\\\\Identifiers\\\\DatabaseName\\|string, mixed given\\.$#" count: 8 path: libraries/classes/Database/CentralColumns.php diff --git a/test/classes/BookmarkTest.php b/test/classes/BookmarkTest.php index 7eefa31ed2..8e5bbda7b9 100644 --- a/test/classes/BookmarkTest.php +++ b/test/classes/BookmarkTest.php @@ -7,8 +7,8 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Bookmark; use PhpMyAdmin\ConfigStorage\Features\BookmarkFeature; use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\TableName; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Tests\Stubs\DbiDummy; /** @covers \PhpMyAdmin\Bookmark */ @@ -49,7 +49,7 @@ class BookmarkTest extends AbstractTestCase ['id', 'dbase', 'user', 'label', 'query'], ); $actual = Bookmark::getList( - new BookmarkFeature(DatabaseName::fromValue('phpmyadmin'), TableName::fromValue('pma_bookmark')), + new BookmarkFeature(DatabaseName::from('phpmyadmin'), TableName::from('pma_bookmark')), $GLOBALS['dbi'], $GLOBALS['cfg']['Server']['user'], 'sakila', @@ -68,7 +68,7 @@ class BookmarkTest extends AbstractTestCase Bookmark::get( $GLOBALS['dbi'], $GLOBALS['cfg']['Server']['user'], - DatabaseName::fromValue('phpmyadmin'), + DatabaseName::from('phpmyadmin'), '1', ), ); diff --git a/test/classes/ConfigStorage/RelationParametersTest.php b/test/classes/ConfigStorage/RelationParametersTest.php index 089ea0fec8..f23640b7c1 100644 --- a/test/classes/ConfigStorage/RelationParametersTest.php +++ b/test/classes/ConfigStorage/RelationParametersTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\ConfigStorage; use PhpMyAdmin\ConfigStorage\RelationParameters; -use PhpMyAdmin\Dbal\DatabaseName; +use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Version; use PHPUnit\Framework\TestCase; diff --git a/test/classes/ConfigStorage/UserGroupsTest.php b/test/classes/ConfigStorage/UserGroupsTest.php index fe502ace4c..8984253fef 100644 --- a/test/classes/ConfigStorage/UserGroupsTest.php +++ b/test/classes/ConfigStorage/UserGroupsTest.php @@ -8,9 +8,9 @@ use Generator; use PhpMyAdmin\ConfigStorage\Features\ConfigurableMenusFeature; use PhpMyAdmin\ConfigStorage\UserGroups; use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Dbal\DatabaseName; use PhpMyAdmin\Dbal\ResultInterface; -use PhpMyAdmin\Dbal\TableName; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DbiDummy; use PhpMyAdmin\Tests\Stubs\DummyResult; @@ -33,9 +33,9 @@ class UserGroupsTest extends AbstractTestCase $GLOBALS['table'] = ''; $this->configurableMenusFeature = new ConfigurableMenusFeature( - DatabaseName::fromValue('pmadb'), - TableName::fromValue('usergroups'), - TableName::fromValue('users'), + DatabaseName::from('pmadb'), + TableName::from('usergroups'), + TableName::from('users'), ); } diff --git a/test/classes/ExportTest.php b/test/classes/ExportTest.php index de3c2b2786..5af344e80c 100644 --- a/test/classes/ExportTest.php +++ b/test/classes/ExportTest.php @@ -5,8 +5,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests; use PhpMyAdmin\ConfigStorage\Relation; -use PhpMyAdmin\Dbal\DatabaseName; use PhpMyAdmin\Export; +use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Plugins\Export\ExportPhparray; use PhpMyAdmin\Plugins\Export\ExportSql; use PhpMyAdmin\Transformations; @@ -115,7 +115,7 @@ class ExportTest extends AbstractTestCase $export = new Export($dbi); $export->exportDatabase( - DatabaseName::fromValue('test_db'), + DatabaseName::from('test_db'), ['test_table'], 'structure_and_data', ['test_table'], diff --git a/test/classes/Dbal/DatabaseNameTest.php b/test/classes/Identifiers/DatabaseNameTest.php similarity index 81% rename from test/classes/Dbal/DatabaseNameTest.php rename to test/classes/Identifiers/DatabaseNameTest.php index 5fc7da025c..09139a437c 100644 --- a/test/classes/Dbal/DatabaseNameTest.php +++ b/test/classes/Identifiers/DatabaseNameTest.php @@ -2,24 +2,24 @@ declare(strict_types=1); -namespace PhpMyAdmin\Tests\Dbal; +namespace PhpMyAdmin\Tests\Identifiers; -use PhpMyAdmin\Dbal\DatabaseName; -use PhpMyAdmin\Dbal\InvalidDatabaseName; +use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Identifiers\InvalidDatabaseName; use PHPUnit\Framework\TestCase; use function str_repeat; /** - * @covers \PhpMyAdmin\Dbal\DatabaseName - * @covers \PhpMyAdmin\Dbal\InvalidDatabaseName + * @covers \PhpMyAdmin\Identifiers\DatabaseName + * @covers \PhpMyAdmin\Identifiers\InvalidDatabaseName */ class DatabaseNameTest extends TestCase { /** @dataProvider providerForTestValidNames */ public function testValidName(string $validName): void { - $name = DatabaseName::fromValue($validName); + $name = DatabaseName::from($validName); $this->assertEquals($validName, $name->getName()); $this->assertEquals($validName, (string) $name); } @@ -27,7 +27,7 @@ class DatabaseNameTest extends TestCase /** @dataProvider providerForTestValidNames */ public function testTryFromValueWithValidName(string $validName): void { - $name = DatabaseName::tryFromValue($validName); + $name = DatabaseName::tryFrom($validName); $this->assertNotNull($name); $this->assertEquals($validName, $name->getName()); $this->assertEquals($validName, (string) $name); @@ -44,10 +44,10 @@ class DatabaseNameTest extends TestCase /** @dataProvider providerForTestInvalidNames */ public function testInvalidNames(mixed $name, string $exceptionMessage): void { - $this->assertNull(DatabaseName::tryFromValue($name)); + $this->assertNull(DatabaseName::tryFrom($name)); $this->expectException(InvalidDatabaseName::class); $this->expectExceptionMessage($exceptionMessage); - DatabaseName::fromValue($name); + DatabaseName::from($name); } /** diff --git a/test/classes/Dbal/TableNameTest.php b/test/classes/Identifiers/TableNameTest.php similarity index 82% rename from test/classes/Dbal/TableNameTest.php rename to test/classes/Identifiers/TableNameTest.php index c7886f8e8a..0b1ff46116 100644 --- a/test/classes/Dbal/TableNameTest.php +++ b/test/classes/Identifiers/TableNameTest.php @@ -2,24 +2,24 @@ declare(strict_types=1); -namespace PhpMyAdmin\Tests\Dbal; +namespace PhpMyAdmin\Tests\Identifiers; -use PhpMyAdmin\Dbal\InvalidTableName; -use PhpMyAdmin\Dbal\TableName; +use PhpMyAdmin\Identifiers\InvalidTableName; +use PhpMyAdmin\Identifiers\TableName; use PHPUnit\Framework\TestCase; use function str_repeat; /** - * @covers \PhpMyAdmin\Dbal\TableName - * @covers \PhpMyAdmin\Dbal\InvalidTableName + * @covers \PhpMyAdmin\Identifiers\TableName + * @covers \PhpMyAdmin\Identifiers\InvalidTableName */ class TableNameTest extends TestCase { /** @dataProvider providerForTestValidNames */ public function testValidName(string $validName): void { - $name = TableName::fromValue($validName); + $name = TableName::from($validName); $this->assertEquals($validName, $name->getName()); $this->assertEquals($validName, (string) $name); } @@ -27,7 +27,7 @@ class TableNameTest extends TestCase /** @dataProvider providerForTestValidNames */ public function testTryFromValueValidName(string $validName): void { - $name = TableName::tryFromValue($validName); + $name = TableName::tryFrom($validName); $this->assertNotNull($name); $this->assertEquals($validName, $name->getName()); $this->assertEquals($validName, (string) $name); @@ -44,10 +44,10 @@ class TableNameTest extends TestCase /** @dataProvider providerForTestInvalidNames */ public function testInvalidNames(mixed $name, string $exceptionMessage): void { - $this->assertNull(TableName::tryFromValue($name)); + $this->assertNull(TableName::tryFrom($name)); $this->expectException(InvalidTableName::class); $this->expectExceptionMessage($exceptionMessage); - TableName::fromValue($name); + TableName::from($name); } /** diff --git a/test/classes/Triggers/TriggerNameTest.php b/test/classes/Identifiers/TriggerNameTest.php similarity index 81% rename from test/classes/Triggers/TriggerNameTest.php rename to test/classes/Identifiers/TriggerNameTest.php index b50c798625..6d44e60d80 100644 --- a/test/classes/Triggers/TriggerNameTest.php +++ b/test/classes/Identifiers/TriggerNameTest.php @@ -2,24 +2,24 @@ declare(strict_types=1); -namespace PhpMyAdmin\Tests\Triggers; +namespace PhpMyAdmin\Tests\Identifiers; -use PhpMyAdmin\Triggers\InvalidTriggerName; -use PhpMyAdmin\Triggers\TriggerName; +use PhpMyAdmin\Identifiers\InvalidTriggerName; +use PhpMyAdmin\Identifiers\TriggerName; use PHPUnit\Framework\TestCase; use function str_repeat; /** - * @covers \PhpMyAdmin\Triggers\InvalidTriggerName - * @covers \PhpMyAdmin\Triggers\TriggerName + * @covers \PhpMyAdmin\Identifiers\InvalidTriggerName + * @covers \PhpMyAdmin\Identifiers\TriggerName */ final class TriggerNameTest extends TestCase { /** @dataProvider providerForTestValidNames */ public function testValidName(string $validName): void { - $name = TriggerName::fromValue($validName); + $name = TriggerName::from($validName); $this->assertEquals($validName, $name->getName()); $this->assertEquals($validName, (string) $name); } @@ -27,7 +27,7 @@ final class TriggerNameTest extends TestCase /** @dataProvider providerForTestValidNames */ public function testTryFromValueValidName(string $validName): void { - $name = TriggerName::tryFromValue($validName); + $name = TriggerName::tryFrom($validName); $this->assertNotNull($name); $this->assertEquals($validName, $name->getName()); $this->assertEquals($validName, (string) $name); @@ -44,10 +44,10 @@ final class TriggerNameTest extends TestCase /** @dataProvider providerForTestInvalidNames */ public function testInvalidNames(mixed $name, string $exceptionMessage): void { - $this->assertNull(TriggerName::tryFromValue($name)); + $this->assertNull(TriggerName::tryFrom($name)); $this->expectException(InvalidTriggerName::class); $this->expectExceptionMessage($exceptionMessage); - TriggerName::fromValue($name); + TriggerName::from($name); } /** diff --git a/test/classes/Plugins/Schema/DiaRelationSchemaTest.php b/test/classes/Plugins/Schema/DiaRelationSchemaTest.php index 4043e9f0de..73e836e3b7 100644 --- a/test/classes/Plugins/Schema/DiaRelationSchemaTest.php +++ b/test/classes/Plugins/Schema/DiaRelationSchemaTest.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Plugins\Schema; -use PhpMyAdmin\Dbal\DatabaseName; +use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Plugins\Schema\Dia\DiaRelationSchema; use PhpMyAdmin\Tests\AbstractTestCase; @@ -41,7 +41,7 @@ class DiaRelationSchemaTest extends AbstractTestCase $GLOBALS['db'] = 'test_db'; $GLOBALS['cfg']['Server']['DisableIS'] = true; - $this->object = new DiaRelationSchema(DatabaseName::fromValue('test_db')); + $this->object = new DiaRelationSchema(DatabaseName::from('test_db')); } /** diff --git a/test/classes/Plugins/Schema/EpsRelationSchemaTest.php b/test/classes/Plugins/Schema/EpsRelationSchemaTest.php index 39652abcdd..1b253ce165 100644 --- a/test/classes/Plugins/Schema/EpsRelationSchemaTest.php +++ b/test/classes/Plugins/Schema/EpsRelationSchemaTest.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Plugins\Schema; -use PhpMyAdmin\Dbal\DatabaseName; +use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Plugins\Schema\Eps\EpsRelationSchema; use PhpMyAdmin\Tests\AbstractTestCase; @@ -39,7 +39,7 @@ class EpsRelationSchemaTest extends AbstractTestCase $GLOBALS['db'] = 'test_db'; $GLOBALS['cfg']['Server']['DisableIS'] = true; - $this->object = new EpsRelationSchema(DatabaseName::fromValue('test_db')); + $this->object = new EpsRelationSchema(DatabaseName::from('test_db')); } /** diff --git a/test/classes/Plugins/Schema/ExportRelationSchemaTest.php b/test/classes/Plugins/Schema/ExportRelationSchemaTest.php index 1071cbd673..efa7b93ccd 100644 --- a/test/classes/Plugins/Schema/ExportRelationSchemaTest.php +++ b/test/classes/Plugins/Schema/ExportRelationSchemaTest.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Plugins\Schema; -use PhpMyAdmin\Dbal\DatabaseName; +use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Plugins\Schema\ExportRelationSchema; use PhpMyAdmin\Tests\AbstractTestCase; @@ -24,7 +24,7 @@ class ExportRelationSchemaTest extends AbstractTestCase $GLOBALS['dbi'] = $this->createDatabaseInterface(); $_REQUEST['page_number'] = 33; - $this->object = new ExportRelationSchema(DatabaseName::fromValue('test_db'), null); + $this->object = new ExportRelationSchema(DatabaseName::from('test_db'), null); } /** diff --git a/test/classes/Plugins/Schema/PdfRelationSchemaTest.php b/test/classes/Plugins/Schema/PdfRelationSchemaTest.php index 5c48285935..3ffe771257 100644 --- a/test/classes/Plugins/Schema/PdfRelationSchemaTest.php +++ b/test/classes/Plugins/Schema/PdfRelationSchemaTest.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Plugins\Schema; -use PhpMyAdmin\Dbal\DatabaseName; +use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Plugins\Schema\Pdf\PdfRelationSchema; use PhpMyAdmin\Tests\AbstractTestCase; @@ -42,7 +42,7 @@ class PdfRelationSchemaTest extends AbstractTestCase $GLOBALS['db'] = 'test_db'; $GLOBALS['cfg']['Server']['DisableIS'] = true; - $this->object = new PdfRelationSchema(DatabaseName::fromValue('test_db')); + $this->object = new PdfRelationSchema(DatabaseName::from('test_db')); } /** diff --git a/test/classes/Plugins/Schema/SvgRelationSchemaTest.php b/test/classes/Plugins/Schema/SvgRelationSchemaTest.php index da12583985..23dc55f354 100644 --- a/test/classes/Plugins/Schema/SvgRelationSchemaTest.php +++ b/test/classes/Plugins/Schema/SvgRelationSchemaTest.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Plugins\Schema; -use PhpMyAdmin\Dbal\DatabaseName; +use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Plugins\Schema\Svg\SvgRelationSchema; use PhpMyAdmin\Tests\AbstractTestCase; @@ -44,7 +44,7 @@ class SvgRelationSchemaTest extends AbstractTestCase $GLOBALS['text_dir'] = 'en'; $GLOBALS['cfg']['Server']['DisableIS'] = true; - $this->object = new SvgRelationSchema(DatabaseName::fromValue('test_db')); + $this->object = new SvgRelationSchema(DatabaseName::from('test_db')); } /** diff --git a/test/classes/Stubs/DbiDummy.php b/test/classes/Stubs/DbiDummy.php index d0555cbec3..090caddd8f 100644 --- a/test/classes/Stubs/DbiDummy.php +++ b/test/classes/Stubs/DbiDummy.php @@ -13,11 +13,11 @@ namespace PhpMyAdmin\Tests\Stubs; use PhpMyAdmin\Config\Settings\Server; use PhpMyAdmin\Dbal\Connection; -use PhpMyAdmin\Dbal\DatabaseName; use PhpMyAdmin\Dbal\DbiExtension; use PhpMyAdmin\Dbal\ResultInterface; use PhpMyAdmin\Dbal\Statement; use PhpMyAdmin\FieldMetadata; +use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Tests\FieldHelper; use PHPUnit\Framework\Assert; use stdClass; diff --git a/test/classes/Tracking/TrackingCheckerTest.php b/test/classes/Tracking/TrackingCheckerTest.php index 1935ff9595..3ba459ad67 100644 --- a/test/classes/Tracking/TrackingCheckerTest.php +++ b/test/classes/Tracking/TrackingCheckerTest.php @@ -7,7 +7,7 @@ namespace PhpMyAdmin\Tests\Tracking; use PhpMyAdmin\Cache; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationParameters; -use PhpMyAdmin\Dbal\TableName; +use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tracking\TrackedTable; use PhpMyAdmin\Tracking\Tracker; @@ -55,8 +55,8 @@ class TrackingCheckerTest extends AbstractTestCase Tracker::enable(); $expectation = [ - 0 => new TrackedTable(TableName::fromValue('0'), true), - 'actor' => new TrackedTable(TableName::fromValue('actor'), false), + 0 => new TrackedTable(TableName::from('0'), true), + 'actor' => new TrackedTable(TableName::from('actor'), false), ]; $actual = $this->trackingChecker->getTrackedTables('dummyDb');