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
Avoid dynamic call to static method in ResourceLoaderModule::buildContent()
[lhc/web/wiklou.git]
/
includes
/
resourceloader
/
ResourceLoaderModule.php
diff --git
a/includes/resourceloader/ResourceLoaderModule.php
b/includes/resourceloader/ResourceLoaderModule.php
index
c9fd267
..
b4a0f46
100644
(file)
--- a/
includes/resourceloader/ResourceLoaderModule.php
+++ b/
includes/resourceloader/ResourceLoaderModule.php
@@
-128,7
+128,7
@@
abstract class ResourceLoaderModule implements LoggerAwareInterface {
* @param ResourceLoaderContext $context
* @return bool
*/
* @param ResourceLoaderContext $context
* @return bool
*/
- public function getFlip( $context ) {
+ public function getFlip(
ResourceLoaderContext
$context ) {
return MediaWikiServices::getInstance()->getContentLanguage()->getDir() !==
$context->getDirection();
}
return MediaWikiServices::getInstance()->getContentLanguage()->getDir() !==
$context->getDirection();
}
@@
-136,9
+136,13
@@
abstract class ResourceLoaderModule implements LoggerAwareInterface {
/**
* Get JS representing deprecation information for the current module if available
*
/**
* Get JS representing deprecation information for the current module if available
*
+ * @param ResourceLoaderContext|null $context Missing $context is deprecated in 1.34
* @return string JavaScript code
*/
* @return string JavaScript code
*/
- public function getDeprecationInformation() {
+ public function getDeprecationInformation( ResourceLoaderContext $context = null ) {
+ if ( $context === null ) {
+ wfDeprecated( __METHOD__ . ' without a ResourceLoader context', '1.34' );
+ }
$deprecationInfo = $this->deprecated;
if ( $deprecationInfo ) {
$name = $this->getName();
$deprecationInfo = $this->deprecated;
if ( $deprecationInfo ) {
$name = $this->getName();
@@
-146,7
+150,10
@@
abstract class ResourceLoaderModule implements LoggerAwareInterface {
if ( is_string( $deprecationInfo ) ) {
$warning .= "\n" . $deprecationInfo;
}
if ( is_string( $deprecationInfo ) ) {
$warning .= "\n" . $deprecationInfo;
}
- return 'mw.log.warn(' . ResourceLoader::encodeJsonForScript( $warning ) . ');';
+ if ( $context === null ) {
+ return 'mw.log.warn(' . ResourceLoader::encodeJsonForScript( $warning ) . ');';
+ }
+ return 'mw.log.warn(' . $context->encodeJson( $warning ) . ');';
} else {
return '';
}
} else {
return '';
}
@@
-690,7
+697,6
@@
abstract class ResourceLoaderModule implements LoggerAwareInterface {
* @return array
*/
final protected function buildContent( ResourceLoaderContext $context ) {
* @return array
*/
final protected function buildContent( ResourceLoaderContext $context ) {
- $rl = $context->getResourceLoader();
$stats = MediaWikiServices::getInstance()->getStatsdDataFactory();
$statStart = microtime( true );
$stats = MediaWikiServices::getInstance()->getStatsdDataFactory();
$statStart = microtime( true );
@@
-759,7
+765,7
@@
abstract class ResourceLoaderModule implements LoggerAwareInterface {
}
// Wrap styles into @media groups as needed and flatten into a numerical array
$styles = [
}
// Wrap styles into @media groups as needed and flatten into a numerical array
$styles = [
- 'css' =>
$rl->
makeCombinedStyles( $stylePairs )
+ 'css' =>
ResourceLoader::
makeCombinedStyles( $stylePairs )
];
}
}
];
}
}