Merge pull request #7 from YOURLS/phpunit6compat

PHPUnit 6 compat stuff

In order to make different versions of PHP and PHPUnit coexist, you either need something like this (tests written for PHPUnit 5.7 and prior run on PHPUnit 6), or to force PHPUnit to a different version, see this: f1fd931

includes/bootstrap.php

@@ -87,20 +87,12 @@
 );
 
 // PHPUnit 6 compatibility for previous versions
-
-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' ); 
-    class_alias( 'PHPUnit\Framework\ExpectationFailedException', 'PHPUnit_Framework_ExpectationFailedException' ); 
-    class_alias( 'PHPUnit\Framework\Error\Notice', 'PHPUnit_Framework_Error_Notice' ); 
-    class_alias( 'PHPUnit\Framework\Test', 'PHPUnit_Framework_Test' ); 
-    class_alias( 'PHPUnit\Framework\Warning', 'PHPUnit_Framework_Warning' ); 
-    class_alias( 'PHPUnit\Framework\AssertionFailedError', 'PHPUnit_Framework_AssertionFailedError' ); 
-    class_alias( 'PHPUnit\Framework\TestSuite', 'PHPUnit_Framework_TestSuite' ); 
-    class_alias( 'PHPUnit\Framework\TestListener', 'PHPUnit_Framework_TestListener' ); 
-    class_alias( 'PHPUnit\Util\GlobalState', 'PHPUnit_Util_GlobalState' ); 
-    class_alias( 'PHPUnit\Util\Getopt', 'PHPUnit_Util_Getopt' );
+if ( class_exists( 'PHPUnit\Runner\Version' ) && version_compare( PHPUnit\Runner\Version::id(), '6.0', '>=' ) ) {
+    class_alias( 'PHPUnit\Framework\Assert',        'PHPUnit_Framework_Assert' );
+    class_alias( 'PHPUnit\Framework\TestCase',      'PHPUnit_Framework_TestCase' );
+    class_alias( 'PHPUnit\Framework\Error\Error',   'PHPUnit_Framework_Error' );
+    class_alias( 'PHPUnit\Framework\Error\Notice',  'PHPUnit_Framework_Error_Notice' );
+    class_alias( 'PHPUnit\Framework\Error\Warning', 'PHPUnit_Framework_Error_Warning' );
 }
 
 // At this point, tests will start
-