diff options
Diffstat (limited to 'tests/phpunit/integration/includes/Rest')
7 files changed, 9 insertions, 7 deletions
diff --git a/tests/phpunit/integration/includes/Rest/Handler/HTMLHandlerTestTrait.php b/tests/phpunit/integration/includes/Rest/Handler/HTMLHandlerTestTrait.php index e244fdf0a374..c0d7d72b2f80 100644 --- a/tests/phpunit/integration/includes/Rest/Handler/HTMLHandlerTestTrait.php +++ b/tests/phpunit/integration/includes/Rest/Handler/HTMLHandlerTestTrait.php @@ -3,7 +3,6 @@ namespace MediaWiki\Tests\Rest\Handler; use Exception; -use HashBagOStuff; use MediaWiki\Block\BlockErrorFormatter; use MediaWiki\Context\IContextSource; use MediaWiki\Edit\ParsoidOutputStash; @@ -14,6 +13,7 @@ use MediaWiki\Permissions\UserAuthority; use MediaWiki\Request\FauxRequest; use MediaWiki\Rest\RequestData; use MediaWiki\User\User; +use Wikimedia\ObjectCache\HashBagOStuff; use WikiPage; /** diff --git a/tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlOutputRendererHelperTest.php b/tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlOutputRendererHelperTest.php index c8b0b50d7352..5ff0401b692b 100644 --- a/tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlOutputRendererHelperTest.php +++ b/tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlOutputRendererHelperTest.php @@ -2,9 +2,7 @@ namespace MediaWiki\Tests\Rest\Handler\Helper; -use EmptyBagOStuff; use Exception; -use HashBagOStuff; use MediaWiki\Content\CssContent; use MediaWiki\Content\IContentHandlerFactory; use MediaWiki\Deferred\DeferredUpdates; @@ -49,6 +47,8 @@ use Psr\Log\NullLogger; use Wikimedia\Bcp47Code\Bcp47Code; use Wikimedia\Bcp47Code\Bcp47CodeValue; use Wikimedia\Message\MessageValue; +use Wikimedia\ObjectCache\EmptyBagOStuff; +use Wikimedia\ObjectCache\HashBagOStuff; use Wikimedia\Parsoid\Core\ClientError; use Wikimedia\Parsoid\Core\PageBundle; use Wikimedia\Parsoid\Core\ResourceLimitExceededException; diff --git a/tests/phpunit/integration/includes/Rest/Handler/PageHTMLHandlerTest.php b/tests/phpunit/integration/includes/Rest/Handler/PageHTMLHandlerTest.php index 18cf1b97f339..2d502fff8f85 100644 --- a/tests/phpunit/integration/includes/Rest/Handler/PageHTMLHandlerTest.php +++ b/tests/phpunit/integration/includes/Rest/Handler/PageHTMLHandlerTest.php @@ -3,7 +3,6 @@ namespace MediaWiki\Tests\Rest\Handler; use Exception; -use HashBagOStuff; use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\Hook\ParserLogLinterDataHook; use MediaWiki\MainConfigNames; @@ -16,6 +15,7 @@ use MediaWikiIntegrationTestCase; use PHPUnit\Framework\MockObject\MockObject; use Psr\Http\Message\StreamInterface; use Wikimedia\Message\MessageValue; +use Wikimedia\ObjectCache\HashBagOStuff; use Wikimedia\Parsoid\Core\ClientError; use Wikimedia\Parsoid\Core\ResourceLimitExceededException; use Wikimedia\Parsoid\Parsoid; diff --git a/tests/phpunit/integration/includes/Rest/Handler/PageRedirectHandlerTest.php b/tests/phpunit/integration/includes/Rest/Handler/PageRedirectHandlerTest.php index 4fa5db8225cf..e6febd3d25c5 100644 --- a/tests/phpunit/integration/includes/Rest/Handler/PageRedirectHandlerTest.php +++ b/tests/phpunit/integration/includes/Rest/Handler/PageRedirectHandlerTest.php @@ -2,11 +2,11 @@ namespace MediaWiki\Tests\Rest\Handler; -use HashBagOStuff; use InvalidArgumentException; use MediaWiki\Rest\RequestData; use MediaWiki\Rest\RequestInterface; use MediaWikiIntegrationTestCase; +use Wikimedia\ObjectCache\HashBagOStuff; /** * @covers \MediaWiki\Rest\Handler\PageSourceHandler diff --git a/tests/phpunit/integration/includes/Rest/Handler/ParsoidOutputAccessTest.php b/tests/phpunit/integration/includes/Rest/Handler/ParsoidOutputAccessTest.php index f78d8069c033..a6848014ce78 100644 --- a/tests/phpunit/integration/includes/Rest/Handler/ParsoidOutputAccessTest.php +++ b/tests/phpunit/integration/includes/Rest/Handler/ParsoidOutputAccessTest.php @@ -16,6 +16,8 @@ use MediaWiki\Revision\SlotRecord; use MediaWiki\Status\Status; use MediaWiki\Title\Title; use PHPUnit\Framework\MockObject\MockObject; +use Wikimedia\ObjectCache\BagOStuff; +use Wikimedia\ObjectCache\HashBagOStuff; use Wikimedia\Parsoid\Config\PageConfig; use Wikimedia\Parsoid\Core\ContentMetadataCollector; use Wikimedia\Parsoid\Core\PageBundle; diff --git a/tests/phpunit/integration/includes/Rest/Handler/RevisionHTMLHandlerTest.php b/tests/phpunit/integration/includes/Rest/Handler/RevisionHTMLHandlerTest.php index 649c613d059a..39ff34697adc 100644 --- a/tests/phpunit/integration/includes/Rest/Handler/RevisionHTMLHandlerTest.php +++ b/tests/phpunit/integration/includes/Rest/Handler/RevisionHTMLHandlerTest.php @@ -3,7 +3,6 @@ namespace MediaWiki\Tests\Rest\Handler; use Exception; -use HashBagOStuff; use MediaWiki\Config\ServiceOptions; use MediaWiki\Deferred\DeferredUpdates; use MediaWiki\MainConfigNames; @@ -23,6 +22,7 @@ use MediaWikiIntegrationTestCase; use Psr\Http\Message\StreamInterface; use ReflectionClass; use Wikimedia\Message\MessageValue; +use Wikimedia\ObjectCache\HashBagOStuff; use Wikimedia\Parsoid\Core\ClientError; use Wikimedia\Parsoid\Core\ResourceLimitExceededException; use Wikimedia\Parsoid\Parsoid; diff --git a/tests/phpunit/integration/includes/Rest/Handler/RevisionSourceHandlerTest.php b/tests/phpunit/integration/includes/Rest/Handler/RevisionSourceHandlerTest.php index 7d0318147fe3..c16f97ff6928 100644 --- a/tests/phpunit/integration/includes/Rest/Handler/RevisionSourceHandlerTest.php +++ b/tests/phpunit/integration/includes/Rest/Handler/RevisionSourceHandlerTest.php @@ -2,7 +2,6 @@ namespace MediaWiki\Tests\Rest\Handler; -use BagOStuff; use Exception; use MediaWiki\Content\TextContent; use MediaWiki\Rest\Handler\RevisionSourceHandler; @@ -12,6 +11,7 @@ use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\SlotRecord; use MediaWikiIntegrationTestCase; use Wikimedia\Message\MessageValue; +use Wikimedia\ObjectCache\BagOStuff; /** * @covers \MediaWiki\Rest\Handler\RevisionSourceHandler |