Changes from gocardless/client-library-templates

lib/Core/ApiClient.php

@@ -137,8 +137,22 @@ private function handleErrors(Response $response)
             return null;
         }
 
+        // Normalize string errors into standard error object format
+        if (is_string($json->error)) {
+            $json->error = (object)[
+                'code' => $status_code,
+                'message' => $json->error
+            ];
+            // Create a new response with normalized error structure
+            $response = new Response(
+                $status_code,
+                $response->getHeaders(),
+                json_encode($json)
+            );
+        }
+
         $error = $json->error;
-        $exception_class = (string) ApiException::getError($status_code, $error->type);
+        $exception_class = (string) ApiException::getError($status_code, $error->type ?? null);
         $exception_class = 'GoCardlessPro\\Core\\Exception\\' . $exception_class;
 
         $api_response = new ApiResponse($response);

lib/Core/Exception/ApiException.php

@@ -25,6 +25,8 @@ public function __construct($api_response)
     public static function getError($status_code, $error_type)
     {
         switch ($status_code) {
+            case 400:
+                return 'InvalidApiUsageException';
             case 401:
                 return 'AuthenticationException';
             case 403:

tests/Core/ApiClientTest.php

@@ -233,4 +233,26 @@ public function testGoCardlessErrorResponse()
             throw $e;
         }
     }
+
+    public function testStringErrorResponse()
+    {
+        $fixture = $this->loadFixture('string_error');
+        $this->expectException('\GoCardlessPro\Core\Exception\ApiException');
+        $this->expectExceptionMessage('Something went wrong');
+
+        $this->mock->append(new \GuzzleHttp\Psr7\Response(400, ['Content-Type' => 'application/json'], $fixture));
+
+        try {
+            $this->api_client->get('/some_endpoint');
+        } catch (\GoCardlessPro\Core\Exception\ApiException $e) {
+            $this->assertEquals($e->getApiResponse()->status_code, '400');
+            $this->assertEquals($e->getApiResponse()->headers, ['Content-Type' => ['application/json']]);
+            $this->assertEquals($e->getMessage(), 'Something went wrong');
+
+            // Verify that methods return appropriate values for string errors
+            $this->assertEquals(array(), $e->getErrors());
+
+            throw $e;
+        }
+    }
 }

tests/fixtures/string_error.json

@@ -0,0 +1,3 @@
+{
+  "error": "Something went wrong"
+}