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 "Get better error message for duplicate names in MagicWordArray"
[lhc/web/wiklou.git]
/
includes
/
context
/
RequestContext.php
diff --git
a/includes/context/RequestContext.php
b/includes/context/RequestContext.php
index
0e1de50
..
4a772ee
100644
(file)
--- a/
includes/context/RequestContext.php
+++ b/
includes/context/RequestContext.php
@@
-138,7
+138,7
@@
class RequestContext implements IContextSource, MutableContext {
*
* @deprecated since 1.27 use a StatsdDataFactory from MediaWikiServices (preferably injected)
*
*
* @deprecated since 1.27 use a StatsdDataFactory from MediaWikiServices (preferably injected)
*
- * @return
Mediawiki
StatsdDataFactory
+ * @return
IBuffering
StatsdDataFactory
*/
public function getStats() {
return MediaWikiServices::getInstance()->getStatsdDataFactory();
*/
public function getStats() {
return MediaWikiServices::getInstance()->getStatsdDataFactory();
@@
-449,10
+449,12
@@
class RequestContext implements IContextSource, MutableContext {
* Get a Message object with context set
* Parameters are the same as wfMessage()
*
* Get a Message object with context set
* Parameters are the same as wfMessage()
*
- * @param mixed ...
+ * @param string|string[]|MessageSpecifier $key Message key, or array of keys,
+ * or a MessageSpecifier.
+ * @param mixed $args,...
* @return Message
*/
* @return Message
*/
- public function msg() {
+ public function msg(
$key
) {
$args = func_get_args();
return call_user_func_array( 'wfMessage', $args )->setContext( $this );
$args = func_get_args();
return call_user_func_array( 'wfMessage', $args )->setContext( $this );