From: jenkins-bot Date: Thu, 21 Jul 2016 17:27:59 +0000 (+0000) Subject: Merge "Enable additional balancer tests (those starting with ``)" X-Git-Tag: 1.31.0-rc.0~6312 X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=29d3feb1d0278cc383f21dac291c11d873c4316a;hp=a400f913e0b56252892ce5888ce46a9080e8fbd6;p=lhc%2Fweb%2Fwiklou.git Merge "Enable additional balancer tests (those starting with ``)" --- diff --git a/composer.json b/composer.json index d5bf93c7ba..54eb3c03d6 100644 --- a/composer.json +++ b/composer.json @@ -40,7 +40,7 @@ "wikimedia/relpath": "1.0.3", "wikimedia/running-stat": "1.1.0", "wikimedia/utfnormal": "1.0.3", - "wikimedia/wrappedstring": "2.1.1", + "wikimedia/wrappedstring": "2.2.0", "zordius/lightncandy": "0.23" }, "require-dev": { diff --git a/includes/collation/IcuCollation.php b/includes/collation/IcuCollation.php index b956d4b30c..c2e8b2412d 100644 --- a/includes/collation/IcuCollation.php +++ b/includes/collation/IcuCollation.php @@ -451,6 +451,13 @@ class IcuCollation extends Collation { $versionPrefix = substr( $icuVersion, 0, 3 ); // Source: http://site.icu-project.org/download $map = [ + '57.' => '8.0', + '56.' => '8.0', + '55.' => '7.0', + '54.' => '7.0', + '53.' => '6.3', + '52.' => '6.3', + '51.' => '6.2', '50.' => '6.2', '49.' => '6.1', '4.8' => '6.0', diff --git a/tests/phpunit/includes/tidy/BalancerTest.php b/tests/phpunit/includes/tidy/BalancerTest.php index 740ddb9d43..f69ecafd5c 100644 --- a/tests/phpunit/includes/tidy/BalancerTest.php +++ b/tests/phpunit/includes/tidy/BalancerTest.php @@ -20,14 +20,7 @@ class BalancerTest extends MediaWikiTestCase { } /** - * Anything cleanup you need to do should go here. - */ - protected function tearDown() { - parent::tearDown(); - } - - /** - * @covers Balancer::balance + * @covers MediaWiki\Tidy\Balancer::balance * @dataProvider provideBalancerTests */ public function testBalancer( $description, $input, $expected ) {