Change Trigger::$table type to use TableName object

MauricioFauth · MauricioFauth · commit 1582b695916e · 2023-05-27T16:17:21.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/libraries/classes/Triggers/Trigger.php b/libraries/classes/Triggers/Trigger.php
@@ -4,6 +4,7 @@
 
 namespace PhpMyAdmin\Triggers;
 
+use PhpMyAdmin\Dbal\TableName;
 use Webmozart\Assert\Assert;
 use Webmozart\Assert\InvalidArgumentException;
 
@@ -13,7 +14,7 @@ public function __construct(
         public readonly string $name,
         public readonly Timing $timing,
         public readonly Event $event,
-        public readonly string $table,
+        public readonly TableName $table,
         public readonly string $statement,
         public readonly string $definer,
     ) {
@@ -37,6 +38,8 @@ public static function tryFromArray(array $trigger): self|null
             $event = Event::tryFrom($event);
             Assert::notNull($event);
             Assert::string($table);
+            $table = TableName::tryFromValue($table);
+            Assert::notNull($table);
             Assert::string($statement);
             Assert::string($definer);
 
diff --git a/libraries/classes/Triggers/Triggers.php b/libraries/classes/Triggers/Triggers.php
@@ -522,7 +522,7 @@ public static function getDetails(
 
             $oneResult = [];
             $oneResult['name'] = $newTrigger->name;
-            $oneResult['table'] = $newTrigger->table;
+            $oneResult['table'] = $newTrigger->table->getName();
             $oneResult['action_timing'] = $newTrigger->timing->value;
             $oneResult['event_manipulation'] = $newTrigger->event->value;
             $oneResult['definition'] = $newTrigger->statement;
diff --git a/test/classes/Triggers/TriggerTest.php b/test/classes/Triggers/TriggerTest.php
@@ -29,7 +29,7 @@ public function testTryFromArrayWithValidValues(array $trigger): void
         $this->assertSame('trigger_name', $actual->name);
         $this->assertSame(Timing::Before, $actual->timing);
         $this->assertSame(Event::Update, $actual->event);
-        $this->assertSame('test_table', $actual->table);
+        $this->assertSame('test_table', $actual->table->getName());
         $this->assertSame('BEGIN END', $actual->statement);
         $this->assertSame('definer@localhost', $actual->definer);
     }

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function testTryFromArrayWithValidValues(array $trigger): void`
`29`	`29`	`$this->assertSame('trigger_name', $actual->name);`
`30`	`30`	`$this->assertSame(Timing::Before, $actual->timing);`
`31`	`31`	`$this->assertSame(Event::Update, $actual->event);`
`32`		`- $this->assertSame('test_table', $actual->table);`
	`32`	`+ $this->assertSame('test_table', $actual->table->getName());`
`33`	`33`	`$this->assertSame('BEGIN END', $actual->statement);`
`34`	`34`	`$this->assertSame('definer@localhost', $actual->definer);`
`35`	`35`	`}`