Merge pull request #29 from tschoffelen/master

Added support for iOS 8 Action categories
ZhukV · Aug 19, 2015 · 6b166e0 · 6b166e0
2 parents a69dc88 + 543ca91
commit 6b166e0
Show file tree

Hide file tree

Showing 4 changed files with 102 additions and 2 deletions.
diff --git a/src/Apple/ApnPush/Notification/ApsData.php b/src/Apple/ApnPush/Notification/ApsData.php
@@ -31,6 +31,11 @@ class ApsData implements ApsDataInterface, \Serializable
      */
     protected $sound;
 
+    /**
+     * @var string
+     */
+    protected $category;
+
     /**
      * @var integer
      */
@@ -94,6 +99,43 @@ public function getBody()
         return $this->body;
     }
 
+    /**
+     * Set category for iOS 8 notification actions
+     *
+     * @param string $category
+     *
+     * @return ApsData
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function setCategory($category)
+    {
+        if (is_object($category)) {
+            $category = (string) $category;
+        }
+
+        if ($category !== null && !is_scalar($category)) {
+            throw new \InvalidArgumentException(sprintf(
+                'Category must be string, "%s" given.',
+                gettype($category)
+            ));
+        }
+
+        $this->category = $category;
+
+        return $this;
+    }
+
+    /**
+     * Get category
+     *
+     * @return string
+     */
+    public function getCategory()
+    {
+        return $this->category;
+    }
+
     /**
      * Set body localize
      *
@@ -280,6 +322,10 @@ public function getPayloadData()
             $apsData['badge'] = $this->badge;
         }
 
+        if (null !== $this->category) {
+            $apsData['category'] = $this->category;
+        }
+
         if (true === $this->contentAvailable) {
             $apsData['content-available'] = 1;
         }
@@ -298,7 +344,8 @@ public function serialize()
             'body' => $this->body,
             'body_custom' => $this->bodyCustom,
             'sound' => $this->sound,
-            'badge' => $this->badge
+            'badge' => $this->badge,
+            'category' => $this->category
         );
 
         if (true === $this->contentAvailable) {
@@ -321,7 +368,8 @@ public function unserialize($data)
             ->setBody($data['body'])
             ->setBodyCustom($data['body_custom'])
             ->setSound($data['sound'])
-            ->setBadge($data['badge']);
+            ->setBadge($data['badge'])
+            ->setCategory($data['category']);
 
         if (isset($data['content-available'])) {
             $this->setContentAvailable($data['content-available']);

diff --git a/src/Apple/ApnPush/Notification/ApsDataInterface.php b/src/Apple/ApnPush/Notification/ApsDataInterface.php
@@ -30,6 +30,20 @@ public function setBody($body);
      */
     public function getBody();
 
+    /**
+     * Set category for iOS 8 notification actions
+     *
+     * @param string $category
+     */
+    public function setCategory($category);
+
+    /**
+     * Get category
+     *
+     * @return mixed
+     */
+    public function getCategory();
+
     /**
      * Set body localize
      *

diff --git a/src/Apple/ApnPush/Notification/Message.php b/src/Apple/ApnPush/Notification/Message.php
@@ -222,6 +222,30 @@ public function getBody()
         return $this->apsData->getBody();
     }
 
+    /**
+     * Set category
+     *
+     * @param string $category
+     *
+     * @return Message
+     */
+    public function setCategory($category)
+    {
+        $this->apsData->setCategory($category);
+
+        return $this;
+    }
+
+    /**
+     * Get category
+     *
+     * @return string
+     */
+    public function getCategory()
+    {
+        return $this->apsData->getCategory();
+    }
+
     /**
      * Set body localize
      *

diff --git a/src/Apple/ApnPush/Notification/MessageInterface.php b/src/Apple/ApnPush/Notification/MessageInterface.php
@@ -66,6 +66,20 @@ public function setBodyLocalize($localizeKey, array $params = array());
      */
     public function getBody();
 
+    /**
+     * Set category
+     *
+     * @param string $category
+     */
+    public function setCategory($category);
+
+    /**
+     * Get category
+     *
+     * @return string
+     */
+    public function getCategory();
+
     /**
      * Set APS data
      *