jonny
/
Vector-Local
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use new ResourceLoader namespace 

To fix Phan errors with the now-deprecated ResourceLoaderContext
class alias.

Bug: T308718
Change-Id: Ifd265d29cee5f8a68e7b3036deaf2ba2b6c49d2e
This commit is contained in:
Sam Wilson 2022-05-25 13:12:31 +08:00 committed by Samtar
parent fcead5e634
commit c32c64481d
4 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
includes/Hooks.php
View File

@ -8,11 +8,11 @@ use MediaWiki\Hook\MakeGlobalVariablesScriptHook;
use MediaWiki\Hook\OutputPageBodyAttributesHook;
use MediaWiki\MediaWikiServices;
use MediaWiki\Preferences\Hook\GetPreferencesHook;
use MediaWiki\ResourceLoader as RL;
use MediaWiki\ResourceLoader\Hook\ResourceLoaderSiteModulePagesHook;
use MediaWiki\ResourceLoader\Hook\ResourceLoaderSiteStylesModulePagesHook;
use MediaWiki\Skins\Hook\SkinPageReadyConfigHook;
use OutputPage;
use ResourceLoaderContext;
use RuntimeException;
use Skin;
use SkinTemplate;
@ -86,12 +86,12 @@ class Hooks implements
/**
* Passes config variables to Vector (modern) ResourceLoader module.
* @param ResourceLoaderContext $context
* @param RL\Context $context
* @param Config $config
* @return array
*/
public static function getVectorResourceLoaderConfig(
ResourceLoaderContext $context,
RL\Context $context,
Config $config
) {
return [
@ -104,12 +104,12 @@ class Hooks implements
* Generates config variables for skins.vector.search Resource Loader module (defined in
* skin.json).
*
* @param ResourceLoaderContext $context
* @param RL\Context $context
* @param Config $config
* @return array<string,mixed>
*/
public static function getVectorWvuiSearchResourceLoaderConfig(
ResourceLoaderContext $context,
RL\Context $context,
Config $config
): array {
$result = $config->get( 'VectorWvuiSearchOptions' );
@ -125,12 +125,12 @@ class Hooks implements
* Replace searchModule provided by skin.
*
* @since 1.35
* @param ResourceLoaderContext $context
* @param RL\Context $context
* @param mixed[] &$config Associative array of configurable options
* @return void This hook must not abort, it must return no value
*/
public function onSkinPageReadyConfig(
ResourceLoaderContext $context,
RL\Context $context,
array &$config
): void {
// It's better to exit before any additional check
@ -140,7 +140,7 @@ class Hooks implements
// Tell the `mediawiki.page.ready` module not to wire up search.
// This allows us to use the new Vue implementation.
// ResourceLoaderContext has no knowledge of legacy / modern Vector
// Context has no knowledge of legacy / modern Vector
// and from its point of view they are the same thing.
// Please see the modules `skins.vector.js` and `skins.vector.legacy.js`
// for the wire up of search.

7
includes/ResourceLoader/VectorResourceLoaderUserModule.php
View File

@ -2,15 +2,14 @@
namespace MediaWiki\Skins\Vector\ResourceLoader;
use MediaWiki\ResourceLoader as RL;
use MediaWiki\Skins\Vector\Constants;
use ResourceLoaderContext;
use ResourceLoaderUserModule;
class VectorResourceLoaderUserModule extends ResourceLoaderUserModule {
class VectorResourceLoaderUserModule extends RL\UserModule {
/**
* @inheritDoc
*/
protected function getPages( ResourceLoaderContext $context ) {
protected function getPages( RL\Context $context ) {
$skin = $context->getSkin();
$config = $this->getConfig();
$user = $context->getUserObj();

7
includes/ResourceLoader/VectorResourceLoaderUserStylesModule.php
View File

@ -2,15 +2,14 @@
namespace MediaWiki\Skins\Vector\ResourceLoader;
use MediaWiki\ResourceLoader as RL;
use MediaWiki\Skins\Vector\Constants;
use ResourceLoaderContext;
use ResourceLoaderUserStylesModule;
class VectorResourceLoaderUserStylesModule extends ResourceLoaderUserStylesModule {
class VectorResourceLoaderUserStylesModule extends RL\UserStylesModule {
/**
* @inheritDoc
*/
protected function getPages( ResourceLoaderContext $context ) {
protected function getPages( RL\Context $context ) {
$skin = $context->getSkin();
$config = $this->getConfig();
$user = $context->getUserObj();

2
skin.json
View File

@ -21,7 +21,7 @@
"license-name": "GPL-2.0-or-later",
"type": "skin",
"requires": {
"MediaWiki": ">= 1.38.0"
"MediaWiki": ">= 1.39.0"
},
"ValidSkinNames": {
"vector-2022": {