Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401650 )

Change subject: Use PHPUnit namespaced classes
......................................................................

Use PHPUnit namespaced classes

PHPUnit 6 introduced namespaces, but those changes were backported to
PHPUnit 4 to make the migration easier.

Functions that accept a TestCase (e.g. PhpunitTestRecorder) still take
the non-namespaced version for backwards-compatibility.

Not all classes have aliases, but we can do so for those that do.

Bug: T177132
Change-Id: Ia26febac0cb96836089fe59e0253457a36d41695
---
M tests/integration/includes/http/MWHttpRequestTestCase.php
M tests/phpunit/MediaWikiPHPUnitTestListener.php
M tests/phpunit/MediaWikiTestCase.php
M tests/phpunit/includes/FauxRequestTest.php
M tests/phpunit/includes/GlobalFunctions/wfArrayFilterTest.php
M tests/phpunit/includes/MediaWikiVersionFetcherTest.php
M tests/phpunit/includes/SanitizerValidateEmailTest.php
M tests/phpunit/includes/TitleArrayFromResultTest.php
M tests/phpunit/includes/WikiReferenceTest.php
M tests/phpunit/includes/XmlJsTest.php
M tests/phpunit/includes/api/ApiTestCase.php
M tests/phpunit/includes/auth/AuthManagerTest.php
M 
tests/phpunit/includes/auth/EmailNotificationSecondaryAuthenticationProviderTest.php
M tests/phpunit/includes/composer/ComposerVersionNormalizerTest.php
M tests/phpunit/includes/config/EtcdConfigTest.php
M tests/phpunit/includes/debug/logger/monolog/LogstashFormatterTest.php
M tests/phpunit/includes/deferred/MWCallableUpdateTest.php
M tests/phpunit/includes/deferred/TransactionRoundDefiningUpdateTest.php
M tests/phpunit/includes/externalstore/ExternalStoreFactoryTest.php
M tests/phpunit/includes/htmlform/HTMLRestrictionsFieldTest.php
M tests/phpunit/includes/jobqueue/JobQueueMemoryTest.php
M tests/phpunit/includes/libs/ArrayUtilsTest.php
M tests/phpunit/includes/libs/DeferredStringifierTest.php
M tests/phpunit/includes/libs/DnsSrvDiscovererTest.php
M tests/phpunit/includes/libs/GenericArrayObjectTest.php
M tests/phpunit/includes/libs/HashRingTest.php
M tests/phpunit/includes/libs/HtmlArmorTest.php
M tests/phpunit/includes/libs/IEUrlExtensionTest.php
M tests/phpunit/includes/libs/IPTest.php
M tests/phpunit/includes/libs/JavaScriptMinifierTest.php
M tests/phpunit/includes/libs/MWMessagePackTest.php
M tests/phpunit/includes/libs/MapCacheLRUTest.php
M tests/phpunit/includes/libs/MemoizedCallableTest.php
M tests/phpunit/includes/libs/ObjectFactoryTest.php
M tests/phpunit/includes/libs/ProcessCacheLRUTest.php
M tests/phpunit/includes/libs/SamplingStatsdClientTest.php
M tests/phpunit/includes/libs/StringUtilsTest.php
M tests/phpunit/includes/libs/TimingTest.php
M tests/phpunit/includes/libs/XhprofDataTest.php
M tests/phpunit/includes/libs/XhprofTest.php
M tests/phpunit/includes/libs/XmlTypeCheckTest.php
M tests/phpunit/includes/libs/http/HttpAcceptNegotiatorTest.php
M tests/phpunit/includes/libs/http/HttpAcceptParserTest.php
M tests/phpunit/includes/libs/mime/MimeAnalyzerTest.php
M tests/phpunit/includes/libs/objectcache/CachedBagOStuffTest.php
M tests/phpunit/includes/libs/objectcache/HashBagOStuffTest.php
M tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
M tests/phpunit/includes/libs/rdbms/TransactionProfilerTest.php
M tests/phpunit/includes/libs/rdbms/connectionmanager/ConnectionManagerTest.php
M 
tests/phpunit/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManagerTest.php
M tests/phpunit/includes/libs/rdbms/database/DBConnRefTest.php
M tests/phpunit/includes/libs/rdbms/database/DatabaseDomainTest.php
M tests/phpunit/includes/libs/rdbms/database/DatabaseMysqlBaseTest.php
M tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
M tests/phpunit/includes/libs/rdbms/database/DatabaseTest.php
M tests/phpunit/includes/libs/xmp/XMPTest.php
M tests/phpunit/includes/libs/xmp/XMPValidateTest.php
M tests/phpunit/includes/objectcache/RedisBagOStuffTest.php
M tests/phpunit/includes/parser/ParserIntegrationTest.php
M tests/phpunit/includes/registration/VersionCheckerTest.php
M tests/phpunit/includes/resourceloader/DerivativeResourceLoaderContextTest.php
M tests/phpunit/includes/resourceloader/MessageBlobStoreTest.php
M tests/phpunit/includes/resourceloader/ResourceLoaderClientHtmlTest.php
M tests/phpunit/includes/resourceloader/ResourceLoaderContextTest.php
M tests/phpunit/includes/resourceloader/ResourceLoaderSkinModuleTest.php
M tests/phpunit/includes/search/SearchSuggestionSetTest.php
M tests/phpunit/includes/services/ServiceContainerTest.php
M tests/phpunit/includes/session/TestUtils.php
M tests/phpunit/includes/shell/CommandFactoryTest.php
M tests/phpunit/includes/shell/CommandTest.php
M tests/phpunit/includes/shell/FirejailCommandTest.php
M tests/phpunit/includes/shell/ShellTest.php
M tests/phpunit/includes/site/FileBasedSiteLookupTest.php
M tests/phpunit/includes/site/MediaWikiPageNameNormalizerTest.php
M tests/phpunit/includes/site/SiteExporterTest.php
M tests/phpunit/includes/site/SiteImporterTest.php
M tests/phpunit/includes/site/SitesCacheFileBuilderTest.php
M tests/phpunit/includes/utils/AvroValidatorTest.php
M tests/phpunit/includes/utils/ClassCollectorTest.php
M tests/phpunit/includes/utils/FileContentsHasherTest.php
M tests/phpunit/includes/utils/MWCryptHashTest.php
M tests/phpunit/includes/utils/MWRestrictionsTest.php
M tests/phpunit/includes/utils/UIDGeneratorTest.php
M tests/phpunit/includes/utils/ZipDirectoryReaderTest.php
M tests/phpunit/includes/watcheditem/WatchedItemQueryServiceUnitTest.php
M tests/phpunit/languages/LanguageCodeTest.php
M tests/phpunit/maintenance/BenchmarkerTest.php
M tests/phpunit/phpunit.php
M tests/phpunit/structure/AvailableRightsTest.php
M tests/phpunit/structure/ExtensionJsonValidationTest.php
M tests/phpunit/structure/StructureTest.php
M tests/phpunit/suites/CoreParserTestSuite.php
M tests/phpunit/suites/ExtensionsParserTestSuite.php
M tests/phpunit/suites/ExtensionsTestSuite.php
M tests/phpunit/suites/LessTestSuite.php
M tests/phpunit/suites/ParserTestFileSuite.php
M tests/phpunit/suites/ParserTestTopLevelSuite.php
M tests/phpunit/suites/UploadFromUrlTestSuite.php
98 files changed, 111 insertions(+), 110 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/50/401650/1

diff --git a/tests/integration/includes/http/MWHttpRequestTestCase.php 
b/tests/integration/includes/http/MWHttpRequestTestCase.php
index 81473df..eadef72 100644
--- a/tests/integration/includes/http/MWHttpRequestTestCase.php
+++ b/tests/integration/includes/http/MWHttpRequestTestCase.php
@@ -2,7 +2,7 @@
 
 use Wikimedia\TestingAccessWrapper;
 
