dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "mediawiki.jqueryMsg: Implement `<nowiki>` support"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiFormatJson.php
diff --git
a/includes/api/ApiFormatJson.php
b/includes/api/ApiFormatJson.php
index
1566a0f
..
41de925
100644
(file)
--- a/
includes/api/ApiFormatJson.php
+++ b/
includes/api/ApiFormatJson.php
@@
-42,7
+42,7
@@
class ApiFormatJson extends ApiFormatBase {
# outside the control of the end user.
# (and do it here because ApiMain::reportUnusedParams() gets called
# before our ::execute())
# outside the control of the end user.
# (and do it here because ApiMain::reportUnusedParams() gets called
# before our ::execute())
- $this->getMain()->
getCheck
( '_' );
+ $this->getMain()->
markParamsUsed
( '_' );
}
}
}
}
@@
-71,25
+71,25
@@
class ApiFormatJson extends ApiFormatBase {
$opt = 0;
if ( $this->isRaw ) {
$opt |= FormatJson::ALL_OK;
$opt = 0;
if ( $this->isRaw ) {
$opt |= FormatJson::ALL_OK;
- $transform =
array()
;
+ $transform =
[]
;
} else {
switch ( $params['formatversion'] ) {
case 1:
$opt |= $params['utf8'] ? FormatJson::ALL_OK : FormatJson::XMLMETA_OK;
} else {
switch ( $params['formatversion'] ) {
case 1:
$opt |= $params['utf8'] ? FormatJson::ALL_OK : FormatJson::XMLMETA_OK;
- $transform =
array(
- 'BC' =>
array()
,
- 'Types' =>
array( 'AssocAsObject' => true )
,
+ $transform =
[
+ 'BC' =>
[]
,
+ 'Types' =>
[ 'AssocAsObject' => true ]
,
'Strip' => 'all',
'Strip' => 'all',
-
)
;
+
]
;
break;
case 2:
case 'latest':
$opt |= $params['ascii'] ? FormatJson::XMLMETA_OK : FormatJson::ALL_OK;
break;
case 2:
case 'latest':
$opt |= $params['ascii'] ? FormatJson::XMLMETA_OK : FormatJson::ALL_OK;
- $transform =
array(
- 'Types' =>
array( 'AssocAsObject' => true )
,
+ $transform =
[
+ 'Types' =>
[ 'AssocAsObject' => true ]
,
'Strip' => 'all',
'Strip' => 'all',
-
)
;
+
]
;
break;
default:
break;
default:
@@
-124,24
+124,24
@@
class ApiFormatJson extends ApiFormatBase {
return parent::getAllowedParams();
}
return parent::getAllowedParams();
}
- $ret = parent::getAllowedParams() +
array(
- 'callback' =>
array(
+ $ret = parent::getAllowedParams() +
[
+ 'callback' =>
[
ApiBase::PARAM_HELP_MSG => 'apihelp-json-param-callback',
ApiBase::PARAM_HELP_MSG => 'apihelp-json-param-callback',
-
)
,
- 'utf8' =>
array(
+
]
,
+ 'utf8' =>
[
ApiBase::PARAM_DFLT => false,
ApiBase::PARAM_HELP_MSG => 'apihelp-json-param-utf8',
ApiBase::PARAM_DFLT => false,
ApiBase::PARAM_HELP_MSG => 'apihelp-json-param-utf8',
-
)
,
- 'ascii' =>
array(
+
]
,
+ 'ascii' =>
[
ApiBase::PARAM_DFLT => false,
ApiBase::PARAM_HELP_MSG => 'apihelp-json-param-ascii',
ApiBase::PARAM_DFLT => false,
ApiBase::PARAM_HELP_MSG => 'apihelp-json-param-ascii',
-
)
,
- 'formatversion' =>
array(
- ApiBase::PARAM_TYPE =>
array( 1, 2, 'latest' )
,
+
]
,
+ 'formatversion' =>
[
+ ApiBase::PARAM_TYPE =>
[ 1, 2, 'latest' ]
,
ApiBase::PARAM_DFLT => 1,
ApiBase::PARAM_HELP_MSG => 'apihelp-json-param-formatversion',
ApiBase::PARAM_DFLT => 1,
ApiBase::PARAM_HELP_MSG => 'apihelp-json-param-formatversion',
-
)
,
-
)
;
+
]
,
+
]
;
return $ret;
}
}
return $ret;
}
}