update response format

Author: sfkelseylee

src/Ocpp/Messages/Call.php

@@ -12,12 +12,17 @@ public function __construct()
     {
         $this->messageId = Uuid::uuid4()->toString();
     }
-
+    
     public function toArray(): array
     {
-        $array = parent::toArray();
-        $array['action'] = (new \ReflectionClass($this))->getShortName();
+        $payload = $this->getPayload();
+        $action = (new \ReflectionClass($this))->getShortName();
 
-        return $array;
+        return [
+            $this->messageTypeID,
+            $this->messageId,
+            $action,
+            $payload,
+        ];
     }
 }

src/Ocpp/Messages/CallError.php

@@ -30,11 +30,11 @@ public function __construct(string $messageId, ?string $errorCode = null, ?strin
     public function toArray(): array
     {
         return [
-            'messageTypeID' => $this->messageTypeID,
-            'messageId' => $this->messageId,
-            'errorCode' => $this->errorCode,
-            'errorDescription' => $this->errorDescription,
-            'errorDetails' => (object) $this->errorDetails,
+            $this->messageTypeID,
+            $this->messageId,
+            $this->errorCode,
+            $this->errorDescription,
+            (object) $this->errorDetails,
         ];
     }
 }

src/Ocpp/Messages/CallResult.php

@@ -10,4 +10,16 @@ public function __construct(string $messageId)
     {
         $this->messageId = $messageId;
     }
+    
+    public function toArray(): array
+    {
+        $payload = $this->getPayload();
+
+        return [
+            $this->messageTypeID,
+            $this->messageId,
+            $payload,
+        ];
+    }
+
 }

src/Ocpp/Messages/Message.php

@@ -8,17 +8,6 @@ abstract class Message
 
     public string $messageId;
 
-    public function toArray(): array
-    {
-        $payload = $this->getPayload();
-
-        return [
-            'messageTypeID' => $this->messageTypeID,
-            'messageId' => $this->messageId,
-            'payload' => $payload,
-        ];
-    }
-
     public function getPayload(): object
     {
         $payload = (array) $this;
@@ -33,5 +22,4 @@ public function getMessageId(): string
     {
         return $this->messageId;
     }
-
 }