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
Require $key in msg() functions
[lhc/web/wiklou.git]
/
includes
/
context
/
DerivativeContext.php
diff --git
a/includes/context/DerivativeContext.php
b/includes/context/DerivativeContext.php
index
1b881e4
..
9c3c42a
100644
(file)
--- a/
includes/context/DerivativeContext.php
+++ b/
includes/context/DerivativeContext.php
@@
-18,6
+18,8
@@
* @author Daniel Friesen
* @file
*/
* @author Daniel Friesen
* @file
*/
+use Liuggio\StatsdClient\Factory\StatsdDataFactory;
+use MediaWiki\MediaWikiServices;
/**
* An IContextSource implementation which will inherit context from another source
/**
* An IContextSource implementation which will inherit context from another source
@@
-67,11
+69,6
@@
class DerivativeContext extends ContextSource implements MutableContext {
*/
private $config;
*/
private $config;
- /**
- * @var Stats
- */
- private $stats;
-
/**
* @var Timing
*/
/**
* @var Timing
*/
@@
-110,14
+107,12
@@
class DerivativeContext extends ContextSource implements MutableContext {
/**
* Get the stats object
*
/**
* Get the stats object
*
- * @return BufferingStatsdDataFactory
+ * @deprecated since 1.27 use a StatsdDataFactory from MediaWikiServices (preferably injected)
+ *
+ * @return MediawikiStatsdDataFactory
*/
public function getStats() {
*/
public function getStats() {
- if ( !is_null( $this->stats ) ) {
- return $this->stats;
- } else {
- return $this->getContext()->getStats();
- }
+ return MediaWikiServices::getInstance()->getStatsdDataFactory();
}
/**
}
/**
@@
-329,10
+324,12
@@
class DerivativeContext extends ContextSource implements MutableContext {
* it would set only the original context, and not take
* into account any changes.
*
* it would set only the original context, and not take
* into account any changes.
*
+ * @param string|string[]|MessageSpecifier $key Message key, or array of keys,
+ * or a MessageSpecifier.
* @param mixed $args,... Arguments to wfMessage
* @return Message
*/
* @param mixed $args,... Arguments to wfMessage
* @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 );