From 34a414187d931a9710c297f665c1b2c0f60d1bc7 Mon Sep 17 00:00:00 2001
From: Pavel Zotikov <pavelzotikov@gmail.com>
Date: Tue, 8 Aug 2017 15:49:07 +0300
Subject: [PATCH 1/2] add restricted_package_name and fix badge counter

---
 src/Message.php      | 19 +++++++++++++++++++
 src/Notification.php |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/Message.php b/src/Message.php
index e39f13a..732c73e 100644
--- a/src/Message.php
+++ b/src/Message.php
@@ -28,6 +28,7 @@ class Message implements \JsonSerializable
     private $recipientType;
     private $timeToLive;
     private $delayWhileIdle;
+    private $restrictedPackageName;
 
     /**
      * Represents the app's "Send-to-Sync" message.
@@ -69,6 +70,21 @@ public function setNotification(Notification $notification)
         return $this;
     }
 
+    /**
+     * Custom package name
+     *
+     * @see https://firebase.google.com/docs/cloud-messaging/http-server-ref#table1
+     *
+     * @param string $package_name
+     *
+     * @return Message
+     */
+    public function setRestrictedPackageName($package_name)
+    {
+        $this->restrictedPackageName = $package_name;
+        return $this;
+    }
+
     /**
      * @see https://firebase.google.com/docs/cloud-messaging/concept-options#collapsible_and_non-collapsible_messages
      *
@@ -169,6 +185,9 @@ public function jsonSerialize()
         if ($this->contentAvailableFlag === TRUE) {
             $jsonData['content_available'] = TRUE;
         }
+        if ($this->restrictedPackageName) {
+            $jsonData['restricted_package_name'] = $this->restrictedPackageName;
+        }
 
         return $jsonData;
     }
diff --git a/src/Notification.php b/src/Notification.php
index 812444d..ff07951 100644
--- a/src/Notification.php
+++ b/src/Notification.php
@@ -138,7 +138,7 @@ public function jsonSerialize()
 
         $jsonData['body'] = $this->body;
 
-        if ($this->badge) {
+        if (is_int($this->badge)) {
             $jsonData['badge'] = $this->badge;
         }
         if ($this->icon) {

From fba95b98a56c448d90bcb5b5accf136f7ebd66fb Mon Sep 17 00:00:00 2001
From: Pavel Zotikov <pavelzotikov@gmail.com>
Date: Tue, 8 Aug 2017 16:03:12 +0300
Subject: [PATCH 2/2] change comments

---
 src/Message.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Message.php b/src/Message.php
index 732c73e..12d0dc5 100644
--- a/src/Message.php
+++ b/src/Message.php
@@ -77,7 +77,7 @@ public function setNotification(Notification $notification)
      *
      * @param string $package_name
      *
-     * @return Message
+     * @return \paragraph1\phpFCM\Message
      */
     public function setRestrictedPackageName($package_name)
     {