X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fmedia%2FMediaWikiMediaTestCase.php;h=a4e8056ac34135f32d1b0efd671dbf29c7aae396;hp=43eb2992d575fdfdd9e2ba4867d3770f6ca90f35;hb=699a2f6db472d44bea310a626b9c68a7224fea3a;hpb=8e9031268a8a1902e76de25f474452269e218c29 diff --git a/tests/phpunit/includes/media/MediaWikiMediaTestCase.php b/tests/phpunit/includes/media/MediaWikiMediaTestCase.php index 43eb2992d5..a4e8056ac3 100644 --- a/tests/phpunit/includes/media/MediaWikiMediaTestCase.php +++ b/tests/phpunit/includes/media/MediaWikiMediaTestCase.php @@ -19,7 +19,7 @@ abstract class MediaWikiMediaTestCase extends MediaWikiTestCase { if ( $this->createsThumbnails() ) { // We need a temp directory for the thumbnails // the container is named 'temp-thumb' because it is the - // thumb directory for a FSRepo named "temp". + // thumb directory for a repo named "temp". $containers['temp-thumb'] = $this->getNewTempDirectory(); } @@ -33,7 +33,7 @@ abstract class MediaWikiMediaTestCase extends MediaWikiTestCase { } /** - * @return array Argument for FSRepo constructor + * @return array Argument for FileRepo constructor */ protected function getRepoOptions() { return [ @@ -76,7 +76,7 @@ abstract class MediaWikiMediaTestCase extends MediaWikiTestCase { protected function dataFile( $name, $type = null ) { if ( !$type ) { // Autodetect by file extension for the lazy. - $magic = MimeMagic::singleton(); + $magic = MediaWiki\MediaWikiServices::getInstance()->getMimeAnalyzer(); $parts = explode( $name, '.' ); $type = $magic->guessTypesForExtension( $parts[count( $parts ) - 1] ); }