Fix Apns "aps" payload

src/FCM/Message/ApnsAlert.php → src/FCM/Message/Apns/ApnsAlert.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Plokko\Firebase\FCM\Message;
+namespace Plokko\Firebase\FCM\Message\Apns;
 
 use JsonSerializable;
 

src/FCM/Message/Apns/ApnsPayload.php

@@ -0,0 +1,46 @@
+<?php
+namespace Plokko\Firebase\FCM\Message\Apns;
+
+use JsonSerializable;
+
+/**
+ * ApnsConfig payload
+ * @package Plokko\Firebase\FCM\Message
+ * @see https://developer.apple.com/library/archive/documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/CreatingtheNotificationPayload.html#//apple_ref/doc/uid/TP40008194-CH10-SW1
+ *
+ * @property-read ApsData $aps
+ */
+class ApnsPayload implements JsonSerializable
+{
+    private
+        /** @var ApsData */
+        $aps;
+    private
+        /**@var array Custom data for app (acme)**/
+        $app_data=[];
+
+    function __get($k)
+    {
+        if($k==='aps'){
+            if(!$this->aps)
+                $this->aps = new ApsData();
+            return $this->aps;
+        }
+        return array_key_exists($k,$this->app_data)?$this->app_data[$k]:null;
+    }
+
+    function __set($k, $v)
+    {
+        if($k==='aps'){
+            throw new \InvalidArgumentException('aps is a reserved keyword');
+        }
+        $this->app_data[$k] = $v;
+    }
+
+    public function jsonSerialize()
+    {
+        return array_filter(array_merge($this->app_data,[
+            'aps'=>$this->aps,
+        ]));
+    }
+}

src/FCM/Message/ApnsPayload.php → src/FCM/Message/Apns/ApsData.php

@@ -1,44 +1,31 @@
 <?php
-namespace Plokko\Firebase\FCM\Message;
+
+namespace Plokko\Firebase\FCM\Message\Apns;
 
 use JsonSerializable;
 
 /**
- * ApnsConfig payload
- * @package Plokko\Firebase\FCM\Message
+ * Contains aps apple's reserved keywords for ApnsPayload
+ * @package Plokko\Firebase\FCM\Message\Apns
+ *
  * @see https://goo.gl/32Pl5W
  */
-class ApnsPayload implements JsonSerializable
+class ApsData implements JsonSerializable
 {
     public
         /** @var ApnsAlert|string */
         $alert,
-
         /** @var int */
         $badge,
-
         /** @var string */
         $sound,
-
         /** @var int */
         $content_available,
-
         /** @var string */
         $category,
-
         /** @var string */
         $thread_id;
 
-    function __get($k)
-    {
-        return $this->{$k};
-    }
-
-    function __set($k, $v)
-    {
-        $this->{$k}=$v;
-    }
-
     public function jsonSerialize()
     {
         return array_filter([

src/FCM/Message/ApnsConfig.php

@@ -3,6 +3,7 @@
 namespace Plokko\Firebase\FCM\Message;
 
 use JsonSerializable;
+use Plokko\Firebase\FCM\Message\Apns\ApnsPayload;
 
 /**
  * Class ApnsConfig