diff --git a/core/tests/Drupal/Tests/Phpunit5FCTrait.php b/core/tests/Drupal/Tests/Phpunit5FCTrait.php index 0c3b0ad238..8eddcbe30c 100644 --- a/core/tests/Drupal/Tests/Phpunit5FCTrait.php +++ b/core/tests/Drupal/Tests/Phpunit5FCTrait.php @@ -47,7 +47,6 @@ * @see https://www.drupal.org/node/2907725 */ public function getMock($originalClassName, $methods = array(), array $arguments = array(), $mockClassName = '', $callOriginalConstructor = TRUE, $callOriginalClone = TRUE, $callAutoload = TRUE, $cloneArguments = FALSE, $callOriginalMethods = FALSE, $proxyTarget = NULL) { - @trigger_error('\Drupal\Tests\Phpunit5FCTrait::getMock() in Drupal 8.5.0 and will be removed before Drupal 9.0.0. Use \Drupal\Tests\Phpunit5FCTrait::createMock() instead. See https://www.drupal.org/node/2907725.', E_USER_DEPRECATED); return $this->createMock($originalClassName, $methods, $arguments, $mockClassName, $callOriginalConstructor, $callOriginalClone, $callAutoload, $cloneArguments, $callOriginalMethods, $proxyTarget); } diff --git a/core/tests/Drupal/Tests/Phpunit5FCTraitTest.php b/core/tests/Drupal/Tests/Phpunit5FCTraitTest.php index cf02b4e0bb..621003f6b3 100644 --- a/core/tests/Drupal/Tests/Phpunit5FCTraitTest.php +++ b/core/tests/Drupal/Tests/Phpunit5FCTraitTest.php @@ -16,8 +16,6 @@ class Phpunit5FCTraitTest extends UnitTestCase { * * @covers ::getMock * @dataProvider providerMockVersions - * @group legacy - * @expectedDeprecation \Drupal\Tests\Phpunit5FCTrait::getMock() in Drupal 8.5.0 and will be removed before Drupal 9.0.0. Use \Drupal\Tests\Phpunit5FCTrait::createMock() instead. See https://www.drupal.org/node/2907725. */ public function testGetMock($className, $expected) { $class = new $className();