Handle title and error_title inconsistency in voice API

The requests can be handled by different services which have
different error formats. This commit reads both error fields and
provides a fallback if neither can be found

Author: mheap

src/Call/Collection.php

@@ -144,10 +144,25 @@ protected function getException(ResponseInterface $response)
         $body = json_decode($response->getBody()->getContents(), true);
         $status = $response->getStatusCode();
 
+        // Error responses aren't consistent. Some are generated within the
+        // proxy and some are generated within voice itself. This handles
+        // both cases
+
+        // This message isn't very useful, but we shouldn't ever see it
+        $errorTitle = 'Unexpected error';
+
+        if (isset($body['title'])) {
+            $errorTitle = $body['title'];
+        }
+
+        if (isset($body['error_title'])) {
+            $errorTitle = $body['error_title'];
+        }
+
         if($status >= 400 AND $status < 500) {
-            $e = new Exception\Request($body['error_title'], $status);
+            $e = new Exception\Request($errorTitle, $status);
         } elseif($status >= 500 AND $status < 600) {
-            $e = new Exception\Server($body['error_title'], $status);
+            $e = new Exception\Server($errorTitle, $status);
         } else {
             $e = new Exception\Exception('Unexpected HTTP Status Code');
             throw $e;

test/Call/CollectionTest.php

@@ -16,6 +16,7 @@
 use Prophecy\Argument;
 use Psr\Http\Message\RequestInterface;
 use Zend\Diactoros\Response;
+use Nexmo\Client\Exception;
 
 class CollectionTest extends \PHPUnit_Framework_TestCase
 {
@@ -132,6 +133,63 @@ public function testCreatePostCall($payload, $method)
         $this->assertInstanceOf('Nexmo\Call\Call', $call);
         $this->assertEquals('e46fd8bd-504d-4044-9600-26dd18b41111', $call->getId());
     }
+    
+    /**
+     * @dataProvider postCall
+     */
+    public function testCreatePostCallErrorFromVApi($payload, $method)
+    {
+        $this->nexmoClient->send(Argument::that(function(RequestInterface $request) use ($payload){
+            $this->assertRequestUrl('api.nexmo.com', '/v1/calls', 'POST', $request);
+            $this->assertRequestBodyIsJson(json_encode($payload), $request);
+            return true;
+        }))->willReturn($this->getResponse('error_vapi', '400'));
+
+        try {
+            $call = $this->collection->$method($payload);
+            $this->fail('Expected to throw request exception');
+        } catch (Exception\Request $e) {
+            $this->assertEquals($e->getMessage(), 'Bad Request');
+        }
+    }
+
+    /**
+     * @dataProvider postCall
+     */
+    public function testCreatePostCallErrorFromProxy($payload, $method)
+    {
+        $this->nexmoClient->send(Argument::that(function(RequestInterface $request) use ($payload){
+            $this->assertRequestUrl('api.nexmo.com', '/v1/calls', 'POST', $request);
+            $this->assertRequestBodyIsJson(json_encode($payload), $request);
+            return true;
+        }))->willReturn($this->getResponse('error_proxy', '400'));
+
+        try {
+            $call = $this->collection->$method($payload);
+            $this->fail('Expected to throw request exception');
+        } catch (Exception\Request $e) {
+            $this->assertEquals($e->getMessage(), 'Unsupported Media Type');
+        }
+    }
+
+    /**
+     * @dataProvider postCall
+     */
+    public function testCreatePostCallErrorUnknownFormat($payload, $method)
+    {
+        $this->nexmoClient->send(Argument::that(function(RequestInterface $request) use ($payload){
+            $this->assertRequestUrl('api.nexmo.com', '/v1/calls', 'POST', $request);
+            $this->assertRequestBodyIsJson(json_encode($payload), $request);
+            return true;
+        }))->willReturn($this->getResponse('error_unknown_format', '400'));
+
+        try {
+            $call = $this->collection->$method($payload);
+            $this->fail('Expected to throw request exception');
+        } catch (Exception\Request $e) {
+            $this->assertEquals($e->getMessage(), "Unexpected error");
+        }
+    }
 
     /**
      * @dataProvider putCall

test/Call/responses/error_proxy.json

@@ -0,0 +1,5 @@
+{
+    "type": "UNSUPPORTED_MEDIA_TYPE",
+    "error_title": "Unsupported Media Type"
+}
+

test/Call/responses/error_unknown_format.json

@@ -0,0 +1,3 @@
+{
+    "msg_error": "Unexpected error"
+}

test/Call/responses/error_vapi.json

@@ -0,0 +1,7 @@
+{
+    "type": 400,
+    "title": "Bad Request",
+    "invalid_parameters": [
+        { "reason": "can contain up to 15 digits prefixed with +", "name": "number" }
+    ]
+}