Add Push::setCollapseKey() and ::setPriority()

composer.json

@@ -18,6 +18,7 @@
     },
     "require": {
         "php": ">= 7.3",
+        "ext-json": "*",
         "guzzlehttp/guzzle": "^6.3 || ^7.0"
     },
     "require-dev": {

src/Device/Info.php

@@ -31,7 +31,7 @@ public function __construct(string $deviceId, bool $details = false)
      */
     public function getUrl(): string
     {
-        $url = "https://iid.googleapis.com/iid/info/{$this->deviceId}";
+        $url = "https://iid.googleapis.com/iid/info/$this->deviceId";
 
         if ($this->details) {
             $url .= '?details=true';
@@ -43,7 +43,7 @@ public function getUrl(): string
     /**
      * @inheritdoc
      */
-    public function getBody(): array
+    public function buildJsonBody(): array
     {
         return [];
     }

src/DeviceGroup/Create.php

@@ -29,7 +29,7 @@ public function __construct(string $groupName, string $deviceId = '')
     /**
      * @inheritdoc
      */
-    public function getBody(): array
+    public function buildJsonBody(): array
     {
         return [
             'operation' => 'create',

src/DeviceGroup/Remove.php

@@ -36,7 +36,7 @@ public function __construct(string $notification_key_name, string $notification_
     /**
      * @inheritdoc
      */
-    public function getBody(): array
+    public function buildJsonBody(): array
     {
         return [
             'operation' => 'remove',

src/DeviceGroup/Update.php

@@ -36,7 +36,7 @@ public function __construct(string $notification_key_name, string $notification_
     /**
      * @inheritdoc
      */
-    public function getBody(): array
+    public function buildJsonBody(): array
     {
         return [
             'operation' => 'add',

src/FcmClient.php

@@ -4,7 +4,9 @@
 
 use Fcm\Device\Info;
 use Fcm\Exception\FcmClientException;
+use Fcm\Exception\NotificationException;
 use GuzzleHttp\Client;
+use GuzzleHttp\Exception\GuzzleException;
 use ReflectionClass;
 
 /**
@@ -69,8 +71,9 @@ public static function create(string $apiToken, string $projectId, array $option
 
     /**
      * @param Request $request
-     *
-     * @return array
+     * @return array The response body received from the FCM API, as an associative array.
+     * @throws NotificationException When the given request isn't valid.
+     * @throws FcmClientException When the sending failed.
      */
     public function send(Request $request): array
     {
@@ -83,7 +86,7 @@ public function send(Request $request): array
         // Create and send the request.
         try {
             $response = $client->post($url, [
-                'json' => $request->getBody()
+                'json' => $request->buildJsonBody()
             ]);
         } catch (GuzzleException $e) {
             throw new FcmClientException('Failed to Connect: '.$e->getMessage());

src/Push/Data.php

@@ -3,12 +3,9 @@
 namespace Fcm\Push;
 
 use Fcm\Exception\NotificationException;
-use Fcm\Request;
 
-class Data implements Request
+class Data extends Push
 {
-    use Push;
-
     /**
      * @param array $data
      * @param string $recipient
@@ -27,46 +24,12 @@ public function __construct(array $data = [], string $recipient = '')
     /**
      * @inheritdoc
      */
-    public function getBody(): array
+    public function buildJsonBody(): array
     {
         if (empty($this->data)) {
             throw new NotificationException('Data should not be empty for a Data Notification.');
         }
 
-        if (empty($this->recipients) && empty($this->topics)) {
-            throw new NotificationException('Must minimaly specify a single recipient or topic.');
-        }
-
-        if (!empty($this->recipients) && !empty($this->topics)) {
-            throw new NotificationException('Must either specify a recipient or topic, not more then one.');
-        }
-
-        $request = [];
-
-        if (!empty($this->recipients)) {
-            if (\count($this->recipients) === 1) {
-                $request['to'] = current($this->recipients);
-            } else {
-                $request['registration_ids'] = $this->recipients;
-            }
-        }
-
-        if (!empty($this->topics)) {
-            $request['condition'] = array_reduce($this->topics, function ($carry, string $topic) {
-                $topicSyntax = "'%s' in topics";
-
-                if (end($this->topics) === $topic) {
-                    return $carry .= sprintf($topicSyntax, $topic);
-                }
-
-                return $carry .= sprintf($topicSyntax, $topic) . '||';
-            });
-        }
-
-        if (!empty($this->data)) {
-            $request['data'] = $this->data;
-        }
-
-        return $request;
+        return parent::buildJsonBody();
     }
 }

src/Push/Notification.php

@@ -2,13 +2,8 @@
 
 namespace Fcm\Push;
 
-use Fcm\Exception\NotificationException;
-use Fcm\Request;
-
-class Notification implements Request
+class Notification extends Push
 {
-    use Push ;
-
     /**
      * @var string
      */
@@ -28,7 +23,7 @@ class Notification implements Request
      * @var string
      */
     private $icon;
-    
+
     /**
      * @var string
      */
@@ -37,8 +32,8 @@ class Notification implements Request
     /**
      * @var string
      */
-    private $tag;    
-    
+    private $tag;
+
     /**
      * @var string
      */
@@ -53,12 +48,7 @@ class Notification implements Request
      * @var string
      */
     private $click_action;
-
-    /**
-     * @param string $title
-     * @param string $body
-     * @param string $recipient
-     */
+
     public function __construct(string $title = '', string $body = '', string $recipient = '', string $sound = '', string $icon = '', string $color = '', int $badge = 0, string $tag = '', string $subtitle = '', array $data = [], string $click_action = '')
     {
         $this->title = $title;
@@ -73,11 +63,11 @@ public function __construct(string $title = '', string $body = '', string $recip
         if (!empty($click_action)) {
             $this->click_action = $click_action;
         }
-        
+
         if (!empty($data)) {
             $this->data = $data;
-        } 
-        
+        }
+
         if (!empty($recipient)) {
             $this->addRecipient($recipient);
         }
@@ -106,7 +96,7 @@ public function setBody(string $body): self
 
         return $this;
     }
-    
+
     /**
      * @param string $sound
      *
@@ -117,8 +107,8 @@ public function setSound(string $sound): self
         $this->sound = $sound;
 
         return $this;
-    } 
-    
+    }
+
     /**
      * @param string $icon
      *
@@ -142,9 +132,9 @@ public function setColor(string $color): self
 
         return $this;
     }
-    
+
     /**
-     * @param string badge
+     * @param int $badge
      *
      * @return $this
      */
@@ -154,7 +144,7 @@ public function setBadge(int $badge): self
 
         return $this;
     }
-    
+
     /**
      * @param string $tag
      *
@@ -184,7 +174,8 @@ public function setSubtitle(string $subtitle): self
      *
      * @return $this
      */
-    public function setClickAction(string $click_action): self {
+    public function setClickAction(string $click_action): self
+    {
         $this->click_action = $click_action;
 
         return $this;
@@ -193,41 +184,9 @@ public function setClickAction(string $click_action): self {
     /**
      * @inheritdoc
      */
-    public function getBody(): array
+    public function buildJsonBody(): array
     {
-        if (empty($this->recipients) && empty($this->topics)) {
-            throw new NotificationException('Must minimaly specify a single recipient or topic.');
-        }
-
-        if (!empty($this->recipients) && !empty($this->topics)) {
-            throw new NotificationException('Must either specify a recipient or topic, not more then one.');
-        }
-        /*
-        if (empty($this->data)) {
-            throw new NotificationException('Data should not be empty for a Data Notification.');
-        }
-        */
-        $request = [];
-
-        if (!empty($this->recipients)) {
-            if (\count($this->recipients) === 1) {
-                $request['to'] = current($this->recipients);
-            } else {
-                $request['registration_ids'] = $this->recipients;
-            }
-        }
-
-        if (!empty($this->topics)) {
-            $request['condition'] = array_reduce($this->topics, function ($carry, string $topic) {
-                $topicSyntax = "'%s' in topics";
-
-                if (end($this->topics) === $topic) {
-                    return $carry .= sprintf($topicSyntax, $topic);
-                }
-
-                return $carry .= sprintf($topicSyntax, $topic) . '||';
-            });
-        }
+        $request = parent::buildJsonBody();
 
         $request['notification']['title'] = $this->title;
         $request['notification']['body'] = $this->body;
@@ -236,17 +195,14 @@ public function getBody(): array
         $request['notification']['color'] = $this->color;
         $request['notification']['tag'] = $this->tag;
         $request['notification']['subtitle'] = $this->subtitle;
-        if ($this->badge>0) {
+        if ($this->badge > 0) {
             $request['notification']['badge'] = $this->badge;
         }
 
         if (!empty($this->click_action)) {
             $request['notification']['click_action'] = $this->click_action;
         }
-
-        if (!empty($this->data)) {
-            $request['data'] = $this->data;
-        }
-        return $request; 
+
+        return $request;
     }
 }