✅ Fix serialization and tests

.gitattributes

@@ -4,4 +4,6 @@
 /.gitattributes             export-ignore
 /.gitignore                 export-ignore
 /.php-cs-fixer.dist.php     export-ignore
+/phpstan.neon.dis           export-ignore
 /phpunit.xml.dist           export-ignore
+/rector.php                 export-ignore

src/Model/Config/AndroidConfig.php

@@ -23,7 +23,7 @@ public function __construct(
         public ?string $restrictedPackageName = null,
         public array $data = [],
         public ?AndroidNotification $notification = null,
-        public ?AndroidFcmOptions $options = null,
+        public ?AndroidFcmOptions $fcmOptions = null,
         public bool $directBootOk = false,
     ) {
     }

src/Model/Config/ApnsConfig.php

@@ -12,13 +12,23 @@
  */
 final readonly class ApnsConfig
 {
+    public object $payload;
+
     /**
      * @param array<string, string> $headers
      */
     public function __construct(
+        ?ApnsNotification $notification = null,
         public array $headers = [],
-        public ?ApnsNotification $payload = null,
-        public ?ApnsFcmOptions $options = null,
+        public ?ApnsFcmOptions $fcmOptions = null,
     ) {
+        if (null !== $notification) {
+            $this->payload = new class($notification) {
+                public function __construct(
+                    public ApnsNotification $aps
+                ) {
+                }
+            };
+        }
     }
 }

src/Model/Config/WebpushConfig.php

@@ -20,7 +20,7 @@ public function __construct(
         public array $headers = [],
         public array $data = [],
         public ?WebpushNotification $notification = null,
-        public ?WebpushFcmOptions $options = null,
+        public ?WebpushFcmOptions $fcmOptions = null,
     ) {
     }
 }

src/Model/Message.php

@@ -33,7 +33,7 @@ public function __construct(
         public ?AndroidConfig $android = null,
         public ?WebpushConfig $webpush = null,
         public ?ApnsConfig $apns = null,
-        public ?FcmOptions $options = null,
+        public ?FcmOptions $fcmOptions = null,
     ) {
         $this->notification = \is_string($notification)
             ? new Notification($notification)

src/Model/Option/ApnsFcmOptions.php

@@ -11,7 +11,7 @@
 {
     public function __construct(
         public ?string $analyticsLabel = null,
-        public ?string $images = null,
+        public ?string $image = null,
     ) {
     }
 }

tests/Fixtures/message.json

@@ -62,7 +62,7 @@
       },
       "image": "https:\/\/example.com\/image.jpg"
     },
-    "options": {
+    "fcm_options": {
       "analytics_label": "android"
     },
     "direct_boot_ok": true
@@ -109,7 +109,7 @@
         300
       ]
     },
-    "options": {
+    "fcm_options": {
       "analytics_label": "webpush",
       "link": "https:\/\/example.com"
     }
@@ -119,49 +119,51 @@
       "apns-priority": "5"
     },
     "payload": {
-      "alert": {
-        "title": "Breaking News",
-        "subtitle": "Unbelievable",
-        "body": "Check out the Top Story",
-        "launch-image": "launch-image.jpg",
-        "title-loc-key": "title-loc-key",
-        "title-loc-args": [
-          "title-loc-args"
-        ],
-        "subtitle-loc-key": "subtitle-loc-key",
-        "subtitle-loc-args": [
-          "subtitle-loc-args"
-        ],
-        "loc-key": "loc-key",
-        "loc-args": [
-          "loc-args"
-        ]
-      },
-      "badge": 2,
-      "sound": {
-        "critical": 1,
-        "name": "default",
-        "volume": 0.5
-      },
-      "thread-id": "thread-id",
-      "category": "category",
-      "content-available": 1,
-      "mutable-content": 1,
-      "target-content-id": "target-content-id",
-      "interruption-level": "interruption-level",
-      "relevance-score": 1.0,
-      "filter-criteria": "filter-criteria",
-      "stale-date": 1,
-      "content-state": "content-state",
-      "timestamp": 1684478064,
-      "events": "events"
+      "aps": {
+        "alert": {
+          "title": "Breaking News",
+          "subtitle": "Unbelievable",
+          "body": "Check out the Top Story",
+          "launch-image": "launch-image.jpg",
+          "title-loc-key": "title-loc-key",
+          "title-loc-args": [
+            "title-loc-args"
+          ],
+          "subtitle-loc-key": "subtitle-loc-key",
+          "subtitle-loc-args": [
+            "subtitle-loc-args"
+          ],
+          "loc-key": "loc-key",
+          "loc-args": [
+            "loc-args"
+          ]
+        },
+        "badge": 2,
+        "sound": {
+          "critical": 1,
+          "name": "default",
+          "volume": 0.5
+        },
+        "thread-id": "thread-id",
+        "category": "category",
+        "content-available": 1,
+        "mutable-content": 1,
+        "target-content-id": "target-content-id",
+        "interruption-level": "interruption-level",
+        "relevance-score": 1.0,
+        "filter-criteria": "filter-criteria",
+        "stale-date": 1,
+        "content-state": "content-state",
+        "timestamp": 1684478064,
+        "events": "events"
+      }
     },
-    "options": {
+    "fcm_options": {
       "analytics_label": "apns",
-      "images": "https:\/\/example.com\/image.jpg"
+      "image": "https:\/\/example.com\/image.jpg"
     }
   },
-  "options": {
+  "fcm_options": {
     "analytics_label": "fcm"
   }
 }

tests/Fixtures/response.json

@@ -0,0 +1,3 @@
+{
+  "name": "projects/tales-from-a-dev/messages/4183526938010908279"
+}

tests/Model/MessageTest.php

@@ -120,7 +120,7 @@ public function testItCanSerializeMessage(): void
                     ),
                     image: 'https://example.com/image.jpg',
                 ),
-                options: new AndroidFcmOptions('android'),
+                fcmOptions: new AndroidFcmOptions('android'),
                 directBootOk: true,
             ),
             webpush: new WebpushConfig(
@@ -165,16 +165,13 @@ public function testItCanSerializeMessage(): void
                         300,
                     ],
                 ),
-                options: new WebpushFcmOptions(
+                fcmOptions: new WebpushFcmOptions(
                     analyticsLabel: 'webpush',
                     link: 'https://example.com',
                 )
             ),
             apns: new ApnsConfig(
-                headers: [
-                    'apns-priority' => '5',
-                ],
-                payload: new ApnsNotification(
+                notification: new ApnsNotification(
                     alert: new Alert(
                         title: 'Breaking News',
                         subtitle: 'Unbelievable',
@@ -211,12 +208,15 @@ public function testItCanSerializeMessage(): void
                     timestamp: 1684478064,
                     events: 'events',
                 ),
-                options: new ApnsFcmOptions(
+                headers: [
+                    'apns-priority' => '5',
+                ],
+                fcmOptions: new ApnsFcmOptions(
                     analyticsLabel: 'apns',
-                    images: 'https://example.com/image.jpg',
+                    image: 'https://example.com/image.jpg',
                 )
             ),
-            options: new FcmOptions(
+            fcmOptions: new FcmOptions(
                 'fcm',
             )
         );