From 2e8512c7d06b43681f918f97eb8bf46f0bd70562 Mon Sep 17 00:00:00 2001 From: Stephane Bisson Date: Thu, 27 Sep 2018 13:09:33 -0400 Subject: [PATCH] Remove temporary rcfilters variables wgStructuredChangeFiltersShowPreference, wgStructuredChangeFiltersShowWatchlistPreference, and wgStructuredChangeFiltersOnWatchlist were introduced for progressive rollout of the RCFilters app on RC and WL. These variables and their related conditional code is no longer needed. Bug: T196033 Change-Id: Id3799fefd21cd9bea0e089a5e12576ee9ea1085e --- includes/DefaultSettings.php | 28 ------------------- .../preferences/DefaultPreferencesFactory.php | 28 ++++++++----------- .../specialpage/ChangesListSpecialPage.php | 12 ++------ includes/specials/SpecialWatchlist.php | 10 +------ ...AbstractChangesListSpecialPageTestCase.php | 8 +++++- .../ChangesListSpecialPageTest.php | 26 +++++++++-------- .../specials/SpecialRecentchangesTest.php | 1 + 7 files changed, 38 insertions(+), 75 deletions(-) diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 96d2e22a8f..9ea1a25f09 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -6929,34 +6929,6 @@ $wgRCWatchCategoryMembership = false; */ $wgUseRCPatrol = true; -/** - * Whether a preference is displayed for structured change filters. - * If false, no preference is displayed and structured change filters are disabled. - * If true, structured change filters are *enabled* by default, and a preference is displayed - * that lets users disable them. - * - * Temporary variable during development and will be removed. - * - * @since 1.30 - */ -$wgStructuredChangeFiltersShowPreference = false; - -/** - * Whether a preference is displayed for structured change filters on watchlist. - * Works just like $wgStructuredChangeFiltersShowPreference. - * - * Temporary variable during development and will be removed - * @since 1.32 - */ -$wgStructuredChangeFiltersShowWatchlistPreference = false; - -/** - * Whether to enable RCFilters app on Special:Watchlist - * - * Temporary variable during development and will be removed. - */ -$wgStructuredChangeFiltersOnWatchlist = false; - /** * Polling rate, in seconds, used by the 'live update' and 'view newest' features * of the RCFilters app on SpecialRecentChanges and Special:Watchlist. diff --git a/includes/preferences/DefaultPreferencesFactory.php b/includes/preferences/DefaultPreferencesFactory.php index 555493a8a3..880da606a1 100644 --- a/includes/preferences/DefaultPreferencesFactory.php +++ b/includes/preferences/DefaultPreferencesFactory.php @@ -1060,14 +1060,12 @@ class DefaultPreferencesFactory implements PreferencesFactory { ]; } - if ( $this->config->get( 'StructuredChangeFiltersShowPreference' ) ) { - $defaultPreferences['rcenhancedfilters-disable'] = [ - 'type' => 'toggle', - 'section' => 'rc/optoutrc', - 'label-message' => 'rcfilters-preference-label', - 'help-message' => 'rcfilters-preference-help', - ]; - } + $defaultPreferences['rcenhancedfilters-disable'] = [ + 'type' => 'toggle', + 'section' => 'rc/optoutrc', + 'label-message' => 'rcfilters-preference-label', + 'help-message' => 'rcfilters-preference-help', + ]; } /** @@ -1264,14 +1262,12 @@ class DefaultPreferencesFactory implements PreferencesFactory { ]; } - if ( $this->config->get( 'StructuredChangeFiltersShowWatchlistPreference' ) ) { - $defaultPreferences['wlenhancedfilters-disable'] = [ - 'type' => 'toggle', - 'section' => 'watchlist/optoutwatchlist', - 'label-message' => 'rcfilters-watchlist-preference-label', - 'help-message' => 'rcfilters-watchlist-preference-help', - ]; - } + $defaultPreferences['wlenhancedfilters-disable'] = [ + 'type' => 'toggle', + 'section' => 'watchlist/optoutwatchlist', + 'label-message' => 'rcfilters-watchlist-preference-label', + 'help-message' => 'rcfilters-watchlist-preference-help', + ]; } /** diff --git a/includes/specialpage/ChangesListSpecialPage.php b/includes/specialpage/ChangesListSpecialPage.php index 43b4e98663..36d3eef6d5 100644 --- a/includes/specialpage/ChangesListSpecialPage.php +++ b/includes/specialpage/ChangesListSpecialPage.php @@ -1846,11 +1846,7 @@ abstract class ChangesListSpecialPage extends SpecialPage { * @return bool */ public function isStructuredFilterUiEnabledByDefault() { - if ( $this->getConfig()->get( 'StructuredChangeFiltersShowPreference' ) ) { - return !$this->getUser()->getDefaultOption( 'rcenhancedfilters-disable' ); - } else { - return $this->getUser()->getDefaultOption( 'rcenhancedfilters' ); - } + return true; } /** @@ -1862,11 +1858,7 @@ abstract class ChangesListSpecialPage extends SpecialPage { * @return bool */ public static function checkStructuredFilterUiEnabled( Config $config, User $user ) { - if ( $config->get( 'StructuredChangeFiltersShowPreference' ) ) { - return !$user->getOption( 'rcenhancedfilters-disable' ); - } else { - return $user->getOption( 'rcenhancedfilters' ); - } + return !$user->getOption( 'rcenhancedfilters-disable' ); } /** diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php index 432cfcc2f9..2445c10cde 100644 --- a/includes/specials/SpecialWatchlist.php +++ b/includes/specials/SpecialWatchlist.php @@ -111,15 +111,7 @@ class SpecialWatchlist extends ChangesListSpecialPage { } public static function checkStructuredFilterUiEnabled( Config $config, User $user ) { - if ( !$config->get( 'StructuredChangeFiltersOnWatchlist' ) ) { - return false; - } - - if ( $config->get( 'StructuredChangeFiltersShowWatchlistPreference' ) ) { - return !$user->getOption( 'wlenhancedfilters-disable' ); - } else { - return $user->getOption( 'rcenhancedfilters' ); - } + return !$user->getOption( 'wlenhancedfilters-disable' ); } /** diff --git a/tests/phpunit/includes/specialpage/AbstractChangesListSpecialPageTestCase.php b/tests/phpunit/includes/specialpage/AbstractChangesListSpecialPageTestCase.php index d84fcd70d6..d57d489b30 100644 --- a/tests/phpunit/includes/specialpage/AbstractChangesListSpecialPageTestCase.php +++ b/tests/phpunit/includes/specialpage/AbstractChangesListSpecialPageTestCase.php @@ -91,7 +91,12 @@ abstract class AbstractChangesListSpecialPageTestCase extends MediaWikiTestCase /** * @dataProvider validateOptionsProvider */ - public function testValidateOptions( $optionsToSet, $expectedRedirect, $expectedRedirectOptions ) { + public function testValidateOptions( + $optionsToSet, + $expectedRedirect, + $expectedRedirectOptions, + $rcfilters + ) { $redirectQuery = []; $redirected = false; $output = $this->getMockBuilder( OutputPage::class ) @@ -110,6 +115,7 @@ abstract class AbstractChangesListSpecialPageTestCase extends MediaWikiTestCase // Give users patrol permissions so we can test that. $user = $this->getTestSysop()->getUser(); + $user->setOption( 'rcenhancedfilters-disable', $rcfilters ? 0 : 1 ); $ctx->setUser( $user ); // Disable this hook or it could break changeType diff --git a/tests/phpunit/includes/specialpage/ChangesListSpecialPageTest.php b/tests/phpunit/includes/specialpage/ChangesListSpecialPageTest.php index 19a1875d58..b8742158b8 100644 --- a/tests/phpunit/includes/specialpage/ChangesListSpecialPageTest.php +++ b/tests/phpunit/includes/specialpage/ChangesListSpecialPageTest.php @@ -15,13 +15,6 @@ use Wikimedia\TestingAccessWrapper; * @covers ChangesListSpecialPage */ class ChangesListSpecialPageTest extends AbstractChangesListSpecialPageTestCase { - public function setUp() { - parent::setUp(); - $this->setMwGlobals( [ - 'wgStructuredChangeFiltersShowPreference' => true, - ] ); - } - protected function getPage() { $mock = $this->getMockBuilder( ChangesListSpecialPage::class ) ->setConstructorArgs( @@ -1004,57 +997,68 @@ class ChangesListSpecialPageTest extends AbstractChangesListSpecialPageTestCase [ 'hideanons' => 1, 'hideliu' => 1, 'hidebots' => 1 ], true, [ 'userExpLevel' => 'unregistered', 'hidebots' => 1, ], + true, ], [ [ 'hideanons' => 1, 'hideliu' => 1, 'hidebots' => 0 ], true, [ 'hidebots' => 0, 'hidehumans' => 1 ], + true, ], [ [ 'hideanons' => 1 ], true, - [ 'userExpLevel' => 'registered' ] + [ 'userExpLevel' => 'registered' ], + true, ], [ [ 'hideliu' => 1 ], true, - [ 'userExpLevel' => 'unregistered' ] + [ 'userExpLevel' => 'unregistered' ], + true, ], [ [ 'hideanons' => 1, 'hidebots' => 1 ], true, - [ 'userExpLevel' => 'registered', 'hidebots' => 1 ] + [ 'userExpLevel' => 'registered', 'hidebots' => 1 ], + true, ], [ [ 'hideliu' => 1, 'hidebots' => 0 ], true, - [ 'userExpLevel' => 'unregistered', 'hidebots' => 0 ] + [ 'userExpLevel' => 'unregistered', 'hidebots' => 0 ], + true, ], [ [ 'hidemyself' => 1, 'hidebyothers' => 1 ], true, [], + true, ], [ [ 'hidebots' => 1, 'hidehumans' => 1 ], true, [], + true, ], [ [ 'hidepatrolled' => 1, 'hideunpatrolled' => 1 ], true, [], + true, ], [ [ 'hideminor' => 1, 'hidemajor' => 1 ], true, [], + true, ], [ // changeType [ 'hidepageedits' => 1, 'hidenewpages' => 1, 'hidecategorization' => 1, 'hidelog' => 1, ], true, [], + true, ], ]; } diff --git a/tests/phpunit/includes/specials/SpecialRecentchangesTest.php b/tests/phpunit/includes/specials/SpecialRecentchangesTest.php index 0b6962d5fa..11988da060 100644 --- a/tests/phpunit/includes/specials/SpecialRecentchangesTest.php +++ b/tests/phpunit/includes/specials/SpecialRecentchangesTest.php @@ -46,6 +46,7 @@ class SpecialRecentchangesTest extends AbstractChangesListSpecialPageTestCase { [ 'hideanons' => 1, 'hideliu' => 1 ], true, [ 'hideliu' => 1 ], + false, ], ]; } -- 2.20.1