Moved PHPUnit aliases into phpunit_aliases file

src/TestSuite/Constraint/Console/ContentsBase.php

@@ -13,12 +13,6 @@
  */
 namespace Cake\TestSuite\Constraint\Console;
 
-if (class_exists('PHPUnit_Runner_Version', false)
-    && !class_exists('PHPUnit\Framework\Constraint\Constraint', false)
-) {
-    class_alias('PHPUnit_Framework_Constraint', 'PHPUnit\Framework\Constraint\Constraint');
-}
-
 use PHPUnit\Framework\Constraint\Constraint;
 
 /**

src/TestSuite/Constraint/Console/ExitCode.php

@@ -13,12 +13,6 @@
  */
 namespace Cake\TestSuite\Constraint\Console;
 
-if (class_exists('PHPUnit_Runner_Version', false)
-    && !class_exists('PHPUnit\Framework\Constraint\Constraint', false)
-) {
-    class_alias('PHPUnit_Framework_Constraint', 'PHPUnit\Framework\Constraint\Constraint');
-}
-
 use PHPUnit\Framework\Constraint\Constraint;
 
 /**

src/TestSuite/Constraint/EventFired.php

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

src/TestSuite/Constraint/EventFiredWith.php

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

src/TestSuite/Constraint/Response/ResponseBase.php

@@ -13,17 +13,6 @@
  */
 namespace Cake\TestSuite\Constraint\Response;
 
-if (class_exists('PHPUnit_Runner_Version', false)
-    && !class_exists('PHPUnit\Framework\Constraint\Constraint', false)
-) {
-    class_alias('PHPUnit_Framework_Constraint', 'PHPUnit\Framework\Constraint\Constraint');
-}
-if (class_exists('PHPUnit_Runner_Version', false)
-    && !class_exists('PHPUnit\Framework\AssertionFailedError', false)
-) {
-    class_alias('PHPUnit_Framework_AssertionFailedError', 'PHPUnit\Framework\AssertionFailedError');
-}
-
 use PHPUnit\Framework\AssertionFailedError;
 use PHPUnit\Framework\Constraint\Constraint;
 

src/TestSuite/Constraint/Session/SessionEquals.php

@@ -13,17 +13,6 @@
  */
 namespace Cake\TestSuite\Constraint\Session;
 
-if (class_exists('PHPUnit_Runner_Version', false)
-    && !class_exists('PHPUnit\Framework\Constraint\Constraint', false)
-) {
-    class_alias('PHPUnit_Framework_Constraint', 'PHPUnit\Framework\Constraint\Constraint');
-}
-if (class_exists('PHPUnit_Runner_Version', false)
-    && !class_exists('PHPUnit\Framework\AssertionFailedError', false)
-) {
-    class_alias('PHPUnit_Framework_AssertionFailedError', 'PHPUnit\Framework\AssertionFailedError');
-}
-
 use PHPUnit\Framework\AssertionFailedError;
 use PHPUnit\Framework\Constraint\Constraint;
 

src/TestSuite/Constraint/View/TemplateFileEquals.php

@@ -13,12 +13,6 @@
  */
 namespace Cake\TestSuite\Constraint\View;
 
-if (class_exists('PHPUnit_Runner_Version', false)
-    && !class_exists('PHPUnit\Framework\Constraint\Constraint', false)
-) {
-    class_alias('PHPUnit_Framework_Constraint', 'PHPUnit\Framework\Constraint\Constraint');
-}
-
 use PHPUnit\Framework\Constraint\Constraint;
 
 /**

tests/phpunit_aliases.php

@@ -4,6 +4,7 @@ if (class_exists('PHPUnit_Runner_Version')) {
         trigger_error(sprintf('Your PHPUnit Version must be at least 5.7.0 to use CakePHP Testsuite, found %s', \PHPUnit_Runner_Version::id()), E_USER_ERROR);
     }
 
+    class_alias('PHPUnit_Framework_Constraint', 'PHPUnit\Framework\Constraint\Constraint');
     class_alias('PHPUnit_Framework_Test', 'PHPUnit\Framework\Test');
     class_alias('PHPUnit_Framework_AssertionFailedError', 'PHPUnit\Framework\AssertionFailedError');
     class_alias('PHPUnit_Framework_TestSuite', 'PHPUnit\Framework\TestSuite');