From d197824c545c36ed07296444d9e4aea406167215 Mon Sep 17 00:00:00 2001 From: Platonides Date: Sat, 23 Nov 2013 20:20:23 +0100 Subject: [PATCH] Replace a bunch of extension_loaded() checks with checkPHPExtension() Change-Id: I7bd9bc3a753975f45e63532d4f07aeff853b9970 --- tests/phpunit/includes/CollationTest.php | 4 +--- tests/phpunit/includes/DiffHistoryBlobTest.php | 11 ++--------- .../includes/media/BitmapMetadataHandlerTest.php | 8 ++------ tests/phpunit/includes/media/ExifBitmapTest.php | 4 +--- tests/phpunit/includes/media/ExifRotationTest.php | 4 +--- tests/phpunit/includes/media/ExifTest.php | 4 +--- tests/phpunit/includes/media/FormatMetadataTest.php | 4 +--- tests/phpunit/includes/media/JpegTest.php | 4 +--- tests/phpunit/includes/media/TiffTest.php | 4 +--- tests/phpunit/includes/media/XMPTest.php | 4 +--- 10 files changed, 12 insertions(+), 39 deletions(-) diff --git a/tests/phpunit/includes/CollationTest.php b/tests/phpunit/includes/CollationTest.php index c6a7169cab..213e610f3a 100644 --- a/tests/phpunit/includes/CollationTest.php +++ b/tests/phpunit/includes/CollationTest.php @@ -10,9 +10,7 @@ class CollationTest extends MediaWikiLangTestCase { protected function setUp() { parent::setUp(); - if ( !extension_loaded( 'intl' ) ) { - $this->markTestSkipped( 'These tests require intl extension' ); - } + $this->checkPHPExtension( 'intl' ); } /** diff --git a/tests/phpunit/includes/DiffHistoryBlobTest.php b/tests/phpunit/includes/DiffHistoryBlobTest.php index 0b04c6e5ea..e28a92cf43 100644 --- a/tests/phpunit/includes/DiffHistoryBlobTest.php +++ b/tests/phpunit/includes/DiffHistoryBlobTest.php @@ -5,19 +5,12 @@ class DiffHistoryBlobTest extends MediaWikiTestCase { protected function setUp() { parent::setUp(); - if ( !extension_loaded( 'xdiff' ) ) { - $this->markTestSkipped( 'The xdiff extension is not available' ); + $this->checkPHPExtension( 'hash' ); + $this->checkPHPExtension( 'xdiff' ); - return; - } if ( !function_exists( 'xdiff_string_rabdiff' ) ) { $this->markTestSkipped( 'The version of xdiff extension is lower than 1.5.0' ); - return; - } - if ( !extension_loaded( 'hash' ) ) { - $this->markTestSkipped( 'The hash extension is not available' ); - return; } } diff --git a/tests/phpunit/includes/media/BitmapMetadataHandlerTest.php b/tests/phpunit/includes/media/BitmapMetadataHandlerTest.php index a0e63a8a3a..8402522a66 100644 --- a/tests/phpunit/includes/media/BitmapMetadataHandlerTest.php +++ b/tests/phpunit/includes/media/BitmapMetadataHandlerTest.php @@ -19,12 +19,8 @@ class BitmapMetadataHandlerTest extends MediaWikiTestCase { * @covers BitmapMetadataHandler::Jpeg */ public function testMultilingualCascade() { - if ( !extension_loaded( 'exif' ) ) { - $this->markTestSkipped( "This test needs the exif extension." ); - } - if ( !extension_loaded( 'xml' ) ) { - $this->markTestSkipped( "This test needs the xml extension." ); - } + $this->checkPHPExtension( 'exif' ); + $this->checkPHPExtension( 'xml' ); $this->setMwGlobals( 'wgShowEXIF', true ); diff --git a/tests/phpunit/includes/media/ExifBitmapTest.php b/tests/phpunit/includes/media/ExifBitmapTest.php index a2e0eb62c4..fb3e40eb6d 100644 --- a/tests/phpunit/includes/media/ExifBitmapTest.php +++ b/tests/phpunit/includes/media/ExifBitmapTest.php @@ -9,9 +9,7 @@ class ExifBitmapTest extends MediaWikiTestCase { protected function setUp() { parent::setUp(); - if ( !extension_loaded( 'exif' ) ) { - $this->markTestSkipped( "This test needs the exif extension." ); - } + $this->checkPHPExtension( 'exif' ); $this->setMwGlobals( 'wgShowEXIF', true ); diff --git a/tests/phpunit/includes/media/ExifRotationTest.php b/tests/phpunit/includes/media/ExifRotationTest.php index 118dc851fd..3cfbf1abaa 100644 --- a/tests/phpunit/includes/media/ExifRotationTest.php +++ b/tests/phpunit/includes/media/ExifRotationTest.php @@ -10,9 +10,7 @@ class ExifRotationTest extends MediaWikiTestCase { protected function setUp() { parent::setUp(); - if ( !extension_loaded( 'exif' ) ) { - $this->markTestSkipped( "This test needs the exif extension." ); - } + $this->checkPHPExtension( 'exif' ); $this->handler = new BitmapHandler(); $filePath = __DIR__ . '/../../data/media'; diff --git a/tests/phpunit/includes/media/ExifTest.php b/tests/phpunit/includes/media/ExifTest.php index 667c078001..735663cf92 100644 --- a/tests/phpunit/includes/media/ExifTest.php +++ b/tests/phpunit/includes/media/ExifTest.php @@ -10,9 +10,7 @@ class ExifTest extends MediaWikiTestCase { protected function setUp() { parent::setUp(); - if ( !extension_loaded( 'exif' ) ) { - $this->markTestSkipped( "This test needs the exif extension." ); - } + $this->checkPHPExtension( 'exif' ); $this->mediaPath = __DIR__ . '/../../data/media/'; diff --git a/tests/phpunit/includes/media/FormatMetadataTest.php b/tests/phpunit/includes/media/FormatMetadataTest.php index 44d8f004f0..605dfa8c24 100644 --- a/tests/phpunit/includes/media/FormatMetadataTest.php +++ b/tests/phpunit/includes/media/FormatMetadataTest.php @@ -10,9 +10,7 @@ class FormatMetadataTest extends MediaWikiTestCase { protected function setUp() { parent::setUp(); - if ( !extension_loaded( 'exif' ) ) { - $this->markTestSkipped( "This test needs the exif extension." ); - } + $this->checkPHPExtension( 'exif' ); $filePath = __DIR__ . '/../../data/media'; $this->backend = new FSFileBackend( array( 'name' => 'localtesting', diff --git a/tests/phpunit/includes/media/JpegTest.php b/tests/phpunit/includes/media/JpegTest.php index a5bf1dcf4a..1b28de1dd0 100644 --- a/tests/phpunit/includes/media/JpegTest.php +++ b/tests/phpunit/includes/media/JpegTest.php @@ -8,9 +8,7 @@ class JpegTest extends MediaWikiTestCase { protected function setUp() { parent::setUp(); - if ( !extension_loaded( 'exif' ) ) { - $this->markTestSkipped( "This test needs the exif extension." ); - } + $this->checkPHPExtension( 'exif' ); $this->filePath = __DIR__ . '/../../data/media/'; diff --git a/tests/phpunit/includes/media/TiffTest.php b/tests/phpunit/includes/media/TiffTest.php index 8d74b98d90..ca97698364 100644 --- a/tests/phpunit/includes/media/TiffTest.php +++ b/tests/phpunit/includes/media/TiffTest.php @@ -8,9 +8,7 @@ class TiffTest extends MediaWikiTestCase { protected function setUp() { parent::setUp(); - if ( !extension_loaded( 'exif' ) ) { - $this->markTestSkipped( "This test needs the exif extension." ); - } + $this->checkPHPExtension( 'exif' ); $this->setMwGlobals( 'wgShowEXIF', true ); diff --git a/tests/phpunit/includes/media/XMPTest.php b/tests/phpunit/includes/media/XMPTest.php index 9ec5796dd3..61ba189dab 100644 --- a/tests/phpunit/includes/media/XMPTest.php +++ b/tests/phpunit/includes/media/XMPTest.php @@ -7,9 +7,7 @@ class XMPTest extends MediaWikiTestCase { protected function setUp() { parent::setUp(); - if ( !extension_loaded( 'xml' ) ) { - $this->markTestSkipped( 'Requires libxml to do XMP parsing' ); - } + $this->checkPHPExtension( 'exif' ); # Requires libxml to do XMP parsing } /** -- 2.20.1