Merge "Deprecate ORMTable::getFieldPrefix"

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

diff --git a/tests/phpunit/includes/api/ApiOptionsTest.php b/tests/phpunit/includes/api/ApiOptionsTest.php
index 15bd8bb..5f955bb 100644 (file)
--- a/tests/phpunit/includes/api/ApiOptionsTest.php
+++ b/tests/phpunit/includes/api/ApiOptionsTest.php
@@ -17,7 +17,7 @@ class ApiOptionsTest extends MediaWikiLangTestCase {
        /** @var DerivativeContext */
        private $mContext;
 
-       private $mOldGetPreferencesHooks = false;
+       private $mOldGetPreferencesHooks;
 
        private static $Success = array( 'options' => 'success' );
 
@@ -61,10 +61,8 @@ class ApiOptionsTest extends MediaWikiLangTestCase {
        protected function tearDown() {
                global $wgHooks;
 
-               if ( $this->mOldGetPreferencesHooks !== false ) {
-                       $wgHooks['GetPreferences'] = $this->mOldGetPreferencesHooks;
-                       $this->mOldGetPreferencesHooks = false;
-               }
+               $wgHooks['GetPreferences'] = $this->mOldGetPreferencesHooks;
+               $this->mOldGetPreferencesHooks = false;
 
                parent::tearDown();
        }
@@ -318,7 +316,9 @@ class ApiOptionsTest extends MediaWikiLangTestCase {
                $this->mUserMock->expects( $this->once() )
                        ->method( 'saveSettings' );
 
-               $request = $this->getSampleRequest( array( 'change' => 'willBeNull|willBeEmpty=|willBeHappy=Happy' ) );
+               $request = $this->getSampleRequest( array(
+                       'change' => 'willBeNull|willBeEmpty=|willBeHappy=Happy'
+               ) );
 
                $response = $this->executeQuery( $request );
 
@@ -382,7 +382,8 @@ class ApiOptionsTest extends MediaWikiLangTestCase {
                        ->method( 'saveSettings' );
 
                $request = $this->getSampleRequest( array(
-                       'change' => 'testmultiselect-opt1=1|testmultiselect-opt2|testmultiselect-opt3=|testmultiselect-opt4=0'
+                       'change' => 'testmultiselect-opt1=1|testmultiselect-opt2|'
+                               . 'testmultiselect-opt3=|testmultiselect-opt4=0'
                ) );
 
                $response = $this->executeQuery( $request );