From 63b343d8af09f286319dd91ca29d0a905ad75fd2 Mon Sep 17 00:00:00 2001 From: Reedy Date: Wed, 10 Feb 2016 21:21:54 +0000 Subject: [PATCH] Disable testIPTCParseForcedUTFButInvalid on PHP > 5.6.0 but < 5.6.10 Bug: T124574 Change-Id: I6893f7f549bb4145296c97ba2fc12583cd22e18e --- tests/phpunit/includes/media/IPTCTest.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/phpunit/includes/media/IPTCTest.php b/tests/phpunit/includes/media/IPTCTest.php index 655618653c..4630b48a65 100644 --- a/tests/phpunit/includes/media/IPTCTest.php +++ b/tests/phpunit/includes/media/IPTCTest.php @@ -44,7 +44,11 @@ class IPTCTest extends MediaWikiTestCase { * @covers IPTC::Parse */ public function testIPTCParseForcedUTFButInvalid() { - if ( version_compare( PHP_VERSION, '5.5.26', '<' ) ) { + if ( version_compare( PHP_VERSION, '5.5.26', '<' ) + || ( version_compare( PHP_VERSION, '5.6.0', '>' ) + && version_compare( PHP_VERSION, '5.6.10', '<' ) + ) + ) { $this->markTestSkipped( 'Test fails on pre-PHP 5.5.25. See T124574/T39665 for details.' ); } $iptcData = "Photoshop 3.0\08BIM\4\4\0\0\0\0\0\x11\x1c\x02\x19\x00\x04\xC3\xC3\xC3\xB8" -- 2.20.1