Merge "Warn if stateful ParserOutput transforms are used"

[lhc/web/wiklou.git] / includes / api / ApiErrorFormatter.php

diff --git a/includes/api/ApiErrorFormatter.php b/includes/api/ApiErrorFormatter.php
index 7fb1352..c637752 100644 (file)
--- a/includes/api/ApiErrorFormatter.php
+++ b/includes/api/ApiErrorFormatter.php
@@ -112,7 +112,7 @@ class ApiErrorFormatter {
         * Add warnings and errors from a StatusValue object to the result
         * @param string|null $modulePath
         * @param StatusValue $status
-        * @param string[] $types 'warning' and/or 'error'
+        * @param string[]|string $types 'warning' and/or 'error'
         */
        public function addMessagesFromStatus(
                $modulePath, StatusValue $status, $types = [ 'warning', 'error' ]
@@ -160,6 +160,9 @@ class ApiErrorFormatter {
                if ( $exception instanceof ILocalizedException ) {
                        $msg = $exception->getMessageObject();
                        $params = [];
+               } elseif ( $exception instanceof MessageSpecifier ) {
+                       $msg = Message::newFromSpecifier( $exception );
+                       $params = [];
                } else {
                        // Extract code and data from the exception, if applicable
                        if ( $exception instanceof UsageException ) {
@@ -358,9 +361,8 @@ class ApiErrorFormatter {
  * @deprecated Only for backwards compatibility, do not use
  * @ingroup API
  */
-// @codingStandardsIgnoreStart Squiz.Classes.ValidClassName.NotCamelCaps
+// phpcs:ignore Squiz.Classes.ValidClassName.NotCamelCaps
 class ApiErrorFormatter_BackCompat extends ApiErrorFormatter {
-       // @codingStandardsIgnoreEnd
 
        /**
         * @param ApiResult $result Into which data will be added