diff options
Diffstat (limited to 'tests/phpunit')
26 files changed, 39 insertions, 19 deletions
diff --git a/tests/phpunit/MediaWikiIntegrationTestCase.php b/tests/phpunit/MediaWikiIntegrationTestCase.php index a4bc63cc7246..a3a6ef86869e 100644 --- a/tests/phpunit/MediaWikiIntegrationTestCase.php +++ b/tests/phpunit/MediaWikiIntegrationTestCase.php @@ -21,6 +21,7 @@ use MediaWiki\Page\ProperPageIdentity; use MediaWiki\Permissions\Authority; use MediaWiki\Permissions\UltimateAuthority; use MediaWiki\Profiler\ProfilingContext; +use MediaWiki\Registration\ExtensionRegistry; use MediaWiki\Request\FauxRequest; use MediaWiki\Request\WebRequest; use MediaWiki\Revision\RevisionRecord; diff --git a/tests/phpunit/MediaWikiUnitTestCase.php b/tests/phpunit/MediaWikiUnitTestCase.php index 5db2a7c084d3..0414d1f83603 100644 --- a/tests/phpunit/MediaWikiUnitTestCase.php +++ b/tests/phpunit/MediaWikiUnitTestCase.php @@ -27,6 +27,7 @@ use MediaWiki\Deferred\DeferredUpdatesScopeStack; use MediaWiki\Logger\LoggerFactory; use MediaWiki\Logger\NullSpi; use MediaWiki\MediaWikiServices; +use MediaWiki\Registration\ExtensionRegistry; use MediaWiki\Settings\SettingsBuilder; use PHPUnit\Framework\Exception; use PHPUnit\Framework\TestCase; diff --git a/tests/phpunit/bootstrap.php b/tests/phpunit/bootstrap.php index 7507124194e8..f332a579ea18 100644 --- a/tests/phpunit/bootstrap.php +++ b/tests/phpunit/bootstrap.php @@ -28,6 +28,8 @@ use MediaWiki\HookContainer\HookRunner; use MediaWiki\MainConfigSchema; use MediaWiki\MediaWikiServices; +use MediaWiki\Registration\ExtensionProcessor; +use MediaWiki\Registration\ExtensionRegistry; use PHPUnit\TextUI\CliArguments\Builder; require_once __DIR__ . '/bootstrap.common.php'; diff --git a/tests/phpunit/getPHPUnitExtensionsAndSkins.php b/tests/phpunit/getPHPUnitExtensionsAndSkins.php index 6a6f28e03b46..e0d45ca2d3f7 100755 --- a/tests/phpunit/getPHPUnitExtensionsAndSkins.php +++ b/tests/phpunit/getPHPUnitExtensionsAndSkins.php @@ -18,6 +18,7 @@ use MediaWiki\HookContainer\HookRunner; use MediaWiki\MediaWikiServices; +use MediaWiki\Registration\ExtensionRegistry; require_once __DIR__ . '/bootstrap.common.php'; diff --git a/tests/phpunit/includes/HookContainer/HookContainerIntegrationTest.php b/tests/phpunit/includes/HookContainer/HookContainerIntegrationTest.php index d15452f2013d..de4168a4193b 100644 --- a/tests/phpunit/includes/HookContainer/HookContainerIntegrationTest.php +++ b/tests/phpunit/includes/HookContainer/HookContainerIntegrationTest.php @@ -2,7 +2,7 @@ namespace MediaWiki\Tests\HookContainer { - use ExtensionRegistry; + use MediaWiki\Registration\ExtensionRegistry; use Wikimedia\ScopedCallback; class HookContainerIntegrationTest extends \MediaWikiIntegrationTestCase { diff --git a/tests/phpunit/includes/ResourceLoader/OOUIImageModuleTest.php b/tests/phpunit/includes/ResourceLoader/OOUIImageModuleTest.php index 5c5c82046222..e6ea1e62313b 100644 --- a/tests/phpunit/includes/ResourceLoader/OOUIImageModuleTest.php +++ b/tests/phpunit/includes/ResourceLoader/OOUIImageModuleTest.php @@ -2,7 +2,7 @@ namespace MediaWiki\Tests\ResourceLoader; -use ExtensionRegistry; +use MediaWiki\Registration\ExtensionRegistry; use MediaWiki\ResourceLoader\OOUIImageModule; use MediaWiki\Tests\Unit\DummyServicesTrait; use SkinFactory; diff --git a/tests/phpunit/includes/ResourceLoader/ResourceLoaderTest.php b/tests/phpunit/includes/ResourceLoader/ResourceLoaderTest.php index 503ff1fda57e..1ca2b19e265d 100644 --- a/tests/phpunit/includes/ResourceLoader/ResourceLoaderTest.php +++ b/tests/phpunit/includes/ResourceLoader/ResourceLoaderTest.php @@ -3,12 +3,12 @@ namespace MediaWiki\Tests\ResourceLoader; use Exception; -use ExtensionRegistry; use InvalidArgumentException; use MediaWiki\Config\Config; use MediaWiki\Config\HashConfig; use MediaWiki\Html\HtmlJsCode; use MediaWiki\MainConfigNames; +use MediaWiki\Registration\ExtensionRegistry; use MediaWiki\Request\FauxRequest; use MediaWiki\ResourceLoader\Context; use MediaWiki\ResourceLoader\FileModule; diff --git a/tests/phpunit/includes/api/query/ApiQuerySiteinfoTest.php b/tests/phpunit/includes/api/query/ApiQuerySiteinfoTest.php index 21db3d9131d9..db7eb74805cb 100644 --- a/tests/phpunit/includes/api/query/ApiQuerySiteinfoTest.php +++ b/tests/phpunit/includes/api/query/ApiQuerySiteinfoTest.php @@ -2,12 +2,12 @@ namespace MediaWiki\Tests\Api\Query; -use ExtensionRegistry; use LanguageCode; use LanguageConverter; use MediaWiki\MainConfigNames; use MediaWiki\MainConfigSchema; use MediaWiki\Message\Message; +use MediaWiki\Registration\ExtensionRegistry; use MediaWiki\SiteStats\SiteStats; use MediaWiki\Tests\Api\ApiTestCase; use MediaWiki\Tests\User\TempUser\TempUserTestTrait; diff --git a/tests/phpunit/includes/language/LanguageIntegrationTest.php b/tests/phpunit/includes/language/LanguageIntegrationTest.php index a0d101757105..e8271b3422ea 100644 --- a/tests/phpunit/includes/language/LanguageIntegrationTest.php +++ b/tests/phpunit/includes/language/LanguageIntegrationTest.php @@ -9,6 +9,7 @@ use MediaWiki\Languages\LanguageFallback; use MediaWiki\Languages\LanguageNameUtils; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; +use MediaWiki\Registration\ExtensionRegistry; use MediaWiki\Tests\Unit\DummyServicesTrait; use MediaWiki\Title\NamespaceInfo; use MediaWiki\User\UserIdentityValue; diff --git a/tests/phpunit/includes/parser/Parsoid/LintErrorCheckerTest.php b/tests/phpunit/includes/parser/Parsoid/LintErrorCheckerTest.php index 1a47cb8a1cfb..96c8c82149e7 100644 --- a/tests/phpunit/includes/parser/Parsoid/LintErrorCheckerTest.php +++ b/tests/phpunit/includes/parser/Parsoid/LintErrorCheckerTest.php @@ -20,6 +20,7 @@ use MediaWiki\MainConfigNames; use MediaWiki\Parser\Parsoid\LintErrorChecker; +use MediaWiki\Registration\ExtensionRegistry; /** * @group Parser diff --git a/tests/phpunit/includes/preferences/SignatureValidatorTest.php b/tests/phpunit/includes/preferences/SignatureValidatorTest.php index b2d938ac8b9f..2cf3ce1e4273 100644 --- a/tests/phpunit/includes/preferences/SignatureValidatorTest.php +++ b/tests/phpunit/includes/preferences/SignatureValidatorTest.php @@ -2,6 +2,7 @@ use MediaWiki\MainConfigNames; use MediaWiki\Preferences\SignatureValidator; +use MediaWiki\Registration\ExtensionRegistry; use Wikimedia\TestingAccessWrapper; /** diff --git a/tests/phpunit/includes/registration/ExtensionRegistrationTest.php b/tests/phpunit/includes/registration/ExtensionRegistrationTest.php index 3c0f759a60a4..826de10b288a 100644 --- a/tests/phpunit/includes/registration/ExtensionRegistrationTest.php +++ b/tests/phpunit/includes/registration/ExtensionRegistrationTest.php @@ -3,8 +3,8 @@ namespace MediaWiki\Tests\Registration; use AutoLoader; -use ExtensionRegistry; use Generator; +use MediaWiki\Registration\ExtensionRegistry; use MediaWiki\Settings\Config\ArrayConfigBuilder; use MediaWiki\Settings\Config\PhpIniSink; use MediaWiki\Settings\SettingsBuilder; @@ -13,7 +13,7 @@ use Wikimedia\ObjectCache\HashBagOStuff; use Wikimedia\TestingAccessWrapper; /** - * @covers \ExtensionRegistry + * @covers \MediaWiki\Registration\ExtensionRegistry */ class ExtensionRegistrationTest extends MediaWikiIntegrationTestCase { diff --git a/tests/phpunit/integration/includes/Rest/Handler/ParsoidHandlerTest.php b/tests/phpunit/integration/includes/Rest/Handler/ParsoidHandlerTest.php index b6f6acce641e..e21710e6837c 100644 --- a/tests/phpunit/integration/includes/Rest/Handler/ParsoidHandlerTest.php +++ b/tests/phpunit/integration/includes/Rest/Handler/ParsoidHandlerTest.php @@ -4,7 +4,6 @@ namespace MediaWiki\Tests\Rest\Handler; use Composer\Semver\Semver; use Exception; -use ExtensionRegistry; use Generator; use Language; use LanguageCode; @@ -18,6 +17,7 @@ use MediaWiki\Parser\Parsoid\HtmlToContentTransform; use MediaWiki\Parser\Parsoid\HtmlTransformFactory; use MediaWiki\Parser\RevisionOutputCache; use MediaWiki\Permissions\UltimateAuthority; +use MediaWiki\Registration\ExtensionRegistry; use MediaWiki\Rest\Handler\Helper\HtmlInputTransformHelper; use MediaWiki\Rest\Handler\Helper\ParsoidFormatHelper; use MediaWiki\Rest\Handler\ParsoidHandler; diff --git a/tests/phpunit/integration/includes/user/TempUser/TempUserCreatorTest.php b/tests/phpunit/integration/includes/user/TempUser/TempUserCreatorTest.php index ea7e6459501d..392c289bf9dc 100644 --- a/tests/phpunit/integration/includes/user/TempUser/TempUserCreatorTest.php +++ b/tests/phpunit/integration/includes/user/TempUser/TempUserCreatorTest.php @@ -2,10 +2,10 @@ namespace MediaWiki\Tests\Integration\User\TempUser; -use ExtensionRegistry; use MediaWiki\Auth\AuthManager; use MediaWiki\Auth\Throttler; use MediaWiki\MainConfigNames; +use MediaWiki\Registration\ExtensionRegistry; use MediaWiki\Request\FauxRequest; use MediaWiki\Session\Session; use MediaWiki\Tests\User\TempUser\TempUserTestTrait; diff --git a/tests/phpunit/phpunit.php b/tests/phpunit/phpunit.php index 9ec392f8d0c6..9a28b48a9143 100644 --- a/tests/phpunit/phpunit.php +++ b/tests/phpunit/phpunit.php @@ -7,6 +7,7 @@ */ use MediaWiki\MediaWikiServices; +use MediaWiki\Registration\ExtensionRegistry; use PHPUnit\TextUI\Command; class PHPUnitMaintClass { diff --git a/tests/phpunit/structure/ExtensionJsonValidationTest.php b/tests/phpunit/structure/ExtensionJsonValidationTest.php index 781b1fd6f743..6e9c09cb1452 100644 --- a/tests/phpunit/structure/ExtensionJsonValidationTest.php +++ b/tests/phpunit/structure/ExtensionJsonValidationTest.php @@ -16,6 +16,10 @@ * http://www.gnu.org/copyleft/gpl.html */ +use MediaWiki\Registration\ExtensionJsonValidationError; +use MediaWiki\Registration\ExtensionJsonValidator; +use MediaWiki\Registration\ExtensionRegistry; + /** * Validates all loaded extensions and skins using the ExtensionRegistry * against the extension.json schema in the docs/ folder. diff --git a/tests/phpunit/structure/SettingsTest.php b/tests/phpunit/structure/SettingsTest.php index 4bd5fdd26d07..e2a8d18db024 100644 --- a/tests/phpunit/structure/SettingsTest.php +++ b/tests/phpunit/structure/SettingsTest.php @@ -2,9 +2,9 @@ namespace MediaWiki\Tests\Structure; -use ExtensionRegistry; use MediaWiki\MainConfigNames; use MediaWiki\MainConfigSchema; +use MediaWiki\Registration\ExtensionRegistry; use MediaWiki\Settings\Config\ArrayConfigBuilder; use MediaWiki\Settings\Config\PhpIniSink; use MediaWiki\Settings\SettingsBuilder; diff --git a/tests/phpunit/suites/ExtensionsTestSuite.php b/tests/phpunit/suites/ExtensionsTestSuite.php index be7064e327a7..bfb77f2854f2 100644 --- a/tests/phpunit/suites/ExtensionsTestSuite.php +++ b/tests/phpunit/suites/ExtensionsTestSuite.php @@ -2,6 +2,7 @@ use MediaWiki\HookContainer\HookRunner; use MediaWiki\MediaWikiServices; +use MediaWiki\Registration\ExtensionRegistry; use PHPUnit\Framework\TestSuite; use SebastianBergmann\FileIterator\Facade; diff --git a/tests/phpunit/unit/includes/Settings/LocalSettingsLoaderTest.php b/tests/phpunit/unit/includes/Settings/LocalSettingsLoaderTest.php index 2d88c65baf68..8a171d6ceedb 100644 --- a/tests/phpunit/unit/includes/Settings/LocalSettingsLoaderTest.php +++ b/tests/phpunit/unit/includes/Settings/LocalSettingsLoaderTest.php @@ -2,7 +2,7 @@ namespace MediaWiki\Tests\Unit\Settings; -use ExtensionRegistry; +use MediaWiki\Registration\ExtensionRegistry; use MediaWiki\Settings\Config\ArrayConfigBuilder; use MediaWiki\Settings\Config\PhpIniSink; use MediaWiki\Settings\LocalSettingsLoader; diff --git a/tests/phpunit/unit/includes/Settings/SettingsBuilderTest.php b/tests/phpunit/unit/includes/Settings/SettingsBuilderTest.php index 25cf4a01336e..aac4758507aa 100644 --- a/tests/phpunit/unit/includes/Settings/SettingsBuilderTest.php +++ b/tests/phpunit/unit/includes/Settings/SettingsBuilderTest.php @@ -2,10 +2,10 @@ namespace MediaWiki\Tests\Unit\Settings; -use ExtensionRegistry; use InvalidArgumentException; use MediaWiki\MainConfigNames; use MediaWiki\MainConfigSchema; +use MediaWiki\Registration\ExtensionRegistry; use MediaWiki\Settings\Cache\CacheableSource; use MediaWiki\Settings\Cache\CachedSource; use MediaWiki\Settings\Config\ArrayConfigBuilder; diff --git a/tests/phpunit/unit/includes/Settings/WikiFarmSettingsLoaderTest.php b/tests/phpunit/unit/includes/Settings/WikiFarmSettingsLoaderTest.php index 6544cfb045ad..91f625cf9279 100644 --- a/tests/phpunit/unit/includes/Settings/WikiFarmSettingsLoaderTest.php +++ b/tests/phpunit/unit/includes/Settings/WikiFarmSettingsLoaderTest.php @@ -2,9 +2,9 @@ namespace MediaWiki\Tests\Unit\Settings; -use ExtensionRegistry; use MediaWiki\Config\HashConfig; use MediaWiki\MainConfigNames; +use MediaWiki\Registration\ExtensionRegistry; use MediaWiki\Settings\Config\ArrayConfigBuilder; use MediaWiki\Settings\Config\PhpIniSink; use MediaWiki\Settings\SettingsBuilder; diff --git a/tests/phpunit/unit/includes/SetupDynamicConfigTest.php b/tests/phpunit/unit/includes/SetupDynamicConfigTest.php index b358cc1638ad..f9e5edb496c7 100644 --- a/tests/phpunit/unit/includes/SetupDynamicConfigTest.php +++ b/tests/phpunit/unit/includes/SetupDynamicConfigTest.php @@ -2,6 +2,7 @@ use MediaWiki\MainConfigNames; use MediaWiki\MainConfigSchema; +use MediaWiki\Registration\ExtensionRegistry; use MediaWiki\Settings\Config\ArrayConfigBuilder; use MediaWiki\Settings\Config\ConfigSchemaAggregator; use MediaWiki\Settings\Config\PhpIniSink; diff --git a/tests/phpunit/unit/includes/registration/ExtensionJsonValidatorTest.php b/tests/phpunit/unit/includes/registration/ExtensionJsonValidatorTest.php index ecc09b012c13..948101053ba9 100644 --- a/tests/phpunit/unit/includes/registration/ExtensionJsonValidatorTest.php +++ b/tests/phpunit/unit/includes/registration/ExtensionJsonValidatorTest.php @@ -18,8 +18,11 @@ * */ +use MediaWiki\Registration\ExtensionJsonValidationError; +use MediaWiki\Registration\ExtensionJsonValidator; + /** - * @covers \ExtensionJsonValidator + * @covers \MediaWiki\Registration\ExtensionJsonValidator */ class ExtensionJsonValidatorTest extends MediaWikiUnitTestCase { diff --git a/tests/phpunit/unit/includes/registration/ExtensionProcessorTest.php b/tests/phpunit/unit/includes/registration/ExtensionProcessorTest.php index 607a4904bb88..0978d7bdb91e 100644 --- a/tests/phpunit/unit/includes/registration/ExtensionProcessorTest.php +++ b/tests/phpunit/unit/includes/registration/ExtensionProcessorTest.php @@ -3,17 +3,17 @@ namespace MediaWiki\Tests\Registration; use Exception; -use ExtensionProcessor; -use ExtensionRegistry; use InvalidArgumentException; use MediaWiki\Json\FormatJson; +use MediaWiki\Registration\ExtensionProcessor; +use MediaWiki\Registration\ExtensionRegistry; use MediaWikiUnitTestCase; use RuntimeException; use UnexpectedValueException; use Wikimedia\TestingAccessWrapper; /** - * @covers \ExtensionProcessor + * @covers \MediaWiki\Registration\ExtensionProcessor */ class ExtensionProcessorTest extends MediaWikiUnitTestCase { diff --git a/tests/phpunit/unit/includes/registration/ExtensionRegistryTest.php b/tests/phpunit/unit/includes/registration/ExtensionRegistryTest.php index 64f52a3fa276..e54a18c3989f 100644 --- a/tests/phpunit/unit/includes/registration/ExtensionRegistryTest.php +++ b/tests/phpunit/unit/includes/registration/ExtensionRegistryTest.php @@ -3,16 +3,16 @@ namespace MediaWiki\Tests\Registration; use Exception; -use ExtensionRegistry; use InvalidArgumentException; use LogicException; +use MediaWiki\Registration\ExtensionRegistry; use MediaWiki\Settings\SettingsBuilder; use MediaWikiUnitTestCase; use Wikimedia\ScopedCallback; use Wikimedia\TestingAccessWrapper; /** - * @covers \ExtensionRegistry + * @covers \MediaWiki\Registration\ExtensionRegistry */ class ExtensionRegistryTest extends MediaWikiUnitTestCase { diff --git a/tests/phpunit/unit/includes/registration/VersionCheckerTest.php b/tests/phpunit/unit/includes/registration/VersionCheckerTest.php index 9ed6f113bfdd..a852a384c99f 100644 --- a/tests/phpunit/unit/includes/registration/VersionCheckerTest.php +++ b/tests/phpunit/unit/includes/registration/VersionCheckerTest.php @@ -1,7 +1,9 @@ <?php +use MediaWiki\Registration\VersionChecker; + /** - * @covers \VersionChecker + * @covers \MediaWiki\Registration\VersionChecker */ class VersionCheckerTest extends MediaWikiUnitTestCase { |