Only alias the minimum required classes

cakephp · Feb 14, 2017 · 8b2b5c3 · 8b2b5c3
1 parent 3b879dd
commit 8b2b5c3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/TestSuite/phpunit-forward-compat.php b/src/TestSuite/phpunit-forward-compat.php
@@ -1,13 +1,10 @@
 <?php
 
-if (!class_exists('PHPUnit\Runner\Version')) {
+if (class_exists('PHPUnit_Runner_Version')) {
     class_alias('PHPUnit_Framework_Test', 'PHPUnit\Framework\Test');
-    class_alias('PHPUnit_Framework_TestResult', 'PHPUnit\Framework\TestResult');
     class_alias('PHPUnit_Framework_TestSuite', 'PHPUnit\Framework\TestSuite');
     class_alias('PHPUnit_Exception', 'PHPUnit\Exception');
-    class_alias('PHPUnit_Framework_Error', 'PHPUnit\Framework\Error\Error');
     class_alias('PHPUnit_Framework_Error_Warning', 'PHPUnit\Framework\Error\Warning');
     class_alias('PHPUnit_Framework_Constraint', 'PHPUnit\Framework\Constraint\Constraint');
-    class_alias('PHPUnit_Framework_ExpectationFailedException', 'PHPUnit\Framework\ExpectationFailedException');
     class_alias('PHPUnit_Framework_AssertionFailedError', 'PHPUnit\Framework\AssertionFailedError');
 }
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -131,3 +131,9 @@
 MutableDate::setTestNow(MutableDate::now());
 
 ini_set('intl.default_locale', 'en_US');
+
+if (class_exists('PHPUnit_Runner_Version')) {
+    class_alias('PHPUnit_Framework_TestResult', 'PHPUnit\Framework\TestResult');
+    class_alias('PHPUnit_Framework_Error', 'PHPUnit\Framework\Error\Error');
+    class_alias('PHPUnit_Framework_ExpectationFailedException', 'PHPUnit\Framework\ExpectationFailedException');
+}