Merge a963854 into 693789b

.travis.yml

@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 5.4
   - 5.5
   - 5.6
   - 7.0

README.md

@@ -8,7 +8,7 @@ A simple PHP package for sending messages to [Slack](https://slack.com) with [in
 
 ## Requirements
 
-* PHP 5.4 or greater. Compatible with PHP7 and hhvm.
+* PHP 5.5, 5.6, 7.0 or HHVM
 
 ## Installation
 

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', 'UTF-8'));
+    }
+
+    protected function getNetworkStubbedClient()
+    {
+        $guzzle = Mockery::mock('GuzzleHttp\Client');
+
+        $guzzle->shouldReceive('post');
+
+        return new Client('http://fake.endpoint', [], $guzzle);
+    }
 }