API: Overhaul ApiResult, make format=xml not throw, and add json formatversion
ApiResult was a mess: some methods could only be used with an array
reference instead of manipulating the stored data, methods that had both
array-ref and internal-data versions had names that didn't at all
correspond, some methods that worked on an array reference were
annoyingly non-static, and then the whole mess with setIndexedTagName.
ApiFormatXml is also entirely annoying to deal with, as it liked to
throw exceptions if certain metadata wasn't provided that no other
formatter required. Its legacy also means we have this silly convention
of using empty-string rather than boolean true, annoying restrictions on
keys (leading to things that should be hashes being arrays of key-value
object instead), '*' used as a key all over the place, and so on.
So, changes here:
* ApiResult is no longer an ApiBase or a ContextSource.
* Wherever sensible, ApiResult provides a static method working on an
arrayref and a non-static method working on internal data.
* Metadata is now always added to ApiResult's internal data structure.
Formatters are responsible for stripping it if necessary. "raw mode"
is deprecated.
* New metadata to replace the '*' key, solve the array() => '[]' vs '{}'
question, and so on.
* New class for formatting warnings and errors using i18n messages, and
support for multiple errors and a more machine-readable format for
warnings. For the moment, though, the actual output will not be changing
yet (see T47843 for future plans).
* New formatversion parameter for format=json and format=php, to select
between BC mode and the modern output.
* In BC mode, booleans will be converted to empty-string presence style;
modules currently returning booleans will need to use
ApiResult::META_BC_BOOLS to preserve their current output.
Actual changes to the API modules' output (e.g. actually returning
booleans for the new formatversion) beyond the use of
ApiResult::setContentValue() are left for a future change.
Bug: T76728
Bug: T57371
Bug: T33629
Change-Id: I7b37295e8862b188d1f3b0cd07f66ac34629678f
2014-12-03 22:14:22 +00:00
|
|
|
<?php
|
|
|
|
|
/**
|
|
|
|
|
* Defines an interface for messages with additional machine-readable data for
|
|
|
|
|
* use by the API, and provides concrete implementations of that interface.
|
|
|
|
|
*
|
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License along
|
|
|
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
|
|
* http://www.gnu.org/copyleft/gpl.html
|
|
|
|
|
*
|
|
|
|
|
* @file
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Interface for messages with machine-readable data for use by the API
|
2015-10-13 21:30:04 +00:00
|
|
|
*
|
|
|
|
|
* The idea is that it's a Message that has some extra data for the API to use when interpreting it
|
|
|
|
|
* as an error (or, in the future, as a warning). Internals of MediaWiki often use messages (or
|
|
|
|
|
* message keys, or Status objects containing messages) to pass information about errors to the user
|
|
|
|
|
* (see e.g. Title::getUserPermissionsErrors()) and the API has to make do with that.
|
|
|
|
|
*
|
API: Overhaul ApiResult, make format=xml not throw, and add json formatversion
ApiResult was a mess: some methods could only be used with an array
reference instead of manipulating the stored data, methods that had both
array-ref and internal-data versions had names that didn't at all
correspond, some methods that worked on an array reference were
annoyingly non-static, and then the whole mess with setIndexedTagName.
ApiFormatXml is also entirely annoying to deal with, as it liked to
throw exceptions if certain metadata wasn't provided that no other
formatter required. Its legacy also means we have this silly convention
of using empty-string rather than boolean true, annoying restrictions on
keys (leading to things that should be hashes being arrays of key-value
object instead), '*' used as a key all over the place, and so on.
So, changes here:
* ApiResult is no longer an ApiBase or a ContextSource.
* Wherever sensible, ApiResult provides a static method working on an
arrayref and a non-static method working on internal data.
* Metadata is now always added to ApiResult's internal data structure.
Formatters are responsible for stripping it if necessary. "raw mode"
is deprecated.
* New metadata to replace the '*' key, solve the array() => '[]' vs '{}'
question, and so on.
* New class for formatting warnings and errors using i18n messages, and
support for multiple errors and a more machine-readable format for
warnings. For the moment, though, the actual output will not be changing
yet (see T47843 for future plans).
* New formatversion parameter for format=json and format=php, to select
between BC mode and the modern output.
* In BC mode, booleans will be converted to empty-string presence style;
modules currently returning booleans will need to use
ApiResult::META_BC_BOOLS to preserve their current output.
Actual changes to the API modules' output (e.g. actually returning
booleans for the new formatversion) beyond the use of
ApiResult::setContentValue() are left for a future change.
Bug: T76728
Bug: T57371
Bug: T33629
Change-Id: I7b37295e8862b188d1f3b0cd07f66ac34629678f
2014-12-03 22:14:22 +00:00
|
|
|
* @since 1.25
|
2017-09-25 16:14:55 +00:00
|
|
|
* @note This interface exists to work around PHP's inheritance, so ApiMessage
|
|
|
|
|
* can extend Message and ApiRawMessage can extend RawMessage while still
|
|
|
|
|
* allowing an instanceof check for a Message object including this
|
|
|
|
|
* functionality. If for some reason you feel the need to implement this
|
|
|
|
|
* interface on some other class, that class must also implement all the
|
|
|
|
|
* public methods the Message class provides (not just those from
|
|
|
|
|
* MessageSpecifier, which as written is fairly useless).
|
API: Overhaul ApiResult, make format=xml not throw, and add json formatversion
ApiResult was a mess: some methods could only be used with an array
reference instead of manipulating the stored data, methods that had both
array-ref and internal-data versions had names that didn't at all
correspond, some methods that worked on an array reference were
annoyingly non-static, and then the whole mess with setIndexedTagName.
ApiFormatXml is also entirely annoying to deal with, as it liked to
throw exceptions if certain metadata wasn't provided that no other
formatter required. Its legacy also means we have this silly convention
of using empty-string rather than boolean true, annoying restrictions on
keys (leading to things that should be hashes being arrays of key-value
object instead), '*' used as a key all over the place, and so on.
So, changes here:
* ApiResult is no longer an ApiBase or a ContextSource.
* Wherever sensible, ApiResult provides a static method working on an
arrayref and a non-static method working on internal data.
* Metadata is now always added to ApiResult's internal data structure.
Formatters are responsible for stripping it if necessary. "raw mode"
is deprecated.
* New metadata to replace the '*' key, solve the array() => '[]' vs '{}'
question, and so on.
* New class for formatting warnings and errors using i18n messages, and
support for multiple errors and a more machine-readable format for
warnings. For the moment, though, the actual output will not be changing
yet (see T47843 for future plans).
* New formatversion parameter for format=json and format=php, to select
between BC mode and the modern output.
* In BC mode, booleans will be converted to empty-string presence style;
modules currently returning booleans will need to use
ApiResult::META_BC_BOOLS to preserve their current output.
Actual changes to the API modules' output (e.g. actually returning
booleans for the new formatversion) beyond the use of
ApiResult::setContentValue() are left for a future change.
Bug: T76728
Bug: T57371
Bug: T33629
Change-Id: I7b37295e8862b188d1f3b0cd07f66ac34629678f
2014-12-03 22:14:22 +00:00
|
|
|
* @ingroup API
|
|
|
|
|
*/
|
|
|
|
|
interface IApiMessage extends MessageSpecifier {
|
|
|
|
|
/**
|
|
|
|
|
* Returns a machine-readable code for use by the API
|
|
|
|
|
*
|
2016-10-19 16:54:25 +00:00
|
|
|
* If no code was specifically set, the message key is used as the code
|
|
|
|
|
* after removing "apiwarn-" or "apierror-" prefixes and applying
|
|
|
|
|
* backwards-compatibility mappings.
|
|
|
|
|
*
|
API: Overhaul ApiResult, make format=xml not throw, and add json formatversion
ApiResult was a mess: some methods could only be used with an array
reference instead of manipulating the stored data, methods that had both
array-ref and internal-data versions had names that didn't at all
correspond, some methods that worked on an array reference were
annoyingly non-static, and then the whole mess with setIndexedTagName.
ApiFormatXml is also entirely annoying to deal with, as it liked to
throw exceptions if certain metadata wasn't provided that no other
formatter required. Its legacy also means we have this silly convention
of using empty-string rather than boolean true, annoying restrictions on
keys (leading to things that should be hashes being arrays of key-value
object instead), '*' used as a key all over the place, and so on.
So, changes here:
* ApiResult is no longer an ApiBase or a ContextSource.
* Wherever sensible, ApiResult provides a static method working on an
arrayref and a non-static method working on internal data.
* Metadata is now always added to ApiResult's internal data structure.
Formatters are responsible for stripping it if necessary. "raw mode"
is deprecated.
* New metadata to replace the '*' key, solve the array() => '[]' vs '{}'
question, and so on.
* New class for formatting warnings and errors using i18n messages, and
support for multiple errors and a more machine-readable format for
warnings. For the moment, though, the actual output will not be changing
yet (see T47843 for future plans).
* New formatversion parameter for format=json and format=php, to select
between BC mode and the modern output.
* In BC mode, booleans will be converted to empty-string presence style;
modules currently returning booleans will need to use
ApiResult::META_BC_BOOLS to preserve their current output.
Actual changes to the API modules' output (e.g. actually returning
booleans for the new formatversion) beyond the use of
ApiResult::setContentValue() are left for a future change.
Bug: T76728
Bug: T57371
Bug: T33629
Change-Id: I7b37295e8862b188d1f3b0cd07f66ac34629678f
2014-12-03 22:14:22 +00:00
|
|
|
* @return string
|
|
|
|
|
*/
|
|
|
|
|
public function getApiCode();
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Returns additional machine-readable data about the error condition
|
|
|
|
|
* @return array
|
|
|
|
|
*/
|
|
|
|
|
public function getApiData();
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Sets the machine-readable code for use by the API
|
2016-10-19 16:54:25 +00:00
|
|
|
* @param string|null $code If null, uses the default (see self::getApiCode())
|
API: Overhaul ApiResult, make format=xml not throw, and add json formatversion
ApiResult was a mess: some methods could only be used with an array
reference instead of manipulating the stored data, methods that had both
array-ref and internal-data versions had names that didn't at all
correspond, some methods that worked on an array reference were
annoyingly non-static, and then the whole mess with setIndexedTagName.
ApiFormatXml is also entirely annoying to deal with, as it liked to
throw exceptions if certain metadata wasn't provided that no other
formatter required. Its legacy also means we have this silly convention
of using empty-string rather than boolean true, annoying restrictions on
keys (leading to things that should be hashes being arrays of key-value
object instead), '*' used as a key all over the place, and so on.
So, changes here:
* ApiResult is no longer an ApiBase or a ContextSource.
* Wherever sensible, ApiResult provides a static method working on an
arrayref and a non-static method working on internal data.
* Metadata is now always added to ApiResult's internal data structure.
Formatters are responsible for stripping it if necessary. "raw mode"
is deprecated.
* New metadata to replace the '*' key, solve the array() => '[]' vs '{}'
question, and so on.
* New class for formatting warnings and errors using i18n messages, and
support for multiple errors and a more machine-readable format for
warnings. For the moment, though, the actual output will not be changing
yet (see T47843 for future plans).
* New formatversion parameter for format=json and format=php, to select
between BC mode and the modern output.
* In BC mode, booleans will be converted to empty-string presence style;
modules currently returning booleans will need to use
ApiResult::META_BC_BOOLS to preserve their current output.
Actual changes to the API modules' output (e.g. actually returning
booleans for the new formatversion) beyond the use of
ApiResult::setContentValue() are left for a future change.
Bug: T76728
Bug: T57371
Bug: T33629
Change-Id: I7b37295e8862b188d1f3b0cd07f66ac34629678f
2014-12-03 22:14:22 +00:00
|
|
|
* @param array|null $data If non-null, passed to self::setApiData()
|
|
|
|
|
*/
|
|
|
|
|
public function setApiCode( $code, array $data = null );
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Sets additional machine-readable data about the error condition
|
|
|
|
|
* @param array $data
|
|
|
|
|
*/
|
|
|
|
|
public function setApiData( array $data );
|
|
|
|
|
}
|
|
|
|
|
|
2016-02-10 15:40:15 +00:00
|
|
|
/**
|
|
|
|
|
* Trait to implement the IApiMessage interface for Message subclasses
|
|
|
|
|
* @since 1.27
|
|
|
|
|
* @ingroup API
|
|
|
|
|
*/
|
|
|
|
|
trait ApiMessageTrait {
|
2016-10-19 16:54:25 +00:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Compatibility code mappings for various MW messages.
|
|
|
|
|
* @todo Ideally anything relying on this should be changed to use ApiMessage.
|
|
|
|
|
*/
|
|
|
|
|
protected static $messageMap = [
|
|
|
|
|
'actionthrottledtext' => 'ratelimited',
|
|
|
|
|
'autoblockedtext' => 'autoblocked',
|
|
|
|
|
'badaccess-group0' => 'permissiondenied',
|
|
|
|
|
'badaccess-groups' => 'permissiondenied',
|
|
|
|
|
'badipaddress' => 'invalidip',
|
|
|
|
|
'blankpage' => 'emptypage',
|
|
|
|
|
'blockedtext' => 'blocked',
|
|
|
|
|
'cannotdelete' => 'cantdelete',
|
|
|
|
|
'cannotundelete' => 'cantundelete',
|
|
|
|
|
'cantmove-titleprotected' => 'protectedtitle',
|
|
|
|
|
'cantrollback' => 'onlyauthor',
|
|
|
|
|
'confirmedittext' => 'confirmemail',
|
|
|
|
|
'content-not-allowed-here' => 'contentnotallowedhere',
|
|
|
|
|
'deleteprotected' => 'cantedit',
|
|
|
|
|
'delete-toobig' => 'bigdelete',
|
|
|
|
|
'edit-conflict' => 'editconflict',
|
|
|
|
|
'imagenocrossnamespace' => 'nonfilenamespace',
|
|
|
|
|
'imagetypemismatch' => 'filetypemismatch',
|
|
|
|
|
'importbadinterwiki' => 'badinterwiki',
|
|
|
|
|
'importcantopen' => 'cantopenfile',
|
|
|
|
|
'import-noarticle' => 'badinterwiki',
|
|
|
|
|
'importnofile' => 'nofile',
|
|
|
|
|
'importuploaderrorpartial' => 'partialupload',
|
|
|
|
|
'importuploaderrorsize' => 'filetoobig',
|
|
|
|
|
'importuploaderrortemp' => 'notempdir',
|
|
|
|
|
'ipb_already_blocked' => 'alreadyblocked',
|
|
|
|
|
'ipb_blocked_as_range' => 'blockedasrange',
|
|
|
|
|
'ipb_cant_unblock' => 'cantunblock',
|
|
|
|
|
'ipb_expiry_invalid' => 'invalidexpiry',
|
|
|
|
|
'ip_range_invalid' => 'invalidrange',
|
|
|
|
|
'mailnologin' => 'cantsend',
|
|
|
|
|
'markedaspatrollederror-noautopatrol' => 'noautopatrol',
|
|
|
|
|
'movenologintext' => 'cantmove-anon',
|
|
|
|
|
'movenotallowed' => 'cantmove',
|
|
|
|
|
'movenotallowedfile' => 'cantmovefile',
|
|
|
|
|
'namespaceprotected' => 'protectednamespace',
|
|
|
|
|
'nocreate-loggedin' => 'cantcreate',
|
|
|
|
|
'nocreatetext' => 'cantcreate-anon',
|
|
|
|
|
'noname' => 'invaliduser',
|
|
|
|
|
'nosuchusershort' => 'nosuchuser',
|
|
|
|
|
'notanarticle' => 'missingtitle',
|
|
|
|
|
'nouserspecified' => 'invaliduser',
|
|
|
|
|
'ns-specialprotected' => 'unsupportednamespace',
|
|
|
|
|
'protect-cantedit' => 'cantedit',
|
|
|
|
|
'protectedinterface' => 'protectednamespace-interface',
|
|
|
|
|
'protectedpagetext' => 'protectedpage',
|
|
|
|
|
'range_block_disabled' => 'rangedisabled',
|
|
|
|
|
'rcpatroldisabled' => 'patroldisabled',
|
|
|
|
|
'readonlytext' => 'readonly',
|
|
|
|
|
'sessionfailure' => 'badtoken',
|
2016-12-01 16:51:03 +00:00
|
|
|
'systemblockedtext' => 'blocked',
|
2016-10-19 16:54:25 +00:00
|
|
|
'titleprotected' => 'protectedtitle',
|
|
|
|
|
'undo-failure' => 'undofailure',
|
|
|
|
|
'userrights-nodatabase' => 'nosuchdatabase',
|
|
|
|
|
'userrights-no-interwiki' => 'nointerwikiuserrights',
|
|
|
|
|
];
|
|
|
|
|
|
2016-02-10 15:40:15 +00:00
|
|
|
protected $apiCode = null;
|
2016-02-17 09:09:32 +00:00
|
|
|
protected $apiData = [];
|
2016-02-10 15:40:15 +00:00
|
|
|
|
|
|
|
|
public function getApiCode() {
|
2016-10-19 16:54:25 +00:00
|
|
|
if ( $this->apiCode === null ) {
|
|
|
|
|
$key = $this->getKey();
|
|
|
|
|
if ( isset( self::$messageMap[$key] ) ) {
|
|
|
|
|
$this->apiCode = self::$messageMap[$key];
|
|
|
|
|
} elseif ( $key === 'apierror-missingparam' ) {
|
|
|
|
|
/// @todo: Kill this case along with ApiBase::$messageMap
|
|
|
|
|
$this->apiCode = 'no' . $this->getParams()[0];
|
|
|
|
|
} elseif ( substr( $key, 0, 8 ) === 'apiwarn-' ) {
|
|
|
|
|
$this->apiCode = substr( $key, 8 );
|
|
|
|
|
} elseif ( substr( $key, 0, 9 ) === 'apierror-' ) {
|
|
|
|
|
$this->apiCode = substr( $key, 9 );
|
|
|
|
|
} else {
|
|
|
|
|
$this->apiCode = $key;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return $this->apiCode;
|
2016-02-10 15:40:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public function setApiCode( $code, array $data = null ) {
|
2016-10-19 16:54:25 +00:00
|
|
|
if ( $code !== null && !( is_string( $code ) && $code !== '' ) ) {
|
|
|
|
|
throw new InvalidArgumentException( "Invalid code \"$code\"" );
|
|
|
|
|
}
|
|
|
|
|
|
2016-02-10 15:40:15 +00:00
|
|
|
$this->apiCode = $code;
|
|
|
|
|
if ( $data !== null ) {
|
|
|
|
|
$this->setApiData( $data );
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public function getApiData() {
|
|
|
|
|
return $this->apiData;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public function setApiData( array $data ) {
|
|
|
|
|
$this->apiData = $data;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public function serialize() {
|
2016-02-17 09:09:32 +00:00
|
|
|
return serialize( [
|
2016-02-10 15:40:15 +00:00
|
|
|
'parent' => parent::serialize(),
|
|
|
|
|
'apiCode' => $this->apiCode,
|
|
|
|
|
'apiData' => $this->apiData,
|
2016-02-17 09:09:32 +00:00
|
|
|
] );
|
2016-02-10 15:40:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public function unserialize( $serialized ) {
|
|
|
|
|
$data = unserialize( $serialized );
|
|
|
|
|
parent::unserialize( $data['parent'] );
|
|
|
|
|
$this->apiCode = $data['apiCode'];
|
|
|
|
|
$this->apiData = $data['apiData'];
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
API: Overhaul ApiResult, make format=xml not throw, and add json formatversion
ApiResult was a mess: some methods could only be used with an array
reference instead of manipulating the stored data, methods that had both
array-ref and internal-data versions had names that didn't at all
correspond, some methods that worked on an array reference were
annoyingly non-static, and then the whole mess with setIndexedTagName.
ApiFormatXml is also entirely annoying to deal with, as it liked to
throw exceptions if certain metadata wasn't provided that no other
formatter required. Its legacy also means we have this silly convention
of using empty-string rather than boolean true, annoying restrictions on
keys (leading to things that should be hashes being arrays of key-value
object instead), '*' used as a key all over the place, and so on.
So, changes here:
* ApiResult is no longer an ApiBase or a ContextSource.
* Wherever sensible, ApiResult provides a static method working on an
arrayref and a non-static method working on internal data.
* Metadata is now always added to ApiResult's internal data structure.
Formatters are responsible for stripping it if necessary. "raw mode"
is deprecated.
* New metadata to replace the '*' key, solve the array() => '[]' vs '{}'
question, and so on.
* New class for formatting warnings and errors using i18n messages, and
support for multiple errors and a more machine-readable format for
warnings. For the moment, though, the actual output will not be changing
yet (see T47843 for future plans).
* New formatversion parameter for format=json and format=php, to select
between BC mode and the modern output.
* In BC mode, booleans will be converted to empty-string presence style;
modules currently returning booleans will need to use
ApiResult::META_BC_BOOLS to preserve their current output.
Actual changes to the API modules' output (e.g. actually returning
booleans for the new formatversion) beyond the use of
ApiResult::setContentValue() are left for a future change.
Bug: T76728
Bug: T57371
Bug: T33629
Change-Id: I7b37295e8862b188d1f3b0cd07f66ac34629678f
2014-12-03 22:14:22 +00:00
|
|
|
/**
|
|
|
|
|
* Extension of Message implementing IApiMessage
|
|
|
|
|
* @since 1.25
|
|
|
|
|
* @ingroup API
|
|
|
|
|
*/
|
|
|
|
|
class ApiMessage extends Message implements IApiMessage {
|
2016-02-10 15:40:15 +00:00
|
|
|
use ApiMessageTrait;
|
API: Overhaul ApiResult, make format=xml not throw, and add json formatversion
ApiResult was a mess: some methods could only be used with an array
reference instead of manipulating the stored data, methods that had both
array-ref and internal-data versions had names that didn't at all
correspond, some methods that worked on an array reference were
annoyingly non-static, and then the whole mess with setIndexedTagName.
ApiFormatXml is also entirely annoying to deal with, as it liked to
throw exceptions if certain metadata wasn't provided that no other
formatter required. Its legacy also means we have this silly convention
of using empty-string rather than boolean true, annoying restrictions on
keys (leading to things that should be hashes being arrays of key-value
object instead), '*' used as a key all over the place, and so on.
So, changes here:
* ApiResult is no longer an ApiBase or a ContextSource.
* Wherever sensible, ApiResult provides a static method working on an
arrayref and a non-static method working on internal data.
* Metadata is now always added to ApiResult's internal data structure.
Formatters are responsible for stripping it if necessary. "raw mode"
is deprecated.
* New metadata to replace the '*' key, solve the array() => '[]' vs '{}'
question, and so on.
* New class for formatting warnings and errors using i18n messages, and
support for multiple errors and a more machine-readable format for
warnings. For the moment, though, the actual output will not be changing
yet (see T47843 for future plans).
* New formatversion parameter for format=json and format=php, to select
between BC mode and the modern output.
* In BC mode, booleans will be converted to empty-string presence style;
modules currently returning booleans will need to use
ApiResult::META_BC_BOOLS to preserve their current output.
Actual changes to the API modules' output (e.g. actually returning
booleans for the new formatversion) beyond the use of
ApiResult::setContentValue() are left for a future change.
Bug: T76728
Bug: T57371
Bug: T33629
Change-Id: I7b37295e8862b188d1f3b0cd07f66ac34629678f
2014-12-03 22:14:22 +00:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Create an IApiMessage for the message
|
|
|
|
|
*
|
|
|
|
|
* This returns $msg if it's an IApiMessage, calls 'new ApiRawMessage' if
|
|
|
|
|
* $msg is a RawMessage, or calls 'new ApiMessage' in all other cases.
|
|
|
|
|
*
|
|
|
|
|
* @param Message|RawMessage|array|string $msg
|
|
|
|
|
* @param string|null $code
|
|
|
|
|
* @param array|null $data
|
2016-10-19 16:54:25 +00:00
|
|
|
* @return IApiMessage
|
API: Overhaul ApiResult, make format=xml not throw, and add json formatversion
ApiResult was a mess: some methods could only be used with an array
reference instead of manipulating the stored data, methods that had both
array-ref and internal-data versions had names that didn't at all
correspond, some methods that worked on an array reference were
annoyingly non-static, and then the whole mess with setIndexedTagName.
ApiFormatXml is also entirely annoying to deal with, as it liked to
throw exceptions if certain metadata wasn't provided that no other
formatter required. Its legacy also means we have this silly convention
of using empty-string rather than boolean true, annoying restrictions on
keys (leading to things that should be hashes being arrays of key-value
object instead), '*' used as a key all over the place, and so on.
So, changes here:
* ApiResult is no longer an ApiBase or a ContextSource.
* Wherever sensible, ApiResult provides a static method working on an
arrayref and a non-static method working on internal data.
* Metadata is now always added to ApiResult's internal data structure.
Formatters are responsible for stripping it if necessary. "raw mode"
is deprecated.
* New metadata to replace the '*' key, solve the array() => '[]' vs '{}'
question, and so on.
* New class for formatting warnings and errors using i18n messages, and
support for multiple errors and a more machine-readable format for
warnings. For the moment, though, the actual output will not be changing
yet (see T47843 for future plans).
* New formatversion parameter for format=json and format=php, to select
between BC mode and the modern output.
* In BC mode, booleans will be converted to empty-string presence style;
modules currently returning booleans will need to use
ApiResult::META_BC_BOOLS to preserve their current output.
Actual changes to the API modules' output (e.g. actually returning
booleans for the new formatversion) beyond the use of
ApiResult::setContentValue() are left for a future change.
Bug: T76728
Bug: T57371
Bug: T33629
Change-Id: I7b37295e8862b188d1f3b0cd07f66ac34629678f
2014-12-03 22:14:22 +00:00
|
|
|
*/
|
|
|
|
|
public static function create( $msg, $code = null, array $data = null ) {
|
2016-10-19 16:54:25 +00:00
|
|
|
if ( is_array( $msg ) ) {
|
|
|
|
|
// From StatusValue
|
|
|
|
|
if ( isset( $msg['message'] ) ) {
|
|
|
|
|
if ( isset( $msg['params'] ) ) {
|
|
|
|
|
$msg = array_merge( [ $msg['message'] ], $msg['params'] );
|
|
|
|
|
} else {
|
|
|
|
|
$msg = [ $msg['message'] ];
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Weirdness that comes in sometimes, including the above
|
|
|
|
|
if ( $msg[0] instanceof MessageSpecifier ) {
|
|
|
|
|
$msg = $msg[0];
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
API: Overhaul ApiResult, make format=xml not throw, and add json formatversion
ApiResult was a mess: some methods could only be used with an array
reference instead of manipulating the stored data, methods that had both
array-ref and internal-data versions had names that didn't at all
correspond, some methods that worked on an array reference were
annoyingly non-static, and then the whole mess with setIndexedTagName.
ApiFormatXml is also entirely annoying to deal with, as it liked to
throw exceptions if certain metadata wasn't provided that no other
formatter required. Its legacy also means we have this silly convention
of using empty-string rather than boolean true, annoying restrictions on
keys (leading to things that should be hashes being arrays of key-value
object instead), '*' used as a key all over the place, and so on.
So, changes here:
* ApiResult is no longer an ApiBase or a ContextSource.
* Wherever sensible, ApiResult provides a static method working on an
arrayref and a non-static method working on internal data.
* Metadata is now always added to ApiResult's internal data structure.
Formatters are responsible for stripping it if necessary. "raw mode"
is deprecated.
* New metadata to replace the '*' key, solve the array() => '[]' vs '{}'
question, and so on.
* New class for formatting warnings and errors using i18n messages, and
support for multiple errors and a more machine-readable format for
warnings. For the moment, though, the actual output will not be changing
yet (see T47843 for future plans).
* New formatversion parameter for format=json and format=php, to select
between BC mode and the modern output.
* In BC mode, booleans will be converted to empty-string presence style;
modules currently returning booleans will need to use
ApiResult::META_BC_BOOLS to preserve their current output.
Actual changes to the API modules' output (e.g. actually returning
booleans for the new formatversion) beyond the use of
ApiResult::setContentValue() are left for a future change.
Bug: T76728
Bug: T57371
Bug: T33629
Change-Id: I7b37295e8862b188d1f3b0cd07f66ac34629678f
2014-12-03 22:14:22 +00:00
|
|
|
if ( $msg instanceof IApiMessage ) {
|
|
|
|
|
return $msg;
|
|
|
|
|
} elseif ( $msg instanceof RawMessage ) {
|
|
|
|
|
return new ApiRawMessage( $msg, $code, $data );
|
|
|
|
|
} else {
|
|
|
|
|
return new ApiMessage( $msg, $code, $data );
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* @param Message|string|array $msg
|
|
|
|
|
* - Message: is cloned
|
|
|
|
|
* - array: first element is $key, rest are $params to Message::__construct
|
|
|
|
|
* - string: passed to Message::__construct
|
|
|
|
|
* @param string|null $code
|
|
|
|
|
* @param array|null $data
|
|
|
|
|
*/
|
|
|
|
|
public function __construct( $msg, $code = null, array $data = null ) {
|
|
|
|
|
if ( $msg instanceof Message ) {
|
|
|
|
|
foreach ( get_class_vars( get_class( $this ) ) as $key => $value ) {
|
|
|
|
|
if ( isset( $msg->$key ) ) {
|
|
|
|
|
$this->$key = $msg->$key;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} elseif ( is_array( $msg ) ) {
|
|
|
|
|
$key = array_shift( $msg );
|
|
|
|
|
parent::__construct( $key, $msg );
|
|
|
|
|
} else {
|
|
|
|
|
parent::__construct( $msg );
|
|
|
|
|
}
|
2016-10-19 16:54:25 +00:00
|
|
|
$this->setApiCode( $code, $data );
|
API: Overhaul ApiResult, make format=xml not throw, and add json formatversion
ApiResult was a mess: some methods could only be used with an array
reference instead of manipulating the stored data, methods that had both
array-ref and internal-data versions had names that didn't at all
correspond, some methods that worked on an array reference were
annoyingly non-static, and then the whole mess with setIndexedTagName.
ApiFormatXml is also entirely annoying to deal with, as it liked to
throw exceptions if certain metadata wasn't provided that no other
formatter required. Its legacy also means we have this silly convention
of using empty-string rather than boolean true, annoying restrictions on
keys (leading to things that should be hashes being arrays of key-value
object instead), '*' used as a key all over the place, and so on.
So, changes here:
* ApiResult is no longer an ApiBase or a ContextSource.
* Wherever sensible, ApiResult provides a static method working on an
arrayref and a non-static method working on internal data.
* Metadata is now always added to ApiResult's internal data structure.
Formatters are responsible for stripping it if necessary. "raw mode"
is deprecated.
* New metadata to replace the '*' key, solve the array() => '[]' vs '{}'
question, and so on.
* New class for formatting warnings and errors using i18n messages, and
support for multiple errors and a more machine-readable format for
warnings. For the moment, though, the actual output will not be changing
yet (see T47843 for future plans).
* New formatversion parameter for format=json and format=php, to select
between BC mode and the modern output.
* In BC mode, booleans will be converted to empty-string presence style;
modules currently returning booleans will need to use
ApiResult::META_BC_BOOLS to preserve their current output.
Actual changes to the API modules' output (e.g. actually returning
booleans for the new formatversion) beyond the use of
ApiResult::setContentValue() are left for a future change.
Bug: T76728
Bug: T57371
Bug: T33629
Change-Id: I7b37295e8862b188d1f3b0cd07f66ac34629678f
2014-12-03 22:14:22 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Extension of RawMessage implementing IApiMessage
|
|
|
|
|
* @since 1.25
|
|
|
|
|
* @ingroup API
|
|
|
|
|
*/
|
|
|
|
|
class ApiRawMessage extends RawMessage implements IApiMessage {
|
2016-02-10 15:40:15 +00:00
|
|
|
use ApiMessageTrait;
|
API: Overhaul ApiResult, make format=xml not throw, and add json formatversion
ApiResult was a mess: some methods could only be used with an array
reference instead of manipulating the stored data, methods that had both
array-ref and internal-data versions had names that didn't at all
correspond, some methods that worked on an array reference were
annoyingly non-static, and then the whole mess with setIndexedTagName.
ApiFormatXml is also entirely annoying to deal with, as it liked to
throw exceptions if certain metadata wasn't provided that no other
formatter required. Its legacy also means we have this silly convention
of using empty-string rather than boolean true, annoying restrictions on
keys (leading to things that should be hashes being arrays of key-value
object instead), '*' used as a key all over the place, and so on.
So, changes here:
* ApiResult is no longer an ApiBase or a ContextSource.
* Wherever sensible, ApiResult provides a static method working on an
arrayref and a non-static method working on internal data.
* Metadata is now always added to ApiResult's internal data structure.
Formatters are responsible for stripping it if necessary. "raw mode"
is deprecated.
* New metadata to replace the '*' key, solve the array() => '[]' vs '{}'
question, and so on.
* New class for formatting warnings and errors using i18n messages, and
support for multiple errors and a more machine-readable format for
warnings. For the moment, though, the actual output will not be changing
yet (see T47843 for future plans).
* New formatversion parameter for format=json and format=php, to select
between BC mode and the modern output.
* In BC mode, booleans will be converted to empty-string presence style;
modules currently returning booleans will need to use
ApiResult::META_BC_BOOLS to preserve their current output.
Actual changes to the API modules' output (e.g. actually returning
booleans for the new formatversion) beyond the use of
ApiResult::setContentValue() are left for a future change.
Bug: T76728
Bug: T57371
Bug: T33629
Change-Id: I7b37295e8862b188d1f3b0cd07f66ac34629678f
2014-12-03 22:14:22 +00:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* @param RawMessage|string|array $msg
|
|
|
|
|
* - RawMessage: is cloned
|
|
|
|
|
* - array: first element is $key, rest are $params to RawMessage::__construct
|
|
|
|
|
* - string: passed to RawMessage::__construct
|
|
|
|
|
* @param string|null $code
|
|
|
|
|
* @param array|null $data
|
|
|
|
|
*/
|
|
|
|
|
public function __construct( $msg, $code = null, array $data = null ) {
|
|
|
|
|
if ( $msg instanceof RawMessage ) {
|
|
|
|
|
foreach ( get_class_vars( get_class( $this ) ) as $key => $value ) {
|
|
|
|
|
if ( isset( $msg->$key ) ) {
|
|
|
|
|
$this->$key = $msg->$key;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} elseif ( is_array( $msg ) ) {
|
|
|
|
|
$key = array_shift( $msg );
|
|
|
|
|
parent::__construct( $key, $msg );
|
|
|
|
|
} else {
|
|
|
|
|
parent::__construct( $msg );
|
|
|
|
|
}
|
2016-10-19 16:54:25 +00:00
|
|
|
$this->setApiCode( $code, $data );
|
API: Overhaul ApiResult, make format=xml not throw, and add json formatversion
ApiResult was a mess: some methods could only be used with an array
reference instead of manipulating the stored data, methods that had both
array-ref and internal-data versions had names that didn't at all
correspond, some methods that worked on an array reference were
annoyingly non-static, and then the whole mess with setIndexedTagName.
ApiFormatXml is also entirely annoying to deal with, as it liked to
throw exceptions if certain metadata wasn't provided that no other
formatter required. Its legacy also means we have this silly convention
of using empty-string rather than boolean true, annoying restrictions on
keys (leading to things that should be hashes being arrays of key-value
object instead), '*' used as a key all over the place, and so on.
So, changes here:
* ApiResult is no longer an ApiBase or a ContextSource.
* Wherever sensible, ApiResult provides a static method working on an
arrayref and a non-static method working on internal data.
* Metadata is now always added to ApiResult's internal data structure.
Formatters are responsible for stripping it if necessary. "raw mode"
is deprecated.
* New metadata to replace the '*' key, solve the array() => '[]' vs '{}'
question, and so on.
* New class for formatting warnings and errors using i18n messages, and
support for multiple errors and a more machine-readable format for
warnings. For the moment, though, the actual output will not be changing
yet (see T47843 for future plans).
* New formatversion parameter for format=json and format=php, to select
between BC mode and the modern output.
* In BC mode, booleans will be converted to empty-string presence style;
modules currently returning booleans will need to use
ApiResult::META_BC_BOOLS to preserve their current output.
Actual changes to the API modules' output (e.g. actually returning
booleans for the new formatversion) beyond the use of
ApiResult::setContentValue() are left for a future change.
Bug: T76728
Bug: T57371
Bug: T33629
Change-Id: I7b37295e8862b188d1f3b0cd07f66ac34629678f
2014-12-03 22:14:22 +00:00
|
|
|
}
|
|
|
|
|
}
|