tests: Enable PHPUnit 4/6 compat layer in some tests that need it

Change-Id: I27a21fa9e97414fae02acbefb28011f0275cba63

diff --git a/tests/phpunit/includes/FauxRequestTest.php b/tests/phpunit/includes/FauxRequestTest.php
index 9f8bb38..9e7d680 100644 (file)
--- a/tests/phpunit/includes/FauxRequestTest.php
+++ b/tests/phpunit/includes/FauxRequestTest.php
@@ -5,6 +5,7 @@ use MediaWiki\Session\SessionManager;
 class FauxRequestTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 class FauxRequestTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;

+       use PHPUnit4And6Compat;

 
        /**
         * @covers FauxRequest::__construct
 
        /**
         * @covers FauxRequest::__construct

diff --git a/tests/phpunit/includes/composer/ComposerVersionNormalizerTest.php b/tests/phpunit/includes/composer/ComposerVersionNormalizerTest.php
index c607ae5..c5c0dc7 100644 (file)
--- a/tests/phpunit/includes/composer/ComposerVersionNormalizerTest.php
+++ b/tests/phpunit/includes/composer/ComposerVersionNormalizerTest.php
@@ -10,6 +10,7 @@
 class ComposerVersionNormalizerTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 class ComposerVersionNormalizerTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;

+       use PHPUnit4And6Compat;

 
        /**
         * @dataProvider nonStringProvider
 
        /**
         * @dataProvider nonStringProvider

diff --git a/tests/phpunit/includes/config/EtcdConfigTest.php b/tests/phpunit/includes/config/EtcdConfigTest.php
index 07dbd00..3eecf82 100644 (file)
--- a/tests/phpunit/includes/config/EtcdConfigTest.php
+++ b/tests/phpunit/includes/config/EtcdConfigTest.php
@@ -5,6 +5,7 @@ use Wikimedia\TestingAccessWrapper;
 class EtcdConfigTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 class EtcdConfigTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;

+       use PHPUnit4And6Compat;

 
        private function createConfigMock( array $options = [] ) {
                return $this->getMockBuilder( EtcdConfig::class )
 
        private function createConfigMock( array $options = [] ) {
                return $this->getMockBuilder( EtcdConfig::class )

diff --git a/tests/phpunit/includes/db/DatabaseOracleTest.php b/tests/phpunit/includes/db/DatabaseOracleTest.php
index b03734e..061e121 100644 (file)
--- a/tests/phpunit/includes/db/DatabaseOracleTest.php
+++ b/tests/phpunit/includes/db/DatabaseOracleTest.php
@@ -3,6 +3,7 @@
 class DatabaseOracleTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 class DatabaseOracleTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;

+       use PHPUnit4And6Compat;

 
        /**
         * @return PHPUnit_Framework_MockObject_MockObject|DatabaseOracle
 
        /**
         * @return PHPUnit_Framework_MockObject_MockObject|DatabaseOracle

diff --git a/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php b/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
index 77198f9..078b7b3 100644 (file)
--- a/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
+++ b/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
@@ -19,6 +19,7 @@ use Wikimedia\TestingAccessWrapper;
 class WANObjectCacheTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 class WANObjectCacheTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;

+       use PHPUnit4And6Compat;

 
        /** @var TimeAdjustableWANObjectCache */
        private $cache;
 
        /** @var TimeAdjustableWANObjectCache */
        private $cache;

