Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/249340
Change subject: resourceloader: Consistently refer to the framework as
ResourceLoader
......................................................................
resourceloader: Consistently refer to the framework as ResourceLoader
Change-Id: Ia59e4eac9662723e80d62f7cfcb9e4292e3ee4de
---
M includes/DefaultSettings.php
M includes/OutputPage.php
M includes/cache/MessageBlobStore.php
M includes/parser/ParserOutput.php
M includes/resourceloader/DerivativeResourceLoaderContext.php
M includes/resourceloader/ResourceLoaderContext.php
M includes/resourceloader/ResourceLoaderEditToolbarModule.php
M includes/resourceloader/ResourceLoaderFileModule.php
M includes/resourceloader/ResourceLoaderImageModule.php
M includes/resourceloader/ResourceLoaderLanguageDataModule.php
M includes/resourceloader/ResourceLoaderLanguageNamesModule.php
M includes/resourceloader/ResourceLoaderModule.php
M includes/resourceloader/ResourceLoaderSiteModule.php
M includes/resourceloader/ResourceLoaderSkinModule.php
M includes/resourceloader/ResourceLoaderSpecialCharacterDataModule.php
M includes/resourceloader/ResourceLoaderStartUpModule.php
M includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
M includes/resourceloader/ResourceLoaderUserDefaultsModule.php
M includes/resourceloader/ResourceLoaderUserGroupsModule.php
M includes/resourceloader/ResourceLoaderUserModule.php
M includes/resourceloader/ResourceLoaderUserOptionsModule.php
M includes/resourceloader/ResourceLoaderUserTokensModule.php
M includes/resourceloader/ResourceLoaderWikiModule.php
M load.php
M maintenance/archives/patch-msg_resource.sql
M maintenance/mssql/tables.sql
M maintenance/tables.sql
M tests/phpunit/includes/GlobalFunctions/wfTimestampTest.php
28 files changed, 45 insertions(+), 52 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/40/249340/1
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index c8da21e..e916938 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3397,14 +3397,14 @@
/** @} */ # End of output format settings }
/*************************************************************************//**
- * @name Resource loader settings
+ * @name ResourceLoader settings
* @{
*/
/**
* Client-side resource modules.
*
- * Extensions should add their resource loader module definitions
+ * Extensions should add their ResourceLoader module definitions
* to the $wgResourceModules variable.
*
* @par Example:
@@ -3529,7 +3529,7 @@
$wgResourceBasePath = null;
/**
- * Maximum time in seconds to cache resources served by the resource loader.
+ * Maximum time in seconds to cache resources served by ResourceLoader.
* Used to set last modified headers (max-age/s-maxage).
*
* Following options to distinguish:
@@ -3736,7 +3736,7 @@
*/
$wgAllowSiteCSSOnRestrictedPages = false;
-/** @} */ # End of resource loader settings }
+/** @} */ # End of ResourceLoader settings }
/*************************************************************************//**
* @name Page title and interwiki link settings
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 147527e..726fec1 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -50,7 +50,7 @@
/**
* @var array Additional stylesheets. Looks like this is for extensions.
- * Might be replaced by resource loader.
+ * Might be replaced by ResourceLoader.
*/
protected $mExtStyles = array();
@@ -132,7 +132,7 @@
private $mLanguageLinks = array();
/**
- * Used for JavaScript (pre resource loader)
+ * Used for JavaScript (predates ResourceLoader)
* @todo We should split JS / CSS.
* mScripts content is inserted as is in "<head>" by Skin. This might
* contain either a link to a stylesheet or inline CSS.
@@ -150,8 +150,6 @@
/** @var array Array of elements in "<head>". Parser might add its own
headers! */
protected $mHeadItems = array();
-
- // @todo FIXME: Next 5 variables probably come from the resource loader
/** @var array */
protected $mModules = array();
@@ -224,7 +222,7 @@
/**
* @var bool Comes from the parser. This was probably made to load
CSS/JS
* only if we had "<gallery>". Used directly in CategoryPage.php.
- * Looks like resource loader can replace this.
+ * Looks like ResourceLoader can replace this.
*/
public $mNoGallery = false;
@@ -568,8 +566,8 @@
}
/**
- * Add one or more modules recognized by the resource loader. Modules
added
- * through this function will be loaded by the resource loader when the
+ * Add one or more modules recognized by ResourceLoader. Modules added
+ * through this function will be loaded by ResourceLoader when the
* page loads.
*
* @param string|array $modules Module name (string) or array of module
names
@@ -591,8 +589,8 @@
}
/**
- * Add only JS of one or more modules recognized by the resource
loader. Module
- * scripts added through this function will be loaded by the resource
loader when
+ * Add only JS of one or more modules recognized by ResourceLoader.
Module
+ * scripts added through this function will be loaded by ResourceLoader
when
* the page loads.
*
* @param string|array $modules Module name (string) or array of module
names
@@ -614,7 +612,7 @@
}
/**
- * Add only CSS of one or more modules recognized by the resource
loader.
+ * Add only CSS of one or more modules recognized by ResourceLoader.
*
* Module styles added through this function will be added using
standard link CSS
* tags, rather than as a combined Javascript and CSS package. Thus,
they will
diff --git a/includes/cache/MessageBlobStore.php
b/includes/cache/MessageBlobStore.php
index b7c70c1..6290eae 100644
--- a/includes/cache/MessageBlobStore.php
+++ b/includes/cache/MessageBlobStore.php
@@ -1,6 +1,6 @@
<?php
/**
- * Resource message blobs storage used by the resource loader.
+ * Resource message blobs storage used by ResourceLoader.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -23,8 +23,8 @@
*/
/**
- * This class provides access to the resource message blobs storage used by
- * the ResourceLoader.
+ * This class provides access to the resource message blobs storage used
+ * by ResourceLoader.
*
* A message blob is a JSON object containing the interface messages for a
* certain resource in a certain language. These message blobs are cached
diff --git a/includes/parser/ParserOutput.php b/includes/parser/ParserOutput.php
index 37b45a6..e4c287a 100644
--- a/includes/parser/ParserOutput.php
+++ b/includes/parser/ParserOutput.php
@@ -108,19 +108,17 @@
public $mHeadItems = array();
/**
- * @var array $mModules Modules to be loaded by the resource loader
+ * @var array $mModules Modules to be loaded by ResourceLoader
*/
public $mModules = array();
/**
- * @var array $mModuleScripts Modules of which only the JS will be
loaded by
- * the resource loader.
+ * @var array $mModuleScripts Modules of which only the JS will be
loaded by ResourceLoader.
*/
public $mModuleScripts = array();
/**
- * @var array $mModuleStyles Modules of which only the CSSS will be
loaded by
- * the resource loader.
+ * @var array $mModuleStyles Modules of which only the CSSS will be
loaded by ResourceLoader.
*/
public $mModuleStyles = array();
diff --git a/includes/resourceloader/DerivativeResourceLoaderContext.php
b/includes/resourceloader/DerivativeResourceLoaderContext.php
index 5967537..1db9ce5 100644
--- a/includes/resourceloader/DerivativeResourceLoaderContext.php
+++ b/includes/resourceloader/DerivativeResourceLoaderContext.php
@@ -1,6 +1,6 @@
<?php
/**
- * Derivative context for resource loader modules.
+ * Derivative context for ResourceLoader modules.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/includes/resourceloader/ResourceLoaderContext.php
b/includes/resourceloader/ResourceLoaderContext.php
index 2e1752a..c797fd6 100644
--- a/includes/resourceloader/ResourceLoaderContext.php
+++ b/includes/resourceloader/ResourceLoaderContext.php
@@ -1,6 +1,6 @@
<?php
/**
- * Context for resource loader modules.
+ * Context for ResourceLoader modules.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/includes/resourceloader/ResourceLoaderEditToolbarModule.php
b/includes/resourceloader/ResourceLoaderEditToolbarModule.php
index b415bca..2a6af71 100644
--- a/includes/resourceloader/ResourceLoaderEditToolbarModule.php
+++ b/includes/resourceloader/ResourceLoaderEditToolbarModule.php
@@ -1,6 +1,6 @@
<?php
/**
- * Resource loader module for the edit toolbar.
+ * ResourceLoader module for the edit toolbar.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/includes/resourceloader/ResourceLoaderFileModule.php
b/includes/resourceloader/ResourceLoaderFileModule.php
index b46707c..ef98400 100644
--- a/includes/resourceloader/ResourceLoaderFileModule.php
+++ b/includes/resourceloader/ResourceLoaderFileModule.php
@@ -1,6 +1,6 @@
<?php
/**
- * Resource loader module based on local JavaScript/CSS files.
+ * ResourceLoader module based on local JavaScript/CSS files.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/includes/resourceloader/ResourceLoaderImageModule.php
b/includes/resourceloader/ResourceLoaderImageModule.php
index e2da28b..8fd94f7 100644
--- a/includes/resourceloader/ResourceLoaderImageModule.php
+++ b/includes/resourceloader/ResourceLoaderImageModule.php
@@ -1,6 +1,6 @@
<?php
/**
- * Resource loader module for generated and embedded images.
+ * ResourceLoader module for generated and embedded images.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
*/
/**
- * Resource loader module for generated and embedded images.
+ * ResourceLoader module for generated and embedded images.
*
* @since 1.25
*/
diff --git a/includes/resourceloader/ResourceLoaderLanguageDataModule.php
b/includes/resourceloader/ResourceLoaderLanguageDataModule.php
index 27c74d7..83db567 100644
--- a/includes/resourceloader/ResourceLoaderLanguageDataModule.php
+++ b/includes/resourceloader/ResourceLoaderLanguageDataModule.php
@@ -1,6 +1,6 @@
<?php
/**
- * Resource loader module for populating language specific data.
+ * ResourceLoader module for populating language specific data.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/includes/resourceloader/ResourceLoaderLanguageNamesModule.php
b/includes/resourceloader/ResourceLoaderLanguageNamesModule.php
index 081c728..3c6e1fa 100644
--- a/includes/resourceloader/ResourceLoaderLanguageNamesModule.php
+++ b/includes/resourceloader/ResourceLoaderLanguageNamesModule.php
@@ -1,6 +1,6 @@
<?php
/**
- * Resource loader module for providing language names.
+ * ResourceLoader module for providing language names.
*
* By default these names will be autonyms however other extensions may
* provided language names in the context language (e.g. cldr extension)
diff --git a/includes/resourceloader/ResourceLoaderModule.php
b/includes/resourceloader/ResourceLoaderModule.php
index 782af81..63ba5c1 100644
--- a/includes/resourceloader/ResourceLoaderModule.php
+++ b/includes/resourceloader/ResourceLoaderModule.php
@@ -1,6 +1,6 @@
<?php
/**
- * Abstraction for resource loader modules.
+ * Abstraction for ResourceLoader modules.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
*/
/**
- * Abstraction for resource loader modules, with name registration and maxage
functionality.
+ * Abstraction for ResourceLoader modules, with name registration and maxage
functionality.
*/
abstract class ResourceLoaderModule {
# Type of resource
diff --git a/includes/resourceloader/ResourceLoaderSiteModule.php
b/includes/resourceloader/ResourceLoaderSiteModule.php
index 380b7a5..eba6815 100644
--- a/includes/resourceloader/ResourceLoaderSiteModule.php
+++ b/includes/resourceloader/ResourceLoaderSiteModule.php
@@ -1,6 +1,6 @@
<?php
/**
- * Resource loader module for site customizations.
+ * ResourceLoader module for site customizations.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/includes/resourceloader/ResourceLoaderSkinModule.php
b/includes/resourceloader/ResourceLoaderSkinModule.php
index 911d953..e1df6d9 100644
--- a/includes/resourceloader/ResourceLoaderSkinModule.php
+++ b/includes/resourceloader/ResourceLoaderSkinModule.php
@@ -1,6 +1,6 @@
<?php
/**
- * Resource loader module for skin stylesheets.
+ * ResourceLoader module for skin stylesheets.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git
a/includes/resourceloader/ResourceLoaderSpecialCharacterDataModule.php
b/includes/resourceloader/ResourceLoaderSpecialCharacterDataModule.php
index 8170cb1..862f629 100644
--- a/includes/resourceloader/ResourceLoaderSpecialCharacterDataModule.php
+++ b/includes/resourceloader/ResourceLoaderSpecialCharacterDataModule.php
@@ -1,6 +1,6 @@
<?php
/**
- * Resource loader module for populating special characters data for some
+ * ResourceLoader module for populating special characters data for some
* editing extensions to use.
*
* This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,7 @@
*/
/**
- * Resource loader module for populating special characters data for some
+ * ResourceLoader module for populating special characters data for some
* editing extensions to use.
*/
class ResourceLoaderSpecialCharacterDataModule extends ResourceLoaderModule {
diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php
b/includes/resourceloader/ResourceLoaderStartUpModule.php
index 8a2423c..e900200 100644
--- a/includes/resourceloader/ResourceLoaderStartUpModule.php
+++ b/includes/resourceloader/ResourceLoaderStartUpModule.php
@@ -1,6 +1,6 @@
<?php
/**
- * Module for resource loader initialization.
+ * Module for ResourceLoader initialization.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
b/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
index 65d770e..6705336 100644
--- a/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
@@ -1,6 +1,6 @@
<?php
/**
- * Resource loader module for user preference customizations.
+ * ResourceLoader module for user preference customizations.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/includes/resourceloader/ResourceLoaderUserDefaultsModule.php
b/includes/resourceloader/ResourceLoaderUserDefaultsModule.php
index eba61ed..abcf9c6 100644
--- a/includes/resourceloader/ResourceLoaderUserDefaultsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserDefaultsModule.php
@@ -1,6 +1,6 @@
<?php
/**
- * Resource loader module for default user preferences.
+ * ResourceLoader module for default user preferences.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/includes/resourceloader/ResourceLoaderUserGroupsModule.php
b/includes/resourceloader/ResourceLoaderUserGroupsModule.php
index 417cfce..dd4dd5c 100644
--- a/includes/resourceloader/ResourceLoaderUserGroupsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserGroupsModule.php
@@ -1,6 +1,6 @@
<?php
/**
- * Resource loader module for user customizations.
+ * ResourceLoader module for user customizations.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/includes/resourceloader/ResourceLoaderUserModule.php
b/includes/resourceloader/ResourceLoaderUserModule.php
index a097844..d45e281 100644
--- a/includes/resourceloader/ResourceLoaderUserModule.php
+++ b/includes/resourceloader/ResourceLoaderUserModule.php
@@ -1,6 +1,6 @@
<?php
/**
- * Resource loader module for user customizations.
+ * ResourceLoader module for user customizations.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/includes/resourceloader/ResourceLoaderUserOptionsModule.php
b/includes/resourceloader/ResourceLoaderUserOptionsModule.php
index 0847109..94f1e68 100644
--- a/includes/resourceloader/ResourceLoaderUserOptionsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserOptionsModule.php
@@ -1,6 +1,6 @@
<?php
/**
- * Resource loader module for user preference customizations.
+ * ResourceLoader module for user preference customizations.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/includes/resourceloader/ResourceLoaderUserTokensModule.php
b/includes/resourceloader/ResourceLoaderUserTokensModule.php
index 28f1b9a..d37aa55 100644
--- a/includes/resourceloader/ResourceLoaderUserTokensModule.php
+++ b/includes/resourceloader/ResourceLoaderUserTokensModule.php
@@ -1,6 +1,6 @@
<?php
/**
- * Resource loader module for user tokens.
+ * ResourceLoader module for user tokens.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/includes/resourceloader/ResourceLoaderWikiModule.php
b/includes/resourceloader/ResourceLoaderWikiModule.php
index 57555f0..52eb2d8 100644
--- a/includes/resourceloader/ResourceLoaderWikiModule.php
+++ b/includes/resourceloader/ResourceLoaderWikiModule.php
@@ -1,6 +1,6 @@
<?php
/**
- * Abstraction for resource loader modules which pull from wiki pages.
+ * Abstraction for ResourceLoader modules that pull from wiki pages.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
*/
/**
- * Abstraction for resource loader modules which pull from wiki pages
+ * Abstraction for ResourceLoader modules which pull from wiki pages
*
* This can only be used for wiki pages in the MediaWiki and User namespaces,
* because of its dependence on the functionality of Title::isCssJsSubpage.
diff --git a/load.php b/load.php
index 22f62fe..e65b09e 100644
--- a/load.php
+++ b/load.php
@@ -1,6 +1,6 @@
<?php
/**
- * This file is the entry point for the resource loader.
+ * This file is the entry point for ResourceLoader.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/maintenance/archives/patch-msg_resource.sql
b/maintenance/archives/patch-msg_resource.sql
index 9fa05d2..b0bbdd0 100644
--- a/maintenance/archives/patch-msg_resource.sql
+++ b/maintenance/archives/patch-msg_resource.sql
@@ -1,4 +1,4 @@
--- Table for storing JSON message blobs for the resource loader
+-- Table for storing JSON message blobs for ResourceLoader
CREATE TABLE /*_*/msg_resource (
-- Resource name
mr_resource varbinary(255) NOT NULL,
diff --git a/maintenance/mssql/tables.sql b/maintenance/mssql/tables.sql
index 5b09ffd..a192db7 100644
--- a/maintenance/mssql/tables.sql
+++ b/maintenance/mssql/tables.sql
@@ -1224,7 +1224,7 @@
);
CREATE INDEX /*i*/lc_lang_key ON /*_*/l10n_cache (lc_lang, lc_key);
--- Table for caching JSON message texts for the resource loader
+-- Table for caching JSON message texts for ResourceLoader
CREATE TABLE /*_*/msg_resource (
-- Resource name
mr_resource nvarchar(255) NOT NULL,
diff --git a/maintenance/tables.sql b/maintenance/tables.sql
index 638b99d..35e7ec2 100644
--- a/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@ -1496,7 +1496,7 @@
) /*$wgDBTableOptions*/;
CREATE INDEX /*i*/lc_lang_key ON /*_*/l10n_cache (lc_lang, lc_key);
--- Table for caching JSON message blobs for the resource loader
+-- Table for caching JSON message blobs for ResourceLoader
CREATE TABLE /*_*/msg_resource (
-- Resource name
mr_resource varbinary(255) NOT NULL,
diff --git a/tests/phpunit/includes/GlobalFunctions/wfTimestampTest.php
b/tests/phpunit/includes/GlobalFunctions/wfTimestampTest.php
index 4ce51c6..a5b65f2 100644
--- a/tests/phpunit/includes/GlobalFunctions/wfTimestampTest.php
+++ b/tests/phpunit/includes/GlobalFunctions/wfTimestampTest.php
@@ -149,9 +149,6 @@
}
/**
- * The Resource Loader uses wfTimestamp() to convert timestamps
- * from If-Modified-Since header. Thus it must be able to parse all
- * rfc2616 date formats
* @see http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.3.1
* @dataProvider provideHttpDates
*/
--
To view, visit https://gerrit.wikimedia.org/r/249340
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia59e4eac9662723e80d62f7cfcb9e4292e3ee4de
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
