Alias classes in the TestSuite files directly

composer.json

@@ -42,8 +42,7 @@
             "src/Core/functions.php",
             "src/Collection/functions.php",
             "src/I18n/functions.php",
-            "src/Utility/bootstrap.php",
-            "src/TestSuite/phpunit-forward-compat.php"
+            "src/Utility/bootstrap.php"
         ]
     },
     "autoload-dev": {

src/TestSuite/Constraint/EventFired.php

@@ -1,6 +1,13 @@
 <?php
 namespace Cake\TestSuite\Constraint;
 
+if (class_exists('PHPUnit_Runner_Version') && !class_exists('PHPUnit\Framework\Constraint\Constraint')) {
+    class_alias('PHPUnit_Framework_Constraint', 'PHPUnit\Framework\Constraint\Constraint');
+}
+if (class_exists('PHPUnit_Runner_Version') && !class_exists('PHPUnit\Framework\AssertionFailedError')) {
+    class_alias('PHPUnit_Framework_AssertionFailedError', 'PHPUnit\Framework\AssertionFailedError');
+}
+
 use Cake\Event\EventManager;
 use PHPUnit\Framework\AssertionFailedError;
 use PHPUnit\Framework\Constraint\Constraint;

src/TestSuite/Constraint/EventFiredWith.php

@@ -1,6 +1,13 @@
 <?php
 namespace Cake\TestSuite\Constraint;
 
+if (class_exists('PHPUnit_Runner_Version') && !class_exists('PHPUnit\Framework\Constraint\Constraint')) {
+    class_alias('PHPUnit_Framework_Constraint', 'PHPUnit\Framework\Constraint\Constraint');
+}
+if (class_exists('PHPUnit_Runner_Version') && !class_exists('PHPUnit\Framework\AssertionFailedError')) {
+    class_alias('PHPUnit_Framework_AssertionFailedError', 'PHPUnit\Framework\AssertionFailedError');
+}
+
 use Cake\Event\Event;
 use Cake\Event\EventManager;
 use PHPUnit\Framework\AssertionFailedError;

src/TestSuite/Fixture/FixtureInjector.php

@@ -14,6 +14,15 @@
  */
 namespace Cake\TestSuite\Fixture;
 
+if (class_exists('PHPUnit_Runner_Version')) {
+    class_alias('PHPUnit_Framework_Test', 'PHPUnit\Framework\Test');
+    if (!class_exists('PHPUnit\Framework\TestSuite')) {
+        class_alias('PHPUnit_Framework_TestSuite', 'PHPUnit\Framework\TestSuite');
+    }
+    class_alias('PHPUnit_Framework_Error_Warning', 'PHPUnit\Framework\Error\Warning');
+    class_alias('PHPUnit_Framework_AssertionFailedError', 'PHPUnit\Framework\AssertionFailedError');
+}
+
 use Cake\TestSuite\TestCase;
 use Exception;
 use PHPUnit\Framework\AssertionFailedError;

src/TestSuite/IntegrationTestCase.php

@@ -13,6 +13,10 @@
  */
 namespace Cake\TestSuite;
 
+if (class_exists('PHPUnit_Runner_Version') && !interface_exists('PHPUnit\Exception')) {
+    class_alias('PHPUnit_Exception', 'PHPUnit\Exception');
+}
+
 use Cake\Core\Configure;
 use Cake\Database\Exception as DatabaseException;
 use Cake\Network\Session;

src/TestSuite/TestSuite.php

@@ -16,6 +16,10 @@
  */
 namespace Cake\TestSuite;
 
+if (class_exists('PHPUnit_Runner_Version') && !class_exists('PHPUnit\Framework\TestSuite')) {
+    class_alias('PHPUnit_Framework_TestSuite', 'PHPUnit\Framework\TestSuite');
+}
+
 use Cake\Filesystem\Folder;
 use PHPUnit\Framework\TestSuite as BaseTestSuite;
 

src/TestSuite/phpunit-forward-compat.php

@@ -1,10 +0,0 @@
-<?php
-
-if (class_exists('PHPUnit_Runner_Version')) {
-    class_alias('PHPUnit_Framework_Test', 'PHPUnit\Framework\Test');
-    class_alias('PHPUnit_Framework_TestSuite', 'PHPUnit\Framework\TestSuite');
-    class_alias('PHPUnit_Exception', 'PHPUnit\Exception');
-    class_alias('PHPUnit_Framework_Error_Warning', 'PHPUnit\Framework\Error\Warning');
-    class_alias('PHPUnit_Framework_Constraint', 'PHPUnit\Framework\Constraint\Constraint');
-    class_alias('PHPUnit_Framework_AssertionFailedError', 'PHPUnit\Framework\AssertionFailedError');
-}