diff --git a/core/tests/Drupal/Tests/Phpunit5FCTrait.php b/core/tests/Drupal/Tests/Phpunit5FCTrait.php
index 8351c67..85e3ff4 100644
--- a/core/tests/Drupal/Tests/Phpunit5FCTrait.php
+++ b/core/tests/Drupal/Tests/Phpunit5FCTrait.php
@@ -3,7 +3,6 @@
 namespace Drupal\Tests;
 
 use PHPUnit\Framework\TestCase;
-use PHPUnit_Framework_MockObject_MockObject;
 
 /**
  * This trait makes tests forward compatible with PHPUnit 5 and above.
@@ -42,14 +41,14 @@
    * @see \PHPUnit_Framework_TestCase::getMock
    * @see https://github.com/sebastianbergmann/phpunit/wiki/Release-Announcement-for-PHPUnit-5.4.0
    *
-   * @return PHPUnit_Framework_MockObject_MockObject
+   * @return \PHPUnit_Framework_MockObject_MockObject
    *
    * @deprecated in Drupal 8.5.0 and will be removed before Drupal 9.0.0.
    *   Use \Drupal\Tests\Phpunit5FCTrait::createMock.
    *
    * @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) {
+  public function getMock($originalClassName, $methods = array(), array $arguments = array(), $mockClassName = '', $callOriginalConstructor = TRUE, $callOriginalClone = TRUE, $callAutoload = TRUE, $cloneArguments = FALSE, $callOriginalMethods = FALSE, $proxyTarget = NULL) {
     if (method_exists('PHPUnit\Framework\TestCase', 'createMock')) {
       return TestCase::createMock($originalClassName, $methods, $arguments, $mockClassName, $callOriginalConstructor, $callOriginalClone, $callAutoload, $cloneArguments, $callOriginalMethods, $proxyTarget);
     }
@@ -87,9 +86,9 @@ public function getMock($originalClassName, $methods = array(), array $arguments
    *
    * @see \PHPUnit_Framework_TestCase::getMock
    *
-   * @return PHPUnit_Framework_MockObject_MockObject
+   * @return \PHPUnit_Framework_MockObject_MockObject
    */
-  public function createMock($originalClassName, $methods = array(), array $arguments = array(), $mockClassName = '', $callOriginalConstructor = true, $callOriginalClone = true, $callAutoload = true, $cloneArguments = false, $callOriginalMethods = false, $proxyTarget = null) {
+  public function createMock($originalClassName, $methods = array(), array $arguments = array(), $mockClassName = '', $callOriginalConstructor = TRUE, $callOriginalClone = TRUE, $callAutoload = TRUE, $cloneArguments = FALSE, $callOriginalMethods = FALSE, $proxyTarget = NULL) {
     if (method_exists('PHPUnit\Framework\TestCase', 'createMock')) {
       return TestCase::createMock($originalClassName, $methods, $arguments, $mockClassName, $callOriginalConstructor, $callOriginalClone, $callAutoload, $cloneArguments, $callOriginalMethods, $proxyTarget);
     }