Use TableName instead of string

kamil-tekiela · kamil-tekiela · commit 67cc2be2a01a · 2023-03-17T22:36:25.000Z
Signed-off-by: Kamil Tekiela &lt;tekiela246@gmail.com&gt;
diff --git a/libraries/classes/Tracking/TrackedTable.php b/libraries/classes/Tracking/TrackedTable.php
@@ -4,9 +4,11 @@
 
 namespace PhpMyAdmin\Tracking;
 
+use PhpMyAdmin\Dbal\TableName;
+
 final class TrackedTable
 {
-    public function __construct(public readonly string $name, public readonly bool $active)
+    public function __construct(public readonly TableName $name, public readonly bool $active)
     {
     }
 }
diff --git a/libraries/classes/Tracking/TrackingChecker.php b/libraries/classes/Tracking/TrackingChecker.php
@@ -9,6 +9,7 @@
 use PhpMyAdmin\ConfigStorage\Relation;
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Dbal\Connection;
+use PhpMyAdmin\Dbal\TableName;
 use PhpMyAdmin\Util;
 
 use function array_column;
@@ -31,7 +32,7 @@ public function __construct(
      * Get a list of untracked tables.
      * Deactivated tracked tables are not included in the list.
      *
-     * @return array<int, string>
+     * @return array<int, string|TableName>
      */
     public function getUntrackedTableNames(string $dbName): array
     {
@@ -75,8 +76,8 @@ public function getTrackedTables(string $dbName): array
 
         $trackedTables = [];
         foreach ($this->dbi->queryAsControlUser($sqlQuery) as $row) {
-            $trackedTable = new TrackedTable((string) $row['table_name'], (bool) $row['tracking_active']);
-            $trackedTables[$trackedTable->name] = $trackedTable;
+            $trackedTable = new TrackedTable(TableName::fromValue($row['table_name']), (bool) $row['tracking_active']);
+            $trackedTables[$trackedTable->name->getName()] = $trackedTable;
         }
 
         return $trackedTables;
diff --git a/test/classes/Tracking/TrackingCheckerTest.php b/test/classes/Tracking/TrackingCheckerTest.php
@@ -7,6 +7,7 @@
 use PhpMyAdmin\Cache;
 use PhpMyAdmin\ConfigStorage\Relation;
 use PhpMyAdmin\ConfigStorage\RelationParameters;
+use PhpMyAdmin\Dbal\TableName;
 use PhpMyAdmin\Tests\AbstractTestCase;
 use PhpMyAdmin\Tracking\TrackedTable;
 use PhpMyAdmin\Tracking\Tracker;
@@ -51,8 +52,8 @@ public function testGetTrackedTables(): void
         Tracker::enable();
 
         $expectation = [
-            0 => new TrackedTable('0', true),
-            'actor' => new TrackedTable('actor', false),
+            0 => new TrackedTable(TableName::fromValue('0'), true),
+            'actor' => new TrackedTable(TableName::fromValue('actor'), false),
         ];
 
         $actual = $this->trackingChecker->getTrackedTables('dummyDb');

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,11 @@`
`4`	`4`
`5`	`5`	`namespace PhpMyAdmin\Tracking;`
`6`	`6`
	`7`	`+use PhpMyAdmin\Dbal\TableName;`
	`8`	`+`
`7`	`9`	`final class TrackedTable`
`8`	`10`	`{`
`9`		`- public function __construct(public readonly string $name, public readonly bool $active)`
	`11`	`+ public function __construct(public readonly TableName $name, public readonly bool $active)`
`10`	`12`	`{`
`11`	`13`	`}`
`12`	`14`	`}`