From: Reedy <reedy@wikimedia.org>
Date: Wed, 10 Feb 2016 21:21:54 +0000 (+0000)
Subject: Disable testIPTCParseForcedUTFButInvalid on PHP > 5.6.0 but < 5.6.10
X-Git-Tag: 1.31.0-rc.0~7997^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22statistiques_visites%22%2C%22%22%29%20.%20%22?a=commitdiff_plain;h=63b343d8af09f286319dd91ca29d0a905ad75fd2;p=lhc%2Fweb%2Fwiklou.git

Disable testIPTCParseForcedUTFButInvalid on PHP > 5.6.0 but < 5.6.10

Bug: T124574
Change-Id: I6893f7f549bb4145296c97ba2fc12583cd22e18e
---

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"