Merge pull request #84 from hnicolas-w/master

Change APS Type From Array To Object. Fix #82
edamov · Oct 31, 2019 · d0a77e6 · d0a77e6
2 parents 3f0d9d3 + 1f97f0e
commit d0a77e6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/src/Payload.php b/src/Payload.php
@@ -309,7 +309,7 @@ public function getCustomValue($key)
      */
     public function toJson(): string
     {
-        return json_encode($this, JSON_UNESCAPED_UNICODE | JSON_FORCE_OBJECT);
+        return json_encode($this, JSON_UNESCAPED_UNICODE);
     }
 
     /**
@@ -323,31 +323,31 @@ public function jsonSerialize()
         $payload = self::getDefaultPayloadStructure();
 
         if ($this->alert instanceof Alert || is_string($this->alert)) {
-            $payload[self::PAYLOAD_ROOT_KEY][self::PAYLOAD_ALERT_KEY] = $this->alert;
+            $payload[self::PAYLOAD_ROOT_KEY]->{self::PAYLOAD_ALERT_KEY} = $this->alert;
         }
 
         if (is_int($this->badge)) {
-            $payload[self::PAYLOAD_ROOT_KEY][self::PAYLOAD_BADGE_KEY] = $this->badge;
+            $payload[self::PAYLOAD_ROOT_KEY]->{self::PAYLOAD_BADGE_KEY} = $this->badge;
         }
 
         if (is_string($this->sound)) {
-            $payload[self::PAYLOAD_ROOT_KEY][self::PAYLOAD_SOUND_KEY] = $this->sound;
+            $payload[self::PAYLOAD_ROOT_KEY]->{self::PAYLOAD_SOUND_KEY} = $this->sound;
         }
 
         if (is_bool($this->contentAvailable)) {
-            $payload[self::PAYLOAD_ROOT_KEY][self::PAYLOAD_CONTENT_AVAILABLE_KEY] = (int)$this->contentAvailable;
+            $payload[self::PAYLOAD_ROOT_KEY]->{self::PAYLOAD_CONTENT_AVAILABLE_KEY} = (int)$this->contentAvailable;
         }
 
         if (is_bool($this->mutableContent)) {
-            $payload[self::PAYLOAD_ROOT_KEY][self::PAYLOAD_MUTABLE_CONTENT_KEY] = (int)$this->mutableContent;
+            $payload[self::PAYLOAD_ROOT_KEY]->{self::PAYLOAD_MUTABLE_CONTENT_KEY} = (int)$this->mutableContent;
         }
 
         if (is_string($this->category)) {
-            $payload[self::PAYLOAD_ROOT_KEY][self::PAYLOAD_CATEGORY_KEY] = $this->category;
+            $payload[self::PAYLOAD_ROOT_KEY]->{self::PAYLOAD_CATEGORY_KEY} = $this->category;
         }
 
         if (is_string($this->threadId)) {
-            $payload[self::PAYLOAD_ROOT_KEY][self::PAYLOAD_THREAD_ID_KEY] = $this->threadId;
+            $payload[self::PAYLOAD_ROOT_KEY]->{self::PAYLOAD_THREAD_ID_KEY} = $this->threadId;
         }
 
         if ((is_array($this->customValues) || $this->customValues instanceof Countable) && count($this->customValues)) {
@@ -364,6 +364,6 @@ public function jsonSerialize()
      */
     private static function getDefaultPayloadStructure()
     {
-        return [self::PAYLOAD_ROOT_KEY => []];
+        return [self::PAYLOAD_ROOT_KEY => new \stdClass];
     }
 }
diff --git a/tests/PayloadTest.php b/tests/PayloadTest.php
@@ -76,8 +76,8 @@ public function testSetCustomValue()
 
     public function testConvertToJSon()
     {
-        $alert = Alert::create()->setTitle('title');
 
+        $alert = Alert::create()->setTitle('title');
         $payload = Payload::create()
             ->setAlert($alert)
             ->setBadge(1)
@@ -93,5 +93,15 @@ public function testConvertToJSon()
             ' "thread-id": "tread-id", "mutable-content": 1, "content-available": 1}, "key": "value"}',
             $payload->toJson()
         );
+
+    }
+
+    public function testSetCustomArrayType() {
+        $alert = Alert::create()->setTitle('title');
+        $payload = Payload::create()
+            ->setAlert($alert)
+            ->setCustomValue('array', array(1,2,3));
+
+        $this->assertEquals(gettype(json_decode($payload->toJson())->array), 'array');
     }
 }