Minor cleanup

Author: dwightwatson

src/FcmMessage.php

@@ -12,7 +12,6 @@ class FcmMessage implements Message
 {
     use Macroable;
 
-
     /**
      * Create a new message instance.
      */
@@ -29,7 +28,6 @@ public function __construct(
         //
     }
 
-
     /**
      * Create a new message instance.
      */
@@ -38,7 +36,6 @@ public static function create(...$args): static
         return new static(...$args);
     }
 
-
     /**
      * Set the message name.
      */
@@ -49,7 +46,9 @@ public function name(?string $name): self
         return $this;
     }
 
-    
+    /**
+     * Set the message token.
+     */
     public function token(?string $token): self
     {
         $this->token = $token;
@@ -58,7 +57,7 @@ public function token(?string $token): self
     }
 
     /**
-     * Set the message topic.s
+     * Set the message topic.
      */
     public function topic(?string $topic): self
     {
@@ -67,14 +66,19 @@ public function topic(?string $topic): self
         return $this;
     }
 
-    
+    /**
+     * Set the message condition.
+     */
     public function condition(?string $condition): self
     {
         $this->condition = $condition;
 
         return $this;
     }
 
+    /**
+     * Set the message data.
+     */
     public function data(?array $data): self
     {
         if (! empty(array_filter($data, fn($value) => ! is_string($value)))) {
@@ -86,21 +90,21 @@ public function data(?array $data): self
         return $this;
     }
 
- 
+    /**
+     * Set the message custom options.
+     */
     public function custom(?array $custom = []): self
     {
         $this->custom = $custom;
 
         return $this;
     }
 
-
     /**
-     * Set "android" specific custom options.
+     * Set Aandroid specific custom options.
      */
     public function android(array $options = []): self
     {
-
         $this->custom([
             ...$this->custom,
             'android' => $options,
@@ -109,11 +113,8 @@ public function android(array $options = []): self
         return $this;
     }
 
-
-
     /**
-     * Set APNs-specific custom options for iOS.
-     * Set APNs-specific custom options for iOS.
+     * Set APNs-specific custom options.
      */
     public function ios(array $options = []): self
     {
@@ -126,22 +127,29 @@ public function ios(array $options = []): self
         return $this;
     }
 
-   
+    /**
+     * Set the message notification.
+     */
     public function notification(Notification $notification): self
     {
         $this->notification = $notification;
 
         return $this;
     }
 
+    /**
+     * Set the client to use for the message.
+     */
     public function usingClient(Messaging $client): self
     {
         $this->client = $client;
 
         return $this;
     }
 
-
+    /**
+     * Get the array represenation of the message.
+     */
     public function toArray()
     {
         return array_filter([
@@ -155,7 +163,6 @@ public function toArray()
         ]);
     }
 
-
     /**
      * @return mixed
      */

tests/FcmMessageTest.php

@@ -112,37 +112,36 @@ public function test_it_can_set_client()
 
     public function test_appends_android_options_into_custom()
     {
-        $msg = FcmMessage::create()
-            ->notification(new Notification(title: 'T', body: 'B'))
-            ->android(['notification' => ['channel_id' => 'ops', 'sound' => 'default']]);
+        $message = FcmMessage::create()
+            ->notification(new Notification(title: 'title', body: 'body'))
+            ->android(['notification' => ['channel_id' => 'channel_id']]);
 
-        $payload = $msg->toArray();
+        $payload = $message->toArray();
 
         $this->assertArrayHasKey('android', $payload);
         $this->assertArrayHasKey('notification', $payload['android']);
-        $this->assertEquals('ops', $payload['android']['notification']['channel_id']);
-        $this->assertEquals('default', $payload['android']['notification']['sound']);
+        $this->assertEquals('channel_id', $payload['android']['notification']['channel_id']);
     }
 
     public function test_appends_ios_options_into_custom()
     {
-        $msg = FcmMessage::create()
-            ->ios(['payload' => ['aps' => ['sound' => 'default']]]);
+        $message = FcmMessage::create()
+            ->ios(['payload' => ['aps' => ['sound' => 'sound']]]);
 
-        $payload = $msg->toArray();
+        $payload = $message->toArray();
 
         $this->assertArrayHasKey('apns', $payload);
         $this->assertArrayHasKey('payload', $payload['apns']);
-        $this->assertEquals('default', $payload['apns']['payload']['aps']['sound']);
+        $this->assertEquals('sound', $payload['apns']['payload']['aps']['sound']);
     }
 
     public function test_preserves_existing_custom_keys_when_using_helpers()
     {
-        $msg = FcmMessage::create()
+        $message = FcmMessage::create()
             ->custom(['meta' => ['a' => 1]])
             ->android(['notification' => ['color' => '#000']]);
 
-        $payload = $msg->toArray();
+        $payload = $message->toArray();
 
         $this->assertArrayHasKey('meta', $payload);
         $this->assertEquals(1, $payload['meta']['a']);