Merge pull request #3 from netiul/fix/do_not_serialize_empty_notifica…

…tion Do not serialize notification object when it contains no serializable…
redjanym · Aug 21, 2017 · f117cbe · f117cbe
2 parents 62d514c + 0f9b2fc
commit f117cbe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Message.php b/src/Message.php
@@ -174,7 +174,7 @@ public function jsonSerialize()
         if ($this->contentAvailable) {
             $jsonData['content_available'] = $this->contentAvailable;
         }
-        if ($this->notification) {
+        if ($this->notification && $this->notification->hasNotificationData()) {
             $jsonData['notification'] = $this->notification;
         }
 

diff --git a/src/Notification.php b/src/Notification.php
@@ -77,9 +77,14 @@ public function setTag($tag)
         return $this;
     }
 
+    public function hasNotificationData()
+    {
+        return $this->title || $this->body || $this->badge || $this->icon || $this->clickAction || $this->sound || $this->tag;
+    }
+
     public function jsonSerialize()
     {
-        $jsonData = $this->getJsonData();
+        $jsonData = [];
         if ($this->title) {
             $jsonData['title'] = $this->title;
         }