attempting to fix build

Author: DavidHickman

.travis.yml

@@ -55,12 +55,14 @@ before_script:
   - |
     case "$TRAVIS_PHP_VERSION" in
       5.6|5.5|5.4|5.3)
+        echo "Using PHPUnit 4.x"
         composer global require "phpunit/phpunit:^4"
         ;;
       5.2)
         ;;
       *)
-        composer global require "phpunit/phpunit:6"
+        echo "Using PHPUnit 6.x"
+        composer global require "phpunit/phpunit:^6"
         ;;
     esac
   - |

tests/phpunit/bootstrap.php

@@ -30,12 +30,8 @@ function _manually_load_plugin() {
 	tests_add_filter( 'muplugins_loaded', '_manually_load_plugin' );
 }
 
-// Core started including their own phpunit6-compat, so we should use that if we can.
-if ( ! file_exists( $test_root . '/includes/phpunit6-compat.php' ) ) {
-	// WordPress versions before 4.8 will be incompatible with newer PHPUnit versions.
-	if ( version_compare( getenv( 'WP_VERSION' ), '4.8', '<' ) && class_exists( 'PHPUnit\Runner\Version' ) ) {
-		require_once dirname( __FILE__ ) . '/phpunit6-compat.php';
-	}
+if ( class_exists( 'PHPUnit\Runner\Version' ) ) {
+	require_once dirname( __FILE__ ) . '/phpunit6-compat.php';
 }
 
 require $test_root . '/includes/bootstrap.php';

tests/phpunit/phpunit6-compat.php

@@ -1,6 +1,6 @@
 <?php
 
-if ( class_exists( 'PHPUnit\Runner\Version' ) && version_compare( PHPUnit\Runner\Version::id(), '6.0', '>=' ) ) {
+if ( class_exists( 'PHPUnit\Runner\Version' ) && !(class_exists('PHPUnit_Framework_TestCase')) && 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 extends PHPUnit\Util\Test {
+	class PHPUnit_Util_Test {
 
 		public static function getTickets( $className, $methodName ) {
-			$annotations = self::parseTestMethodAnnotations( $className, $methodName );
+			$annotations = PHPUnit\Util\Test::parseTestMethodAnnotations( $className, $methodName );
 
 			$tickets = array();