dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: a400f91)
Merge "Enable additional balancer tests (those starting with `<!DOCTYPE html>`)"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 21 Jul 2016 17:27:59 +0000 (17:27 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 21 Jul 2016 17:27:59 +0000 (17:27 +0000)
composer.json patch | blob | history
includes/collation/IcuCollation.php patch | blob | history
tests/phpunit/includes/tidy/BalancerTest.php patch | blob | history

diff --git a/composer.json b/composer.json
index d5bf93c..54eb3c0 100644 (file)
--- 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 b956d4b..c2e8b24 100644 (file)
--- 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 740ddb9..f69ecaf 100644 (file)
--- 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 ) {
Wiklou, le Wiki du Wiklou