Merge c41785e into 693789b

src/Client.php

@@ -3,6 +3,7 @@
 namespace Maknz\Slack;
 
 use GuzzleHttp\Client as Guzzle;
+use RuntimeException;
 
 class Client
 {
@@ -371,6 +372,10 @@ public function sendMessage(Message $message)
 
         $encoded = json_encode($payload, JSON_UNESCAPED_UNICODE);
 
+        if ($encoded === false) {
+            throw new RuntimeException(sprintf('JSON encoding error %s: %s', json_last_error(), json_last_error_msg()));
+        }
+
         $this->guzzle->post($this->endpoint, ['body' => $encoded]);
     }
 

tests/ClientFunctionalTest.php

@@ -127,4 +127,24 @@ public function testMessageWithAttachmentsAndFields()
 
         $this->assertEquals($expectedHttpData, $payload);
     }
+
+    public function testBadEncodingThrowsException()
+    {
+        $client = $this->getNetworkStubbedClient();
+
+        $this->setExpectedException(RuntimeException::class, 'JSON encoding error');
+
+        // Force encoding to ISO-8859-1 so we know we're providing malformed
+        // encoding to json_encode
+        $client->send(mb_convert_encoding('æøå', 'ISO-8859-1'));
+    }
+
+    protected function getNetworkStubbedClient()
+    {
+        $guzzle = Mockery::mock('GuzzleHttp\Client');
+
+        $guzzle->shouldReceive('post');
+
+        return new Client('http://fake.endpoint', [], $guzzle);
+    }
 }