Merge "Add config for serving main Page from the domain root"

[lhc/web/wiklou.git] / includes / Rest / ResponseFactory.php
diff --git a/includes/Rest/ResponseFactory.php b/includes/Rest/ResponseFactory.php

index d18cdb5..fd0f3c7 100644 (file)
--- a/includes/Rest/ResponseFactory.php
+++ b/includes/Rest/ResponseFactory.php
@@ -5,19 +5,31 @@ namespace MediaWiki\Rest;
  use Exception;
  use HttpStatus;
  use InvalidArgumentException;
+use LanguageCode;
  use MWExceptionHandler;
  use stdClass;
  use Throwable;
+use Wikimedia\Message\ITextFormatter;
+use Wikimedia\Message\MessageValue;
  
  /**
   * Generates standardized response objects.
   */
  class ResponseFactory {
-
         const CT_PLAIN = 'text/plain; charset=utf-8';
         const CT_HTML = 'text/html; charset=utf-8';
         const CT_JSON = 'application/json';
  
+       /** @var ITextFormatter[] */
+       private $textFormatters;
+
+       /**
+        * @param ITextFormatter[] $textFormatters
+        */
+       public function __construct( $textFormatters ) {
+               $this->textFormatters = $textFormatters;
+       }
+
         /**
          * Encode a stdClass object or array to a JSON string
          *
@@ -167,16 +179,31 @@ class ResponseFactory {
                 return $response;
         }
  
+       /**
+        * Create an HTTP 4xx or 5xx response with error message localisation
+        */
+       public function createLocalizedHttpError( $errorCode, MessageValue $messageValue ) {
+               return $this->createHttpError( $errorCode, $this->formatMessage( $messageValue ) );
+       }
+
         /**
          * Turn an exception into a JSON error response.
          * @param Exception|Throwable $exception
          * @return Response
          */
         public function createFromException( $exception ) {
-               if ( $exception instanceof HttpException ) {
+               if ( $exception instanceof LocalizedHttpException ) {
+                       $response = $this->createLocalizedHttpError( $exception->getCode(),
+                               $exception->getMessageValue() );
+               } elseif ( $exception instanceof HttpException ) {
                         // FIXME can HttpException represent 2xx or 3xx responses?
-                       $response = $this->createHttpError( $exception->getCode(),
-                               [ 'message' => $exception->getMessage() ] );
+                       $response = $this->createHttpError(
+                               $exception->getCode(),
+                               array_merge(
+                                       [ 'message' => $exception->getMessage() ],
+                                       (array)$exception->getErrorData()
+                               )
+                       );
                 } else {
                         $response = $this->createHttpError( 500, [
                                 'message' => 'Error: exception of type ' . get_class( $exception ),
@@ -235,4 +262,18 @@ class ResponseFactory {
                 return "<!doctype html><title>Redirect</title><a href=\"$url\">$url</a>";
         }
  
+       public function formatMessage( MessageValue $messageValue ) {
+               if ( !$this->textFormatters ) {
+                       // For unit tests
+                       return [];
+               }
+               $translations = [];
+               foreach ( $this->textFormatters as $formatter ) {
+                       $lang = LanguageCode::bcp47( $formatter->getLangCode() );
+                       $messageText = $formatter->format( $messageValue );
+                       $translations[$lang] = $messageText;
+               }
+               return [ 'messageTranslations' => $translations ];
+       }
+
  }