fix watch command & message output

patchlevel · Mar 6, 2024 · bc9648b · bc9648b
1 parent afc4913
commit bc9648b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/Console/Command/WatchCommand.php b/src/Console/Command/WatchCommand.php
@@ -75,10 +75,9 @@ function () use ($console, &$index, $aggregate, $aggregateId): void {
 
                 foreach ($stream as $message) {
                     $console->message($this->serializer, $message);
+                    $index = $stream->index();
                 }
 
-                $index = $stream->index();
-
                 $stream->close();
             },
             [],

diff --git a/src/Console/OutputStyle.php b/src/Console/OutputStyle.php
@@ -43,8 +43,14 @@ public function message(EventSerializer $serializer, Message $message): void
 
         $headers = $message->headers();
 
-        if (isset($headers['recordedOn']) && $headers['recordedOn'] instanceof DateTimeInterface) {
-            $headers['recordedOn'] = $headers['recordedOn']->format(DateTimeInterface::ATOM);
+        foreach ($headers as $key => $value) {
+            if ($value instanceof DateTimeInterface) {
+                $headers[$key] = $value->format(DateTimeInterface::ATOM);
+            }
+
+            if (is_array($value) || is_object($value)) {
+                $headers[$key] = json_encode($value, JSON_THROW_ON_ERROR | JSON_PRETTY_PRINT);
+            }
         }
 
         $this->horizontalTable(array_keys($headers), [array_values($headers)]);