From 031ace2dba5feabd8feef093199af03e5c937660 Mon Sep 17 00:00:00 2001 From: gerritbot Date: Wed, 29 Nov 2023 12:39:47 +0000 Subject: [PATCH] Update UserOptionsLookup's FQN User-options related classes are being moved to the MediaWiki\User\Options namespace in MediaWiki Core; reflect that change here. Bug: T352284 Depends-On: I9822eb1553870b876d0b8a927e4e86c27d83bd52 Change-Id: I0c66220b0ba9501e8ef20a172d21d7e75a19d6cc --- extension.json | 2 +- includes/PopupsContext.php | 2 +- tests/phpunit/PopupsContextTest.php | 2 +- tests/phpunit/PopupsContextTestWrapper.php | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/extension.json b/extension.json index 38f78b164..29295f9a6 100644 --- a/extension.json +++ b/extension.json @@ -10,7 +10,7 @@ "descriptionmsg": "popups-desc", "license-name": "GPL-2.0-or-later", "requires": { - "MediaWiki": ">= 1.41" + "MediaWiki": ">= 1.42.0" }, "AutoloadNamespaces": { "Popups\\": "includes/" diff --git a/includes/PopupsContext.php b/includes/PopupsContext.php index c22eef2c9..41061cb8c 100644 --- a/includes/PopupsContext.php +++ b/includes/PopupsContext.php @@ -25,7 +25,7 @@ use ExtensionRegistry; use MediaWiki\MediaWikiServices; use MediaWiki\SpecialPage\SpecialPageFactory; use MediaWiki\Title\Title; -use MediaWiki\User\UserOptionsLookup; +use MediaWiki\User\Options\UserOptionsLookup; /** * Popups Module diff --git a/tests/phpunit/PopupsContextTest.php b/tests/phpunit/PopupsContextTest.php index 649041648..8523e8ac9 100644 --- a/tests/phpunit/PopupsContextTest.php +++ b/tests/phpunit/PopupsContextTest.php @@ -20,7 +20,7 @@ */ use MediaWiki\Title\Title; -use MediaWiki\User\UserOptionsLookup; +use MediaWiki\User\Options\UserOptionsLookup; use PHPUnit\Framework\MockObject\Stub\ConsecutiveCalls; use Popups\PopupsContext; use Popups\PopupsGadgetsIntegration; diff --git a/tests/phpunit/PopupsContextTestWrapper.php b/tests/phpunit/PopupsContextTestWrapper.php index 0bba7c32f..4ae7462d1 100644 --- a/tests/phpunit/PopupsContextTestWrapper.php +++ b/tests/phpunit/PopupsContextTestWrapper.php @@ -19,6 +19,7 @@ * @ingroup extensions */ +use MediaWiki\User\Options\UserOptionsLookup; use Popups\PopupsContext; use Popups\PopupsGadgetsIntegration;