Fix issues identified by SpaceBeforeSingleLineComment sniff

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

diff --git a/tests/phpunit/includes/cache/GenderCacheTest.php b/tests/phpunit/includes/cache/GenderCacheTest.php
index ce2db5d..6b22000 100644 (file)
--- a/tests/phpunit/includes/cache/GenderCacheTest.php
+++ b/tests/phpunit/includes/cache/GenderCacheTest.php
@@ -6,20 +6,16 @@
  */
 class GenderCacheTest extends MediaWikiLangTestCase {
 
-       protected function setUp() {
-               global $wgDefaultUserOptions;
-               parent::setUp();
-               //ensure the correct default gender
-               $wgDefaultUserOptions['gender'] = 'unknown';
-       }
-
        function addDBData() {
+               // ensure the correct default gender
+               $this->mergeMwGlobalArrayValue( 'wgDefaultUserOptions', array( 'gender' => 'unknown' ) );
+
                $user = User::newFromName( 'UTMale' );
                if ( $user->getID() == 0 ) {
                        $user->addToDatabase();
                        $user->setPassword( 'UTMalePassword' );
                }
-               //ensure the right gender
+               // ensure the right gender
                $user->setOption( 'gender', 'male' );
                $user->saveSettings();
 
@@ -28,7 +24,7 @@ class GenderCacheTest extends MediaWikiLangTestCase {
                        $user->addToDatabase();
                        $user->setPassword( 'UTFemalePassword' );
                }
-               //ensure the right gender
+               // ensure the right gender
                $user->setOption( 'gender', 'female' );
                $user->saveSettings();
 
@@ -37,7 +33,7 @@ class GenderCacheTest extends MediaWikiLangTestCase {
                        $user->addToDatabase();
                        $user->setPassword( 'UTDefaultGenderPassword' );
                }
-               //ensure the default gender
+               // ensure the default gender
                $user->setOption( 'gender', null );
                $user->saveSettings();
        }
@@ -73,7 +69,7 @@ class GenderCacheTest extends MediaWikiLangTestCase {
                        array( 'UTFemale', 'female' ),
                        array( 'UTDefaultGender', 'unknown' ),
                        array( 'UTNotExist', 'unknown' ),
-                       //some not valid user
+                       // some not valid user
                        array( '127.0.0.1', 'unknown' ),
                        array( 'user@test', 'unknown' ),
                );