-class MWHttpRequestTestCase extends PHPUnit_Framework_TestCase {
+class MWHttpRequestTestCase extends PHPUnit\Framework\TestCase {
        protected static $httpEngine;
        protected $oldHttpEngine;
 
diff --git a/tests/phpunit/MediaWikiPHPUnitTestListener.php 
b/tests/phpunit/MediaWikiPHPUnitTestListener.php
index dd606d8..db9f53a 100644
--- a/tests/phpunit/MediaWikiPHPUnitTestListener.php
+++ b/tests/phpunit/MediaWikiPHPUnitTestListener.php
@@ -1,7 +1,7 @@
 <?php
 
 class MediaWikiPHPUnitTestListener
-       extends PHPUnit_TextUI_ResultPrinter implements 
PHPUnit_Framework_TestListener {
+       extends PHPUnit_TextUI_ResultPrinter implements 
PHPUnit\Framework\TestListener {
 
        /**
         * @var string
diff --git a/tests/phpunit/MediaWikiTestCase.php 
b/tests/phpunit/MediaWikiTestCase.php
index d542826..a7dec75 100644
--- a/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -12,7 +12,7 @@
 /**
  * @since 1.18
  */
-abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
+abstract class MediaWikiTestCase extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/FauxRequestTest.php 
b/tests/phpunit/includes/FauxRequestTest.php
index f6ccbc7..9f8bb38 100644
--- a/tests/phpunit/includes/FauxRequestTest.php
+++ b/tests/phpunit/includes/FauxRequestTest.php
@@ -2,7 +2,7 @@
 
 use MediaWiki\Session\SessionManager;
 
-class FauxRequestTest extends PHPUnit_Framework_TestCase {
+class FauxRequestTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/GlobalFunctions/wfArrayFilterTest.php 
b/tests/phpunit/includes/GlobalFunctions/wfArrayFilterTest.php
index 388aee7..336a1c6 100644
--- a/tests/phpunit/includes/GlobalFunctions/wfArrayFilterTest.php
+++ b/tests/phpunit/includes/GlobalFunctions/wfArrayFilterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class WfArrayFilterTest extends \PHPUnit_Framework_TestCase {
+class WfArrayFilterTest extends \PHPUnit\Framework\TestCase {
        public function testWfArrayFilter() {
                $arr = [ 'a' => 1, 'b' => 2, 'c' => 3 ];
                $filtered = wfArrayFilter( $arr, function ( $val, $key ) {
diff --git a/tests/phpunit/includes/MediaWikiVersionFetcherTest.php 
b/tests/phpunit/includes/MediaWikiVersionFetcherTest.php
index 6aa9849..87a7dff 100644
--- a/tests/phpunit/includes/MediaWikiVersionFetcherTest.php
+++ b/tests/phpunit/includes/MediaWikiVersionFetcherTest.php
@@ -10,7 +10,7 @@
  *
  * @author Jeroen De Dauw < [email protected] >
  */
-class MediaWikiVersionFetcherTest extends PHPUnit_Framework_TestCase {
+class MediaWikiVersionFetcherTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/SanitizerValidateEmailTest.php 
b/tests/phpunit/includes/SanitizerValidateEmailTest.php
index c7e15ea..c4e4308 100644
--- a/tests/phpunit/includes/SanitizerValidateEmailTest.php
+++ b/tests/phpunit/includes/SanitizerValidateEmailTest.php
@@ -5,7 +5,7 @@
  * @todo all test methods in this class should be refactored and...
  *    use a single test method and a single data provider...
  */
-class SanitizerValidateEmailTest extends PHPUnit_Framework_TestCase {
+class SanitizerValidateEmailTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/TitleArrayFromResultTest.php 
b/tests/phpunit/includes/TitleArrayFromResultTest.php
index 8882214..f977ac4 100644
--- a/tests/phpunit/includes/TitleArrayFromResultTest.php
+++ b/tests/phpunit/includes/TitleArrayFromResultTest.php
@@ -4,7 +4,7 @@
  * @author Addshore
  * @covers TitleArrayFromResult
  */
-class TitleArrayFromResultTest extends PHPUnit_Framework_TestCase {
+class TitleArrayFromResultTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/WikiReferenceTest.php 
b/tests/phpunit/includes/WikiReferenceTest.php
index 227dd87..bc69a1b 100644
--- a/tests/phpunit/includes/WikiReferenceTest.php
+++ b/tests/phpunit/includes/WikiReferenceTest.php
@@ -4,7 +4,7 @@
  * @covers WikiReference
  */
 
-class WikiReferenceTest extends PHPUnit_Framework_TestCase {
+class WikiReferenceTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/XmlJsTest.php 
b/tests/phpunit/includes/XmlJsTest.php
index dec7bf3..c7975ef 100644
--- a/tests/phpunit/includes/XmlJsTest.php
+++ b/tests/phpunit/includes/XmlJsTest.php
@@ -3,7 +3,7 @@
 /**
  * @group Xml
  */
-class XmlJsTest extends PHPUnit_Framework_TestCase {
+class XmlJsTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/api/ApiTestCase.php 
b/tests/phpunit/includes/api/ApiTestCase.php
index f1ff947..8d4ff8f 100644
--- a/tests/phpunit/includes/api/ApiTestCase.php
+++ b/tests/phpunit/includes/api/ApiTestCase.php
@@ -223,7 +223,7 @@
         */
        public function testApiTestGroup() {
                $groups = PHPUnit_Util_Test::getGroups( static::class );
-               $constraint = PHPUnit_Framework_Assert::logicalOr(
+               $constraint = PHPUnit\Framework\Assert::logicalOr(
                        $this->contains( 'medium' ),
                        $this->contains( 'large' )
                );
diff --git a/tests/phpunit/includes/auth/AuthManagerTest.php 
b/tests/phpunit/includes/auth/AuthManagerTest.php
index c18af8b..d7d938c 100644
--- a/tests/phpunit/includes/auth/AuthManagerTest.php
+++ b/tests/phpunit/includes/auth/AuthManagerTest.php
@@ -951,7 +951,7 @@
                $this->initializeManager( true );
                $this->logger->setCollect( true );
 
-               $constraint = \PHPUnit_Framework_Assert::logicalOr(
+               $constraint = \PHPUnit\Framework\Assert::logicalOr(
                        $this->equalTo( AuthenticationResponse::PASS ),
                        $this->equalTo( AuthenticationResponse::FAIL )
                );
@@ -1985,7 +1985,7 @@
                $expectLog = [];
                $this->initializeManager( true );
 
-               $constraint = \PHPUnit_Framework_Assert::logicalOr(
+               $constraint = \PHPUnit\Framework\Assert::logicalOr(
                        $this->equalTo( AuthenticationResponse::PASS ),
                        $this->equalTo( AuthenticationResponse::FAIL )
                );
@@ -3465,7 +3465,7 @@
                } );
                $this->initializeManager( true );
 
-               $constraint = \PHPUnit_Framework_Assert::logicalOr(
+               $constraint = \PHPUnit\Framework\Assert::logicalOr(
                        $this->equalTo( AuthenticationResponse::PASS ),
                        $this->equalTo( AuthenticationResponse::FAIL )
                );
diff --git 
a/tests/phpunit/includes/auth/EmailNotificationSecondaryAuthenticationProviderTest.php
 
b/tests/phpunit/includes/auth/EmailNotificationSecondaryAuthenticationProviderTest.php
index 3757069..ca3cc36 100644
--- 
a/tests/phpunit/includes/auth/EmailNotificationSecondaryAuthenticationProviderTest.php
+++ 
b/tests/phpunit/includes/auth/EmailNotificationSecondaryAuthenticationProviderTest.php
@@ -5,7 +5,7 @@
 use Psr\Log\LoggerInterface;
 use Wikimedia\TestingAccessWrapper;
 
-class EmailNotificationSecondaryAuthenticationProviderTest extends 
\PHPUnit_Framework_TestCase {
+class EmailNotificationSecondaryAuthenticationProviderTest extends 
\PHPUnit\Framework\TestCase {
        public function testConstructor() {
                $config = new \HashConfig( [
                        'EnableEmail' => true,
diff --git a/tests/phpunit/includes/composer/ComposerVersionNormalizerTest.php 
b/tests/phpunit/includes/composer/ComposerVersionNormalizerTest.php
index a4cc446..e65ea35 100644
--- a/tests/phpunit/includes/composer/ComposerVersionNormalizerTest.php
+++ b/tests/phpunit/includes/composer/ComposerVersionNormalizerTest.php
@@ -7,7 +7,7 @@
  *
  * @author Jeroen De Dauw < [email protected] >
  */
-class ComposerVersionNormalizerTest extends PHPUnit_Framework_TestCase {
+class ComposerVersionNormalizerTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/config/EtcdConfigTest.php 
b/tests/phpunit/includes/config/EtcdConfigTest.php
index 7a4d9d9..8509178 100644
--- a/tests/phpunit/includes/config/EtcdConfigTest.php
+++ b/tests/phpunit/includes/config/EtcdConfigTest.php
@@ -2,7 +2,7 @@
 
 use Wikimedia\TestingAccessWrapper;
 
-class EtcdConfigTest extends PHPUnit_Framework_TestCase {
+class EtcdConfigTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git 
a/tests/phpunit/includes/debug/logger/monolog/LogstashFormatterTest.php 
b/tests/phpunit/includes/debug/logger/monolog/LogstashFormatterTest.php
index 8086b4b..1ee188e7 100644
--- a/tests/phpunit/includes/debug/logger/monolog/LogstashFormatterTest.php
+++ b/tests/phpunit/includes/debug/logger/monolog/LogstashFormatterTest.php
@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Logger\Monolog;
 
-class LogstashFormatterTest extends \PHPUnit_Framework_TestCase {
+class LogstashFormatterTest extends \PHPUnit\Framework\TestCase {
        /**
         * @dataProvider provideV1
         * @param array $record The input record.
diff --git a/tests/phpunit/includes/deferred/MWCallableUpdateTest.php 
b/tests/phpunit/includes/deferred/MWCallableUpdateTest.php
index 088ab4f..a38778f 100644
--- a/tests/phpunit/includes/deferred/MWCallableUpdateTest.php
+++ b/tests/phpunit/includes/deferred/MWCallableUpdateTest.php
@@ -3,7 +3,7 @@
 /**
  * @covers MWCallableUpdate
  */
-class MWCallableUpdateTest extends PHPUnit_Framework_TestCase {
+class MWCallableUpdateTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git 
a/tests/phpunit/includes/deferred/TransactionRoundDefiningUpdateTest.php 
b/tests/phpunit/includes/deferred/TransactionRoundDefiningUpdateTest.php
index 1261c24..693897e 100644
--- a/tests/phpunit/includes/deferred/TransactionRoundDefiningUpdateTest.php
+++ b/tests/phpunit/includes/deferred/TransactionRoundDefiningUpdateTest.php
@@ -3,7 +3,7 @@
 /**
  * @covers TransactionRoundDefiningUpdate
  */
-class TransactionRoundDefiningUpdateTest extends PHPUnit_Framework_TestCase {
+class TransactionRoundDefiningUpdateTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/externalstore/ExternalStoreFactoryTest.php 
b/tests/phpunit/includes/externalstore/ExternalStoreFactoryTest.php
index d43e04a..f762693 100644
--- a/tests/phpunit/includes/externalstore/ExternalStoreFactoryTest.php
+++ b/tests/phpunit/includes/externalstore/ExternalStoreFactoryTest.php
@@ -3,7 +3,7 @@
 /**
  * @covers ExternalStoreFactory
  */
-class ExternalStoreFactoryTest extends PHPUnit_Framework_TestCase {
+class ExternalStoreFactoryTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/htmlform/HTMLRestrictionsFieldTest.php 
b/tests/phpunit/includes/htmlform/HTMLRestrictionsFieldTest.php
index 75c93be..c4290e1 100644
--- a/tests/phpunit/includes/htmlform/HTMLRestrictionsFieldTest.php
+++ b/tests/phpunit/includes/htmlform/HTMLRestrictionsFieldTest.php
@@ -3,7 +3,7 @@
 /**
  * @covers HTMLRestrictionsField
  */
-class HTMLRestrictionsFieldTest extends PHPUnit_Framework_TestCase {
+class HTMLRestrictionsFieldTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/jobqueue/JobQueueMemoryTest.php 
b/tests/phpunit/includes/jobqueue/JobQueueMemoryTest.php
index edba75ce..4153706 100644
--- a/tests/phpunit/includes/jobqueue/JobQueueMemoryTest.php
+++ b/tests/phpunit/includes/jobqueue/JobQueueMemoryTest.php
@@ -8,7 +8,7 @@
  * @licence GNU GPL v2+
  * @author Thiemo Kreuz
  */
-class JobQueueMemoryTest extends PHPUnit_Framework_TestCase {
+class JobQueueMemoryTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/libs/ArrayUtilsTest.php 
b/tests/phpunit/includes/libs/ArrayUtilsTest.php
index 76b4ee1..4b34ba4 100644
--- a/tests/phpunit/includes/libs/ArrayUtilsTest.php
+++ b/tests/phpunit/includes/libs/ArrayUtilsTest.php
@@ -5,7 +5,7 @@
  * @group Database
  */
 
-class ArrayUtilsTest extends PHPUnit_Framework_TestCase {
+class ArrayUtilsTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/libs/DeferredStringifierTest.php 
b/tests/phpunit/includes/libs/DeferredStringifierTest.php
index 19dc53cb..c7e6d7e 100644
--- a/tests/phpunit/includes/libs/DeferredStringifierTest.php
+++ b/tests/phpunit/includes/libs/DeferredStringifierTest.php
@@ -3,7 +3,7 @@
 /**
  * @covers DeferredStringifier
  */
-class DeferredStringifierTest extends PHPUnit_Framework_TestCase {
+class DeferredStringifierTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/libs/DnsSrvDiscovererTest.php 
b/tests/phpunit/includes/libs/DnsSrvDiscovererTest.php
index 264cc00..1b3397c 100644
--- a/tests/phpunit/includes/libs/DnsSrvDiscovererTest.php
+++ b/tests/phpunit/includes/libs/DnsSrvDiscovererTest.php
@@ -3,7 +3,7 @@
 /**
  * @covers DnsSrvDiscoverer
  */
-class DnsSrvDiscovererTest extends PHPUnit_Framework_TestCase {
+class DnsSrvDiscovererTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/libs/GenericArrayObjectTest.php 
b/tests/phpunit/includes/libs/GenericArrayObjectTest.php
index 3e8aaeb..a7cf755 100644
--- a/tests/phpunit/includes/libs/GenericArrayObjectTest.php
+++ b/tests/phpunit/includes/libs/GenericArrayObjectTest.php
@@ -26,7 +26,7 @@
  *
  * @author Jeroen De Dauw < [email protected] >
  */
-abstract class GenericArrayObjectTest extends PHPUnit_Framework_TestCase {
+abstract class GenericArrayObjectTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/libs/HashRingTest.php 
b/tests/phpunit/includes/libs/HashRingTest.php
index 040bebf..ba28828 100644
--- a/tests/phpunit/includes/libs/HashRingTest.php
+++ b/tests/phpunit/includes/libs/HashRingTest.php
@@ -3,7 +3,7 @@
 /**
  * @group HashRing
  */
-class HashRingTest extends PHPUnit_Framework_TestCase {
+class HashRingTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/libs/HtmlArmorTest.php 
b/tests/phpunit/includes/libs/HtmlArmorTest.php
index eb601e7..c5e87e4 100644
--- a/tests/phpunit/includes/libs/HtmlArmorTest.php
+++ b/tests/phpunit/includes/libs/HtmlArmorTest.php
@@ -3,7 +3,7 @@
 /**
  * @covers HtmlArmor
  */
-class HtmlArmorTest extends PHPUnit_Framework_TestCase {
+class HtmlArmorTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/libs/IEUrlExtensionTest.php 
b/tests/phpunit/includes/libs/IEUrlExtensionTest.php
index 8192f01..03c7b0c 100644
--- a/tests/phpunit/includes/libs/IEUrlExtensionTest.php
+++ b/tests/phpunit/includes/libs/IEUrlExtensionTest.php
@@ -5,7 +5,7 @@
  * @todo tests below for findIE6Extension should be split into...
  *    ...a dataprovider and test method.
  */
-class IEUrlExtensionTest extends PHPUnit_Framework_TestCase {
+class IEUrlExtensionTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/libs/IPTest.php 
b/tests/phpunit/includes/libs/IPTest.php
index 8a120ea..ee9f4ea 100644
--- a/tests/phpunit/includes/libs/IPTest.php
+++ b/tests/phpunit/includes/libs/IPTest.php
@@ -9,7 +9,7 @@
  * dataprovider.
  */
 
-class IPTest extends PHPUnit_Framework_TestCase {
+class IPTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/libs/JavaScriptMinifierTest.php 
b/tests/phpunit/includes/libs/JavaScriptMinifierTest.php
index 5061e27..cb90a2b 100644
--- a/tests/phpunit/includes/libs/JavaScriptMinifierTest.php
+++ b/tests/phpunit/includes/libs/JavaScriptMinifierTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class JavaScriptMinifierTest extends PHPUnit_Framework_TestCase {
+class JavaScriptMinifierTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/libs/MWMessagePackTest.php 
b/tests/phpunit/includes/libs/MWMessagePackTest.php
index 57c9831..695a734 100644
--- a/tests/phpunit/includes/libs/MWMessagePackTest.php
+++ b/tests/phpunit/includes/libs/MWMessagePackTest.php
@@ -3,7 +3,7 @@
  * PHP Unit tests for MWMessagePack
  * @covers MWMessagePack
  */
-class MWMessagePackTest extends PHPUnit_Framework_TestCase {
+class MWMessagePackTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/libs/MapCacheLRUTest.php 
b/tests/phpunit/includes/libs/MapCacheLRUTest.php
index 363b081..2a962b7 100644
--- a/tests/phpunit/includes/libs/MapCacheLRUTest.php
+++ b/tests/phpunit/includes/libs/MapCacheLRUTest.php
@@ -2,7 +2,7 @@
 /**
  * @group Cache
  */
-class MapCacheLRUTest extends PHPUnit_Framework_TestCase {
+class MapCacheLRUTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/libs/MemoizedCallableTest.php 
b/tests/phpunit/includes/libs/MemoizedCallableTest.php
index ba8af93..e86e0cc 100644
--- a/tests/phpunit/includes/libs/MemoizedCallableTest.php
+++ b/tests/phpunit/includes/libs/MemoizedCallableTest.php
@@ -24,7 +24,7 @@
  * PHP Unit tests for MemoizedCallable class.
  * @covers MemoizedCallable
  */
-class MemoizedCallableTest extends PHPUnit_Framework_TestCase {
+class MemoizedCallableTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/libs/ObjectFactoryTest.php 
b/tests/phpunit/includes/libs/ObjectFactoryTest.php
index 03814da..0003d80 100644
--- a/tests/phpunit/includes/libs/ObjectFactoryTest.php
+++ b/tests/phpunit/includes/libs/ObjectFactoryTest.php
@@ -18,7 +18,7 @@
  * @file
  */
 
-class ObjectFactoryTest extends PHPUnit_Framework_TestCase {
+class ObjectFactoryTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/libs/ProcessCacheLRUTest.php 
b/tests/phpunit/includes/libs/ProcessCacheLRUTest.php
index ddb7bfa..c8940e5 100644
--- a/tests/phpunit/includes/libs/ProcessCacheLRUTest.php
+++ b/tests/phpunit/includes/libs/ProcessCacheLRUTest.php
@@ -9,7 +9,7 @@
  *
  * @group Cache
  */
-class ProcessCacheLRUTest extends PHPUnit_Framework_TestCase {
+class ProcessCacheLRUTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/libs/SamplingStatsdClientTest.php 
b/tests/phpunit/includes/libs/SamplingStatsdClientTest.php
index d0e404b..85b8c62 100644
--- a/tests/phpunit/includes/libs/SamplingStatsdClientTest.php
+++ b/tests/phpunit/includes/libs/SamplingStatsdClientTest.php
@@ -6,7 +6,7 @@
 /**
  * @covers SamplingStatsdClient
  */
-class SamplingStatsdClientTest extends PHPUnit_Framework_TestCase {
+class SamplingStatsdClientTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/libs/StringUtilsTest.php 
b/tests/phpunit/includes/libs/StringUtilsTest.php
index 3e5ccac..fcfa53e 100644
--- a/tests/phpunit/includes/libs/StringUtilsTest.php
+++ b/tests/phpunit/includes/libs/StringUtilsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class StringUtilsTest extends PHPUnit_Framework_TestCase {
+class StringUtilsTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/libs/TimingTest.php 
b/tests/phpunit/includes/libs/TimingTest.php
index 7e166f8..581a518 100644
--- a/tests/phpunit/includes/libs/TimingTest.php
+++ b/tests/phpunit/includes/libs/TimingTest.php
@@ -19,7 +19,7 @@
  * @author Ori Livneh <[email protected]>
  */
 
-class TimingTest extends PHPUnit_Framework_TestCase {
+class TimingTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/libs/XhprofDataTest.php 
b/tests/phpunit/includes/libs/XhprofDataTest.php
index d226227..1cbd86f 100644
--- a/tests/phpunit/includes/libs/XhprofDataTest.php
+++ b/tests/phpunit/includes/libs/XhprofDataTest.php
@@ -24,7 +24,7 @@
  * @copyright © 2014 Wikimedia Foundation and contributors
  * @since 1.25
  */
-class XhprofDataTest extends PHPUnit_Framework_TestCase {
+class XhprofDataTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/libs/XhprofTest.php 
b/tests/phpunit/includes/libs/XhprofTest.php
index c9123b8..cf81209 100644
--- a/tests/phpunit/includes/libs/XhprofTest.php
+++ b/tests/phpunit/includes/libs/XhprofTest.php
@@ -18,7 +18,7 @@
  * @file
  */
 
-class XhprofTest extends PHPUnit_Framework_TestCase {
+class XhprofTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/libs/XmlTypeCheckTest.php 
b/tests/phpunit/includes/libs/XmlTypeCheckTest.php
index 8a11d87..8616b41 100644
--- a/tests/phpunit/includes/libs/XmlTypeCheckTest.php
+++ b/tests/phpunit/includes/libs/XmlTypeCheckTest.php
@@ -5,7 +5,7 @@
  * @group Xml
  * @covers XMLTypeCheck
  */
-class XmlTypeCheckTest extends PHPUnit_Framework_TestCase {
+class XmlTypeCheckTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/libs/http/HttpAcceptNegotiatorTest.php 
b/tests/phpunit/includes/libs/http/HttpAcceptNegotiatorTest.php
index 4415bc9..40761b2 100644
--- a/tests/phpunit/includes/libs/http/HttpAcceptNegotiatorTest.php
+++ b/tests/phpunit/includes/libs/http/HttpAcceptNegotiatorTest.php
@@ -8,7 +8,7 @@
  * @license GPL-2.0+
  * @author Daniel Kinzler
  */
-class HttpAcceptNegotiatorTest extends \PHPUnit_Framework_TestCase {
+class HttpAcceptNegotiatorTest extends \PHPUnit\Framework\TestCase {
 
        public function provideGetFirstSupportedValue() {
                return [
diff --git a/tests/phpunit/includes/libs/http/HttpAcceptParserTest.php 
b/tests/phpunit/includes/libs/http/HttpAcceptParserTest.php
index 5bd9425..d62311b 100644
--- a/tests/phpunit/includes/libs/http/HttpAcceptParserTest.php
+++ b/tests/phpunit/includes/libs/http/HttpAcceptParserTest.php
@@ -8,7 +8,7 @@
  * @license GPL-2.0+
  * @author Daniel Kinzler
  */
-class HttpAcceptParserTest extends \PHPUnit_Framework_TestCase {
+class HttpAcceptParserTest extends \PHPUnit\Framework\TestCase {
 
        public function provideParseWeights() {
                return [
diff --git a/tests/phpunit/includes/libs/mime/MimeAnalyzerTest.php 
b/tests/phpunit/includes/libs/mime/MimeAnalyzerTest.php
index 1f3cae5..fbe5a2b 100644
--- a/tests/phpunit/includes/libs/mime/MimeAnalyzerTest.php
+++ b/tests/phpunit/includes/libs/mime/MimeAnalyzerTest.php
@@ -3,7 +3,7 @@
  * @group Media
  * @covers MimeAnalyzer
  */
-class MimeAnalyzerTest extends PHPUnit_Framework_TestCase {
+class MimeAnalyzerTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/libs/objectcache/CachedBagOStuffTest.php 
b/tests/phpunit/includes/libs/objectcache/CachedBagOStuffTest.php
index d71b16c..d0360a9 100644
--- a/tests/phpunit/includes/libs/objectcache/CachedBagOStuffTest.php
+++ b/tests/phpunit/includes/libs/objectcache/CachedBagOStuffTest.php
@@ -5,7 +5,7 @@
 /**
  * @group BagOStuff
  */
-class CachedBagOStuffTest extends PHPUnit_Framework_TestCase {
+class CachedBagOStuffTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/libs/objectcache/HashBagOStuffTest.php 
b/tests/phpunit/includes/libs/objectcache/HashBagOStuffTest.php
index 9eb3409..332e23b 100644
--- a/tests/phpunit/includes/libs/objectcache/HashBagOStuffTest.php
+++ b/tests/phpunit/includes/libs/objectcache/HashBagOStuffTest.php
@@ -5,7 +5,7 @@
 /**
  * @group BagOStuff
  */
-class HashBagOStuffTest extends PHPUnit_Framework_TestCase {
+class HashBagOStuffTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php 
b/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
index 7053fc1..04d86da 100644
--- a/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
+++ b/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
@@ -16,7 +16,7 @@
  * @covers WANObjectCache::getInterimValue
  * @covers WANObjectCache::setInterimValue
  */
-class WANObjectCacheTest extends PHPUnit_Framework_TestCase {
+class WANObjectCacheTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/libs/rdbms/TransactionProfilerTest.php 
b/tests/phpunit/includes/libs/rdbms/TransactionProfilerTest.php
index 54706d5..17a0d31 100644
--- a/tests/phpunit/includes/libs/rdbms/TransactionProfilerTest.php
+++ b/tests/phpunit/includes/libs/rdbms/TransactionProfilerTest.php
@@ -6,7 +6,7 @@
 /**
  * @covers \Wikimedia\Rdbms\TransactionProfiler
  */
-class TransactionProfilerTest extends PHPUnit_Framework_TestCase {
+class TransactionProfilerTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git 
a/tests/phpunit/includes/libs/rdbms/connectionmanager/ConnectionManagerTest.php 
b/tests/phpunit/includes/libs/rdbms/connectionmanager/ConnectionManagerTest.php
index a3f3981..2861344 100644
--- 
a/tests/phpunit/includes/libs/rdbms/connectionmanager/ConnectionManagerTest.php
+++ 
b/tests/phpunit/includes/libs/rdbms/connectionmanager/ConnectionManagerTest.php
@@ -13,7 +13,7 @@
  * @license GPL-2.0+
  * @author Daniel Kinzler
  */
-class ConnectionManagerTest extends \PHPUnit_Framework_TestCase {
+class ConnectionManagerTest extends \PHPUnit\Framework\TestCase {
 
        /**
         * @return IDatabase|PHPUnit_Framework_MockObject_MockObject
diff --git 
a/tests/phpunit/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManagerTest.php
 
b/tests/phpunit/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManagerTest.php
index 4e76f2a..6650bf2 100644
--- 
a/tests/phpunit/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManagerTest.php
+++ 
b/tests/phpunit/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManagerTest.php
@@ -13,7 +13,7 @@
  * @license GPL-2.0+
  * @author Daniel Kinzler
  */
-class SessionConsistentConnectionManagerTest extends 
\PHPUnit_Framework_TestCase {
+class SessionConsistentConnectionManagerTest extends 
\PHPUnit\Framework\TestCase {
 
        /**
         * @return IDatabase|PHPUnit_Framework_MockObject_MockObject
diff --git a/tests/phpunit/includes/libs/rdbms/database/DBConnRefTest.php 
b/tests/phpunit/includes/libs/rdbms/database/DBConnRefTest.php
index e660265..d1f961a 100644
--- a/tests/phpunit/includes/libs/rdbms/database/DBConnRefTest.php
+++ b/tests/phpunit/includes/libs/rdbms/database/DBConnRefTest.php
@@ -10,7 +10,7 @@
 /**
  * @covers Wikimedia\Rdbms\DBConnRef
  */
-class DBConnRefTest extends PHPUnit_Framework_TestCase {
+class DBConnRefTest extends PHPUnit\Framework\TestCase {
 
        /**
         * @return ILoadBalancer
diff --git a/tests/phpunit/includes/libs/rdbms/database/DatabaseDomainTest.php 
b/tests/phpunit/includes/libs/rdbms/database/DatabaseDomainTest.php
index 4e5f735..b13e8fc 100644
--- a/tests/phpunit/includes/libs/rdbms/database/DatabaseDomainTest.php
+++ b/tests/phpunit/includes/libs/rdbms/database/DatabaseDomainTest.php
@@ -5,7 +5,7 @@
 /**
  * @covers Wikimedia\Rdbms\DatabaseDomain
  */
-class DatabaseDomainTest extends PHPUnit_Framework_TestCase {
+class DatabaseDomainTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git 
a/tests/phpunit/includes/libs/rdbms/database/DatabaseMysqlBaseTest.php 
b/tests/phpunit/includes/libs/rdbms/database/DatabaseMysqlBaseTest.php
index a9f1880..cb515e9 100644
--- a/tests/phpunit/includes/libs/rdbms/database/DatabaseMysqlBaseTest.php
+++ b/tests/phpunit/includes/libs/rdbms/database/DatabaseMysqlBaseTest.php
@@ -105,7 +105,7 @@
        }
 }
 
-class DatabaseMysqlBaseTest extends PHPUnit_Framework_TestCase {
+class DatabaseMysqlBaseTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php 
b/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
index 23f7865..d44ca57 100644
--- a/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
+++ b/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
@@ -6,7 +6,7 @@
  * Test the parts of the Database abstract class that deal
  * with creating SQL text.
  */
-class DatabaseSQLTest extends PHPUnit_Framework_TestCase {
+class DatabaseSQLTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/libs/rdbms/database/DatabaseTest.php 
b/tests/phpunit/includes/libs/rdbms/database/DatabaseTest.php
index 4a0a7e7..4ec0e5d 100644
--- a/tests/phpunit/includes/libs/rdbms/database/DatabaseTest.php
+++ b/tests/phpunit/includes/libs/rdbms/database/DatabaseTest.php
@@ -5,7 +5,7 @@
 use Wikimedia\Rdbms\TransactionProfiler;
 use Wikimedia\TestingAccessWrapper;
 
-class DatabaseTest extends PHPUnit_Framework_TestCase {
+class DatabaseTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/libs/xmp/XMPTest.php 
b/tests/phpunit/includes/libs/xmp/XMPTest.php
index 7becad2..73fd471 100644
--- a/tests/phpunit/includes/libs/xmp/XMPTest.php
+++ b/tests/phpunit/includes/libs/xmp/XMPTest.php
@@ -4,7 +4,7 @@
  * @group Media
  * @covers XMPReader
  */
-class XMPTest extends PHPUnit_Framework_TestCase {
+class XMPTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/libs/xmp/XMPValidateTest.php 
b/tests/phpunit/includes/libs/xmp/XMPValidateTest.php
index 0785920..746f68a 100644
--- a/tests/phpunit/includes/libs/xmp/XMPValidateTest.php
+++ b/tests/phpunit/includes/libs/xmp/XMPValidateTest.php
@@ -5,7 +5,7 @@
 /**
  * @group Media
  */
-class XMPValidateTest extends PHPUnit_Framework_TestCase {
+class XMPValidateTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/objectcache/RedisBagOStuffTest.php 
b/tests/phpunit/includes/objectcache/RedisBagOStuffTest.php
index ea58e4a..c28d287 100644
--- a/tests/phpunit/includes/objectcache/RedisBagOStuffTest.php
+++ b/tests/phpunit/includes/objectcache/RedisBagOStuffTest.php
@@ -5,7 +5,7 @@
 /**
  * @group BagOStuff
  */
-class RedisBagOStuffTest extends PHPUnit_Framework_TestCase {
+class RedisBagOStuffTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/parser/ParserIntegrationTest.php 
b/tests/phpunit/includes/parser/ParserIntegrationTest.php
index 8d17d21..a60f7ed 100644
--- a/tests/phpunit/includes/parser/ParserIntegrationTest.php
+++ b/tests/phpunit/includes/parser/ParserIntegrationTest.php
@@ -14,7 +14,7 @@
  *
  * @todo covers tags
  */
-class ParserIntegrationTest extends PHPUnit_Framework_TestCase {
+class ParserIntegrationTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/registration/VersionCheckerTest.php 
b/tests/phpunit/includes/registration/VersionCheckerTest.php
index 15d0c2b..b5f3685 100644
--- a/tests/phpunit/includes/registration/VersionCheckerTest.php
+++ b/tests/phpunit/includes/registration/VersionCheckerTest.php
@@ -3,7 +3,7 @@
 /**
  * @covers VersionChecker
  */
-class VersionCheckerTest extends PHPUnit_Framework_TestCase {
+class VersionCheckerTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git 
a/tests/phpunit/includes/resourceloader/DerivativeResourceLoaderContextTest.php 
b/tests/phpunit/includes/resourceloader/DerivativeResourceLoaderContextTest.php
index db1fb64..e4f58eb 100644
--- 
a/tests/phpunit/includes/resourceloader/DerivativeResourceLoaderContextTest.php
+++ 
b/tests/phpunit/includes/resourceloader/DerivativeResourceLoaderContextTest.php
@@ -4,7 +4,7 @@
  * @group ResourceLoader
  * @covers DerivativeResourceLoaderContext
  */
-class DerivativeResourceLoaderContextTest extends PHPUnit_Framework_TestCase {
+class DerivativeResourceLoaderContextTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/resourceloader/MessageBlobStoreTest.php 
b/tests/phpunit/includes/resourceloader/MessageBlobStoreTest.php
index 7521e88..e0d4f48 100644
--- a/tests/phpunit/includes/resourceloader/MessageBlobStoreTest.php
+++ b/tests/phpunit/includes/resourceloader/MessageBlobStoreTest.php
@@ -6,7 +6,7 @@
  * @group Cache
  * @covers MessageBlobStore
  */
-class MessageBlobStoreTest extends PHPUnit_Framework_TestCase {
+class MessageBlobStoreTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git 
a/tests/phpunit/includes/resourceloader/ResourceLoaderClientHtmlTest.php 
b/tests/phpunit/includes/resourceloader/ResourceLoaderClientHtmlTest.php
index c83f500..429db67 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderClientHtmlTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderClientHtmlTest.php
@@ -5,7 +5,7 @@
 /**
  * @group ResourceLoader
  */
-class ResourceLoaderClientHtmlTest extends PHPUnit_Framework_TestCase {
+class ResourceLoaderClientHtmlTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git 
a/tests/phpunit/includes/resourceloader/ResourceLoaderContextTest.php 
b/tests/phpunit/includes/resourceloader/ResourceLoaderContextTest.php
index f848556..b226ee1 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderContextTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderContextTest.php
@@ -8,7 +8,7 @@
  * @group Cache
  * @covers ResourceLoaderContext
  */
-class ResourceLoaderContextTest extends PHPUnit_Framework_TestCase {
+class ResourceLoaderContextTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git 
a/tests/phpunit/includes/resourceloader/ResourceLoaderSkinModuleTest.php 
b/tests/phpunit/includes/resourceloader/ResourceLoaderSkinModuleTest.php
index 0718af6..a1b1422 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderSkinModuleTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderSkinModuleTest.php
@@ -3,7 +3,7 @@
 /**
  * @group ResourceLoader
  */
-class ResourceLoaderSkinModuleTest extends PHPUnit_Framework_TestCase {
+class ResourceLoaderSkinModuleTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/search/SearchSuggestionSetTest.php 
b/tests/phpunit/includes/search/SearchSuggestionSetTest.php
index 28c69fa..54533a7 100644
--- a/tests/phpunit/includes/search/SearchSuggestionSetTest.php
+++ b/tests/phpunit/includes/search/SearchSuggestionSetTest.php
@@ -19,7 +19,7 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
-class SearchSuggestionSetTest extends \PHPUnit_Framework_TestCase {
+class SearchSuggestionSetTest extends \PHPUnit\Framework\TestCase {
        /**
         * Test that adding a new suggestion at the end
         * will keep proper score ordering
diff --git a/tests/phpunit/includes/services/ServiceContainerTest.php 
b/tests/phpunit/includes/services/ServiceContainerTest.php
index f4f5650..78e6a02 100644
--- a/tests/phpunit/includes/services/ServiceContainerTest.php
+++ b/tests/phpunit/includes/services/ServiceContainerTest.php
@@ -6,7 +6,7 @@
  *
  * @group MediaWiki
  */
-class ServiceContainerTest extends PHPUnit_Framework_TestCase {
+class ServiceContainerTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
@@ -54,8 +54,8 @@
                        $name,
                        function ( $actualLocator, $extra ) use ( $services, 
$theService, &$count ) {
                                $count++;
-                               PHPUnit_Framework_Assert::assertSame( 
$services, $actualLocator );
-                               PHPUnit_Framework_Assert::assertSame( $extra, 
'Foo' );
+                               PHPUnit\Framework\Assert::assertSame( 
$services, $actualLocator );
+                               PHPUnit\Framework\Assert::assertSame( $extra, 
'Foo' );
                                return $theService;
                        }
                );
@@ -125,7 +125,7 @@
                $name = 'TestService92834576';
 
                $services->defineService( $name, function ( $actualLocator ) 
use ( $services, $theService ) {
-                       PHPUnit_Framework_Assert::assertSame( $services, 
$actualLocator );
+                       PHPUnit\Framework\Assert::assertSame( $services, 
$actualLocator );
                        return $theService;
                } );
 
@@ -252,7 +252,7 @@
                $name = 'TestService92834576';
 
                $services->defineService( $name, function () {
-                       PHPUnit_Framework_Assert::fail(
+                       PHPUnit\Framework\Assert::fail(
                                'The original instantiator function should not 
get called'
                        );
                } );
@@ -261,8 +261,8 @@
                $services->redefineService(
                        $name,
                        function ( $actualLocator, $extra ) use ( $services, 
$theService1 ) {
-                               PHPUnit_Framework_Assert::assertSame( 
$services, $actualLocator );
-                               PHPUnit_Framework_Assert::assertSame( 'Foo', 
$extra );
+                               PHPUnit\Framework\Assert::assertSame( 
$services, $actualLocator );
+                               PHPUnit\Framework\Assert::assertSame( 'Foo', 
$extra );
                                return $theService1;
                        }
                );
diff --git a/tests/phpunit/includes/session/TestUtils.php 
b/tests/phpunit/includes/session/TestUtils.php
index af29d6b..3ff4caa 100644
--- a/tests/phpunit/includes/session/TestUtils.php
+++ b/tests/phpunit/includes/session/TestUtils.php
@@ -65,7 +65,7 @@
        public static function getDummySessionBackend() {
                $rc = new \ReflectionClass( SessionBackend::class );
                if ( !method_exists( $rc, 'newInstanceWithoutConstructor' ) ) {
-                       \PHPUnit_Framework_Assert::markTestSkipped(
+                       \PHPUnit\Framework\Assert::markTestSkipped(
                                'ReflectionClass::newInstanceWithoutConstructor 
isn\'t available'
                        );
                }
@@ -86,7 +86,7 @@
        public static function getDummySession( $backend = null, $index = -1, 
$logger = null ) {
                $rc = new \ReflectionClass( Session::class );
                if ( !method_exists( $rc, 'newInstanceWithoutConstructor' ) ) {
-                       \PHPUnit_Framework_Assert::markTestSkipped(
+                       \PHPUnit\Framework\Assert::markTestSkipped(
                                'ReflectionClass::newInstanceWithoutConstructor 
isn\'t available'
                        );
                }
diff --git a/tests/phpunit/includes/shell/CommandFactoryTest.php 
b/tests/phpunit/includes/shell/CommandFactoryTest.php
index cb2669f..b031431 100644
--- a/tests/phpunit/includes/shell/CommandFactoryTest.php
+++ b/tests/phpunit/includes/shell/CommandFactoryTest.php
@@ -9,7 +9,7 @@
 /**
  * @group Shell
  */
-class CommandFactoryTest extends PHPUnit_Framework_TestCase {
+class CommandFactoryTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/shell/CommandTest.php 
b/tests/phpunit/includes/shell/CommandTest.php
index 2bafa03..1b9cfd7 100644
--- a/tests/phpunit/includes/shell/CommandTest.php
+++ b/tests/phpunit/includes/shell/CommandTest.php
@@ -7,7 +7,7 @@
  * @covers \MediaWiki\Shell\Command
  * @group Shell
  */
-class CommandTest extends PHPUnit_Framework_TestCase {
+class CommandTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/shell/FirejailCommandTest.php 
b/tests/phpunit/includes/shell/FirejailCommandTest.php
index 1585375..199393c 100644
--- a/tests/phpunit/includes/shell/FirejailCommandTest.php
+++ b/tests/phpunit/includes/shell/FirejailCommandTest.php
@@ -23,7 +23,7 @@
 use MediaWiki\Shell\Shell;
 use Wikimedia\TestingAccessWrapper;
 
-class FirejailCommandTest extends PHPUnit_Framework_TestCase {
+class FirejailCommandTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/shell/ShellTest.php 
b/tests/phpunit/includes/shell/ShellTest.php
index 986a665..8162bc0 100644
--- a/tests/phpunit/includes/shell/ShellTest.php
+++ b/tests/phpunit/includes/shell/ShellTest.php
@@ -6,7 +6,7 @@
  * @covers \MediaWiki\Shell\Shell
  * @group Shell
  */
-class ShellTest extends PHPUnit_Framework_TestCase {
+class ShellTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/site/FileBasedSiteLookupTest.php 
b/tests/phpunit/includes/site/FileBasedSiteLookupTest.php
index ed6fbfe..ce3de75 100644
--- a/tests/phpunit/includes/site/FileBasedSiteLookupTest.php
+++ b/tests/phpunit/includes/site/FileBasedSiteLookupTest.php
@@ -27,7 +27,7 @@
  *
  * @author Katie Filbert < [email protected] >
  */
-class FileBasedSiteLookupTest extends PHPUnit_Framework_TestCase {
+class FileBasedSiteLookupTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/site/MediaWikiPageNameNormalizerTest.php 
b/tests/phpunit/includes/site/MediaWikiPageNameNormalizerTest.php
index d230550..0dcdc66 100644
--- a/tests/phpunit/includes/site/MediaWikiPageNameNormalizerTest.php
+++ b/tests/phpunit/includes/site/MediaWikiPageNameNormalizerTest.php
@@ -27,7 +27,7 @@
  *
  * @author Marius Hoch
  */
-class MediaWikiPageNameNormalizerTest extends PHPUnit_Framework_TestCase {
+class MediaWikiPageNameNormalizerTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
@@ -108,9 +108,9 @@
        public static $response;
 
        public static function get( $url, $options = [], $caller = __METHOD__ ) 
{
-               PHPUnit_Framework_Assert::assertInternalType( 'string', $url );
-               PHPUnit_Framework_Assert::assertInternalType( 'array', $options 
);
-               PHPUnit_Framework_Assert::assertInternalType( 'string', $caller 
);
+               PHPUnit\Framework\Assert::assertInternalType( 'string', $url );
+               PHPUnit\Framework\Assert::assertInternalType( 'array', $options 
);
+               PHPUnit\Framework\Assert::assertInternalType( 'string', $caller 
);
 
                return self::$response;
        }
diff --git a/tests/phpunit/includes/site/SiteExporterTest.php 
b/tests/phpunit/includes/site/SiteExporterTest.php
index 09cdea7..74d55d1 100644
--- a/tests/phpunit/includes/site/SiteExporterTest.php
+++ b/tests/phpunit/includes/site/SiteExporterTest.php
@@ -29,7 +29,7 @@
  *
  * @author Daniel Kinzler
  */
-class SiteExporterTest extends PHPUnit_Framework_TestCase {
+class SiteExporterTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/site/SiteImporterTest.php 
b/tests/phpunit/includes/site/SiteImporterTest.php
index 8a43bf8..25e37ea 100644
--- a/tests/phpunit/includes/site/SiteImporterTest.php
+++ b/tests/phpunit/includes/site/SiteImporterTest.php
@@ -29,7 +29,7 @@
  *
  * @author Daniel Kinzler
  */
-class SiteImporterTest extends PHPUnit_Framework_TestCase {
+class SiteImporterTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/site/SitesCacheFileBuilderTest.php 
b/tests/phpunit/includes/site/SitesCacheFileBuilderTest.php
index 6514beb..a5184fa 100644
--- a/tests/phpunit/includes/site/SitesCacheFileBuilderTest.php
+++ b/tests/phpunit/includes/site/SitesCacheFileBuilderTest.php
@@ -27,7 +27,7 @@
  *
  * @author Katie Filbert < [email protected] >
  */
-class SitesCacheFileBuilderTest extends PHPUnit_Framework_TestCase {
+class SitesCacheFileBuilderTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/utils/AvroValidatorTest.php 
b/tests/phpunit/includes/utils/AvroValidatorTest.php
index caeeaab..12d2574 100644
--- a/tests/phpunit/includes/utils/AvroValidatorTest.php
+++ b/tests/phpunit/includes/utils/AvroValidatorTest.php
@@ -12,7 +12,7 @@
 /**
  * @covers AvroValidator
  */
-class AvroValidatorTest extends PHPUnit_Framework_TestCase {
+class AvroValidatorTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/utils/ClassCollectorTest.php 
b/tests/phpunit/includes/utils/ClassCollectorTest.php
index 8e07b5e..6392e8b 100644
--- a/tests/phpunit/includes/utils/ClassCollectorTest.php
+++ b/tests/phpunit/includes/utils/ClassCollectorTest.php
@@ -3,7 +3,7 @@
 /**
  * @covers ClassCollector
  */
-class ClassCollectorTest extends PHPUnit_Framework_TestCase {
+class ClassCollectorTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/utils/FileContentsHasherTest.php 
b/tests/phpunit/includes/utils/FileContentsHasherTest.php
index b3885bd..316d9f4 100644
--- a/tests/phpunit/includes/utils/FileContentsHasherTest.php
+++ b/tests/phpunit/includes/utils/FileContentsHasherTest.php
@@ -3,7 +3,7 @@
 /**
  * @covers FileContentsHasherTest
  */
-class FileContentsHasherTest extends PHPUnit_Framework_TestCase {
+class FileContentsHasherTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/utils/MWCryptHashTest.php 
b/tests/phpunit/includes/utils/MWCryptHashTest.php
index 66c8d00..94705bf 100644
--- a/tests/phpunit/includes/utils/MWCryptHashTest.php
+++ b/tests/phpunit/includes/utils/MWCryptHashTest.php
@@ -5,7 +5,7 @@
  *
  * @covers MWCryptHash
  */
-class MWCryptHashTest extends PHPUnit_Framework_TestCase {
+class MWCryptHashTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/utils/MWRestrictionsTest.php 
b/tests/phpunit/includes/utils/MWRestrictionsTest.php
index 4c05326..2351bca 100644
--- a/tests/phpunit/includes/utils/MWRestrictionsTest.php
+++ b/tests/phpunit/includes/utils/MWRestrictionsTest.php
@@ -1,5 +1,5 @@
 <?php
-class MWRestrictionsTest extends PHPUnit_Framework_TestCase {
+class MWRestrictionsTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/utils/UIDGeneratorTest.php 
b/tests/phpunit/includes/utils/UIDGeneratorTest.php
index 230c935..05d062f 100644
--- a/tests/phpunit/includes/utils/UIDGeneratorTest.php
+++ b/tests/phpunit/includes/utils/UIDGeneratorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class UIDGeneratorTest extends PHPUnit_Framework_TestCase {
+class UIDGeneratorTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/includes/utils/ZipDirectoryReaderTest.php 
b/tests/phpunit/includes/utils/ZipDirectoryReaderTest.php
index 09a0676..9f18e5a 100644
--- a/tests/phpunit/includes/utils/ZipDirectoryReaderTest.php
+++ b/tests/phpunit/includes/utils/ZipDirectoryReaderTest.php
@@ -4,7 +4,7 @@
  * @covers ZipDirectoryReader
  * NOTE: this test is more like an integration test than a unit test
  */
-class ZipDirectoryReaderTest extends PHPUnit_Framework_TestCase {
+class ZipDirectoryReaderTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git 
a/tests/phpunit/includes/watcheditem/WatchedItemQueryServiceUnitTest.php 
b/tests/phpunit/includes/watcheditem/WatchedItemQueryServiceUnitTest.php
index ef2486d..8ef1aa9 100644
--- a/tests/phpunit/includes/watcheditem/WatchedItemQueryServiceUnitTest.php
+++ b/tests/phpunit/includes/watcheditem/WatchedItemQueryServiceUnitTest.php
@@ -6,7 +6,7 @@
 /**
  * @covers WatchedItemQueryService
  */
-class WatchedItemQueryServiceUnitTest extends PHPUnit_Framework_TestCase {
+class WatchedItemQueryServiceUnitTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/languages/LanguageCodeTest.php 
b/tests/phpunit/languages/LanguageCodeTest.php
index d36f38b..76ec0e3 100644
--- a/tests/phpunit/languages/LanguageCodeTest.php
+++ b/tests/phpunit/languages/LanguageCodeTest.php
@@ -8,7 +8,7 @@
  * @license GPL-2.0+
  * @author Thiemo Kreuz
  */
-class LanguageCodeTest extends PHPUnit_Framework_TestCase {
+class LanguageCodeTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/maintenance/BenchmarkerTest.php 
b/tests/phpunit/maintenance/BenchmarkerTest.php
index ec570e2..7754ab9 100644
--- a/tests/phpunit/maintenance/BenchmarkerTest.php
+++ b/tests/phpunit/maintenance/BenchmarkerTest.php
@@ -5,7 +5,7 @@
 /**
  * @covers Benchmarker
  */
-class BenchmarkerTest extends PHPUnit_Framework_TestCase {
+class BenchmarkerTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/phpunit.php b/tests/phpunit/phpunit.php
index 7203777..3cbf300 100755
--- a/tests/phpunit/phpunit.php
+++ b/tests/phpunit/phpunit.php
@@ -112,7 +112,7 @@
                        }
                }
 
-               if ( !class_exists( 'PHPUnit_Framework_TestCase' ) ) {
+               if ( !class_exists( 'PHPUnit\Framework\TestCase' ) ) {
                        echo "PHPUnit not found. Please install it and other 
dev dependencies by
                running `composer install` in MediaWiki root directory.\n";
                        exit( 1 );
diff --git a/tests/phpunit/structure/AvailableRightsTest.php 
b/tests/phpunit/structure/AvailableRightsTest.php
index 4ab0c2c..6c2ff02 100644
--- a/tests/phpunit/structure/AvailableRightsTest.php
+++ b/tests/phpunit/structure/AvailableRightsTest.php
@@ -6,7 +6,7 @@
  *
  * @author Marius Hoch < [email protected] >
  */
-class AvailableRightsTest extends PHPUnit_Framework_TestCase {
+class AvailableRightsTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/structure/ExtensionJsonValidationTest.php 
b/tests/phpunit/structure/ExtensionJsonValidationTest.php
index 0cf4659..60c97cc 100644
--- a/tests/phpunit/structure/ExtensionJsonValidationTest.php
+++ b/tests/phpunit/structure/ExtensionJsonValidationTest.php
@@ -20,7 +20,7 @@
  * Validates all loaded extensions and skins using the ExtensionRegistry
  * against the extension.json schema in the docs/ folder.
  */
-class ExtensionJsonValidationTest extends PHPUnit_Framework_TestCase {
+class ExtensionJsonValidationTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/structure/StructureTest.php 
b/tests/phpunit/structure/StructureTest.php
index 9016cb7..d56ff2f 100644
--- a/tests/phpunit/structure/StructureTest.php
+++ b/tests/phpunit/structure/StructureTest.php
@@ -25,6 +25,7 @@
                        'MediaWikiTestCase',
                        'ResourceLoaderTestCase',
                        'PHPUnit_Framework_TestCase',
+                       'PHPUnit\Framework\TestCase',
                        'DumpTestCase',
                ] );
                $testClassRegex = "^class .* extends ($testClassRegex)";
diff --git a/tests/phpunit/suites/CoreParserTestSuite.php 
b/tests/phpunit/suites/CoreParserTestSuite.php
index 7a33a22..46e7328 100644
--- a/tests/phpunit/suites/CoreParserTestSuite.php
+++ b/tests/phpunit/suites/CoreParserTestSuite.php
@@ -1,6 +1,6 @@
 <?php
 
-class CoreParserTestSuite extends PHPUnit_Framework_TestSuite {
+class CoreParserTestSuite extends PHPUnit\Framework\TestSuite {
 
        public static function suite() {
                return ParserTestTopLevelSuite::suite( 
ParserTestTopLevelSuite::CORE_ONLY );
diff --git a/tests/phpunit/suites/ExtensionsParserTestSuite.php 
b/tests/phpunit/suites/ExtensionsParserTestSuite.php
index 8d6ee07..281653b 100644
--- a/tests/phpunit/suites/ExtensionsParserTestSuite.php
+++ b/tests/phpunit/suites/ExtensionsParserTestSuite.php
@@ -1,5 +1,5 @@
 <?php
-class ExtensionsParserTestSuite extends PHPUnit_Framework_TestSuite {
+class ExtensionsParserTestSuite extends PHPUnit\Framework\TestSuite {
 
        public static function suite() {
                return ParserTestTopLevelSuite::suite( 
ParserTestTopLevelSuite::NO_CORE );
diff --git a/tests/phpunit/suites/ExtensionsTestSuite.php 
b/tests/phpunit/suites/ExtensionsTestSuite.php
index 02934fa..ad3f490 100644
--- a/tests/phpunit/suites/ExtensionsTestSuite.php
+++ b/tests/phpunit/suites/ExtensionsTestSuite.php
@@ -5,7 +5,7 @@
  * how to register your tests.
  */
 
-class ExtensionsTestSuite extends PHPUnit_Framework_TestSuite {
+class ExtensionsTestSuite extends PHPUnit\Framework\TestSuite {
        public function __construct() {
                parent::__construct();
 
diff --git a/tests/phpunit/suites/LessTestSuite.php 
b/tests/phpunit/suites/LessTestSuite.php
index 26a784a..eca3259 100644
--- a/tests/phpunit/suites/LessTestSuite.php
+++ b/tests/phpunit/suites/LessTestSuite.php
@@ -3,7 +3,7 @@
 /**
  * @author Sam Smith <[email protected]>
  */
-class LessTestSuite extends PHPUnit_Framework_TestSuite {
+class LessTestSuite extends PHPUnit\Framework\TestSuite {
        public function __construct() {
                parent::__construct();
 
diff --git a/tests/phpunit/suites/ParserTestFileSuite.php 
b/tests/phpunit/suites/ParserTestFileSuite.php
index b72d8b8..fa06894 100644
--- a/tests/phpunit/suites/ParserTestFileSuite.php
+++ b/tests/phpunit/suites/ParserTestFileSuite.php
@@ -5,7 +5,7 @@
  * It is not invoked directly. Use --filter to select files, or
  * use parserTests.php.
  */
-class ParserTestFileSuite extends PHPUnit_Framework_TestSuite {
+class ParserTestFileSuite extends PHPUnit\Framework\TestSuite {
        private $ptRunner;
        private $ptFileName;
        private $ptFileInfo;
diff --git a/tests/phpunit/suites/ParserTestTopLevelSuite.php 
b/tests/phpunit/suites/ParserTestTopLevelSuite.php
index 07b18f5..5fb57d1 100644
--- a/tests/phpunit/suites/ParserTestTopLevelSuite.php
+++ b/tests/phpunit/suites/ParserTestTopLevelSuite.php
@@ -10,7 +10,7 @@
  * @group ParserTests
  * @group Database
  */
-class ParserTestTopLevelSuite extends PHPUnit_Framework_TestSuite {
+class ParserTestTopLevelSuite extends PHPUnit\Framework\TestSuite {
        /** @var ParserTestRunner */
        private $ptRunner;
 
@@ -54,7 +54,7 @@
         * @param int $flags Bitwise flag to filter out the $wgParserTestFiles 
that
         * will be included.  Default: ParserTestTopLevelSuite::CORE_ONLY
         *
-        * @return PHPUnit_Framework_TestSuite
+        * @return PHPUnit\Framework\TestSuite
         */
        public static function suite( $flags = self::CORE_ONLY ) {
                return new self( $flags );
diff --git a/tests/phpunit/suites/UploadFromUrlTestSuite.php 
b/tests/phpunit/suites/UploadFromUrlTestSuite.php
index f2e6858..988442c 100644
--- a/tests/phpunit/suites/UploadFromUrlTestSuite.php
+++ b/tests/phpunit/suites/UploadFromUrlTestSuite.php
@@ -2,7 +2,7 @@
 
 require_once dirname( __DIR__ ) . '/includes/upload/UploadFromUrlTest.php';
 
-class UploadFromUrlTestSuite extends PHPUnit_Framework_TestSuite {
+class UploadFromUrlTestSuite extends PHPUnit\Framework\TestSuite {
        public $savedGlobals = [];
 
        public static function addTables( &$tables ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/401650
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia26febac0cb96836089fe59e0253457a36d41695
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to