Merge "Remove GEHomepageEnabled configuration flag"

Author: jenkins-bot

extension.json

@@ -2670,10 +2670,6 @@
 			"description": "Number of days a reminder on Special:Homepage should be shown for if the user has not filled out the welcome survey yet. Set to 0 to disable the reminder.",
 			"value": 30
 		},
-		"GEHomepageEnabled": {
-			"description": "Global ON/OFF switch for the Homepage feature.",
-			"value": true
-		},
 		"GEHomepageNewAccountEnablePercentage": {
 			"description": "Percentage of new accounts to enable homepage for. Must be a whole number.",
 			"value": 100

includes/HomepageHooks.php

@@ -300,7 +300,6 @@ public static function isHomepageEnabled( ?UserIdentity $user = null ): bool {
 		// keep the dependencies minimal, this is used from other hooks as well
 		$services = MediaWikiServices::getInstance();
 		return (
-			$services->getMainConfig()->get( 'GEHomepageEnabled' ) &&
 			(
 				$user === null ||
 				$services->getUserOptionsLookup()->getBoolOption(
@@ -317,9 +316,8 @@ public static function isHomepageEnabled( ?UserIdentity $user = null ): bool {
 	 * @param UserIdentity $user
 	 * @return bool
 	 */
-	private function isHomepageEnabledGloballyAndForUser( UserIdentity $user ): bool {
-		return $this->config->get( 'GEHomepageEnabled' ) &&
-			$this->userOptionsLookup->getBoolOption( $user, self::HOMEPAGE_PREF_ENABLE );
+	private function isHomepageEnabledForUser( UserIdentity $user ): bool {
+		return $this->userOptionsLookup->getBoolOption( $user, self::HOMEPAGE_PREF_ENABLE );
 	}
 
 	/**
@@ -1470,7 +1468,7 @@ public function onCirrusSearchScoreBuilder(
 	/** @inheritDoc */
 	public function onContributeCards( array &$cards ): void {
 		$userIdentity = $this->userIdentity ?? RequestContext::getMain()->getUser();
-		if ( !$this->isHomepageEnabledGloballyAndForUser( $userIdentity ) ) {
+		if ( !$this->isHomepageEnabledForUser( $userIdentity ) ) {
 			return;
 		}
 		$messageLocalizer = $this->messageLocalizer ?? RequestContext::getMain();

tests/phpunit/integration/Specials/SpecialHomepageTest.php

@@ -93,7 +93,6 @@ public function testMissingParametersToNewcomerTaskSubpath(
 
 	private function enableHomepageForTesting(): User {
 		$this->overrideConfigValues( [
-			'GEHomepageEnabled' => true,
 			'GEHelpPanelHelpDeskTitle' => 'HelpDeskTitle',
 		] );
 		$user = $this->getMutableTestUser()->getUser()->getInstanceForUpdate();

tests/phpunit/unit/HomepageHooksTest.php

@@ -114,9 +114,7 @@ public function testOnContributeCards() {
 			->with( $userIdentity, HomepageHooks::HOMEPAGE_PREF_ENABLE )
 			->willReturn( true );
 		$homepageHooks = $this->getHomepageHooksMock(
-			new HashConfig( [
-				'GEHomepageEnabled' => true,
-			] ),
+			new HashConfig( [] ),
 			$titleFactoryMock,
 			$specialPageFactoryMock,
 			$userOptionsLookupMock
@@ -144,22 +142,13 @@ public function testOnContributeCards() {
 			] ]
 		], $cards );
 
-		// Scenario if Homepage is globally disabled, user has pref enabled
-		$homepageHooks = $this->getHomepageHooksMock(
-			new HashConfig( [ 'GEHomepageEnabled' => false ] ),
-		);
-		$homepageHooks->setUserIdentity( $userIdentity );
-		$cards = [];
-		$homepageHooks->onContributeCards( $cards );
-		$this->assertArrayEquals( [], $cards );
-
-		// Scenario if Homepage is globally enabled, user has pref disabled
+		// Scenario if user has pref disabled
 		$userOptionsLookupMock = $this->createMock( UserOptionsLookup::class );
 		$userOptionsLookupMock->method( 'getBoolOption' )
 			->with( $userIdentity, HomepageHooks::HOMEPAGE_PREF_ENABLE )
 			->willReturn( false );
 		$homepageHooks = $this->getHomepageHooksMock(
-			new HashConfig( [ 'GEHomepageEnabled' => true ] ),
+			new HashConfig( [] ),
 			$titleFactoryMock,
 			$specialPageFactoryMock,
 			$userOptionsLookupMock