fix 400 bad request when empty 'extra' params are passed

changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.0.1 - 2017-06-29
+
+* Fix 400 bad request when empty 'extra' params are passed
+
 ## 1.0.0 - 2017-05-30
 
 * Initial release

src/Messages/AndroidMessageBuilder.php

@@ -328,7 +328,6 @@ public function build()
         $params = [
             'alert' => $this->alert,
             'title' => $this->title,
-            'extra' => $this->extra,
             'message_variation_id' => $this->messageVariationId,
             'priority' => $this->priority,
             'collapse_key' => $this->collapseKey,
@@ -341,6 +340,10 @@ public function build()
             'accent_color' => $this->accentColour,
         ];
 
+        if (!empty($this->extra)) {
+            $params['extra'] = $this->extra;
+        }
+
         return array_filter($params, function ($param) {
             return $param !== null;
         });

src/Messages/AppleMessageBuilder.php

@@ -241,7 +241,6 @@ public function build()
             'badge' => $this->badge,
             'alert' => $this->alert,
             'sound' => $this->sound,
-            'extra' => $this->extra,
             'category' => $this->category,
             'expiry' => $this->expiryDate ? $this->expiryDate->format('c') : null,
             'custom_uri' => $this->uri,
@@ -250,6 +249,10 @@ public function build()
             'asset_file_type' => $this->assetFileType,
         ];
 
+        if (!empty($this->extra)) {
+            $params['extra'] = $this->extra;
+        }
+
         return array_filter($params, function ($param) {
             return $param !== null;
         });

tests/AndroidMessageBuilderTest.php

@@ -40,6 +40,10 @@ public function testWithExtraAttributes()
         $params = $builder->build();
         $this->assertArrayHasKey('extra', $params);
         $this->assertEquals(['version' => 'abc'], $params['extra']);
+
+        $builder->withExtraAttributes([]);
+        $params = $builder->build();
+        $this->assertArrayNotHasKey('extra', $params);
     }
 
     public function testAddExtraAttribute()

tests/AppleMessageBuilderTest.php

@@ -54,6 +54,10 @@ public function testWithExtraAttributes()
         $params = $builder->build();
         $this->assertArrayHasKey('extra', $params);
         $this->assertEquals(['version' => 'abc'], $params['extra']);
+
+        $builder->withExtraAttributes([]);
+        $params = $builder->build();
+        $this->assertArrayNotHasKey('extra', $params);
     }
 
     public function testAddExtraAttribute()