Try to fix ApiRawRequester.request

Author: Grace Yim

lib/ToopherApi.php

@@ -179,22 +179,21 @@ private function request($method, $endpoint, $parameters = array(), $rawRequest
             }
 
             $err = json_decode($resultBody, true);
-            if ($err === NULL) {
+            if ($err) {
                 $jsonError = $this->json_error_to_string(json_last_error());
                 if (!empty($jsonError))
                 {
                     error_log(sprintf('Error parsing response body JSON: %s', $jsonError));
                     error_log(sprintf('Response body: %s', $result->getBody()));
                     throw new ToopherRequestException(sprintf('JSON Parsing Error: %s', $jsonError));
                 }
-            }
-
-            if(array_key_exists('error_message', $err))
-            {
-                throw new ToopherRequestException($err['error_message'], $err['error_code']);
             } else {
-                throw new ToopherRequestException(sprintf('%s - %s', $result->getReasonPhrase(), $resultBody), $result->getStatus());
+                if(array_key_exists('error_message', $err))
+                {
+                    throw new ToopherRequestException($err['error_message'], $err['error_code']);
+                }
             }
+            throw new ToopherRequestException(sprintf('%s - %s', $result->getReasonPhrase(), $resultBody), $result->getStatus());
         }
 
         if ($rawRequest) {
@@ -210,7 +209,7 @@ private function request($method, $endpoint, $parameters = array(), $rawRequest
                     throw new ToopherRequestException(sprintf('JSON Parsing Error: %s', $jsonError));
                 }
             }
-        return $decoded;
+            return $decoded;
         }
     }
 

test/ToopherApiTest.php

@@ -510,9 +510,9 @@ public function test403WithEmptyMessageRaisesToopherRequestException()
     * @expectedException ToopherRequestException
     * @expectedExceptionMessage JSON Parsing Error: Syntax error, malformed JSON
     */
-    public function test200WithEmptyMessageRaisesToopherRequestException()
+    public function test403WithBadJsonRaisesToopherRequestException()
     {
-        $resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/authentication_requests/1');
+        $resp = new HTTP_Request2_Response('HTTP/1.1 403 Forbidden', false, 'https://api.toopher.com/v1/authentication_requests/1');
         $resp->appendBody('stuff');
         $this->mock->addResponse($resp);
         $toopher = $this->getToopherApi($this->mock);
@@ -523,9 +523,9 @@ public function test200WithEmptyMessageRaisesToopherRequestException()
     * @expectedException ToopherRequestException
     * @expectedExceptionMessage JSON Parsing Error: Syntax error, malformed JSON
     */
-    public function test403WithBadJsonRaisesToopherRequestException()
+    public function test200WithEmptyMessageRaisesToopherRequestException()
     {
-        $resp = new HTTP_Request2_Response('HTTP/1.1 403 Forbidden', false, 'https://api.toopher.com/v1/authentication_requests/1');
+        $resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/authentication_requests/1');
         $resp->appendBody('stuff');
         $this->mock->addResponse($resp);
         $toopher = $this->getToopherApi($this->mock);