Adding sound option to message based on GCM docs (#19)

* Adding sound option to message based on GCM docs

* Fixing sound test

* Fixing problem with closure cannot be serialised.

* Fixing code styling

Author: Zoran Lorkovic

src/GcmChannel.php

@@ -80,6 +80,7 @@ protected function getPacket($tokens, $message)
         $packet->setNotification([
                 'title' => $message->title,
                 'body' => $message->message,
+                'sound' => $message->sound,
             ] + $message->data);
 
         return $packet;
@@ -100,7 +101,7 @@ protected function handleFailedNotifications($notifiable, Notification $notifica
             }
 
             $this->events->fire(
-                new NotificationFailed($notifiable, $notification, $this, [
+                new NotificationFailed($notifiable, $notification, get_class($this), [
                     'token' => $token,
                     'error' => $result['error'],
                 ])

src/GcmMessage.php

@@ -7,6 +7,8 @@ class GcmMessage
     const PRIORITY_NORMAL = 'normal';
     const PRIORITY_HIGH = 'high';
 
+    const DEFAULT_SOUND = 'default';
+
     /**
      * The title of the notification.
      *
@@ -36,6 +38,13 @@ class GcmMessage
      */
     public $priority = self::PRIORITY_NORMAL;
 
+    /**
+     * Notification sound
+     *
+     * @var string
+     */
+    public $sound = self::DEFAULT_SOUND;
+
     /**
      * Additional data of the notification.
      *
@@ -51,23 +60,25 @@ class GcmMessage
      *
      * @return static
      */
-    public static function create($title = null, $message = null, $data = [], $priority = self::PRIORITY_NORMAL)
+    public static function create($title = null, $message = null, $data = [], $priority = self::PRIORITY_NORMAL, $sound = self::DEFAULT_SOUND)
     {
-        return new static($title, $message, $data, $priority);
+        return new static($title, $message, $data, $priority, $sound);
     }
 
     /**
      * @param string|null $title
      * @param string|null $message
      * @param array $data
      * @param string $priority
+     * @param string $sound
      */
-    public function __construct($title = null, $message = null, $data = [], $priority = self::PRIORITY_NORMAL)
+    public function __construct($title = null, $message = null, $data = [], $priority = self::PRIORITY_NORMAL, $sound = self::DEFAULT_SOUND)
     {
         $this->title = $title;
         $this->message = $message;
         $this->data = $data;
         $this->priority = $priority;
+        $this->sound = $sound;
     }
 
     /**
@@ -126,6 +137,20 @@ public function priority($priority)
         return $this;
     }
 
+    /**
+     * Set the sound for notification
+     *
+     * @param string $sound
+     *
+     * @return $this
+     */
+    public function sound($sound)
+    {
+        $this->sound = $sound;
+
+        return $this;
+    }
+
     /**
      * Add data to the notification.
      *

tests/GcmMessageTest.php

@@ -19,21 +19,23 @@ public function setUp()
     /** @test */
     public function it_can_accept_parameters_when_constructing_a_message()
     {
-        $message = new GcmMessage('myTitle', 'myMessage', ['foo' => 'bar'], GcmMessage::PRIORITY_HIGH);
+        $message = new GcmMessage('myTitle', 'myMessage', ['foo' => 'bar'], GcmMessage::PRIORITY_HIGH, GcmMessage::DEFAULT_SOUND);
         $this->assertEquals('myTitle', $message->title);
         $this->assertEquals('myMessage', $message->message);
         $this->assertEquals('bar', $message->data['foo']);
         $this->assertEquals(GcmMessage::PRIORITY_HIGH, $message->priority);
+		$this->assertEquals(GcmMessage::DEFAULT_SOUND, $message->sound);
     }
 
     /** @test */
     public function it_provides_a_create_method()
     {
-        $message = GcmMessage::create('myTitle', 'myMessage', ['foo' => 'bar'], GcmMessage::PRIORITY_HIGH);
+        $message = GcmMessage::create('myTitle', 'myMessage', ['foo' => 'bar'], GcmMessage::PRIORITY_HIGH, GcmMessage::DEFAULT_SOUND);
         $this->assertEquals('myTitle', $message->title);
         $this->assertEquals('myMessage', $message->message);
         $this->assertEquals('bar', $message->data['foo']);
         $this->assertEquals(GcmMessage::PRIORITY_HIGH, $message->priority);
+		$this->assertEquals(GcmMessage::DEFAULT_SOUND, $message->sound);
     }
 
     /** @test */
@@ -69,4 +71,17 @@ public function it_can_set_the_priority()
         $this->message->priority(GcmMessage::PRIORITY_HIGH);
         $this->assertEquals(GcmMessage::PRIORITY_HIGH, $this->message->priority);
     }
+
+    /** @test */
+    public function it_has_default_sound()
+    {
+        $this->assertEquals(GcmMessage::DEFAULT_SOUND, $this->message->sound);
+    }
+
+    /** @test */
+    public function it_can_set_the_sound()
+    {
+        $this->message->sound(GcmMessage::DEFAULT_SOUND);
+        $this->assertEquals(GcmMessage::DEFAULT_SOUND, $this->message->sound);
+    }
 }