revert

wpengine · Apr 8, 2019 · f706369 · f706369
1 parent e332c11
commit f706369
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -54,17 +54,13 @@ before_script:
   - export PATH="$HOME/.composer/vendor/bin:$PATH"
   - |
     case "$TRAVIS_PHP_VERSION" in
-      5.6|5.5|5.4|5.3|5.2)
-        composer global require consolidation/cgr
-        PATH="$(composer config -g home)/vendor/bin:$PATH"
-        cgr "phpunit/phpunit:^4"
+      5.6|5.5|5.4|5.3)
+        composer global require "phpunit/phpunit:^4"
         ;;
       5.2)
-      ;;
+        ;;
       *)
-        composer global require consolidation/cgr
-        PATH="$(composer config -g home)/vendor/bin:$PATH"
-        cgr "phpunit/phpunit:^6"
+        composer global require "phpunit/phpunit:6"
         ;;
     esac
   - |

diff --git a/tests/phpunit/phpunit6-compat.php b/tests/phpunit/phpunit6-compat.php
@@ -1,6 +1,6 @@
 <?php
 
-if (class_exists( 'PHPUnit\Runner\Version' ) && version_compare( PHPUnit\Runner\Version::id(), '6.0', '>=' ) && ! class_exists( 'PHPUnit_Framework_TestCase' ) ) {
+if ( class_exists( 'PHPUnit\Runner\Version' ) && version_compare( PHPUnit\Runner\Version::id(), '6.0', '>=' ) ) {
 
 	class_alias( 'PHPUnit\Framework\TestCase',                   'PHPUnit_Framework_TestCase' );
 	class_alias( 'PHPUnit\Framework\Exception',                  'PHPUnit_Framework_Exception' );
@@ -15,10 +15,10 @@ class_alias( 'PHPUnit\Framework\TestListener',               'PHPUnit_Framework_
 	class_alias( 'PHPUnit\Util\GlobalState',                     'PHPUnit_Util_GlobalState' );
 	class_alias( 'PHPUnit\Util\Getopt',                          'PHPUnit_Util_Getopt' );
 
-	class PHPUnit_Util_Test {
+	class PHPUnit_Util_Test extends PHPUnit\Util\Test {
 
 		public static function getTickets( $className, $methodName ) {
-			$annotations = PHPUnit\Util\Test::parseTestMethodAnnotations( $className, $methodName );
+			$annotations = self::parseTestMethodAnnotations( $className, $methodName );
 
 			$tickets = array();