Merge "Switch to librarized version of TestingAccessWrapper"

diff --combined tests/phpunit/includes/auth/AuthManagerTest.php
index 802e4ae,e8ef3ae..015fb3e
--- 1/tests/phpunit/includes/auth/AuthManagerTest.php
--- 2/tests/phpunit/includes/auth/AuthManagerTest.php
+++ b/tests/phpunit/includes/auth/AuthManagerTest.php
@@@ -7,6 -7,7 +7,7 @@@ use MediaWiki\Session\UserInfo
  use Psr\Log\LogLevel;
  use StatusValue;
  use Wikimedia\ScopedCallback;
+ use Wikimedia\TestingAccessWrapper;
  
  /**
   * @group AuthManager
@@@ -127,7 -128,7 +128,7 @@@ class AuthManagerTest extends \MediaWik
                }
                $this->manager = new AuthManager( $this->request, $this->config );
                $this->manager->setLogger( $this->logger );
-               $this->managerPriv = \TestingAccessWrapper::newFromObject( $this->manager );
+               $this->managerPriv = TestingAccessWrapper::newFromObject( $this->manager );
        }
  
        /**
@@@ -170,7 -171,7 +171,7 @@@
                        'logger' => new \Psr\Log\NullLogger(),
                        'store' => new \HashBagOStuff(),
                ] );
-               \TestingAccessWrapper::newFromObject( $manager )->getProvider( (string)$provider );
+               TestingAccessWrapper::newFromObject( $manager )->getProvider( (string)$provider );
  
                $reset = \MediaWiki\Session\TestUtils::setSessionManagerSingleton( $manager );
  
@@@ -196,7 -197,7 +197,7 @@@
                $this->assertSame( \RequestContext::getMain()->getRequest(), $singleton->getRequest() );
                $this->assertSame(
                        \RequestContext::getMain()->getConfig(),
-                       \TestingAccessWrapper::newFromObject( $singleton )->config
+                       TestingAccessWrapper::newFromObject( $singleton )->config
                );
        }
  
@@@ -1404,13 -1405,12 +1405,13 @@@
                        $this->manager->checkAccountCreatePermissions( new \User )
                );
  
 -              $this->setMwGlobals( [ 'wgReadOnly' => 'Because' ] );
 +              $readOnlyMode = \MediaWiki\MediaWikiServices::getInstance()->getReadOnlyMode();
 +              $readOnlyMode->setReason( 'Because' );
                $this->assertEquals(
                        \Status::newFatal( 'readonlytext', 'Because' ),
                        $this->manager->checkAccountCreatePermissions( new \User )
                );
 -              $this->setMwGlobals( [ 'wgReadOnly' => false ] );
 +              $readOnlyMode->setReason( false );
  
                $wgGroupPermissions['*']['createaccount'] = false;
                $status = $this->manager->checkAccountCreatePermissions( new \User );
@@@ -1598,8 -1598,7 +1599,8 @@@
                $this->assertSame( AuthenticationResponse::FAIL, $ret->status );
                $this->assertSame( 'noname', $ret->message->getKey() );
  
 -              $this->setMwGlobals( [ 'wgReadOnly' => 'Because' ] );
 +              $readOnlyMode = \MediaWiki\MediaWikiServices::getInstance()->getReadOnlyMode();
 +              $readOnlyMode->setReason( 'Because' );
                $this->hook( 'LocalUserCreated', $this->never() );
                $userReq->username = self::usernameForCreation();
                $ret = $this->manager->beginAccountCreation( $creator, [ $userReq ], 'http://localhost/' );
@@@ -1607,7 -1606,7 +1608,7 @@@
                $this->assertSame( AuthenticationResponse::FAIL, $ret->status );
                $this->assertSame( 'readonlytext', $ret->message->getKey() );
                $this->assertSame( [ 'Because' ], $ret->message->getParams() );
 -              $this->setMwGlobals( [ 'wgReadOnly' => false ] );
 +              $readOnlyMode->setReason( false );
  
                $this->hook( 'LocalUserCreated', $this->never() );
                $userReq->username = self::usernameForCreation();
@@@ -1772,15 -1771,14 +1773,15 @@@
  
                $this->request->getSession()->setSecret( 'AuthManager::accountCreationState',
                        [ 'username' => $creator->getName() ] + $session );
 -              $this->setMwGlobals( [ 'wgReadOnly' => 'Because' ] );
 +              $readOnlyMode = \MediaWiki\MediaWikiServices::getInstance()->getReadOnlyMode();
 +              $readOnlyMode->setReason( 'Because' );
                $this->hook( 'LocalUserCreated', $this->never() );
                $ret = $this->manager->continueAccountCreation( [] );
                $this->unhook( 'LocalUserCreated' );
                $this->assertSame( AuthenticationResponse::FAIL, $ret->status );
                $this->assertSame( 'readonlytext', $ret->message->getKey() );
                $this->assertSame( [ 'Because' ], $ret->message->getParams() );
 -              $this->setMwGlobals( [ 'wgReadOnly' => false ] );
 +              $readOnlyMode->setReason( false );
  
                $this->request->getSession()->setSecret( 'AuthManager::accountCreationState',
                        [ 'username' => $creator->getName() ] + $session );
@@@ -2471,8 -2469,7 +2472,8 @@@
  
                // Wiki is read-only
                $session->clear();
 -              $this->setMwGlobals( [ 'wgReadOnly' => 'Because' ] );
 +              $readOnlyMode = \MediaWiki\MediaWikiServices::getInstance()->getReadOnlyMode();
 +              $readOnlyMode->setReason( 'Because' );
                $user = \User::newFromName( $username );
                $this->hook( 'LocalUserCreated', $this->never() );
                $ret = $this->manager->autoCreateUser( $user, AuthManager::AUTOCREATE_SOURCE_SESSION, true );
@@@ -2485,7 -2482,7 +2486,7 @@@
                        [ LogLevel::DEBUG, 'denied by wfReadOnly(): {reason}' ],
                ], $logger->getBuffer() );
                $logger->clearBuffer();
 -              $this->setMwGlobals( [ 'wgReadOnly' => false ] );
 +              $readOnlyMode->setReason( false );
  
                // Session blacklisted
                $session->clear();