Skip to content

Commit 090da99

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #18477 from MauricioFauth/identifier-name
Create the `Identifiers\Identifier` interface
2 parents b2555a4 + 1be42d1 commit 090da99

97 files changed

Lines changed: 354 additions & 311 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎libraries/classes/Bookmark.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use PhpMyAdmin\ConfigStorage\Features\BookmarkFeature;
1111
use PhpMyAdmin\ConfigStorage\Relation;
1212
use PhpMyAdmin\Dbal\Connection;
13-
use PhpMyAdmin\Dbal\DatabaseName;
13+
use PhpMyAdmin\Identifiers\DatabaseName;
1414

1515
use function count;
1616
use function preg_match_all;

‎libraries/classes/Common.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
use PhpMyAdmin\Config\Settings\Server;
99
use PhpMyAdmin\ConfigStorage\Relation;
1010
use PhpMyAdmin\Dbal\Connection;
11-
use PhpMyAdmin\Dbal\DatabaseName;
12-
use PhpMyAdmin\Dbal\TableName;
1311
use PhpMyAdmin\Exceptions\AuthenticationPluginException;
1412
use PhpMyAdmin\Exceptions\ConfigException;
1513
use PhpMyAdmin\Exceptions\MissingExtensionException;
1614
use PhpMyAdmin\Exceptions\SessionHandlerException;
1715
use PhpMyAdmin\Http\Factory\ServerRequestFactory;
1816
use PhpMyAdmin\Http\ServerRequest;
17+
use PhpMyAdmin\Identifiers\DatabaseName;
18+
use PhpMyAdmin\Identifiers\TableName;
1919
use PhpMyAdmin\Plugins\AuthenticationPlugin;
2020
use PhpMyAdmin\Plugins\AuthenticationPluginFactory;
2121
use PhpMyAdmin\SqlParser\Lexer;
@@ -482,8 +482,8 @@ private static function setDatabaseAndTableFromRequest(ContainerInterface $conta
482482
{
483483
$GLOBALS['urlParams'] ??= null;
484484

485-
$db = DatabaseName::tryFromValue($request->getParam('db'));
486-
$table = TableName::tryFromValue($request->getParam('table'));
485+
$db = DatabaseName::tryFrom($request->getParam('db'));
486+
$table = TableName::tryFrom($request->getParam('table'));
487487

488488
$GLOBALS['db'] = $db?->getName() ?? '';
489489
$GLOBALS['table'] = $table?->getName() ?? '';

‎libraries/classes/ConfigStorage/Features/BookmarkFeature.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
namespace PhpMyAdmin\ConfigStorage\Features;
66

7-
use PhpMyAdmin\Dbal\DatabaseName;
8-
use PhpMyAdmin\Dbal\TableName;
7+
use PhpMyAdmin\Identifiers\DatabaseName;
8+
use PhpMyAdmin\Identifiers\TableName;
99

1010
/** @psalm-immutable */
1111
final class BookmarkFeature

‎libraries/classes/ConfigStorage/Features/BrowserTransformationFeature.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
namespace PhpMyAdmin\ConfigStorage\Features;
66

7-
use PhpMyAdmin\Dbal\DatabaseName;
8-
use PhpMyAdmin\Dbal\TableName;
7+
use PhpMyAdmin\Identifiers\DatabaseName;
8+
use PhpMyAdmin\Identifiers\TableName;
99

1010
/** @psalm-immutable */
1111
final class BrowserTransformationFeature

‎libraries/classes/ConfigStorage/Features/CentralColumnsFeature.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
namespace PhpMyAdmin\ConfigStorage\Features;
66

7-
use PhpMyAdmin\Dbal\DatabaseName;
8-
use PhpMyAdmin\Dbal\TableName;
7+
use PhpMyAdmin\Identifiers\DatabaseName;
8+
use PhpMyAdmin\Identifiers\TableName;
99

1010
/** @psalm-immutable */
1111
final class CentralColumnsFeature

‎libraries/classes/ConfigStorage/Features/ColumnCommentsFeature.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
namespace PhpMyAdmin\ConfigStorage\Features;
66

7-
use PhpMyAdmin\Dbal\DatabaseName;
8-
use PhpMyAdmin\Dbal\TableName;
7+
use PhpMyAdmin\Identifiers\DatabaseName;
8+
use PhpMyAdmin\Identifiers\TableName;
99

1010
/** @psalm-immutable */
1111
final class ColumnCommentsFeature

‎libraries/classes/ConfigStorage/Features/ConfigurableMenusFeature.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
namespace PhpMyAdmin\ConfigStorage\Features;
66

7-
use PhpMyAdmin\Dbal\DatabaseName;
8-
use PhpMyAdmin\Dbal\TableName;
7+
use PhpMyAdmin\Identifiers\DatabaseName;
8+
use PhpMyAdmin\Identifiers\TableName;
99

1010
/** @psalm-immutable */
1111
final class ConfigurableMenusFeature

‎libraries/classes/ConfigStorage/Features/DatabaseDesignerSettingsFeature.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
namespace PhpMyAdmin\ConfigStorage\Features;
66

7-
use PhpMyAdmin\Dbal\DatabaseName;
8-
use PhpMyAdmin\Dbal\TableName;
7+
use PhpMyAdmin\Identifiers\DatabaseName;
8+
use PhpMyAdmin\Identifiers\TableName;
99

1010
/** @psalm-immutable */
1111
final class DatabaseDesignerSettingsFeature

‎libraries/classes/ConfigStorage/Features/DisplayFeature.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
namespace PhpMyAdmin\ConfigStorage\Features;
66

7-
use PhpMyAdmin\Dbal\DatabaseName;
8-
use PhpMyAdmin\Dbal\TableName;
7+
use PhpMyAdmin\Identifiers\DatabaseName;
8+
use PhpMyAdmin\Identifiers\TableName;
99

1010
/** @psalm-immutable */
1111
final class DisplayFeature

‎libraries/classes/ConfigStorage/Features/ExportTemplatesFeature.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
namespace PhpMyAdmin\ConfigStorage\Features;
66

7-
use PhpMyAdmin\Dbal\DatabaseName;
8-
use PhpMyAdmin\Dbal\TableName;
7+
use PhpMyAdmin\Identifiers\DatabaseName;
8+
use PhpMyAdmin\Identifiers\TableName;
99

1010
/** @psalm-immutable */
1111
final class ExportTemplatesFeature

0 commit comments

Comments
 (0)