aboutsummaryrefslogtreecommitdiffstats
path: root/includes/ResourceLoader/FileModule.php
diff options
context:
space:
mode:
authorTim Starling <tstarling@wikimedia.org>2023-08-02 13:40:54 +1000
committerTim Starling <tstarling@wikimedia.org>2023-08-03 14:10:16 +1000
commit8a4134ed21d0e472358bf2ea1ed4e57368e3f9eb (patch)
treef78acc9efde9ddfa4f9a17ae7300571411ac20aa /includes/ResourceLoader/FileModule.php
parent4a27e538c30368a50d0de9f825f719202223a30e (diff)
downloadmediawikicore-8a4134ed21d0e472358bf2ea1ed4e57368e3f9eb.tar.gz
mediawikicore-8a4134ed21d0e472358bf2ea1ed4e57368e3f9eb.zip
ResourceLoader: deliver deprecation warnings as strings
It's awkward to construct a source map when the file contents is modified after loading. Delivering deprecation warnings as JS code seems like an odd convention anyway. So, send the module deprecation warning as an additional parameter to mediawiki.loader.implement(). Deprecation warnings are no longer displayed in only=scripts mode. Remove deprecation tests from FileModuleTest since FileModule no longer has any relevant deprecation code. Add tests to ModuleTest. Deprecate Module::getDeprecationInformation(). Bug: T47514 Change-Id: I20938cf4ab78afc9a2d72fbd163a7c5f21755820
Diffstat (limited to 'includes/ResourceLoader/FileModule.php')
-rw-r--r--includes/ResourceLoader/FileModule.php7
1 files changed, 1 insertions, 6 deletions
diff --git a/includes/ResourceLoader/FileModule.php b/includes/ResourceLoader/FileModule.php
index 5c9c4f1b55c1..9f580aa8765b 100644
--- a/includes/ResourceLoader/FileModule.php
+++ b/includes/ResourceLoader/FileModule.php
@@ -326,7 +326,6 @@ class FileModule extends Module {
* @return string|array JavaScript code for $context, or package files data structure
*/
public function getScript( Context $context ) {
- $deprecationScript = $this->getDeprecationInformation( $context );
$packageFiles = $this->getPackageFiles( $context );
if ( $packageFiles !== null ) {
foreach ( $packageFiles['files'] as &$file ) {
@@ -335,15 +334,11 @@ class FileModule extends Module {
$file['type'] = 'script';
}
}
- if ( $deprecationScript ) {
- $mainFile =& $packageFiles['files'][$packageFiles['main']];
- $mainFile['content'] = $deprecationScript . $mainFile['content'];
- }
return $packageFiles;
}
$files = $this->getScriptFiles( $context );
- return $deprecationScript . $this->readScriptFiles( $context, $files );
+ return $this->readScriptFiles( $context, $files );
}
/**