wikimedia/mediawiki-skins-Vector
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/skins/Vector.git synced 2024-09-23 10:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Inject services in Hooks

Browse source 
Change-Id: Ice931a7596c73781f05265d96e0086729402ae63
This commit is contained in:
Fomafix 2024-02-27 19:33:12 +00:00
parent d3a4911499
commit 9d1819f4ec
3 changed files with 33 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
includes/Hooks.php
View file

@ -11,6 +11,7 @@ use MediaWiki\ResourceLoader\Hook\ResourceLoaderSiteModulePagesHook;
use MediaWiki\ResourceLoader\Hook\ResourceLoaderSiteStylesModulePagesHook;
use MediaWiki\Skins\Hook\SkinPageReadyConfigHook;
use MediaWiki\Skins\Vector\Hooks\HookRunner;
use MediaWiki\User\Options\UserOptionsManager;
use MediaWiki\User\User;
use RequestContext;
use RuntimeException;
@ -31,6 +32,17 @@ class Hooks implements
ResourceLoaderSiteStylesModulePagesHook,
SkinPageReadyConfigHook
{
private Config $config;
private UserOptionsManager $userOptionsManager;
public function __construct(
Config $config,
UserOptionsManager $userOptionsManager
) {
$this->config = $config;
$this->userOptionsManager = $userOptionsManager;
}
/**
* Checks if the current skin is a variant of Vector
*
@ -512,8 +524,7 @@ class Hooks implements
* @param array &$pages
*/
public function onResourceLoaderSiteStylesModulePages( $skin, &$pages ): void {
$config = MediaWikiServices::getInstance()->getMainConfig();
if ( $skin === Constants::SKIN_NAME_MODERN && $config->get( 'VectorShareUserScripts' ) ) {
if ( $skin === Constants::SKIN_NAME_MODERN && $this->config->get( 'VectorShareUserScripts' ) ) {
$pages['MediaWiki:Vector.css'] = [ 'type' => 'style' ];
}
}
@ -525,8 +536,7 @@ class Hooks implements
* @param array &$pages
*/
public function onResourceLoaderSiteModulePages( $skin, &$pages ): void {
$config = MediaWikiServices::getInstance()->getMainConfig();
if ( $skin === Constants::SKIN_NAME_MODERN && $config->get( 'VectorShareUserScripts' ) ) {
if ( $skin === Constants::SKIN_NAME_MODERN && $this->config->get( 'VectorShareUserScripts' ) ) {
$pages['MediaWiki:Vector.js'] = [ 'type' => 'script' ];
}
}
@ -575,11 +585,9 @@ class Hooks implements
* @param bool $isAutoCreated
*/
public function onLocalUserCreated( $user, $isAutoCreated ) {
$config = MediaWikiServices::getInstance()->getMainConfig();
$default = $config->get( Constants::CONFIG_KEY_DEFAULT_SKIN_VERSION_FOR_NEW_ACCOUNTS );
$default = $this->config->get( Constants::CONFIG_KEY_DEFAULT_SKIN_VERSION_FOR_NEW_ACCOUNTS );
if ( $default ) {
$optionsManager = MediaWikiServices::getInstance()->getUserOptionsManager();
$optionsManager->setOption(
$this->userOptionsManager->setOption(
$user,
Constants::PREF_KEY_SKIN,
$default === Constants::SKIN_VERSION_LEGACY ?
@ -611,10 +619,9 @@ class Hooks implements
return;
}
// Only add Vector 2022 beta feature if there is at least one beta feature present in config
$config = MediaWikiServices::getInstance()->getMainConfig();
$configHasBeta = false;
foreach ( Constants::VECTOR_BETA_FEATURES as $featureName ) {
if ( $config->has( $featureName ) && $config->get( $featureName )[ 'beta' ] === true ) {
if ( $this->config->has( $featureName ) && $this->config->get( $featureName )[ 'beta' ] === true ) {
$configHasBeta = true;
break;
}
@ -622,7 +629,7 @@ class Hooks implements
if ( !$configHasBeta ) {
return;
}
$skinsAssetsPath = $config->get( 'StylePath' );
$skinsAssetsPath = $this->config->get( 'StylePath' );
$imagesDir = "$skinsAssetsPath/Vector/resources/images";
$betaFeatures[ Constants::VECTOR_2022_BETA_KEY ] = [
'label-message' => 'vector-2022-beta-preview-label',

6
skin.json
View file

@ -184,7 +184,11 @@
]
},
"VectorHooks": {
"class": "MediaWiki\\Skins\\Vector\\Hooks"
"class": "MediaWiki\\Skins\\Vector\\Hooks",
"services": [
"MainConfig",
"UserOptionsManager"
]
}
},
"Hooks": {

16
tests/phpunit/integration/VectorHooksTest.php
View file

@ -368,7 +368,7 @@ class VectorHooksTest extends MediaWikiIntegrationTestCase {
* @covers ::onLocalUserCreated
*/
public function testOnLocalUserCreatedLegacy() {
$this->overrideConfigValues( [
$config = new HashConfig( [
'VectorDefaultSkinVersionForNewAccounts' => Constants::SKIN_VERSION_LEGACY,
] );
@ -377,19 +377,21 @@ class VectorHooksTest extends MediaWikiIntegrationTestCase {
$userOptionsManager->expects( $this->once() )
->method( 'setOption' )
->with( $user, 'skin', Constants::SKIN_NAME_LEGACY );
$this->setService( 'UserOptionsManager', $userOptionsManager );
// NOTE: Using $this->getServiceContainer()->getHookContainer()->run( ... )
// will instead call Echo's legacy hook as that is already registered which
// will break this test. Use Vector's hook handler instead.
( new Hooks() )->onLocalUserCreated( $user, false );
( new Hooks(
$config,
$userOptionsManager
) )->onLocalUserCreated( $user, false );
}
/**
* @covers ::onLocalUserCreated
*/
public function testOnLocalUserCreatedLatest() {
$this->overrideConfigValues( [
$config = new HashConfig( [
'VectorDefaultSkinVersionForNewAccounts' => Constants::SKIN_VERSION_LATEST,
] );
@ -398,12 +400,14 @@ class VectorHooksTest extends MediaWikiIntegrationTestCase {
$userOptionsManager->expects( $this->once() )
->method( 'setOption' )
->with( $user, 'skin', Constants::SKIN_NAME_MODERN );
$this->setService( 'UserOptionsManager', $userOptionsManager );
// NOTE: Using $this->getServiceContainer()->getHookContainer()->run( ... )
// will instead call Echo's legacy hook as that is already registered which
// will break this test. Use Vector's hook handler instead.
( new Hooks() )->onLocalUserCreated( $user, false );
( new Hooks(
$config,
$userOptionsManager
) )->onLocalUserCreated( $user, false );
}
/**