Merge pull request #3 from lutskanu/master

Added time_to_live and delay_while_idle message parameters

Author: palbertini

src/Message.php

@@ -25,6 +25,8 @@ class Message implements \JsonSerializable
     private $data;
     private $recipients = array();
     private $recipientType;
+    private $timeToLive;
+    private $delayWhileIdle;
 
     /**
      * where should the message go
@@ -89,6 +91,33 @@ public function setPriority($priority)
         return $this;
     }
 
+    /**
+     * @see https://firebase.google.com/docs/cloud-messaging/concept-options#ttl
+     *
+     * @param integer $ttl
+     *
+     * @return \paragraph1\phpFCM\Message
+     */
+    public function setTimeToLive($ttl)
+    {
+        $this->timeToLive = $ttl;
+
+        return $this;
+    }
+
+    /**
+     * @see https://firebase.google.com/docs/cloud-messaging/concept-options#lifetime
+     *
+     * @param bool $delayWhileIdle
+     *
+     * @return \paragraph1\phpFCM\Message
+     */
+    public function setDelayWhileIdle($delayWhileIdle)
+    {
+        $this->delayWhileIdle = $delayWhileIdle;
+        return $this;
+    }
+
     public function setData(array $data)
     {
         $this->data = $data;
@@ -116,6 +145,12 @@ public function jsonSerialize()
         if ($this->notification) {
             $jsonData['notification'] = $this->notification;
         }
+        if ($this->timeToLive) {
+            $jsonData['time_to_live'] = (int)$this->timeToLive;
+        }
+        if ($this->delayWhileIdle) {
+            $jsonData['delay_while_idle'] = (bool)$this->delayWhileIdle;
+        }
 
         return $jsonData;
     }

tests/MessageTest.php

@@ -99,6 +99,36 @@ public function testJsonEncodeCorrectlyHandlesCollapseKeyAndData()
         );
     }
 
+    public function testJsonEncodeHandlesTTL()
+    {
+        $body = '{"to":"\/topics\/testing","data":{"foo":"bar"},"priority":"high","time_to_live":3}';
+
+        $this->fixture->setData(['foo' => 'bar'])
+            ->setTimeToLive(3);
+
+        $this->fixture->addRecipient(new Topic('testing'));
+
+        $this->assertSame(
+            $body,
+            json_encode($this->fixture)
+        );
+    }
+
+    public function testJsonEncodeHandlesDelayIdle()
+    {
+        $body = '{"to":"\/topics\/testing","data":{"foo":"bar"},"priority":"high","delay_while_idle":true}';
+
+        $this->fixture->setData(['foo' => 'bar'])
+            ->setDelayWhileIdle(true);
+
+        $this->fixture->addRecipient(new Topic('testing'));
+
+        $this->assertSame(
+            $body,
+            json_encode($this->fixture)
+        );
+    }
+
     public function testAddingNewAndUnknownRecipientTypesYieldsException()
     {
         $this->setExpectedException(\UnexpectedValueException::class);