Refactor json serialization of Server class

Author: carlbennett

src/libraries/Server.php

@@ -11,11 +11,12 @@
 use \DateTime;
 use \DateTimeZone;
 use \InvalidArgumentException;
+use \JsonSerializable;
 use \PDO;
 use \PDOException;
 use \StdClass;
 
-class Server {
+class Server implements JsonSerializable {
 
   const STATUS_ONLINE   = 0x00000001;
   const STATUS_DISABLED = 0x00000002;
@@ -168,6 +169,32 @@ public function getUserId() {
     return $this->user_id;
   }
 
+  public function jsonSerialize() {
+    $created_datetime = $this->getCreatedDateTime();
+    if (!is_null($created_datetime)) $created_datetime = [
+      "iso"  => $created_datetime->format("r"),
+      "unix" => $created_datetime->getTimestamp(),
+    ];
+
+    $updated_datetime = $this->getUpdatedDateTime();
+    if (!is_null($updated_datetime)) $updated_datetime = [
+      "iso"  => $updated_datetime->format("r"),
+      "unix" => $updated_datetime->getTimestamp(),
+    ];
+
+    return [
+      "address"          => $this->getAddress(),
+      "created_datetime" => $created_datetime,
+      "id"               => $this->getId(),
+      "label"            => $this->getLabel(),
+      "port"             => $this->getPort(),
+      "status_bitmask"   => $this->getStatusBitmask(),
+      "type_id"          => $this->getTypeId(),
+      "updated_datetime" => $updated_datetime,
+      "user"             => $this->getUser()
+    ];
+  }
+
   protected static function normalize(StdClass &$data) {
     $data->address          = (string) $data->address;
     $data->created_datetime = (string) $data->created_datetime;

src/views/ServersJSON.php

@@ -30,27 +30,7 @@ public function render(Model &$model) {
     }
 
     foreach ($model->servers as $server) {
-      $created_datetime = $server->getCreatedDateTime();
-      $updated_datetime = $server->getUpdatedDateTime();
-      if (!is_null($created_datetime)) $created_datetime = [
-        "iso"  => $created_datetime->format("r"),
-        "unix" => $created_datetime->getTimestamp(),
-      ];
-      if (!is_null($updated_datetime)) $updated_datetime = [
-        "iso"  => $updated_datetime->format("r"),
-        "unix" => $updated_datetime->getTimestamp(),
-      ];
-      $content["servers"][] = [
-        "address"          => $server->getAddress(),
-        "created_datetime" => $created_datetime,
-        "id"               => $server->getId(),
-        "label"            => $server->getLabel(),
-        "port"             => $server->getPort(),
-        "status_bitmask"   => $server->getStatusBitmask(),
-        "type_id"          => $server->getTypeId(),
-        "updated_datetime" => $updated_datetime,
-        "user"             => $server->getUser()
-      ];
+      $content["servers"][] = $server;
     }
 
     $content["status_bitmasks"] = $model->status_bitmasks;