Merge "phpunit: Don't redefine methods in traits"

4 files changed, 0 insertions, 51 deletions

diff --git a/tests/phpunit/mocks/MockHttpTrait.php b/tests/phpunit/mocks/MockHttpTrait.php
index 23d7d93f1497..ecde52663f05 100644
--- a/tests/phpunit/mocks/MockHttpTrait.php
+++ b/tests/phpunit/mocks/MockHttpTrait.php
@@ -18,7 +18,6 @@
 
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\Http\HttpRequestFactory;
-use PHPUnit\Framework\MockObject\MockBuilder;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
@@ -31,15 +30,6 @@ use Psr\Log\NullLogger;
  * @since 1.36
  */
 trait MockHttpTrait {
-
-	/**
-	 * @see TestCase::getMockBuilder()
-	 *
-	 * @param string $className
-	 * @return MockBuilder
-	 */
-	abstract public function getMockBuilder( $className ): MockBuilder;
-
 	/**
 	 * @see MediaWikiIntegrationTestCase::setService()
 	 *
diff --git a/tests/phpunit/mocks/MockServiceDependenciesTrait.php b/tests/phpunit/mocks/MockServiceDependenciesTrait.php
index abed4194c54f..f4a239de08be 100644
--- a/tests/phpunit/mocks/MockServiceDependenciesTrait.php
+++ b/tests/phpunit/mocks/MockServiceDependenciesTrait.php
@@ -60,16 +60,4 @@ trait MockServiceDependenciesTrait {
 
 		$this->fail( "Unrecognized parameter type $type" );
 	}
-
-	/**
-	 * Provided by PHPUnit\Framework\Assert
-	 * @param string $message
-	 */
-	abstract protected function fail( string $message );
-
-	/**
-	 * Provided by PHPUnit\Framework\TestCase
-	 * @param string $originalClassName
-	 */
-	abstract protected function createMock( $originalClassName );
 }
diff --git a/tests/phpunit/mocks/MockTitleTrait.php b/tests/phpunit/mocks/MockTitleTrait.php
index d8fc55f07d6b..c7f8a946e248 100644
--- a/tests/phpunit/mocks/MockTitleTrait.php
+++ b/tests/phpunit/mocks/MockTitleTrait.php
@@ -105,23 +105,4 @@ trait MockTitleTrait {
 
 		return $titleCodec;
 	}
-
-	/**
-	 * Expected to be provided by the class, probably inherited from TestCase.
-	 *
-	 * @param string $originalClassName
-	 *
-	 * @return MockObject
-	 */
-	abstract protected function createMock( $originalClassName ): MockObject;
-
-	/**
-	 * Expected to be provided by the class, probably MediaWikiTestCaseTrait.
-	 *
-	 * @param string $type
-	 * @param string[] $allow methods to allow
-	 *
-	 * @return MockObject
-	 */
-	abstract protected function createNoOpMock( $type, $allow = [] );
 }
diff --git a/tests/phpunit/mocks/permissions/MockAuthorityTrait.php b/tests/phpunit/mocks/permissions/MockAuthorityTrait.php
index 6dcc828f1e88..22f4f2561afd 100644
--- a/tests/phpunit/mocks/permissions/MockAuthorityTrait.php
+++ b/tests/phpunit/mocks/permissions/MockAuthorityTrait.php
@@ -7,7 +7,6 @@ use MediaWiki\Permissions\SimpleAuthority;
 use MediaWiki\Permissions\UltimateAuthority;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityValue;
-use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Various useful Authority mocks.
@@ -186,13 +185,4 @@ trait MockAuthorityTrait {
 			} );
 		return $mock;
 	}
-
-	/**
-	 * Expected to be provided by the class, probably inherited from TestCase.
-	 *
-	 * @param string $originalClassName
-	 *
-	 * @return MockObject
-	 */
-	abstract protected function createMock( $originalClassName ): MockObject;
 }