X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fspecialpage%2FAbstractChangesListSpecialPageTestCase.php;h=92d986d70ac2a1995a758bad2b178e9a8536fd7f;hb=77cc011b9c8d24d191b2094e81db13c7ab0ff844;hp=8b8ba0c0e16fc067bfe12d55e2ce0ab842e6438e;hpb=220bda9175a18458449e9d754fb48830c1f76f25;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/specialpage/AbstractChangesListSpecialPageTestCase.php b/tests/phpunit/includes/specialpage/AbstractChangesListSpecialPageTestCase.php
index 8b8ba0c0e1..92d986d70a 100644
--- a/tests/phpunit/includes/specialpage/AbstractChangesListSpecialPageTestCase.php
+++ b/tests/phpunit/includes/specialpage/AbstractChangesListSpecialPageTestCase.php
@@ -32,12 +32,6 @@ abstract class AbstractChangesListSpecialPageTestCase extends MediaWikiTestCase
 			'patrol' => true,
 		];
 
-		// Deprecated
-		$this->setTemporaryHook(
-			'ChangesListSpecialPageFilters',
-			null
-		);
-
 		# setup the ChangesListSpecialPage (or subclass) object
 		$this->changesListSpecialPage = $this->getPage();
 		$context = $this->changesListSpecialPage->getContext();
@@ -91,7 +85,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 )
@@ -101,7 +100,7 @@ abstract class AbstractChangesListSpecialPageTestCase extends MediaWikiTestCase
 		$output->method( 'redirect' )->willReturnCallback(
 			function ( $url ) use ( &$redirectQuery, &$redirected ) {
 				$urlParts = wfParseUrl( $url );
-				$query = isset( $urlParts[ 'query' ] ) ? $urlParts[ 'query' ] : '';
+				$query = $urlParts[ 'query' ] ?? '';
 				parse_str( $query, $redirectQuery );
 				$redirected = true;
 			}
@@ -110,6 +109,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