Merge "Tweaked BagOStuff::lock() retry times slightly to be faster"

[lhc/web/wiklou.git] / tests / phpunit / includes / CollationTest.php

diff --git a/tests/phpunit/includes/CollationTest.php b/tests/phpunit/includes/CollationTest.php
index c6a7169..74b1296 100644 (file)
--- 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' );
        }
 
        /**
@@ -22,9 +20,9 @@ class CollationTest extends MediaWikiLangTestCase {
         * prefix of "XY". Our collation
         * code makes this assumption.
         *
-        * @param $lang String Language code for collator
-        * @param $base String Base string
-        * @param $extended String String containing base as a prefix.
+        * @param string $lang Language code for collator
+        * @param string $base Base string
+        * @param string $extended String containing base as a prefix.
         *
         * @dataProvider prefixDataProvider
         */
@@ -83,9 +81,9 @@ class CollationTest extends MediaWikiLangTestCase {
        /**
         * Test correct first letter is fetched.
         *
-        * @param $collation String Collation name (aka uca-en)
-        * @param $string String String to get first letter of
-        * @param $firstLetter String Expected first letter.
+        * @param string $collation Collation name (aka uca-en)
+        * @param string $string String to get first letter of
+        * @param string $firstLetter Expected first letter.
         *
         * @dataProvider firstLetterProvider
         */