Remove ResponseException::fromBadResponse and enhance ServerException with status mapping

Author: Mohamed Khaled

src/Providers/Http/Exception/ResponseException.php

@@ -5,8 +5,6 @@
 namespace WordPress\AiClient\Providers\Http\Exception;
 
 use WordPress\AiClient\Common\Exception\RuntimeException;
-use WordPress\AiClient\Providers\Http\DTO\Response;
-use WordPress\AiClient\Providers\Http\Utilities\ErrorMessageExtractor;
 
 /**
  * Exception class for HTTP response errors.
@@ -53,31 +51,4 @@ public static function fromInvalidData(string $apiName, string $message): self
     {
         return new self(sprintf('Unexpected %s API response: %s', $apiName, $message));
     }
-
-    /**
-     * Creates a ResponseException from a bad HTTP response.
-     *
-     * This method extracts error details from common API response formats
-     * and creates an exception with a descriptive message and status code.
-     *
-     * @since n.e.x.t
-     *
-     * @param Response $response The HTTP response that failed.
-     * @return self
-     */
-    public static function fromBadResponse(Response $response): self
-    {
-        $errorMessage = sprintf(
-            'Bad status code: %d.',
-            $response->getStatusCode()
-        );
-
-        // Extract error message from response data using centralized utility
-        $extractedError = ErrorMessageExtractor::extractFromResponseData($response->getData());
-        if ($extractedError !== null) {
-            $errorMessage .= ' ' . $extractedError;
-        }
-
-        return new self($errorMessage, $response->getStatusCode());
-    }
 }

src/Providers/Http/Exception/ServerException.php

@@ -29,11 +29,23 @@ class ServerException extends RuntimeException
      * @param Response $response The HTTP response that failed.
      * @return self
      */
-    public static function fromServerError(Response $response): self
+    public static function fromServerErrorResponse(Response $response): self
     {
+        $statusCode = $response->getStatusCode();
+        $statusTexts = [
+            500 => 'Internal Server Error',
+            502 => 'Bad Gateway',
+            503 => 'Service Unavailable',
+            504 => 'Gateway Timeout',
+            507 => 'Insufficient Storage',
+        ];
+
+        $statusText = $statusTexts[$statusCode] ?? 'Server Error';
+
         $errorMessage = sprintf(
-            'Server error (%d): Request failed due to server-side issue',
-            $response->getStatusCode()
+            'Server error (%d %s): Request failed due to server-side issue',
+            $statusCode,
+            $statusText
         );
 
         // Extract error message from response data using centralized utility

src/Providers/Http/Util/ResponseUtil.php

@@ -7,7 +7,6 @@
 use WordPress\AiClient\Providers\Http\DTO\Response;
 use WordPress\AiClient\Providers\Http\Exception\ClientException;
 use WordPress\AiClient\Providers\Http\Exception\RedirectException;
-use WordPress\AiClient\Providers\Http\Exception\ResponseException;
 use WordPress\AiClient\Providers\Http\Exception\ServerException;
 
 /**
@@ -25,15 +24,15 @@ class ResponseUtil
      * - 3xx: RedirectException (redirect responses)
      * - 4xx: ClientException (client errors)
      * - 5xx: ServerException (server errors)
-     * - Other unsuccessful responses: ResponseException (malformed responses)
+     * - Other unsuccessful responses: RuntimeException (invalid status codes)
      *
      * @since 0.1.0
      *
      * @param Response $response The HTTP response to check.
      * @throws RedirectException If the response indicates a redirect (3xx).
      * @throws ClientException If the response indicates a client error (4xx).
      * @throws ServerException If the response indicates a server error (5xx).
-     * @throws ResponseException If the response format is unexpected.
+     * @throws \RuntimeException If the response has an invalid status code.
      */
     public static function throwIfNotSuccessful(Response $response): void
     {
@@ -55,10 +54,11 @@ public static function throwIfNotSuccessful(Response $response): void
 
         // 5xx Server Errors
         if ($statusCode >= 500 && $statusCode < 600) {
-            throw ServerException::fromServerError($response);
+            throw ServerException::fromServerErrorResponse($response);
         }
 
-        // Other unsuccessful responses - should be extremely rare
-        throw ResponseException::fromBadResponse($response);
+        throw new \RuntimeException(
+            sprintf('Response returned invalid status code: %s', $response->getStatusCode())
+        );
     }
 }

tests/unit/Providers/Http/Util/ResponseUtilTest.php

@@ -117,7 +117,8 @@ public function testThrowIfNotSuccessfulThrowsServerExceptionFor5xxErrors(
         $this->expectException(ServerException::class);
         $this->expectExceptionCode($statusCode);
         $this->expectExceptionMessageMatches(
-            "/^Server error \\({$statusCode}\\): Request failed due to server-side issue( - {$expectedMessagePart})?$/"
+            "/^Server error \\({$statusCode} [^)]+\\): Request failed due to " .
+            "server-side issue( - {$expectedMessagePart})?$/"
         );
 
         ResponseUtil::throwIfNotSuccessful($response);