Update to MediaWiki 1.22.0

1 files changed, 7 insertions, 5 deletions

diff --git a/tests/phpunit/includes/media/ExifTest.php b/tests/phpunit/includes/media/ExifTest.php
index e7e95f7e..dea36b03 100644
--- a/tests/phpunit/includes/media/ExifTest.php
+++ b/tests/phpunit/includes/media/ExifTest.php
@@ -1,14 +1,18 @@
 <?php
 class ExifTest extends MediaWikiTestCase {
 
+	/** @var string */
+	protected $mediaPath;
+
 	protected function setUp() {
 		parent::setUp();
+		if ( !extension_loaded( 'exif' ) ) {
+			$this->markTestSkipped( "This test needs the exif extension." );
+		}
 
 		$this->mediaPath = __DIR__ . '/../../data/media/';
 
-		if ( !wfDl( 'exif' ) ) {
-			$this->markTestSkipped( "This test needs the exif extension." );
-		}
+
 
 		$this->setMwGlobals( 'wgShowEXIF', true );
 	}
@@ -39,6 +43,4 @@ class ExifTest extends MediaWikiTestCase {
 		);
 		$this->assertEquals( $expected, $data );
 	}
-
-
 }