diff options
Diffstat (limited to 'tests/phpunit')
25 files changed, 25 insertions, 6 deletions
diff --git a/tests/phpunit/MediaWikiIntegrationTestCase.php b/tests/phpunit/MediaWikiIntegrationTestCase.php index 362c93734f9d..e2c277936396 100644 --- a/tests/phpunit/MediaWikiIntegrationTestCase.php +++ b/tests/phpunit/MediaWikiIntegrationTestCase.php @@ -15,6 +15,7 @@ use MediaWiki\Permissions\Authority; use MediaWiki\Permissions\UltimateAuthority; use MediaWiki\Profiler\ProfilingContext; use MediaWiki\Request\FauxRequest; +use MediaWiki\Request\WebRequest; use MediaWiki\Revision\RevisionRecord; use MediaWiki\SiteStats\SiteStatsInit; use MediaWiki\Storage\PageUpdateStatus; diff --git a/tests/phpunit/includes/FauxRequestTest.php b/tests/phpunit/includes/FauxRequestTest.php index d607010b4f0f..fb04f7d2b3d7 100644 --- a/tests/phpunit/includes/FauxRequestTest.php +++ b/tests/phpunit/includes/FauxRequestTest.php @@ -2,6 +2,7 @@ use MediaWiki\MainConfigNames; use MediaWiki\Request\FauxRequest; +use MediaWiki\Request\WebRequest; use MediaWiki\Session\SessionManager; class FauxRequestTest extends MediaWikiIntegrationTestCase { diff --git a/tests/phpunit/includes/MediaWikiTest.php b/tests/phpunit/includes/MediaWikiTest.php index 312eb945556c..2da51169f47d 100644 --- a/tests/phpunit/includes/MediaWikiTest.php +++ b/tests/phpunit/includes/MediaWikiTest.php @@ -2,6 +2,7 @@ use MediaWiki\MainConfigNames; use MediaWiki\Request\FauxRequest; +use MediaWiki\Request\WebRequest; use MediaWiki\Request\WebResponse; use MediaWiki\Title\Title; use Wikimedia\TestingAccessWrapper; diff --git a/tests/phpunit/includes/OutputPageTest.php b/tests/phpunit/includes/OutputPageTest.php index a9cee5d2ec0e..534e42b5b26e 100644 --- a/tests/phpunit/includes/OutputPageTest.php +++ b/tests/phpunit/includes/OutputPageTest.php @@ -12,6 +12,7 @@ use MediaWiki\Parser\ParserOutputFlags; use MediaWiki\Permissions\Authority; use MediaWiki\Request\ContentSecurityPolicy; use MediaWiki\Request\FauxRequest; +use MediaWiki\Request\WebRequest; use MediaWiki\ResourceLoader as RL; use MediaWiki\ResourceLoader\ResourceLoader; use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait; diff --git a/tests/phpunit/includes/ResourceLoader/ContextTest.php b/tests/phpunit/includes/ResourceLoader/ContextTest.php index 75e589f45992..bcfb755f0787 100644 --- a/tests/phpunit/includes/ResourceLoader/ContextTest.php +++ b/tests/phpunit/includes/ResourceLoader/ContextTest.php @@ -6,12 +6,12 @@ use EmptyResourceLoader; use HashConfig; use MediaWiki\MainConfigNames; use MediaWiki\Request\FauxRequest; +use MediaWiki\Request\WebRequest; use MediaWiki\ResourceLoader\Context; use MediaWiki\ResourceLoader\ResourceLoader; use MediaWikiCoversValidator; use Message; use User; -use WebRequest; /** * See also: diff --git a/tests/phpunit/includes/WebRequestTest.php b/tests/phpunit/includes/WebRequestTest.php index 57e9c45e937f..f6f63c97fa26 100644 --- a/tests/phpunit/includes/WebRequestTest.php +++ b/tests/phpunit/includes/WebRequestTest.php @@ -2,6 +2,7 @@ use MediaWiki\MainConfigNames; use MediaWiki\Request\ProxyLookup; +use MediaWiki\Request\WebRequest; /** * @covers WebRequest diff --git a/tests/phpunit/includes/actions/RollbackActionTest.php b/tests/phpunit/includes/actions/RollbackActionTest.php index d990aefce5cd..fdd255f93fdf 100644 --- a/tests/phpunit/includes/actions/RollbackActionTest.php +++ b/tests/phpunit/includes/actions/RollbackActionTest.php @@ -6,12 +6,12 @@ use Article; use DerivativeContext; use ErrorPageError; use MediaWiki\Request\FauxRequest; +use MediaWiki\Request\WebRequest; use MediaWiki\Title\Title; use MediaWikiIntegrationTestCase; use RequestContext; use RollbackAction; use User; -use WebRequest; /** * @covers RollbackAction diff --git a/tests/phpunit/includes/actions/WatchActionTest.php b/tests/phpunit/includes/actions/WatchActionTest.php index f75499bf9923..a3cb7fb8c218 100644 --- a/tests/phpunit/includes/actions/WatchActionTest.php +++ b/tests/phpunit/includes/actions/WatchActionTest.php @@ -4,6 +4,7 @@ use MediaWiki\Language\RawMessage; use MediaWiki\MainConfigNames; use MediaWiki\Output\OutputPage; use MediaWiki\Permissions\PermissionManager; +use MediaWiki\Request\WebRequest; use MediaWiki\Status\Status; use MediaWiki\Tests\Unit\DummyServicesTrait; use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait; diff --git a/tests/phpunit/includes/api/ApiMainTest.php b/tests/phpunit/includes/api/ApiMainTest.php index 53084c48cdf2..dfe303446cfe 100644 --- a/tests/phpunit/includes/api/ApiMainTest.php +++ b/tests/phpunit/includes/api/ApiMainTest.php @@ -5,6 +5,7 @@ use MediaWiki\MainConfigNames; use MediaWiki\Permissions\Authority; use MediaWiki\Request\FauxRequest; use MediaWiki\Request\FauxResponse; +use MediaWiki\Request\WebRequest; use MediaWiki\StubObject\StubGlobalUser; use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait; use Wikimedia\Rdbms\DBConnRef; diff --git a/tests/phpunit/includes/api/ApiTestContext.php b/tests/phpunit/includes/api/ApiTestContext.php index 75a6c378c463..0ea64cc2e21a 100644 --- a/tests/phpunit/includes/api/ApiTestContext.php +++ b/tests/phpunit/includes/api/ApiTestContext.php @@ -1,6 +1,7 @@ <?php use MediaWiki\Permissions\Authority; +use MediaWiki\Request\WebRequest; class ApiTestContext extends RequestContext { diff --git a/tests/phpunit/includes/auth/AuthManagerTest.php b/tests/phpunit/includes/auth/AuthManagerTest.php index ce745d67723f..be6b042dfc3d 100644 --- a/tests/phpunit/includes/auth/AuthManagerTest.php +++ b/tests/phpunit/includes/auth/AuthManagerTest.php @@ -18,6 +18,7 @@ use MediaWiki\Languages\LanguageConverterFactory; use MediaWiki\Logger\LoggerFactory; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; +use MediaWiki\Request\WebRequest; use MediaWiki\Session\SessionInfo; use MediaWiki\Session\UserInfo; use MediaWiki\Status\Status; @@ -35,7 +36,6 @@ use Psr\Log\LoggerInterface; use Psr\Log\LogLevel; use StatusValue; use User; -use WebRequest; use Wikimedia\ObjectFactory\ObjectFactory; use Wikimedia\Rdbms\ILoadBalancer; use Wikimedia\Rdbms\ReadOnlyMode; diff --git a/tests/phpunit/includes/block/BlockManagerTest.php b/tests/phpunit/includes/block/BlockManagerTest.php index 924eeaf3d016..ba11484c96d2 100644 --- a/tests/phpunit/includes/block/BlockManagerTest.php +++ b/tests/phpunit/includes/block/BlockManagerTest.php @@ -7,6 +7,7 @@ use MediaWiki\Block\SystemBlock; use MediaWiki\MainConfigNames; use MediaWiki\Request\FauxRequest; use MediaWiki\Request\FauxResponse; +use MediaWiki\Request\WebRequest; use Psr\Log\NullLogger; use Wikimedia\TestingAccessWrapper; diff --git a/tests/phpunit/includes/jobqueue/JobRunnerTest.php b/tests/phpunit/includes/jobqueue/JobRunnerTest.php index 8424b0403ee9..ae106a2470f8 100644 --- a/tests/phpunit/includes/jobqueue/JobRunnerTest.php +++ b/tests/phpunit/includes/jobqueue/JobRunnerTest.php @@ -1,6 +1,7 @@ <?php use MediaWiki\Page\DeletePage; +use MediaWiki\Request\WebRequest; use MediaWiki\Title\Title; /** diff --git a/tests/phpunit/includes/jobqueue/JobTest.php b/tests/phpunit/includes/jobqueue/JobTest.php index 987fda4a20c0..bc1a4d1cb53d 100644 --- a/tests/phpunit/includes/jobqueue/JobTest.php +++ b/tests/phpunit/includes/jobqueue/JobTest.php @@ -1,6 +1,7 @@ <?php use MediaWiki\MainConfigNames; +use MediaWiki\Request\WebRequest; use MediaWiki\Title\Title; /** diff --git a/tests/phpunit/includes/session/CsrfTokenSetTest.php b/tests/phpunit/includes/session/CsrfTokenSetTest.php index fe2778e516d5..6a599f4b418c 100644 --- a/tests/phpunit/includes/session/CsrfTokenSetTest.php +++ b/tests/phpunit/includes/session/CsrfTokenSetTest.php @@ -2,11 +2,11 @@ namespace MediaWiki\Tests\Session; +use MediaWiki\Request\WebRequest; use MediaWiki\Session\CsrfTokenSet; use MediaWiki\Session\SessionManager; use MediaWikiIntegrationTestCase; use User; -use WebRequest; /** * @covers \MediaWiki\Session\CsrfTokenSet diff --git a/tests/phpunit/includes/specials/SpecialPageExecutor.php b/tests/phpunit/includes/specials/SpecialPageExecutor.php index 66c956a7404d..8973a0dbb6e7 100644 --- a/tests/phpunit/includes/specials/SpecialPageExecutor.php +++ b/tests/phpunit/includes/specials/SpecialPageExecutor.php @@ -4,6 +4,7 @@ use MediaWiki\Output\OutputPage; use MediaWiki\Permissions\Authority; use MediaWiki\Request\FauxRequest; use MediaWiki\Request\FauxResponse; +use MediaWiki\Request\WebRequest; /** * @author Addshore diff --git a/tests/phpunit/includes/specials/SpecialPageTestBase.php b/tests/phpunit/includes/specials/SpecialPageTestBase.php index 50af2bd22a35..8ca5792e27ab 100644 --- a/tests/phpunit/includes/specials/SpecialPageTestBase.php +++ b/tests/phpunit/includes/specials/SpecialPageTestBase.php @@ -1,6 +1,7 @@ <?php use MediaWiki\Permissions\Authority; +use MediaWiki\Request\WebRequest; /** * Base class for testing special pages. diff --git a/tests/phpunit/includes/user/PasswordResetTest.php b/tests/phpunit/includes/user/PasswordResetTest.php index 68f24444049e..1ceb6c1c3cd1 100644 --- a/tests/phpunit/includes/user/PasswordResetTest.php +++ b/tests/phpunit/includes/user/PasswordResetTest.php @@ -6,6 +6,7 @@ use MediaWiki\Block\CompositeBlock; use MediaWiki\Block\DatabaseBlock; use MediaWiki\Block\SystemBlock; use MediaWiki\Config\ServiceOptions; +use MediaWiki\Request\WebRequest; use MediaWiki\Status\Status; use MediaWiki\Tests\Unit\DummyServicesTrait; use MediaWiki\User\StaticUserOptionsLookup; diff --git a/tests/phpunit/includes/user/UserGroupManagerTest.php b/tests/phpunit/includes/user/UserGroupManagerTest.php index 184b166d8936..8c4c7d7811d9 100644 --- a/tests/phpunit/includes/user/UserGroupManagerTest.php +++ b/tests/phpunit/includes/user/UserGroupManagerTest.php @@ -27,6 +27,7 @@ use MediaWiki\Config\ServiceOptions; use MediaWiki\Config\SiteConfiguration; use MediaWiki\MainConfigNames; use MediaWiki\Permissions\SimpleAuthority; +use MediaWiki\Request\WebRequest; use MediaWiki\Session\PHPSessionHandler; use MediaWiki\Session\SessionManager; use MediaWiki\User\TempUser\RealTempUserConfig; @@ -41,7 +42,6 @@ use PHPUnit\Framework\MockObject\Rule\InvokedCount; use RequestContext; use TestLogger; use User; -use WebRequest; use Wikimedia\Assert\PreconditionException; /** diff --git a/tests/phpunit/includes/user/UserTest.php b/tests/phpunit/includes/user/UserTest.php index 345985a5fa2d..d853d0a97ba1 100644 --- a/tests/phpunit/includes/user/UserTest.php +++ b/tests/phpunit/includes/user/UserTest.php @@ -9,6 +9,7 @@ use MediaWiki\MainConfigNames; use MediaWiki\Permissions\RateLimiter; use MediaWiki\Permissions\RateLimitSubject; use MediaWiki\Request\FauxRequest; +use MediaWiki\Request\WebRequest; use MediaWiki\Tests\Unit\DummyServicesTrait; use MediaWiki\Title\Title; use MediaWiki\User\UserIdentityValue; diff --git a/tests/phpunit/mocks/session/DummySessionProvider.php b/tests/phpunit/mocks/session/DummySessionProvider.php index 1d6047accb9d..4ba4c49468db 100644 --- a/tests/phpunit/mocks/session/DummySessionProvider.php +++ b/tests/phpunit/mocks/session/DummySessionProvider.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Request\WebRequest; use MediaWiki\Session\SessionBackend; use MediaWiki\Session\SessionInfo; use MediaWiki\Session\SessionProvider; diff --git a/tests/phpunit/structure/RestStructureTest.php b/tests/phpunit/structure/RestStructureTest.php index 244b98a685f0..efb9587de37f 100644 --- a/tests/phpunit/structure/RestStructureTest.php +++ b/tests/phpunit/structure/RestStructureTest.php @@ -5,6 +5,7 @@ use MediaWiki\HookContainer\StaticHookRegistry; use MediaWiki\MainConfigSchema; use MediaWiki\MediaWikiServices; use MediaWiki\Permissions\SimpleAuthority; +use MediaWiki\Request\WebRequest; use MediaWiki\Rest\CorsUtils; use MediaWiki\Rest\EntryPoint; use MediaWiki\Rest\Handler; diff --git a/tests/phpunit/unit/includes/DerivativeRequestTest.php b/tests/phpunit/unit/includes/DerivativeRequestTest.php index 1ad709a03df7..7c233141d2dd 100644 --- a/tests/phpunit/unit/includes/DerivativeRequestTest.php +++ b/tests/phpunit/unit/includes/DerivativeRequestTest.php @@ -1,6 +1,7 @@ <?php use MediaWiki\Request\DerivativeRequest; +use MediaWiki\Request\WebRequest; /** * @covers MediaWiki\Request\DerivativeRequest diff --git a/tests/phpunit/unit/includes/Permissions/UserAuthorityTest.php b/tests/phpunit/unit/includes/Permissions/UserAuthorityTest.php index 4e60e98549ba..f10a0e16023a 100644 --- a/tests/phpunit/unit/includes/Permissions/UserAuthorityTest.php +++ b/tests/phpunit/unit/includes/Permissions/UserAuthorityTest.php @@ -35,12 +35,12 @@ use MediaWiki\Permissions\RateLimiter; use MediaWiki\Permissions\RateLimitSubject; use MediaWiki\Permissions\UserAuthority; use MediaWiki\Request\FauxRequest; +use MediaWiki\Request\WebRequest; use MediaWikiUnitTestCase; use Message; use PHPUnit\Framework\MockObject\MockObject; use StatusValue; use User; -use WebRequest; /** * @covers \MediaWiki\Permissions\UserAuthority diff --git a/tests/phpunit/unit/includes/utils/MWRestrictionsTest.php b/tests/phpunit/unit/includes/utils/MWRestrictionsTest.php index 08b8ba1681cf..550c3f8312a0 100644 --- a/tests/phpunit/unit/includes/utils/MWRestrictionsTest.php +++ b/tests/phpunit/unit/includes/utils/MWRestrictionsTest.php @@ -1,6 +1,7 @@ <?php use MediaWiki\Request\FauxRequest; +use MediaWiki\Request\WebRequest; use MediaWiki\Status\Status; class MWRestrictionsTest extends MediaWikiUnitTestCase { |