Platonides has uploaded a new change for review.
https://gerrit.wikimedia.org/r/97330
Change subject: Replace a bunch of extension_loaded() checks with
checkPHPExtension()
......................................................................
Replace a bunch of extension_loaded() checks with checkPHPExtension()
Change-Id: I7bd9bc3a753975f45e63532d4f07aeff853b9970
---
M tests/phpunit/includes/CollationTest.php
M tests/phpunit/includes/DiffHistoryBlobTest.php
M tests/phpunit/includes/media/BitmapMetadataHandlerTest.php
M tests/phpunit/includes/media/ExifBitmapTest.php
M tests/phpunit/includes/media/ExifRotationTest.php
M tests/phpunit/includes/media/ExifTest.php
M tests/phpunit/includes/media/FormatMetadataTest.php
M tests/phpunit/includes/media/JpegTest.php
M tests/phpunit/includes/media/TiffTest.php
M tests/phpunit/includes/media/XMPTest.php
10 files changed, 12 insertions(+), 38 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/30/97330/1
diff --git a/tests/phpunit/includes/CollationTest.php
b/tests/phpunit/includes/CollationTest.php
index c6a7169..213e610 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 76a9a10..16d21b7 100644
--- a/tests/phpunit/includes/DiffHistoryBlobTest.php
+++ b/tests/phpunit/includes/DiffHistoryBlobTest.php
@@ -2,21 +2,15 @@
class DiffHistoryBlobTest extends MediaWikiTestCase {
protected function 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;
- }
parent::setUp();
}
diff --git a/tests/phpunit/includes/media/BitmapMetadataHandlerTest.php
b/tests/phpunit/includes/media/BitmapMetadataHandlerTest.php
index a0e63a8..8402522 100644
--- a/tests/phpunit/includes/media/BitmapMetadataHandlerTest.php
+++ b/tests/phpunit/includes/media/BitmapMetadataHandlerTest.php
@@ -19,12 +19,8 @@
* @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 a2e0eb6..fb3e40e 100644
--- a/tests/phpunit/includes/media/ExifBitmapTest.php
+++ b/tests/phpunit/includes/media/ExifBitmapTest.php
@@ -9,9 +9,7 @@
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 f4f4154..7cc219b 100644
--- a/tests/phpunit/includes/media/ExifRotationTest.php
+++ b/tests/phpunit/includes/media/ExifRotationTest.php
@@ -10,9 +10,7 @@
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 667c078..735663c 100644
--- a/tests/phpunit/includes/media/ExifTest.php
+++ b/tests/phpunit/includes/media/ExifTest.php
@@ -10,9 +10,7 @@
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 a4f71db..c6ff3e0 100644
--- a/tests/phpunit/includes/media/FormatMetadataTest.php
+++ b/tests/phpunit/includes/media/FormatMetadataTest.php
@@ -10,9 +10,7 @@
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 bff64bb..2aa8bc3 100644
--- a/tests/phpunit/includes/media/JpegTest.php
+++ b/tests/phpunit/includes/media/JpegTest.php
@@ -8,9 +8,7 @@
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 8d74b98..ca97698 100644
--- a/tests/phpunit/includes/media/TiffTest.php
+++ b/tests/phpunit/includes/media/TiffTest.php
@@ -8,9 +8,7 @@
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 9ec5796..61ba189 100644
--- a/tests/phpunit/includes/media/XMPTest.php
+++ b/tests/phpunit/includes/media/XMPTest.php
@@ -7,9 +7,7 @@
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
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/97330
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7bd9bc3a753975f45e63532d4f07aeff853b9970
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Platonides <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
