diff options
Diffstat (limited to 'tests/phpunit/unit/includes')
9 files changed, 23 insertions, 11 deletions
diff --git a/tests/phpunit/unit/includes/CommentFormatter/CommentParserFactoryTest.php b/tests/phpunit/unit/includes/CommentFormatter/CommentParserFactoryTest.php index b966f73b30f7..e945293771ce 100644 --- a/tests/phpunit/unit/includes/CommentFormatter/CommentParserFactoryTest.php +++ b/tests/phpunit/unit/includes/CommentFormatter/CommentParserFactoryTest.php @@ -24,13 +24,13 @@ use MediaWiki\Cache\LinkBatchFactory; use MediaWiki\Cache\LinkCache; use MediaWiki\CommentFormatter\CommentParser; use MediaWiki\CommentFormatter\CommentParserFactory; +use MediaWiki\FileRepo\RepoGroup; use MediaWiki\HookContainer\HookContainer; use MediaWiki\Language\Language; use MediaWiki\Linker\LinkRenderer; use MediaWiki\Title\NamespaceInfo; use MediaWiki\Title\TitleParser; use MediaWikiUnitTestCase; -use RepoGroup; /** * @group CommentFormatter diff --git a/tests/phpunit/unit/includes/DomainEvent/EventDispatchEngineTest.php b/tests/phpunit/unit/includes/DomainEvent/EventDispatchEngineTest.php index 6893059dfea9..4ac3026e5104 100644 --- a/tests/phpunit/unit/includes/DomainEvent/EventDispatchEngineTest.php +++ b/tests/phpunit/unit/includes/DomainEvent/EventDispatchEngineTest.php @@ -281,7 +281,7 @@ class EventDispatchEngineTest extends MediaWikiUnitTestCase { $this->trace =& $trace; } - public function handleFooCompleteEventAfterCommit() { + public function handleFooCompleteEvent() { $this->trace[] = 'afterFooComplete'; } }; diff --git a/tests/phpunit/unit/includes/Rest/Handler/MediaTestTrait.php b/tests/phpunit/unit/includes/Rest/Handler/MediaTestTrait.php index 426cff12df56..3cc5065f451d 100644 --- a/tests/phpunit/unit/includes/Rest/Handler/MediaTestTrait.php +++ b/tests/phpunit/unit/includes/Rest/Handler/MediaTestTrait.php @@ -2,13 +2,13 @@ namespace MediaWiki\Tests\Rest\Handler; -use LocalFile; -use LocalRepo; +use MediaWiki\FileRepo\File\LocalFile; +use MediaWiki\FileRepo\LocalRepo; +use MediaWiki\FileRepo\RepoGroup; use MediaWiki\Page\PageReference; use MediaWiki\User\UserIdentityValue; use MockTitleTrait; use PHPUnit\Framework\MockObject\MockObject; -use RepoGroup; use ThumbnailImage; /** diff --git a/tests/phpunit/unit/includes/Rest/Handler/PageHandlerTestTrait.php b/tests/phpunit/unit/includes/Rest/Handler/PageHandlerTestTrait.php index 8e0ebfa4f865..2c3323c9dcb0 100644 --- a/tests/phpunit/unit/includes/Rest/Handler/PageHandlerTestTrait.php +++ b/tests/phpunit/unit/includes/Rest/Handler/PageHandlerTestTrait.php @@ -2,9 +2,10 @@ namespace MediaWiki\Tests\Rest\Handler; -use File; -use FileRepo; use MediaWiki\Config\ServiceOptions; +use MediaWiki\FileRepo\File\File; +use MediaWiki\FileRepo\FileRepo; +use MediaWiki\FileRepo\RepoGroup; use MediaWiki\MainConfigNames; use MediaWiki\MainConfigSchema; use MediaWiki\Parser\Parsoid\ParsoidParser; @@ -24,7 +25,6 @@ use MediaWiki\Rest\RequestInterface; use MediaWiki\Rest\ResponseFactory; use MediaWiki\Rest\Router; use PHPUnit\Framework\MockObject\MockObject; -use RepoGroup; use Wikimedia\ObjectCache\WANObjectCache; use Wikimedia\Parsoid\Parsoid; use Wikimedia\Stats\StatsFactory; diff --git a/tests/phpunit/unit/includes/SetupDynamicConfigTest.php b/tests/phpunit/unit/includes/SetupDynamicConfigTest.php index ccdddbbf812e..86acf2f51762 100644 --- a/tests/phpunit/unit/includes/SetupDynamicConfigTest.php +++ b/tests/phpunit/unit/includes/SetupDynamicConfigTest.php @@ -1,6 +1,13 @@ <?php +use MediaWiki\FileRepo\FileRepo; +use MediaWiki\FileRepo\ForeignAPIRepo; +use MediaWiki\FileRepo\ForeignDBRepo; +use MediaWiki\FileRepo\LocalRepo; use MediaWiki\Language\LanguageCode; +use MediaWiki\Logging\LogFormatter; +use MediaWiki\Logging\NewUsersLogFormatter; +use MediaWiki\Logging\PageLangLogFormatter; use MediaWiki\MainConfigNames; use MediaWiki\MainConfigSchema; use MediaWiki\Registration\ExtensionRegistry; diff --git a/tests/phpunit/unit/includes/actions/ActionFactoryTest.php b/tests/phpunit/unit/includes/actions/ActionFactoryTest.php index 09fbd501b781..9e31236e53b2 100644 --- a/tests/phpunit/unit/includes/actions/ActionFactoryTest.php +++ b/tests/phpunit/unit/includes/actions/ActionFactoryTest.php @@ -1,7 +1,11 @@ <?php +use MediaWiki\Actions\Action; use MediaWiki\Actions\ActionFactory; +use MediaWiki\Actions\EditAction; +use MediaWiki\Actions\InfoAction; use MediaWiki\Context\IContextSource; +use MediaWiki\Page\Article; use MediaWiki\Request\FauxRequest; use MediaWiki\Tests\Unit\DummyServicesTrait; use PHPUnit\Framework\MockObject\MockObject; diff --git a/tests/phpunit/unit/includes/page/RedirectStoreUnitTest.php b/tests/phpunit/unit/includes/page/RedirectStoreUnitTest.php index 38dc0826f710..e2ac66f13499 100644 --- a/tests/phpunit/unit/includes/page/RedirectStoreUnitTest.php +++ b/tests/phpunit/unit/includes/page/RedirectStoreUnitTest.php @@ -1,7 +1,8 @@ <?php namespace MediaWiki\Tests\Unit\Page; -use File; +use MediaWiki\FileRepo\File\File; +use MediaWiki\FileRepo\RepoGroup; use MediaWiki\Page\PageIdentityValue; use MediaWiki\Page\PageLookup; use MediaWiki\Page\PageStoreRecord; @@ -10,7 +11,6 @@ use MediaWiki\Title\TitleParser; use MediaWiki\Title\TitleValue; use MediaWikiUnitTestCase; use Psr\Log\NullLogger; -use RepoGroup; use Wikimedia\Rdbms\IConnectionProvider; /** diff --git a/tests/phpunit/unit/includes/page/UndeletePageTest.php b/tests/phpunit/unit/includes/page/UndeletePageTest.php index 542911750aa1..ead7f8429b66 100644 --- a/tests/phpunit/unit/includes/page/UndeletePageTest.php +++ b/tests/phpunit/unit/includes/page/UndeletePageTest.php @@ -6,6 +6,7 @@ use Generator; use JobQueueGroup; use MediaWiki\Config\ServiceOptions; use MediaWiki\Content\IContentHandlerFactory; +use MediaWiki\FileRepo\RepoGroup; use MediaWiki\Linker\LinkTarget; use MediaWiki\Page\PageIdentity; use MediaWiki\Page\PageIdentityValue; @@ -20,7 +21,6 @@ use MediaWiki\Title\NamespaceInfo; use MediaWiki\Title\Title; use MediaWikiUnitTestCase; use Psr\Log\NullLogger; -use RepoGroup; use Wikimedia\Message\ITextFormatter; use Wikimedia\Rdbms\IConnectionProvider; use Wikimedia\Rdbms\ReadOnlyMode; diff --git a/tests/phpunit/unit/includes/watchlist/WatchedItemQueryServiceUnitTest.php b/tests/phpunit/unit/includes/watchlist/WatchedItemQueryServiceUnitTest.php index 10160d84f7c4..bb67daf83c93 100644 --- a/tests/phpunit/unit/includes/watchlist/WatchedItemQueryServiceUnitTest.php +++ b/tests/phpunit/unit/includes/watchlist/WatchedItemQueryServiceUnitTest.php @@ -1,6 +1,7 @@ <?php use MediaWiki\CommentStore\CommentStore; +use MediaWiki\Logging\LogPage; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Title\TitleValue; use MediaWiki\User\Options\UserOptionsLookup; |