Better handle error message

Author: j0k3r

lib/Imgur/Listener/ErrorListener.php

@@ -35,8 +35,14 @@ public function error(ErrorEvent $event)
         if (\is_array($responseData) && isset($responseData['data']) && isset($responseData['data']['error'])) {
             $errorMessage = $responseData['data']['error'];
             // when uploading too fast, error is an array
-            if (\is_array($responseData['data']['error']) && isset($responseData['data']['error']['message'])) {
-                $errorMessage = $responseData['data']['error']['message'];
+            if (\is_array($responseData['data']['error'])) {
+                $errorMessage = '';
+
+                if (isset($responseData['data']['error']['message'])) {
+                    $errorMessage = $responseData['data']['error']['message'];
+                } elseif (isset($responseData['data']['error']['code'])) {
+                    $errorMessage = 'Error code: ' . $responseData['data']['error']['code'];
+                }
             }
 
             $message = 'Request failed with: "' . $errorMessage . '"';

tests/Listener/ErrorListenerTest.php

@@ -190,6 +190,42 @@ public function testErrorUploadingTooFast()
         $listener->error($this->getEventMock($response));
     }
 
+    /**
+     * @expectedException \Imgur\Exception\ErrorException
+     * @expectedExceptionMessage Request to: /3/image.json failed with: "Error code: 666"
+     */
+    public function testErrorNoMessageInError()
+    {
+        $response = $this->getMockBuilder('GuzzleHttp\Message\ResponseInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $response->expects($this->exactly(2))
+            ->method('getStatusCode')
+            ->will($this->returnValue(429));
+        $response->expects($this->once())
+            ->method('getBody')
+            ->will($this->returnValue(json_encode(['status' => 400, 'success' => false, 'data' => ['error' => ['code' => 666, 'type' => 'ImgurException', 'exception' => []], 'request' => '/3/image.json', 'method' => 'POST']])));
+        $response->expects($this->at(1))
+            ->method('getHeader')
+            ->with('X-RateLimit-UserRemaining')
+            ->will($this->returnValue(9));
+        $response->expects($this->at(2))
+            ->method('getHeader')
+            ->with('X-RateLimit-UserLimit')
+            ->will($this->returnValue(10));
+        $response->expects($this->at(3))
+            ->method('getHeader')
+            ->with('X-RateLimit-ClientRemaining')
+            ->will($this->returnValue(9));
+        $response->expects($this->at(4))
+            ->method('getHeader')
+            ->with('X-RateLimit-ClientLimit')
+            ->will($this->returnValue(10));
+
+        $listener = new ErrorListener();
+        $listener->error($this->getEventMock($response));
+    }
+
     /**
      * @expectedException \Imgur\Exception\RuntimeException
      * @expectedExceptionMessage hihi