Merge pull request #18846 from kamil-tekiela/favorites-jsonserializable

MauricioFauth · web-flow · commit 17ac06680416 · 2023-12-14T16:44:43.000-03:00
Implement JsonSerializable
diff --git a/src/Controllers/Database/Structure/FavoriteTableController.php b/src/Controllers/Database/Structure/FavoriteTableController.php
@@ -21,7 +21,6 @@
 use PhpMyAdmin\Util;
 
 use function __;
-use function array_map;
 use function count;
 use function json_decode;
 use function json_encode;
@@ -114,10 +113,7 @@ public function __invoke(ServerRequest $request): void
             }
         }
 
-        $favoriteTables[$user] = array_map(
-            static fn (RecentFavoriteTable $table) => $table->toArray(),
-            $favoriteInstance->getTables(),
-        );
+        $favoriteTables[$user] = $favoriteInstance->getTables();
 
         $json = [];
         $json['changes'] = $changes;
@@ -174,10 +170,7 @@ private function synchronizeFavoriteTables(
             }
         }
 
-        $favoriteTables[$user] = array_map(
-            static fn (RecentFavoriteTable $table) => $table->toArray(),
-            $favoriteInstance->getTables(),
-        );
+        $favoriteTables[$user] = $favoriteInstance->getTables();
 
         // Set flag when localStorage and pmadb(if present) are in sync.
         $_SESSION['tmpval']['favorites_synced'][$GLOBALS['server']] = true;
diff --git a/src/Favorites/RecentFavoriteTable.php b/src/Favorites/RecentFavoriteTable.php
@@ -4,10 +4,11 @@
 
 namespace PhpMyAdmin\Favorites;
 
+use JsonSerializable;
 use PhpMyAdmin\Identifiers\DatabaseName;
 use PhpMyAdmin\Identifiers\TableName;
 
-final class RecentFavoriteTable
+final class RecentFavoriteTable implements JsonSerializable
 {
     public function __construct(public readonly DatabaseName $db, public readonly TableName $table)
     {
@@ -24,4 +25,12 @@ public function toArray(): array
     {
         return ['db' => $this->db->getName(), 'table' => $this->table->getName()];
     }
+
+    public function jsonSerialize(): mixed
+    {
+        return [
+            'db' => $this->db->getName(),
+            'table' => $this->table->getName(),
+        ];
+    }
 }
diff --git a/src/Favorites/RecentFavoriteTables.php b/src/Favorites/RecentFavoriteTables.php
@@ -203,14 +203,14 @@ public function getHtmlList(): string
             $tables = [];
             foreach ($this->tables as $table) {
                 $removeParameters = [
-                    'db' => $table->db,
+                    'db' => $table->db->getName(),
+                    'favorite_table' => $table->table->getName(),
                     'ajax_request' => true,
-                    'favorite_table' => $table->table,
                     'remove_favorite' => true,
                 ];
                 $tableParameters = [
-                    'db' => $table->db,
-                    'table' => $table->table,
+                    'db' => $table->db->getName(),
+                    'table' => $table->table->getName(),
                     'md5' => md5($table->db . '.' . $table->table),
                 ];
 

Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,11 @@`
`4`	`4`
`5`	`5`	`namespace PhpMyAdmin\Favorites;`
`6`	`6`
	`7`	`+use JsonSerializable;`
`7`	`8`	`use PhpMyAdmin\Identifiers\DatabaseName;`
`8`	`9`	`use PhpMyAdmin\Identifiers\TableName;`
`9`	`10`
`10`		`-final class RecentFavoriteTable`
	`11`	`+final class RecentFavoriteTable implements JsonSerializable`
`11`	`12`	`{`
`12`	`13`	`public function __construct(public readonly DatabaseName $db, public readonly TableName $table)`
`13`	`14`	`{`
`@@ -24,4 +25,12 @@ public function toArray(): array`
`24`	`25`	`{`
`25`	`26`	`return ['db' => $this->db->getName(), 'table' => $this->table->getName()];`
`26`	`27`	`}`
	`28`	`+`
	`29`	`+ public function jsonSerialize(): mixed`
	`30`	`+ {`
	`31`	`+ return [`
	`32`	`+ 'db' => $this->db->getName(),`
	`33`	`+ 'table' => $this->table->getName(),`
	`34`	`+ ];`
	`35`	`+ }`
`27`	`36`	`}`