Restore ability to run tests independently from MW

.gitignore

@@ -8,4 +8,6 @@ vendor/
 extensions/
 
 composer.phar
-composer.lock
+composer.lock
+
+phpunit.phar

README.md

@@ -60,12 +60,17 @@ Maps has been maintained since 2009 and is installed on over 1000 public wikis.
 
 As setup, run `composer install` inside of the Maps root directory.
 
-You can run the MediaWiki independent tests by changing into the Maps root directory and running
+You can run the MediaWiki independent tests by executing phpunit in the root directory of maps:
+
+    phpunit
 
-    php vendor/bin/phpunit
-
 This is possible without having a MediaWiki installation or webserver. A clone of the Maps code suffices.
 
+If you do not have PHPUnit installed, you can download the .phar into the root directory and execute it there:
+
+	wget -O phpunit.phar https://phar.phpunit.de/phpunit-7.phar
+	php phpunit.phar
+
 To run the tests with MediaWiki, change into `tests/phpunit` of your MediaWiki installation and run
 
     php phpunit.php --wiki wiki -c ../../extensions/Maps/phpunit.xml.dist

tests/Integration/parsers/DistanceParserTest.php

@@ -44,7 +44,7 @@ public function validInputProvider() {
 	public function testGivenInvalidInput_exceptionIsThrown( $input ) {
 		$parser = new DistanceParser();
 
-		$this->setExpectedException( ParseException::class );
+		$this->expectException( ParseException::class );
 		$parser->parse( $input );
 	}
 

tests/Integration/parsers/WmsOverlayParserTest.php

@@ -48,7 +48,7 @@ public function testWhenStyleNameIsSpecified_getStyleNameReturnsIt() {
 	public function testWhenThereAreLessThanTwoSegments_parseExceptionIsThrown() {
 		$parser = new WmsOverlayParser();
 
-		$this->setExpectedException( ParseException::class );
+		$this->expectException( ParseException::class );
 		$parser->parse( 'Such' );
 	}
 

tests/Unit/Elements/BaseElementTest.php

@@ -80,7 +80,7 @@ public function testGivenValidArguments_constructorDoesNotThrowException() {
 	 * @since 3.0
 	 */
 	public function testGivenInvalidArguments_constructorThrowsException() {
-		$this->setExpectedException( InvalidArgumentException::class );
+		$this->expectException( InvalidArgumentException::class );
 		call_user_func_array( [ $this, 'newInstance' ], func_get_args() );
 	}
 

tests/bootstrap.php

@@ -1,18 +1,26 @@
 <?php
 
-// If testing against an older version of MediaWiki, define
-// an empty trait to avoid fatal errors.
-if ( !trait_exists( PHPUnit4And6Compat::class ) ) {
-	trait PHPUnit4And6Compat {
-	}
+if ( PHP_SAPI !== 'cli' ) {
+	die( 'Not an entry point' );
 }
 
 if ( defined( 'MEDIAWIKI' ) ) {
+	// If testing against an older version of MediaWiki, define
+	// an empty trait to avoid fatal errors.
+	if ( !trait_exists( PHPUnit4And6Compat::class ) ) {
+		trait PHPUnit4And6Compat {
+			public function expectException( string $exception ) {
+				$this->setExpectedException( $exception );
+			}
+		}
+	}
+
 	return;
 }
 
-if ( PHP_SAPI !== 'cli' ) {
-	die( 'Not an entry point' );
+if ( !trait_exists( PHPUnit4And6Compat::class ) ) {
+	trait PHPUnit4And6Compat {
+	}
 }
 
 error_reporting( -1 );