ApiOptionsTest: Simplify hook restoration
authorTimo Tijhof <krinklemail@gmail.com>
Tue, 1 Jul 2014 16:32:05 +0000 (18:32 +0200)
committerTimo Tijhof <krinklemail@gmail.com>
Tue, 1 Jul 2014 16:32:05 +0000 (18:32 +0200)
Change-Id: I2afc35b45caf9ddfd34fb0bba0839987b7fb2ed4

tests/phpunit/includes/api/ApiOptionsTest.php

index e031ce3..5f955bb 100644 (file)
@@ -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();
        }