Add more properties to the Notification.

Use sngrl\PhpFirebaseCloudMessaging\Notification as Notification Entity.

Author: redjanym

Entity/DeviceNotification.php

@@ -2,8 +2,16 @@
 
 namespace RedjanYm\FCMBundle\Entity;
 
+use sngrl\PhpFirebaseCloudMessaging\Notification;
+
 class DeviceNotification extends Notification implements \RedjanYm\FCMBundle\Model\DeviceNotification
 {
+
+    use NotificationData;
+
+    /**
+     * @var string $deviceToken
+     */
     private $deviceToken;
 
     /**
@@ -31,4 +39,4 @@ public function getDeviceToken()
             throw new \InvalidArgumentException('The Mobile Notification must have a Device Token!');
         }
     }
-}
+}

Entity/Notification.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace RedjanYm\FCMBundle\Entity;
+
+
+trait NotificationData {
+
+    /**
+     * @var array
+     */
+    private $data = array();
+
+    /**
+     * @var string
+     */
+    private $priority;
+
+    /**
+     * @return array
+     */
+    public function getData()
+    {
+        return $this->data;
+    }
+
+    /**
+     * @param array $data
+     * @return $this
+     */
+    public function setData(array $data)
+    {
+        $this->data = $data;
+
+        return $this;
+    }
+
+    /**
+     * @param $key
+     * @param $value
+     * @return $this
+     */
+    public function addData($key, $value)
+    {
+        if((is_string($key) || is_numeric($key)) && strlen($key) > 0) {
+            $this->data[$key] = $value;
+        } else {
+            throw new \InvalidArgumentException('The value of key must not be empty!');
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param $key
+     * @return $this
+     */
+    public function removeData($key)
+    {
+        if(isset($this->data[$key])){
+            unset($this->data[$key]);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPriority()
+    {
+        return $this->priority;
+    }
+
+    /**
+     * @param string $priority
+     * @return $this;
+     */
+    public function setPriority($priority)
+    {
+        $this->priority = $priority;
+
+        return $this;
+    }
+}

Entity/NotificationData.php

@@ -2,9 +2,16 @@
 
 namespace RedjanYm\FCMBundle\Entity;
 
+use sngrl\PhpFirebaseCloudMessaging\Notification;
 
 class TopicNotification extends Notification implements \RedjanYm\FCMBundle\Model\TopicNotification
 {
+
+    use NotificationData;
+
+    /**
+     * @var string $topic
+     */
     private $topic;
 
     /**

Entity/TopicNotification.php

@@ -92,7 +92,7 @@ public function subscribeDevicesToTopic($topicId = null, $deviceTokens = array()
         if(!$topicId || empty($deviceTokens)){
             throw new \InvalidArgumentException("Please check arguments!");
         }
-        
+
         return $this->client->addTopicSubscription($topicId, $deviceTokens);
     }
 
@@ -123,8 +123,10 @@ public function sendNotification($notification)
             throw new \InvalidArgumentException('Notification must be of type DeviceNotification or TopicNotification');
         }
 
-        $message = new Message();
-        $message->setPriority($notification->getPriority());
+        $message = (new Message())
+            ->setNotification($notification)
+            ->setData($notification->getData())
+            ->setPriority($notification->getPriority());
 
         // Check for the type of Notification
         if($notification instanceof DeviceNotification){
@@ -133,15 +135,6 @@ public function sendNotification($notification)
             $message->addRecipient(new Topic($notification->getTopic()));
         }
 
-        $message
-            ->setNotification(
-                new Notification(
-                    $notification->getTitle(),
-                    $notification->getBody()
-                )
-            )
-            ->setData($notification->getData());
-
         return $this->client->send($message);
     }
-}
+}