Merge "Parse wikitext in gallery caption"

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

diff --git a/tests/phpunit/includes/TestUserRegistry.php b/tests/phpunit/includes/TestUserRegistry.php
index 0c178ca..3064a3d 100644 (file)
--- a/tests/phpunit/includes/TestUserRegistry.php
+++ b/tests/phpunit/includes/TestUserRegistry.php
@@ -28,7 +28,7 @@ class TestUserRegistry {
         *
         * @param string $testName Caller's __CLASS__. Used to generate the
         *  user's username.
-        * @param string[] $groups Groups the test user should be added to.
+        * @param string|string[] $groups Groups the test user should be added to.
         * @return TestUser
         */
        public static function getMutableTestUser( $testName, $groups = [] ) {
@@ -38,7 +38,7 @@ class TestUserRegistry {
                        "TestUser $testName $id",  // username
                        "Name $id",                // real name
                        "$id@mediawiki.test",      // e-mail
-                       $groups,                   // groups
+                       (array)$groups,            // groups
                        $password                  // password
                );
                $testUser->getUser()->clearInstanceCache();
@@ -54,17 +54,15 @@ class TestUserRegistry {
         *
         * @since 1.28
         *
-        * @param string[] $groups Groups the test user should be added to.
+        * @param string|string[] $groups Groups the test user should be added to.
         * @return TestUser
         */
        public static function getImmutableTestUser( $groups = [] ) {
-               $groups = array_unique( $groups );
+               $groups = array_unique( (array)$groups );
                sort( $groups );
                $key = implode( ',', $groups );
 
-               $testUser = isset( self::$testUsers[$key] )
-                       ? self::$testUsers[$key]
-                       : false;
+               $testUser = self::$testUsers[$key] ?? false;
 
                if ( !$testUser || !$testUser->getUser()->isLoggedIn() ) {
                        $id = self::getNextId();