diff --git a/tests/phpunit/includes/libs/rdbms/database/DBConnRefTest.php b/tests/phpunit/includes/libs/rdbms/database/DBConnRefTest.php
index d1f961a..bc9d9ea 100644 (file)
--- a/tests/phpunit/includes/libs/rdbms/database/DBConnRefTest.php
+++ b/tests/phpunit/includes/libs/rdbms/database/DBConnRefTest.php
@@ -12,6 +12,8 @@ use Wikimedia\Rdbms\ResultWrapper;
  */
 class DBConnRefTest extends PHPUnit\Framework\TestCase {
 
  */
 class DBConnRefTest extends PHPUnit\Framework\TestCase {
 

+       use PHPUnit4And6Compat;
+

        /**
         * @return ILoadBalancer
         */
        /**
         * @return ILoadBalancer
         */

diff --git a/tests/phpunit/includes/libs/rdbms/database/DatabaseDomainTest.php b/tests/phpunit/includes/libs/rdbms/database/DatabaseDomainTest.php
index b13e8fc..b2e7155 100644 (file)
--- a/tests/phpunit/includes/libs/rdbms/database/DatabaseDomainTest.php
+++ b/tests/phpunit/includes/libs/rdbms/database/DatabaseDomainTest.php
@@ -8,6 +8,7 @@ use Wikimedia\Rdbms\DatabaseDomain;
 class DatabaseDomainTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 class DatabaseDomainTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;

+       use PHPUnit4And6Compat;

 
        public static function provideConstruct() {
                return [
 
        public static function provideConstruct() {
                return [

diff --git a/tests/phpunit/includes/libs/rdbms/database/DatabaseMssqlTest.php b/tests/phpunit/includes/libs/rdbms/database/DatabaseMssqlTest.php
index bb85f5a..b28a5b9 100644 (file)
--- a/tests/phpunit/includes/libs/rdbms/database/DatabaseMssqlTest.php
+++ b/tests/phpunit/includes/libs/rdbms/database/DatabaseMssqlTest.php
@@ -5,6 +5,7 @@ use Wikimedia\Rdbms\DatabaseMssql;
 class DatabaseMssqlTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 class DatabaseMssqlTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;

+       use PHPUnit4And6Compat;

 
        /**
         * @return PHPUnit_Framework_MockObject_MockObject|DatabaseMssql
 
        /**
         * @return PHPUnit_Framework_MockObject_MockObject|DatabaseMssql

diff --git a/tests/phpunit/includes/libs/rdbms/database/DatabaseMysqlBaseTest.php b/tests/phpunit/includes/libs/rdbms/database/DatabaseMysqlBaseTest.php
index 1eca89b..378935c 100644 (file)
--- a/tests/phpunit/includes/libs/rdbms/database/DatabaseMysqlBaseTest.php
+++ b/tests/phpunit/includes/libs/rdbms/database/DatabaseMysqlBaseTest.php
@@ -29,6 +29,7 @@ use Wikimedia\TestingAccessWrapper;
 class DatabaseMysqlBaseTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 class DatabaseMysqlBaseTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;

+       use PHPUnit4And6Compat;

 
        /**
         * @dataProvider provideDiapers
 
        /**
         * @dataProvider provideDiapers

diff --git a/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php b/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
index 40e07d8..a57dce1 100644 (file)
--- a/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
+++ b/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
@@ -14,6 +14,7 @@ use Wikimedia\Rdbms\DBUnexpectedError;
 class DatabaseSQLTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 class DatabaseSQLTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;

+       use PHPUnit4And6Compat;

 
        /** @var DatabaseTestHelper|Database */
        private $database;
 
        /** @var DatabaseTestHelper|Database */
        private $database;

diff --git a/tests/phpunit/includes/libs/rdbms/database/DatabaseSqliteRdbmsTest.php b/tests/phpunit/includes/libs/rdbms/database/DatabaseSqliteRdbmsTest.php
index d963a5d..a886d6b 100644 (file)
--- a/tests/phpunit/includes/libs/rdbms/database/DatabaseSqliteRdbmsTest.php
+++ b/tests/phpunit/includes/libs/rdbms/database/DatabaseSqliteRdbmsTest.php
@@ -11,6 +11,7 @@ use Wikimedia\Rdbms\DatabaseSqlite;
 class DatabaseSqliteRdbmsTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 class DatabaseSqliteRdbmsTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;

+       use PHPUnit4And6Compat;

 
        /**
         * @return PHPUnit_Framework_MockObject_MockObject|DatabaseSqlite
 
        /**
         * @return PHPUnit_Framework_MockObject_MockObject|DatabaseSqlite

diff --git a/tests/phpunit/includes/services/ServiceContainerTest.php b/tests/phpunit/includes/services/ServiceContainerTest.php
index 1e8175e..a760908 100644 (file)
--- a/tests/phpunit/includes/services/ServiceContainerTest.php
+++ b/tests/phpunit/includes/services/ServiceContainerTest.php
@@ -9,6 +9,7 @@ use MediaWiki\Services\ServiceContainer;
 class ServiceContainerTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 class ServiceContainerTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;

+       use PHPUnit4And6Compat;

 
        private function newServiceContainer( $extraArgs = [] ) {
                return new ServiceContainer( $extraArgs );
 
        private function newServiceContainer( $extraArgs = [] ) {
                return new ServiceContainer( $extraArgs );

diff --git a/tests/phpunit/includes/site/SiteExporterTest.php b/tests/phpunit/includes/site/SiteExporterTest.php
index 279bbb2..db900da 100644 (file)
--- a/tests/phpunit/includes/site/SiteExporterTest.php
+++ b/tests/phpunit/includes/site/SiteExporterTest.php
@@ -32,6 +32,7 @@
 class SiteExporterTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 class SiteExporterTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;

+       use PHPUnit4And6Compat;

 
        public function testConstructor_InvalidArgument() {
                $this->setExpectedException( InvalidArgumentException::class );
 
        public function testConstructor_InvalidArgument() {
                $this->setExpectedException( InvalidArgumentException::class );

diff --git a/tests/phpunit/includes/site/SiteImporterTest.php b/tests/phpunit/includes/site/SiteImporterTest.php
index 7c949ac..bd95a50 100644 (file)
--- a/tests/phpunit/includes/site/SiteImporterTest.php
+++ b/tests/phpunit/includes/site/SiteImporterTest.php
@@ -32,6 +32,7 @@
 class SiteImporterTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;
 class SiteImporterTest extends PHPUnit\Framework\TestCase {
 
        use MediaWikiCoversValidator;

+       use PHPUnit4And6Compat;

 
        private function newSiteImporter( array $expectedSites, $errorCount ) {
                $store = $this->getMockBuilder( SiteStore::class )->getMock();
 
        private function newSiteImporter( array $expectedSites, $errorCount ) {
                $store = $this->getMockBuilder( SiteStore::class )->getMock();

diff --git a/tests/phpunit/includes/sparql/SparqlClientTest.php b/tests/phpunit/includes/sparql/SparqlClientTest.php
index cfaf49b..b217af1 100644 (file)
--- a/tests/phpunit/includes/sparql/SparqlClientTest.php
+++ b/tests/phpunit/includes/sparql/SparqlClientTest.php
@@ -4,12 +4,15 @@ namespace MediaWiki\Sparql;
 use Http;
 use MediaWiki\Http\HttpRequestFactory;
 use MWHttpRequest;
 use Http;
 use MediaWiki\Http\HttpRequestFactory;
 use MWHttpRequest;

+use PHPUnit4And6Compat;

 
 /**
  * @covers \MediaWiki\Sparql\SparqlClient
  */
 class SparqlClientTest extends \PHPUnit\Framework\TestCase {
 
 
 /**
  * @covers \MediaWiki\Sparql\SparqlClient
  */
 class SparqlClientTest extends \PHPUnit\Framework\TestCase {
 

+       use PHPUnit4And6Compat;
+

        private function getRequestFactory( $request ) {
                $requestFactory = $this->getMock( HttpRequestFactory::class );
                $requestFactory->method( 'create' )->willReturn( $request );
        private function getRequestFactory( $request ) {
                $requestFactory = $this->getMock( HttpRequestFactory::class );
                $requestFactory->method( 'create' )->willReturn( $request );