fix: ios() helper now sets 'apns' key, updated test to match review feedback

Author: Jgmdevelopers

src/FcmMessage.php

@@ -12,14 +12,7 @@ class FcmMessage implements Message
 {
     use Macroable;
 
-    /**
-     * Extra android notification options (channel_id, sound, color, etc.).
-     */
-    protected ?array $androidNotification = null;
-
-    /**
-     * Create a new message instance.
-     */
+   
     public function __construct(
         public ?string $name = null,
         public ?string $token = null,
@@ -29,61 +22,45 @@ public function __construct(
         public array $custom = [],
         public ?Notification $notification = null,
         public ?Messaging $client = null,
-    ) {
-        //
-    }
+    ) { }
 
-    /**
-     * Create a new message instance.
-     */
+    
     public static function create(...$args): static
     {
         return new static(...$args);
     }
 
-    /**
-     * Set the message name.
-     */
+   
     public function name(?string $name): self
     {
         $this->name = $name;
 
         return $this;
     }
 
-    /**
-     * Set the message token.
-     */
+    
     public function token(?string $token): self
     {
         $this->token = $token;
 
         return $this;
     }
 
-    /**
-     * Set the message topic.
-     */
     public function topic(?string $topic): self
     {
         $this->topic = $topic;
 
         return $this;
     }
 
-    /**
-     * Set the message condition.
-     */
+    
     public function condition(?string $condition): self
     {
         $this->condition = $condition;
 
         return $this;
     }
 
-    /**
-     * Set the message data, or throw exception if data is not an array of strings.
-     */
     public function data(?array $data): self
     {
         if (! empty(array_filter($data, fn($value) => ! is_string($value)))) {
@@ -95,22 +72,20 @@ public function data(?array $data): self
         return $this;
     }
 
-    /**
-     * Set additional custom message data.
-     */
+ 
     public function custom(?array $custom = []): self
     {
         $this->custom = $custom ?? [];
 
         return $this;
     }
- 
+
     /**
-     * Helper Android
+     * Set android-specific custom options.
      */
     public function android(array $options = []): self
     {
-        // preserva lo que ya hubiera en custom y agrega/actualiza 'android'
+        
         $this->custom([
             ...$this->custom,
             'android' => $options,
@@ -119,59 +94,38 @@ public function android(array $options = []): self
         return $this;
     }
 
-    
+
     /**
-     * Helper iOS
+     * Set APNs-specific custom options for iOS.
      */
     public function ios(array $options = []): self
     {
         $this->custom([
             ...$this->custom,
-            'ios' => $options,
+            'apns' => $options,
         ]);
 
         return $this;
     }
 
-    /**
-     * Set the message notification.
-     */
+   
     public function notification(Notification $notification): self
     {
         $this->notification = $notification;
 
         return $this;
     }
 
-    /**
-     * Set the message Firebase Messaging client instance.
-     */
     public function usingClient(Messaging $client): self
     {
         $this->client = $client;
 
         return $this;
     }
 
-    /**
-     * Helper to define android.notification options.
-     *
-     * Example:
-     * ->androidNotification([
-     *     'channel_id' => 'alertas-operativas',
-     *     'sound' => 'default',
-     * ])
-     */
-    public function androidNotification(array $options): self
-    {
-        $this->androidNotification = $options;
-
-        return $this;
-    }
-
     public function toArray()
     {
-        // payload base
+
         $payload = array_filter([
             'name' => $this->name,
             'data' => $this->data,
@@ -182,14 +136,7 @@ public function toArray()
             ...$this->custom,
         ]);
 
-        // si usamos el helper, lo metemos en android.notification
-        if (! empty($this->androidNotification)) {
-            $payload['android'] = $payload['android'] ?? [];
-            $payload['android']['notification'] = array_merge(
-                $payload['android']['notification'] ?? [],
-                $this->androidNotification
-            );
-        }
+
 
         return $payload;
     }

tests/FcmMessageHelpersTest.php

@@ -33,15 +33,15 @@ public function test_appends_ios_options_into_custom()
     {
         $msg = FcmMessage::create()
             ->ios(['payload' => ['aps' => ['sound' => 'default']]]);
-
         $payload = $msg->toArray();
 
-        $this->assertArrayHasKey('ios', $payload);
-        $this->assertArrayHasKey('payload', $payload['ios']);
-        $this->assertEquals('default', $payload['ios']['payload']['aps']['sound']);
+        $this->assertArrayHasKey('apns', $payload);
+        $this->assertArrayHasKey('payload', $payload['apns']);
+        $this->assertEquals('default', $payload['apns']['payload']['aps']['sound']);
     }
 
 
+
     /**
      * Test that using the helpers does not overwrite existing custom keys.
      * Ensures merging does not erase pre-existing custom payload data.