2014-08-29 06:31:44 +00:00
|
|
|
<?php
|
|
|
|
|
|
2016-02-11 04:57:03 +00:00
|
|
|
use MediaWiki\MediaWikiServices;
|
2017-02-10 18:09:05 +00:00
|
|
|
use Wikimedia\Rdbms\IDatabase;
|
2017-04-19 19:37:35 +00:00
|
|
|
use Wikimedia\TestingAccessWrapper;
|
2016-02-11 04:57:03 +00:00
|
|
|
|
2014-08-29 06:31:44 +00:00
|
|
|
class ResourceLoaderWikiModuleTest extends ResourceLoaderTestCase {
|
|
|
|
|
|
2014-10-21 00:43:26 +00:00
|
|
|
/**
|
|
|
|
|
* @covers ResourceLoaderWikiModule::__construct
|
|
|
|
|
* @dataProvider provideConstructor
|
|
|
|
|
*/
|
|
|
|
|
public function testConstructor( $params ) {
|
|
|
|
|
$module = new ResourceLoaderWikiModule( $params );
|
2018-01-13 00:02:09 +00:00
|
|
|
$this->assertInstanceOf( ResourceLoaderWikiModule::class, $module );
|
2014-10-21 00:43:26 +00:00
|
|
|
}
|
|
|
|
|
|
resourceloader: Improve titleInfo docs and simplify title key
* Document the structure of the in-process $titleInfo cache.
Specifically, specify that it is not the value from getTitleInfo(),
but rather a container for zero or more versions of such values.
The reason this is fragmented is because ResourceLoaderContext
is a parameter to most methods and as such, makes everything
variable. Tracked as T99107.
* Make various bits easier to understand by consistently refering
to the container keys as "batchKey", and referring to the internal
keys as "titleKey".
* Centralise title key logic by moving to private method.
* Replace the internal creation of titleKey to be based on LinkTarget
with plain namespace IDs and db keys, instead of invoking the
expensive getPrefixedTitle function which involves quite a lot
of overhead (TitleCodec, GenderCache, Database, Language,
LocalisationCache, ..).
Change-Id: I701e5156ef7815a0e36caefae5871524eff3f688
2018-04-10 17:29:50 +00:00
|
|
|
private function prepareTitleInfo( array $mockInfo ) {
|
|
|
|
|
$module = TestingAccessWrapper::newFromClass( ResourceLoaderWikiModule::class );
|
|
|
|
|
$info = [];
|
|
|
|
|
foreach ( $mockInfo as $key => $val ) {
|
|
|
|
|
$info[ $module->makeTitleKey( Title::newFromText( $key ) ) ] = $val;
|
|
|
|
|
}
|
|
|
|
|
return $info;
|
|
|
|
|
}
|
|
|
|
|
|
2014-10-21 00:43:26 +00:00
|
|
|
public static function provideConstructor() {
|
2016-02-17 09:09:32 +00:00
|
|
|
return [
|
2014-10-21 00:43:26 +00:00
|
|
|
// Nothing
|
2016-02-17 09:09:32 +00:00
|
|
|
[ null ],
|
|
|
|
|
[ [] ],
|
2014-10-21 00:43:26 +00:00
|
|
|
// Unrecognized settings
|
2016-02-17 09:09:32 +00:00
|
|
|
[ [ 'foo' => 'baz' ] ],
|
2014-10-21 00:43:26 +00:00
|
|
|
// Real settings
|
2016-02-17 09:09:32 +00:00
|
|
|
[ [ 'scripts' => [ 'MediaWiki:Common.js' ] ] ],
|
|
|
|
|
];
|
2014-10-21 00:43:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* @dataProvider provideGetPages
|
|
|
|
|
* @covers ResourceLoaderWikiModule::getPages
|
|
|
|
|
*/
|
|
|
|
|
public function testGetPages( $params, Config $config, $expected ) {
|
|
|
|
|
$module = new ResourceLoaderWikiModule( $params );
|
|
|
|
|
$module->setConfig( $config );
|
|
|
|
|
|
resourceloader: Replace timestamp system with version hashing
Modules now track their version via getVersionHash() instead of getModifiedTime().
== Background ==
While some resources have observeable timestamps (e.g. files stored on disk),
many other resources do not. E.g. config variables, and module definitions.
For static file modules, one can e.g. revert one of more files in a module to a
previous version and not affect the max timestamp.
Wiki modules include pages only if they exist. The user module supports common.js
and skin.js. By default neither exists. If a user has both, and then the
less-recently modified one is deleted, the max-timestamp remains unchanged.
For client-side caching, batch requests use "Math.max" on the relevant timestamps.
Again, if a module changes but another module is more recent (e.g. out-of-order
deployment, or out-of-order discovery), the change would not result in a cache miss.
More scenarios can be found in the associated Phabricator tasks.
== Version hash ==
Previously we virtually mapped these variables to a timestamp by storing the current
time alongside a hash of the value in ObjectCache. Considering the number of
possible request contexts (wikis * modules * users * skins * languages) this doesn't
work well. It results in needless cache invalidation when the first time observation
is purged due to LRU algorithms. It also has other minor bugs leading to fewer
cache hits.
All modules automatically get the benefits of version hashing with this change.
The old getDefinitionMtime() and getHashMtime() have been replaced with dummies
that return 1. These functions are often called from getModifiedTime() in subclasses.
For backward-compatibility, their respective values (definition summary and hash)
are now included in getVersionHash directly.
As examples, the following modules have been updated to use getVersionHash directly.
Other modules still work fine and can be updated later.
* ResourceLoaderFileModule
* ResourceLoaderEditToolbarModule
* ResourceLoaderStartUpModule
* ResourceLoaderWikiModule
The presence of hashes in place of timestamps increases the startup module size on
a default MediaWiki install from 4.4k to 5.8k (after gzip and minification).
== ETag ==
Since timestamps are no longer tracked, we need a different way to implement caching
for cache proxies (e.g. Varnish) and web browsers. Previously we used the
Last-Modified header (in combination with Cache-Control and Expires).
Instead of Last-Modified (and If-Modified-Since), we use ETag (and If-None-Match).
Entity tags (new in HTTP/1.1) are much stricter than Last-Modified by default.
They instruct browsers to allow usage of partial Range requests. Since our responses
are dynamically generated, we need to use the Weak version of ETag.
While this sounds bad, it's no different than Last-Modified. As reassured by
RFC 2616 <http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.3.3> the
specified behaviour behind Last-Modified follows the same "Weak" caching logic as
Entity tags. It's just that entity tags are capable of a stricter mode (whereas
Last-Modified is inherently weak).
== File cache ==
If $wgUseFileCache is enabled, ResourceLoader uses ResourceFileCache to cache
load.php responses. While the blind TTL handling (during the allowed expiry period)
is still maxage/timestamp based, tryRespondNotModified() now requires the caller to
know the expected ETag.
For this to work, the FileCache handling had to be moved from the top of
ResoureLoader::respond() to after the expected ETag is computed.
This also allows us to remove the duplicate tryRespondNotModified() handling since
that's is already handled by ResourceLoader::respond() meanwhile.
== Misc ==
* Remove redundant modifiedTime cache in ResourceLoaderFileModule.
* Change bugzilla references to Phabricator.
* Centralised inclusion of wgCacheEpoch using getDefinitionSummary. Previously this
logic was duplicated in each place the modified timestamp was used.
* It's easy to forget calling the parent class in getDefinitionSummary().
Previously this method only tracked 'class' by default. As such, various
extensions hardcoded that one value instead of calling the parent and extending
the array. To better prevent this in the future, getVersionHash() now asserts
that the '_cacheEpoch' property made it through.
* tests: Don't use getDefinitionSummary() as an API.
Fix ResourceLoaderWikiModuleTest to call getPages properly.
* In tests, the default timestamp used to be 1388534400000 (which is the unix time
of 20140101000000; the unit tests' CacheEpoch). The new version hash of these
modules is "XyCC+PSK", which is the base64 encoded prefix of the SHA1 digest of:
'{"_class":"ResourceLoaderTestModule","_cacheEpoch":"20140101000000"}'
* Add sha1.js library for client-side hash generation.
Compared various different implementations for code size (after minfication/gzip),
and speed (when used for short hexidecimal strings).
https://jsperf.com/sha1-implementations
- CryptoJS <https://code.google.com/p/crypto-js/#SHA-1> (min+gzip: 2.5k)
http://crypto-js.googlecode.com/svn/tags/3.1.2/build/rollups/sha1.js
Chrome: 45k, Firefox: 89k, Safari: 92k
- jsSHA <https://github.com/Caligatio/jsSHA>
https://github.com/Caligatio/jsSHA/blob/3c1d4f2e/src/sha1.js (min+gzip: 1.8k)
Chrome: 65k, Firefox: 53k, Safari: 69k
- phpjs-sha1 <https://github.com/kvz/phpjs> (RL min+gzip: 0.8k)
https://github.com/kvz/phpjs/blob/1eaab15d/functions/strings/sha1.js
Chrome: 200k, Firefox: 280k, Safari: 78k
Modern browsers implement the HTML5 Crypto API. However, this API is asynchronous,
only enabled when on HTTPS in Chromium, and is quite low-level. It requires boilerplate
code to actually use with TextEncoder, ArrayBuffer and Uint32Array. Due this being
needed in the module loader, we'd have to load the fallback regardless. Considering
this is not used in a critical path for performance, it's not worth shipping two
implementations for this optimisation.
May also resolve:
* T44094
* T90411
* T94810
Bug: T94074
Change-Id: Ibb292d2416839327d1807a66c78fd96dac0637d0
2015-04-29 22:53:24 +00:00
|
|
|
// Because getPages is protected..
|
|
|
|
|
$getPages = new ReflectionMethod( $module, 'getPages' );
|
|
|
|
|
$getPages->setAccessible( true );
|
|
|
|
|
$out = $getPages->invoke( $module, ResourceLoaderContext::newDummyContext() );
|
|
|
|
|
$this->assertEquals( $expected, $out );
|
2014-10-21 00:43:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public static function provideGetPages() {
|
2016-02-17 09:09:32 +00:00
|
|
|
$settings = self::getSettings() + [
|
2014-10-21 00:43:26 +00:00
|
|
|
'UseSiteJs' => true,
|
|
|
|
|
'UseSiteCss' => true,
|
2016-02-17 09:09:32 +00:00
|
|
|
];
|
2014-10-21 00:43:26 +00:00
|
|
|
|
2016-02-17 09:09:32 +00:00
|
|
|
$params = [
|
|
|
|
|
'styles' => [ 'MediaWiki:Common.css' ],
|
|
|
|
|
'scripts' => [ 'MediaWiki:Common.js' ],
|
|
|
|
|
];
|
2014-10-21 00:43:26 +00:00
|
|
|
|
2016-02-17 09:09:32 +00:00
|
|
|
return [
|
|
|
|
|
[ [], new HashConfig( $settings ), [] ],
|
|
|
|
|
[ $params, new HashConfig( $settings ), [
|
|
|
|
|
'MediaWiki:Common.js' => [ 'type' => 'script' ],
|
|
|
|
|
'MediaWiki:Common.css' => [ 'type' => 'style' ]
|
|
|
|
|
] ],
|
|
|
|
|
[ $params, new HashConfig( [ 'UseSiteCss' => false ] + $settings ), [
|
|
|
|
|
'MediaWiki:Common.js' => [ 'type' => 'script' ],
|
|
|
|
|
] ],
|
|
|
|
|
[ $params, new HashConfig( [ 'UseSiteJs' => false ] + $settings ), [
|
|
|
|
|
'MediaWiki:Common.css' => [ 'type' => 'style' ],
|
|
|
|
|
] ],
|
|
|
|
|
[ $params,
|
2015-09-26 19:48:17 +00:00
|
|
|
new HashConfig(
|
2016-02-17 09:09:32 +00:00
|
|
|
[ 'UseSiteJs' => false, 'UseSiteCss' => false ]
|
2015-09-26 19:48:17 +00:00
|
|
|
),
|
2016-02-17 09:09:32 +00:00
|
|
|
[]
|
|
|
|
|
],
|
|
|
|
|
];
|
2014-10-21 00:43:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* @covers ResourceLoaderWikiModule::getGroup
|
|
|
|
|
* @dataProvider provideGetGroup
|
|
|
|
|
*/
|
|
|
|
|
public function testGetGroup( $params, $expected ) {
|
|
|
|
|
$module = new ResourceLoaderWikiModule( $params );
|
|
|
|
|
$this->assertEquals( $expected, $module->getGroup() );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public static function provideGetGroup() {
|
2016-02-17 09:09:32 +00:00
|
|
|
return [
|
2014-10-21 00:43:26 +00:00
|
|
|
// No group specified
|
2016-02-17 09:09:32 +00:00
|
|
|
[ [], null ],
|
2014-10-21 00:43:26 +00:00
|
|
|
// A random group
|
2016-02-17 09:09:32 +00:00
|
|
|
[ [ 'group' => 'foobar' ], 'foobar' ],
|
|
|
|
|
];
|
2014-10-21 00:43:26 +00:00
|
|
|
}
|
|
|
|
|
|
2014-08-29 06:31:44 +00:00
|
|
|
/**
|
|
|
|
|
* @covers ResourceLoaderWikiModule::isKnownEmpty
|
|
|
|
|
* @dataProvider provideIsKnownEmpty
|
|
|
|
|
*/
|
2018-04-24 00:11:27 +00:00
|
|
|
public function testIsKnownEmpty( $titleInfo, $group, $dependencies, $expected ) {
|
2018-01-13 00:02:09 +00:00
|
|
|
$module = $this->getMockBuilder( ResourceLoaderWikiModule::class )
|
2018-04-24 00:11:27 +00:00
|
|
|
->setMethods( [ 'getTitleInfo', 'getGroup', 'getDependencies' ] )
|
2014-08-29 06:31:44 +00:00
|
|
|
->getMock();
|
|
|
|
|
$module->expects( $this->any() )
|
|
|
|
|
->method( 'getTitleInfo' )
|
resourceloader: Improve titleInfo docs and simplify title key
* Document the structure of the in-process $titleInfo cache.
Specifically, specify that it is not the value from getTitleInfo(),
but rather a container for zero or more versions of such values.
The reason this is fragmented is because ResourceLoaderContext
is a parameter to most methods and as such, makes everything
variable. Tracked as T99107.
* Make various bits easier to understand by consistently refering
to the container keys as "batchKey", and referring to the internal
keys as "titleKey".
* Centralise title key logic by moving to private method.
* Replace the internal creation of titleKey to be based on LinkTarget
with plain namespace IDs and db keys, instead of invoking the
expensive getPrefixedTitle function which involves quite a lot
of overhead (TitleCodec, GenderCache, Database, Language,
LocalisationCache, ..).
Change-Id: I701e5156ef7815a0e36caefae5871524eff3f688
2018-04-10 17:29:50 +00:00
|
|
|
->will( $this->returnValue( $this->prepareTitleInfo( $titleInfo ) ) );
|
2014-08-29 06:31:44 +00:00
|
|
|
$module->expects( $this->any() )
|
|
|
|
|
->method( 'getGroup' )
|
|
|
|
|
->will( $this->returnValue( $group ) );
|
2018-04-24 00:11:27 +00:00
|
|
|
$module->expects( $this->any() )
|
|
|
|
|
->method( 'getDependencies' )
|
|
|
|
|
->will( $this->returnValue( $dependencies ) );
|
2018-01-13 00:02:09 +00:00
|
|
|
$context = $this->getMockBuilder( ResourceLoaderContext::class )
|
2014-08-29 06:31:44 +00:00
|
|
|
->disableOriginalConstructor()
|
|
|
|
|
->getMock();
|
|
|
|
|
$this->assertEquals( $expected, $module->isKnownEmpty( $context ) );
|
|
|
|
|
}
|
|
|
|
|
|
2014-09-18 01:28:26 +00:00
|
|
|
public static function provideIsKnownEmpty() {
|
2016-02-17 09:09:32 +00:00
|
|
|
return [
|
2014-08-29 06:31:44 +00:00
|
|
|
// No valid pages
|
2018-04-24 00:11:27 +00:00
|
|
|
[ [], 'test1', [], true ],
|
2014-08-29 06:31:44 +00:00
|
|
|
// 'site' module with a non-empty page
|
2016-02-17 09:09:32 +00:00
|
|
|
[
|
2016-09-08 02:24:49 +00:00
|
|
|
[ 'MediaWiki:Common.js' => [ 'page_len' => 1234 ] ],
|
2015-06-04 01:52:42 +00:00
|
|
|
'site',
|
2018-04-24 00:11:27 +00:00
|
|
|
[],
|
|
|
|
|
false,
|
|
|
|
|
],
|
|
|
|
|
// 'site' module without existing pages but dependencies
|
|
|
|
|
[
|
|
|
|
|
[],
|
|
|
|
|
'site',
|
|
|
|
|
[ 'mobile.css' ],
|
|
|
|
|
false,
|
|
|
|
|
],
|
|
|
|
|
// 'site' module which is empty but has dependencies
|
|
|
|
|
[
|
|
|
|
|
[ 'MediaWiki:Common.js' => [ 'page_len' => 0 ] ],
|
|
|
|
|
'site',
|
|
|
|
|
[ 'mobile.css' ],
|
2015-06-04 01:52:42 +00:00
|
|
|
false,
|
2016-02-17 09:09:32 +00:00
|
|
|
],
|
2014-08-29 06:31:44 +00:00
|
|
|
// 'site' module with an empty page
|
2016-02-17 09:09:32 +00:00
|
|
|
[
|
2016-09-08 02:24:49 +00:00
|
|
|
[ 'MediaWiki:Foo.js' => [ 'page_len' => 0 ] ],
|
2015-06-04 01:52:42 +00:00
|
|
|
'site',
|
2018-04-24 00:11:27 +00:00
|
|
|
[],
|
2015-06-04 01:52:42 +00:00
|
|
|
false,
|
2016-02-17 09:09:32 +00:00
|
|
|
],
|
2014-08-29 06:31:44 +00:00
|
|
|
// 'user' module with a non-empty page
|
2016-02-17 09:09:32 +00:00
|
|
|
[
|
2016-09-08 02:24:49 +00:00
|
|
|
[ 'User:Example/common.js' => [ 'page_len' => 25 ] ],
|
2015-06-04 01:52:42 +00:00
|
|
|
'user',
|
2018-04-24 00:11:27 +00:00
|
|
|
[],
|
2015-06-04 01:52:42 +00:00
|
|
|
false,
|
2016-02-17 09:09:32 +00:00
|
|
|
],
|
2014-08-29 06:31:44 +00:00
|
|
|
// 'user' module with an empty page
|
2016-02-17 09:09:32 +00:00
|
|
|
[
|
2016-09-08 02:24:49 +00:00
|
|
|
[ 'User:Example/foo.js' => [ 'page_len' => 0 ] ],
|
2015-06-04 01:52:42 +00:00
|
|
|
'user',
|
2018-04-24 00:11:27 +00:00
|
|
|
[],
|
2015-06-04 01:52:42 +00:00
|
|
|
true,
|
2016-02-17 09:09:32 +00:00
|
|
|
],
|
|
|
|
|
];
|
2014-08-29 06:31:44 +00:00
|
|
|
}
|
2016-09-14 21:14:31 +00:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* @covers ResourceLoaderWikiModule::getTitleInfo
|
|
|
|
|
*/
|
|
|
|
|
public function testGetTitleInfo() {
|
|
|
|
|
$pages = [
|
|
|
|
|
'MediaWiki:Common.css' => [ 'type' => 'styles' ],
|
|
|
|
|
'mediawiki: fallback.css' => [ 'type' => 'styles' ],
|
|
|
|
|
];
|
resourceloader: Improve titleInfo docs and simplify title key
* Document the structure of the in-process $titleInfo cache.
Specifically, specify that it is not the value from getTitleInfo(),
but rather a container for zero or more versions of such values.
The reason this is fragmented is because ResourceLoaderContext
is a parameter to most methods and as such, makes everything
variable. Tracked as T99107.
* Make various bits easier to understand by consistently refering
to the container keys as "batchKey", and referring to the internal
keys as "titleKey".
* Centralise title key logic by moving to private method.
* Replace the internal creation of titleKey to be based on LinkTarget
with plain namespace IDs and db keys, instead of invoking the
expensive getPrefixedTitle function which involves quite a lot
of overhead (TitleCodec, GenderCache, Database, Language,
LocalisationCache, ..).
Change-Id: I701e5156ef7815a0e36caefae5871524eff3f688
2018-04-10 17:29:50 +00:00
|
|
|
$titleInfo = $this->prepareTitleInfo( [
|
2016-09-14 21:14:31 +00:00
|
|
|
'MediaWiki:Common.css' => [ 'page_len' => 1234 ],
|
|
|
|
|
'MediaWiki:Fallback.css' => [ 'page_len' => 0 ],
|
resourceloader: Improve titleInfo docs and simplify title key
* Document the structure of the in-process $titleInfo cache.
Specifically, specify that it is not the value from getTitleInfo(),
but rather a container for zero or more versions of such values.
The reason this is fragmented is because ResourceLoaderContext
is a parameter to most methods and as such, makes everything
variable. Tracked as T99107.
* Make various bits easier to understand by consistently refering
to the container keys as "batchKey", and referring to the internal
keys as "titleKey".
* Centralise title key logic by moving to private method.
* Replace the internal creation of titleKey to be based on LinkTarget
with plain namespace IDs and db keys, instead of invoking the
expensive getPrefixedTitle function which involves quite a lot
of overhead (TitleCodec, GenderCache, Database, Language,
LocalisationCache, ..).
Change-Id: I701e5156ef7815a0e36caefae5871524eff3f688
2018-04-10 17:29:50 +00:00
|
|
|
] );
|
2016-09-14 21:14:31 +00:00
|
|
|
$expected = $titleInfo;
|
|
|
|
|
|
2018-01-13 00:02:09 +00:00
|
|
|
$module = $this->getMockBuilder( TestResourceLoaderWikiModule::class )
|
2016-09-14 21:14:31 +00:00
|
|
|
->setMethods( [ 'getPages' ] )
|
|
|
|
|
->getMock();
|
|
|
|
|
$module->method( 'getPages' )->willReturn( $pages );
|
|
|
|
|
// Can't mock static methods
|
|
|
|
|
$module::$returnFetchTitleInfo = $titleInfo;
|
|
|
|
|
|
2018-01-13 00:02:09 +00:00
|
|
|
$context = $this->getMockBuilder( ResourceLoaderContext::class )
|
2016-09-14 21:14:31 +00:00
|
|
|
->disableOriginalConstructor()
|
|
|
|
|
->getMock();
|
|
|
|
|
|
|
|
|
|
$module = TestingAccessWrapper::newFromObject( $module );
|
|
|
|
|
$this->assertEquals( $expected, $module->getTitleInfo( $context ), 'Title info' );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* @covers ResourceLoaderWikiModule::getTitleInfo
|
|
|
|
|
* @covers ResourceLoaderWikiModule::setTitleInfo
|
|
|
|
|
* @covers ResourceLoaderWikiModule::preloadTitleInfo
|
|
|
|
|
*/
|
|
|
|
|
public function testGetPreloadedTitleInfo() {
|
|
|
|
|
$pages = [
|
|
|
|
|
'MediaWiki:Common.css' => [ 'type' => 'styles' ],
|
|
|
|
|
// Regression against T145673. It's impossible to statically declare page names in
|
|
|
|
|
// a canonical way since the canonical prefix is localised. As such, the preload
|
|
|
|
|
// cache computed the right cache key, but failed to find the results when
|
|
|
|
|
// doing an intersect on the canonical result, producing an empty array.
|
|
|
|
|
'mediawiki: fallback.css' => [ 'type' => 'styles' ],
|
|
|
|
|
];
|
resourceloader: Improve titleInfo docs and simplify title key
* Document the structure of the in-process $titleInfo cache.
Specifically, specify that it is not the value from getTitleInfo(),
but rather a container for zero or more versions of such values.
The reason this is fragmented is because ResourceLoaderContext
is a parameter to most methods and as such, makes everything
variable. Tracked as T99107.
* Make various bits easier to understand by consistently refering
to the container keys as "batchKey", and referring to the internal
keys as "titleKey".
* Centralise title key logic by moving to private method.
* Replace the internal creation of titleKey to be based on LinkTarget
with plain namespace IDs and db keys, instead of invoking the
expensive getPrefixedTitle function which involves quite a lot
of overhead (TitleCodec, GenderCache, Database, Language,
LocalisationCache, ..).
Change-Id: I701e5156ef7815a0e36caefae5871524eff3f688
2018-04-10 17:29:50 +00:00
|
|
|
$titleInfo = $this->prepareTitleInfo( [
|
2016-09-14 21:14:31 +00:00
|
|
|
'MediaWiki:Common.css' => [ 'page_len' => 1234 ],
|
|
|
|
|
'MediaWiki:Fallback.css' => [ 'page_len' => 0 ],
|
resourceloader: Improve titleInfo docs and simplify title key
* Document the structure of the in-process $titleInfo cache.
Specifically, specify that it is not the value from getTitleInfo(),
but rather a container for zero or more versions of such values.
The reason this is fragmented is because ResourceLoaderContext
is a parameter to most methods and as such, makes everything
variable. Tracked as T99107.
* Make various bits easier to understand by consistently refering
to the container keys as "batchKey", and referring to the internal
keys as "titleKey".
* Centralise title key logic by moving to private method.
* Replace the internal creation of titleKey to be based on LinkTarget
with plain namespace IDs and db keys, instead of invoking the
expensive getPrefixedTitle function which involves quite a lot
of overhead (TitleCodec, GenderCache, Database, Language,
LocalisationCache, ..).
Change-Id: I701e5156ef7815a0e36caefae5871524eff3f688
2018-04-10 17:29:50 +00:00
|
|
|
] );
|
2016-09-14 21:14:31 +00:00
|
|
|
$expected = $titleInfo;
|
|
|
|
|
|
2018-01-13 00:02:09 +00:00
|
|
|
$module = $this->getMockBuilder( TestResourceLoaderWikiModule::class )
|
2016-09-14 21:14:31 +00:00
|
|
|
->setMethods( [ 'getPages' ] )
|
|
|
|
|
->getMock();
|
|
|
|
|
$module->method( 'getPages' )->willReturn( $pages );
|
|
|
|
|
// Can't mock static methods
|
|
|
|
|
$module::$returnFetchTitleInfo = $titleInfo;
|
|
|
|
|
|
|
|
|
|
$rl = new EmptyResourceLoader();
|
|
|
|
|
$rl->register( 'testmodule', $module );
|
|
|
|
|
$context = new ResourceLoaderContext( $rl, new FauxRequest() );
|
|
|
|
|
|
2016-09-02 08:28:23 +00:00
|
|
|
TestResourceLoaderWikiModule::invalidateModuleCache(
|
|
|
|
|
Title::newFromText( 'MediaWiki:Common.css' ),
|
|
|
|
|
null,
|
|
|
|
|
null,
|
|
|
|
|
wfWikiID()
|
|
|
|
|
);
|
2016-09-14 21:14:31 +00:00
|
|
|
TestResourceLoaderWikiModule::preloadTitleInfo(
|
|
|
|
|
$context,
|
|
|
|
|
wfGetDB( DB_REPLICA ),
|
|
|
|
|
[ 'testmodule' ]
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
$module = TestingAccessWrapper::newFromObject( $module );
|
|
|
|
|
$this->assertEquals( $expected, $module->getTitleInfo( $context ), 'Title info' );
|
|
|
|
|
}
|
2016-02-11 04:57:03 +00:00
|
|
|
|
2017-04-01 01:35:09 +00:00
|
|
|
/**
|
|
|
|
|
* @covers ResourceLoaderWikiModule::preloadTitleInfo
|
|
|
|
|
*/
|
|
|
|
|
public function testGetPreloadedBadTitle() {
|
|
|
|
|
// Mock values
|
|
|
|
|
$pages = [
|
|
|
|
|
// Covers else branch for invalid page name
|
|
|
|
|
'[x]' => [ 'type' => 'styles' ],
|
|
|
|
|
];
|
|
|
|
|
$titleInfo = [];
|
|
|
|
|
|
|
|
|
|
// Set up objects
|
2018-01-13 00:02:09 +00:00
|
|
|
$module = $this->getMockBuilder( TestResourceLoaderWikiModule::class )
|
2018-09-07 17:01:32 +00:00
|
|
|
->setMethods( [ 'getPages' ] )->getMock();
|
2017-04-01 01:35:09 +00:00
|
|
|
$module->method( 'getPages' )->willReturn( $pages );
|
|
|
|
|
$module::$returnFetchTitleInfo = $titleInfo;
|
|
|
|
|
$rl = new EmptyResourceLoader();
|
|
|
|
|
$rl->register( 'testmodule', $module );
|
|
|
|
|
$context = new ResourceLoaderContext( $rl, new FauxRequest() );
|
|
|
|
|
|
|
|
|
|
// Act
|
|
|
|
|
TestResourceLoaderWikiModule::preloadTitleInfo(
|
|
|
|
|
$context,
|
|
|
|
|
wfGetDB( DB_REPLICA ),
|
|
|
|
|
[ 'testmodule' ]
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
// Assert
|
|
|
|
|
$module = TestingAccessWrapper::newFromObject( $module );
|
|
|
|
|
$this->assertEquals( $titleInfo, $module->getTitleInfo( $context ), 'Title info' );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* @covers ResourceLoaderWikiModule::preloadTitleInfo
|
|
|
|
|
*/
|
|
|
|
|
public function testGetPreloadedTitleInfoEmpty() {
|
|
|
|
|
$context = new ResourceLoaderContext( new EmptyResourceLoader(), new FauxRequest() );
|
|
|
|
|
// Covers early return
|
|
|
|
|
$this->assertSame(
|
|
|
|
|
null,
|
|
|
|
|
ResourceLoaderWikiModule::preloadTitleInfo(
|
|
|
|
|
$context,
|
|
|
|
|
wfGetDB( DB_REPLICA ),
|
|
|
|
|
[]
|
|
|
|
|
)
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public static function provideGetContent() {
|
|
|
|
|
return [
|
|
|
|
|
'Bad title' => [ null, '[x]' ],
|
|
|
|
|
'Dead redirect' => [ null, [
|
|
|
|
|
'text' => 'Dead redirect',
|
|
|
|
|
'title' => 'Dead_redirect',
|
|
|
|
|
'redirect' => 1,
|
|
|
|
|
] ],
|
|
|
|
|
'Bad content model' => [ null, [
|
|
|
|
|
'text' => 'MediaWiki:Wikitext',
|
|
|
|
|
'ns' => NS_MEDIAWIKI,
|
|
|
|
|
'title' => 'Wikitext',
|
|
|
|
|
] ],
|
|
|
|
|
'No JS content found' => [ null, [
|
|
|
|
|
'text' => 'MediaWiki:Script.js',
|
|
|
|
|
'ns' => NS_MEDIAWIKI,
|
|
|
|
|
'title' => 'Script.js',
|
|
|
|
|
] ],
|
|
|
|
|
'No CSS content found' => [ null, [
|
|
|
|
|
'text' => 'MediaWiki:Styles.css',
|
|
|
|
|
'ns' => NS_MEDIAWIKI,
|
|
|
|
|
'title' => 'Script.css',
|
|
|
|
|
] ],
|
|
|
|
|
];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* @covers ResourceLoaderWikiModule::getContent
|
|
|
|
|
* @dataProvider provideGetContent
|
|
|
|
|
*/
|
|
|
|
|
public function testGetContent( $expected, $title ) {
|
|
|
|
|
$context = $this->getResourceLoaderContext( [], new EmptyResourceLoader );
|
2018-01-13 00:02:09 +00:00
|
|
|
$module = $this->getMockBuilder( ResourceLoaderWikiModule::class )
|
2018-09-07 17:01:32 +00:00
|
|
|
->setMethods( [ 'getContentObj' ] )->getMock();
|
2017-04-01 01:35:09 +00:00
|
|
|
$module->expects( $this->any() )
|
|
|
|
|
->method( 'getContentObj' )->willReturn( null );
|
|
|
|
|
|
|
|
|
|
if ( is_array( $title ) ) {
|
|
|
|
|
$title += [ 'ns' => NS_MAIN, 'id' => 1, 'len' => 1, 'redirect' => 0 ];
|
|
|
|
|
$titleText = $title['text'];
|
|
|
|
|
// Mock Title db access via LinkCache
|
|
|
|
|
MediaWikiServices::getInstance()->getLinkCache()->addGoodLinkObj(
|
|
|
|
|
$title['id'],
|
|
|
|
|
new TitleValue( $title['ns'], $title['title'] ),
|
|
|
|
|
$title['len'],
|
|
|
|
|
$title['redirect']
|
|
|
|
|
);
|
|
|
|
|
} else {
|
|
|
|
|
$titleText = $title;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$module = TestingAccessWrapper::newFromObject( $module );
|
|
|
|
|
$this->assertEquals(
|
|
|
|
|
$expected,
|
2017-02-28 20:52:17 +00:00
|
|
|
$module->getContent( $titleText, $context )
|
2017-04-01 01:35:09 +00:00
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
2016-02-11 04:57:03 +00:00
|
|
|
/**
|
|
|
|
|
* @covers ResourceLoaderWikiModule::getContent
|
2017-02-28 20:52:17 +00:00
|
|
|
* @covers ResourceLoaderWikiModule::getContentObj
|
|
|
|
|
* @covers ResourceLoaderWikiModule::shouldEmbedModule
|
|
|
|
|
*/
|
|
|
|
|
public function testContentOverrides() {
|
|
|
|
|
$pages = [
|
|
|
|
|
'MediaWiki:Common.css' => [ 'type' => 'style' ],
|
|
|
|
|
];
|
|
|
|
|
|
|
|
|
|
$module = $this->getMockBuilder( TestResourceLoaderWikiModule::class )
|
|
|
|
|
->setMethods( [ 'getPages' ] )
|
|
|
|
|
->getMock();
|
|
|
|
|
$module->method( 'getPages' )->willReturn( $pages );
|
|
|
|
|
|
|
|
|
|
$rl = new EmptyResourceLoader();
|
|
|
|
|
$rl->register( 'testmodule', $module );
|
|
|
|
|
$context = new DerivativeResourceLoaderContext(
|
|
|
|
|
new ResourceLoaderContext( $rl, new FauxRequest() )
|
|
|
|
|
);
|
|
|
|
|
$context->setContentOverrideCallback( function ( Title $t ) {
|
|
|
|
|
if ( $t->getPrefixedText() === 'MediaWiki:Common.css' ) {
|
|
|
|
|
return new CssContent( '.override{}' );
|
|
|
|
|
}
|
|
|
|
|
return null;
|
|
|
|
|
} );
|
|
|
|
|
|
|
|
|
|
$this->assertTrue( $module->shouldEmbedModule( $context ) );
|
|
|
|
|
$this->assertEquals( [
|
|
|
|
|
'all' => [
|
|
|
|
|
"/*\nMediaWiki:Common.css\n*/\n.override{}"
|
|
|
|
|
]
|
|
|
|
|
], $module->getStyles( $context ) );
|
|
|
|
|
|
|
|
|
|
$context->setContentOverrideCallback( function ( Title $t ) {
|
|
|
|
|
if ( $t->getPrefixedText() === 'MediaWiki:Skin.css' ) {
|
|
|
|
|
return new CssContent( '.override{}' );
|
|
|
|
|
}
|
|
|
|
|
return null;
|
|
|
|
|
} );
|
|
|
|
|
$this->assertFalse( $module->shouldEmbedModule( $context ) );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* @covers ResourceLoaderWikiModule::getContent
|
|
|
|
|
* @covers ResourceLoaderWikiModule::getContentObj
|
2016-02-11 04:57:03 +00:00
|
|
|
*/
|
|
|
|
|
public function testGetContentForRedirects() {
|
|
|
|
|
// Set up context and module object
|
2017-02-28 20:52:17 +00:00
|
|
|
$context = new DerivativeResourceLoaderContext(
|
|
|
|
|
$this->getResourceLoaderContext( [], new EmptyResourceLoader )
|
|
|
|
|
);
|
2018-01-13 00:02:09 +00:00
|
|
|
$module = $this->getMockBuilder( ResourceLoaderWikiModule::class )
|
2017-02-28 20:52:17 +00:00
|
|
|
->setMethods( [ 'getPages' ] )
|
2016-02-11 04:57:03 +00:00
|
|
|
->getMock();
|
|
|
|
|
$module->expects( $this->any() )
|
|
|
|
|
->method( 'getPages' )
|
|
|
|
|
->will( $this->returnValue( [
|
|
|
|
|
'MediaWiki:Redirect.js' => [ 'type' => 'script' ]
|
|
|
|
|
] ) );
|
2017-02-28 20:52:17 +00:00
|
|
|
$context->setContentOverrideCallback( function ( Title $title ) {
|
|
|
|
|
if ( $title->getPrefixedText() === 'MediaWiki:Redirect.js' ) {
|
|
|
|
|
$handler = new JavaScriptContentHandler();
|
|
|
|
|
return $handler->makeRedirectContent(
|
|
|
|
|
Title::makeTitle( NS_MEDIAWIKI, 'Target.js' )
|
|
|
|
|
);
|
|
|
|
|
} elseif ( $title->getPrefixedText() === 'MediaWiki:Target.js' ) {
|
|
|
|
|
return new JavaScriptContent( 'target;' );
|
|
|
|
|
} else {
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
} );
|
2016-02-11 04:57:03 +00:00
|
|
|
|
|
|
|
|
// Mock away Title's db queries with LinkCache
|
|
|
|
|
MediaWikiServices::getInstance()->getLinkCache()->addGoodLinkObj(
|
|
|
|
|
1, // id
|
|
|
|
|
new TitleValue( NS_MEDIAWIKI, 'Redirect.js' ),
|
|
|
|
|
1, // len
|
|
|
|
|
1 // redirect
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
$this->assertEquals(
|
|
|
|
|
"/*\nMediaWiki:Redirect.js\n*/\ntarget;\n",
|
|
|
|
|
$module->getScript( $context ),
|
|
|
|
|
'Redirect resolved by getContent'
|
|
|
|
|
);
|
|
|
|
|
}
|
2016-09-14 21:14:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
class TestResourceLoaderWikiModule extends ResourceLoaderWikiModule {
|
|
|
|
|
public static $returnFetchTitleInfo = null;
|
|
|
|
|
protected static function fetchTitleInfo( IDatabase $db, array $pages, $fname = null ) {
|
|
|
|
|
$ret = self::$returnFetchTitleInfo;
|
|
|
|
|
self::$returnFetchTitleInfo = null;
|
|
|
|
|
return $ret;
|
|
|
|
|
}
|
2014-08-29 06:31:44 +00:00
|
|
|
}
|