Only parse Arrayable on output.

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
katsana · Feb 19, 2020 · c60f905 · c60f905
1 parent bace921
commit c60f905
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/Data.php b/src/Data.php
@@ -53,8 +53,11 @@ public static function make($message, $id = null)
     public function __toString()
     {
         $id = ! \is_null($this->id) ? "id: {$this->id}\n" : '';
-        $data = 'data: '.\json_encode($this->message)."\n\n";
 
-        return sprintf("%sdata: %s\n\n", $id, \json_encode($this->message));
+        $payload = $this->message instanceof Arrayable
+            ? $this->message->toArray()
+            : \json_encode($this->message);
+
+        return sprintf("%sdata: %s\n\n", $id, $payload);
     }
 }
diff --git a/src/Handler.php b/src/Handler.php
@@ -2,8 +2,6 @@
 
 namespace Katsana\Prefetch;
 
-use Illuminate\Contracts\Support\Arrayable;
-
 abstract class Handler
 {
     /**
@@ -13,9 +11,7 @@ abstract class Handler
      */
     public function transform($data): Data
     {
-        return Data::make(
-            $data instanceof Arrayable ? $data->toArray() : $data
-        );
+        return Data::make($data);
     }
 
     /**