Merge #21 - Multiple FCM Account Support

Pull-request: #21

Author: williamdes

README.md

@@ -1,4 +1,4 @@
-# Laravel-FCM (maintained version of the abandonned "official" repository)
+# Laravel-FCM (maintained and enhanced version of the abandonned "official" repository)
 
 ![Run tests](https://github.com/code-lts/Laravel-FCM/workflows/Run%20tests/badge.svg?branch=main)
 [![Coverage Status](https://codecov.io/gh/code-lts/laravel-fcm/branch/main/graph/badge.svg)](https://codecov.io/gh/code-lts/laravel-fcm)
@@ -105,7 +105,7 @@ Copy the config file ```fcm.php``` manually from the directory ```/vendor/code-l
 
 In your `.env` file, add the server key and the secret key for the Firebase Cloud Messaging:
 
-```php
+```env
 FCM_SERVER_KEY=my_secret_server_key
 FCM_SENDER_ID=my_secret_sender_id
 ```
@@ -275,7 +275,7 @@ $topicResponse = FCM::sendToTopic($topic, null, $notification, null);
 
 $topicResponse->isSuccess();
 $topicResponse->shouldRetry();
-$topicResponse->error());
+$topicResponse->error();
 
 ```
 
@@ -310,8 +310,6 @@ $key = FCMTopic::unsubscribeTopic($topic_id, $recipients_tokens);
 #### Sending a Notification to a Group
 
 ```php
-
-
 $notificationBuilder = new PayloadNotificationBuilder('my title');
 $notificationBuilder->setBody('Hello world')
 						->setSound('default');

src/Request/Request.php

@@ -52,10 +52,12 @@ class Request extends BaseRequest
      * @param PayloadNotification $notification
      * @param PayloadData         $data
      * @param Topics|null         $topic
+     * @param string|null         $serverKey (optional) The server key
+     * @param string|null         $senderId  (optional) The sender Id
      */
-    public function __construct($to, Options $options = null, PayloadNotification $notification = null, PayloadData $data = null, Topics $topic = null)
+    public function __construct($to, Options $options = null, PayloadNotification $notification = null, PayloadData $data = null, Topics $topic = null, string $serverKey = null, string $senderId = null)
     {
-        parent::__construct();
+        parent::__construct($serverKey, $senderId);
 
         $this->to = $to;
         $this->options = $options;

src/Sender/FCMSender.php

@@ -23,10 +23,12 @@ class FCMSender extends HTTPSender
      * @param Options|null             $options
      * @param PayloadNotification|null $notification
      * @param PayloadData|null         $data
+     * @param string|null              $serverKey (optional) The server key
+     * @param string|null              $senderId  (optional) The sender Id
      *
      * @return DownstreamResponse|null
      */
-    public function sendTo($to, Options $options = null, PayloadNotification $notification = null, PayloadData $data = null)
+    public function sendTo($to, Options $options = null, PayloadNotification $notification = null, PayloadData $data = null, string $serverKey = null, string $senderId = null)
     {
         $response = null;
 
@@ -45,7 +47,7 @@ public function sendTo($to, Options $options = null, PayloadNotification $notifi
                 }
             }
         } else {
-            $request = new Request($to, $options, $notification, $data);
+            $request = new Request($to, $options, $notification, $data, null, $serverKey, $senderId);
             $responseGuzzle = $this->post($request);
 
             $response = new DownstreamResponse($responseGuzzle, $to, $this->logger);
@@ -61,12 +63,14 @@ public function sendTo($to, Options $options = null, PayloadNotification $notifi
      * @param Options|null             $options
      * @param PayloadNotification|null $notification
      * @param PayloadData|null         $data
+     * @param string|null              $serverKey (optional) The server key
+     * @param string|null              $senderId  (optional) The sender Id
      *
      * @return GroupResponse
      */
-    public function sendToGroup($notificationKey, Options $options = null, PayloadNotification $notification = null, PayloadData $data = null)
+    public function sendToGroup($notificationKey, Options $options = null, PayloadNotification $notification = null, PayloadData $data = null, string $serverKey = null, string $senderId = null)
     {
-        $request = new Request($notificationKey, $options, $notification, $data);
+        $request = new Request($notificationKey, $options, $notification, $data, null, $serverKey, $senderId);
 
         $responseGuzzle = $this->post($request);
 
@@ -80,12 +84,14 @@ public function sendToGroup($notificationKey, Options $options = null, PayloadNo
      * @param Options|null             $options
      * @param PayloadNotification|null $notification
      * @param PayloadData|null         $data
+     * @param string|null              $serverKey (optional) The server key
+     * @param string|null              $senderId  (optional) The sender Id
      *
      * @return TopicResponse
      */
-    public function sendToTopic(Topics $topics, Options $options = null, PayloadNotification $notification = null, PayloadData $data = null)
+    public function sendToTopic(Topics $topics, Options $options = null, PayloadNotification $notification = null, PayloadData $data = null, string $serverKey = null, string $senderId = null)
     {
-        $request = new Request(null, $options, $notification, $data, $topics);
+        $request = new Request(null, $options, $notification, $data, $topics, $serverKey, $senderId);
 
         $responseGuzzle = $this->post($request);