Merge "Remove Revision::getRevisionText from migrateArchiveText"

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

diff --git a/tests/phpunit/includes/auth/AuthManagerTest.php b/tests/phpunit/includes/auth/AuthManagerTest.php
index fc6f688..55d4e10 100644 (file)
--- a/tests/phpunit/includes/auth/AuthManagerTest.php
+++ b/tests/phpunit/includes/auth/AuthManagerTest.php
@@ -1473,12 +1473,10 @@ class AuthManagerTest extends \MediaWikiTestCase {
                        ],
                        'wgProxyWhitelist' => [],
                ] );
-               $this->resetServices();
                $status = $this->manager->checkAccountCreatePermissions( new \User );
                $this->assertFalse( $status->isOK() );
                $this->assertTrue( $status->hasMessage( 'sorbs_create_account_reason' ) );
                $this->setMwGlobals( 'wgProxyWhitelist', [ '127.0.0.1' ] );
-               $this->resetServices();
                $status = $this->manager->checkAccountCreatePermissions( new \User );
                $this->assertTrue( $status->isGood() );
        }
@@ -1610,9 +1608,9 @@ class AuthManagerTest extends \MediaWikiTestCase {
                $this->assertSame( AuthenticationResponse::FAIL, $ret->status );
                $this->assertSame( 'noname', $ret->message->getKey() );
 
+               $this->hook( 'LocalUserCreated', $this->never() );
                $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/' );
                $this->unhook( 'LocalUserCreated' );
@@ -1782,11 +1780,11 @@ class AuthManagerTest extends \MediaWikiTestCase {
                        $session, $this->request->getSession()->getSecret( 'AuthManager::accountCreationState' )
                );
 
+               $this->hook( 'LocalUserCreated', $this->never() );
                $this->request->getSession()->setSecret( 'AuthManager::accountCreationState',
                        [ 'username' => $creator->getName() ] + $session );
                $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 );
@@ -2122,9 +2120,9 @@ class AuthManagerTest extends \MediaWikiTestCase {
                        }
 
                        if ( $created ) {
-                               $this->assertNotEquals( 0, \User::idFromName( $username ) );
+                               $this->assertNotNull( \User::idFromName( $username ) );
                        } else {
-                               $this->assertEquals( 0, \User::idFromName( $username ) );
+                               $this->assertNull( \User::idFromName( $username ) );
                        }
 
                        $first = false;
@@ -2366,8 +2364,6 @@ class AuthManagerTest extends \MediaWikiTestCase {
                $this->mergeMwGlobalArrayValue( 'wgObjectCaches',
                        [ __METHOD__ => [ 'class' => 'HashBagOStuff' ] ] );
                $this->setMwGlobals( [ 'wgMainCacheType' => __METHOD__ ] );
-               // Supply services with updated globals
-               $this->resetServices();
 
                // Set up lots of mocks...
                $mocks = [];
@@ -2478,7 +2474,7 @@ class AuthManagerTest extends \MediaWikiTestCase {
                $this->assertEquals( $expect, $ret );
                $this->assertNotEquals( 0, $user->getId() );
                $this->assertSame( 'UTSysop', $user->getName() );
-               $this->assertEquals( 0, $session->getUser()->getId() );
+               $this->assertSame( 0, $session->getUser()->getId() );
                $this->assertSame( [
                        [ LogLevel::DEBUG, '{username} already exists locally' ],
                ], $logger->getBuffer() );
@@ -2486,16 +2482,16 @@ class AuthManagerTest extends \MediaWikiTestCase {
 
                // Wiki is read-only
                $session->clear();
+               $this->hook( 'LocalUserCreated', $this->never() );
                $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 );
                $this->unhook( 'LocalUserCreated' );
                $this->assertEquals( \Status::newFatal( wfMessage( 'readonlytext', 'Because' ) ), $ret );
-               $this->assertEquals( 0, $user->getId() );
+               $this->assertSame( 0, $user->getId() );
                $this->assertNotEquals( $username, $user->getName() );
-               $this->assertEquals( 0, $session->getUser()->getId() );
+               $this->assertSame( 0, $session->getUser()->getId() );
                $this->assertSame( [
                        [ LogLevel::DEBUG, 'denied by wfReadOnly(): {reason}' ],
                ], $logger->getBuffer() );
@@ -2510,9 +2506,9 @@ class AuthManagerTest extends \MediaWikiTestCase {
                $ret = $this->manager->autoCreateUser( $user, AuthManager::AUTOCREATE_SOURCE_SESSION, true );
                $this->unhook( 'LocalUserCreated' );
                $this->assertEquals( \Status::newFatal( 'test' ), $ret );
-               $this->assertEquals( 0, $user->getId() );
+               $this->assertSame( 0, $user->getId() );
                $this->assertNotEquals( $username, $user->getName() );
-               $this->assertEquals( 0, $session->getUser()->getId() );
+               $this->assertSame( 0, $session->getUser()->getId() );
                $this->assertSame( [
                        [ LogLevel::DEBUG, 'blacklisted in session {sessionid}' ],
                ], $logger->getBuffer() );
@@ -2525,9 +2521,9 @@ class AuthManagerTest extends \MediaWikiTestCase {
                $ret = $this->manager->autoCreateUser( $user, AuthManager::AUTOCREATE_SOURCE_SESSION, true );
                $this->unhook( 'LocalUserCreated' );
                $this->assertEquals( \Status::newFatal( 'test2' ), $ret );
-               $this->assertEquals( 0, $user->getId() );
+               $this->assertSame( 0, $user->getId() );
                $this->assertNotEquals( $username, $user->getName() );
-               $this->assertEquals( 0, $session->getUser()->getId() );
+               $this->assertSame( 0, $session->getUser()->getId() );
                $this->assertSame( [
                        [ LogLevel::DEBUG, 'blacklisted in session {sessionid}' ],
                ], $logger->getBuffer() );
@@ -2540,9 +2536,9 @@ class AuthManagerTest extends \MediaWikiTestCase {
                $ret = $this->manager->autoCreateUser( $user, AuthManager::AUTOCREATE_SOURCE_SESSION, true );
                $this->unhook( 'LocalUserCreated' );
                $this->assertEquals( \Status::newFatal( 'noname' ), $ret );
-               $this->assertEquals( 0, $user->getId() );
+               $this->assertSame( 0, $user->getId() );
                $this->assertNotEquals( $username . '@', $user->getId() );
-               $this->assertEquals( 0, $session->getUser()->getId() );
+               $this->assertSame( 0, $session->getUser()->getId() );
                $this->assertSame( [
                        [ LogLevel::DEBUG, 'name "{username}" is not creatable' ],
                ], $logger->getBuffer() );
@@ -2558,9 +2554,9 @@ class AuthManagerTest extends \MediaWikiTestCase {
                $ret = $this->manager->autoCreateUser( $user, AuthManager::AUTOCREATE_SOURCE_SESSION, true );
                $this->unhook( 'LocalUserCreated' );
                $this->assertEquals( \Status::newFatal( 'authmanager-autocreate-noperm' ), $ret );
-               $this->assertEquals( 0, $user->getId() );
+               $this->assertSame( 0, $user->getId() );
                $this->assertNotEquals( $username, $user->getName() );
-               $this->assertEquals( 0, $session->getUser()->getId() );
+               $this->assertSame( 0, $session->getUser()->getId() );
                $this->assertSame( [
                        [ LogLevel::DEBUG, 'IP lacks the ability to create or autocreate accounts' ],
                ], $logger->getBuffer() );
@@ -2612,9 +2608,9 @@ class AuthManagerTest extends \MediaWikiTestCase {
                unset( $lock );
                $this->unhook( 'LocalUserCreated' );
                $this->assertEquals( \Status::newFatal( 'usernameinprogress' ), $ret );
-               $this->assertEquals( 0, $user->getId() );
+               $this->assertSame( 0, $user->getId() );
                $this->assertNotEquals( $username, $user->getName() );
-               $this->assertEquals( 0, $session->getUser()->getId() );
+               $this->assertSame( 0, $session->getUser()->getId() );
                $this->assertSame( [
                        [ LogLevel::DEBUG, 'Could not acquire account creation lock' ],
                ], $logger->getBuffer() );
@@ -2627,9 +2623,9 @@ class AuthManagerTest extends \MediaWikiTestCase {
                $ret = $this->manager->autoCreateUser( $user, AuthManager::AUTOCREATE_SOURCE_SESSION, true );
                $this->unhook( 'LocalUserCreated' );
                $this->assertEquals( \Status::newFatal( 'fail-in-pre' ), $ret );
-               $this->assertEquals( 0, $user->getId() );
+               $this->assertSame( 0, $user->getId() );
                $this->assertNotEquals( $username, $user->getName() );
-               $this->assertEquals( 0, $session->getUser()->getId() );
+               $this->assertSame( 0, $session->getUser()->getId() );
                $this->assertSame( [
                        [ LogLevel::DEBUG, 'Provider denied creation of {username}: {reason}' ],
                ], $logger->getBuffer() );
@@ -2644,9 +2640,9 @@ class AuthManagerTest extends \MediaWikiTestCase {
                $ret = $this->manager->autoCreateUser( $user, AuthManager::AUTOCREATE_SOURCE_SESSION, true );
                $this->unhook( 'LocalUserCreated' );
                $this->assertEquals( \Status::newFatal( 'fail-in-primary' ), $ret );
-               $this->assertEquals( 0, $user->getId() );
+               $this->assertSame( 0, $user->getId() );
                $this->assertNotEquals( $username, $user->getName() );
-               $this->assertEquals( 0, $session->getUser()->getId() );
+               $this->assertSame( 0, $session->getUser()->getId() );
                $this->assertSame( [
                        [ LogLevel::DEBUG, 'Provider denied creation of {username}: {reason}' ],
                ], $logger->getBuffer() );
@@ -2661,9 +2657,9 @@ class AuthManagerTest extends \MediaWikiTestCase {
                $ret = $this->manager->autoCreateUser( $user, AuthManager::AUTOCREATE_SOURCE_SESSION, true );
                $this->unhook( 'LocalUserCreated' );
                $this->assertEquals( \Status::newFatal( 'fail-in-secondary' ), $ret );
-               $this->assertEquals( 0, $user->getId() );
+               $this->assertSame( 0, $user->getId() );
                $this->assertNotEquals( $username, $user->getName() );
-               $this->assertEquals( 0, $session->getUser()->getId() );
+               $this->assertSame( 0, $session->getUser()->getId() );
                $this->assertSame( [
                        [ LogLevel::DEBUG, 'Provider denied creation of {username}: {reason}' ],
                ], $logger->getBuffer() );
@@ -2682,9 +2678,9 @@ class AuthManagerTest extends \MediaWikiTestCase {
                $ret = $this->manager->autoCreateUser( $user, AuthManager::AUTOCREATE_SOURCE_SESSION, true );
                $this->unhook( 'LocalUserCreated' );
                $this->assertEquals( \Status::newFatal( 'authmanager-autocreate-exception' ), $ret );
-               $this->assertEquals( 0, $user->getId() );
+               $this->assertSame( 0, $user->getId() );
                $this->assertNotEquals( $username, $user->getName() );
-               $this->assertEquals( 0, $session->getUser()->getId() );
+               $this->assertSame( 0, $session->getUser()->getId() );
                $this->assertSame( [
                        [ LogLevel::DEBUG, '{username} denied by prior creation attempt failures' ],
                ], $logger->getBuffer() );
@@ -2701,9 +2697,9 @@ class AuthManagerTest extends \MediaWikiTestCase {
                $user->setName( $username );
                $ret = $this->manager->autoCreateUser( $user, AuthManager::AUTOCREATE_SOURCE_SESSION, true );
                $this->assertEquals( \Status::newFatal( 'because' ), $ret );
-               $this->assertEquals( 0, $user->getId() );
+               $this->assertSame( 0, $user->getId() );
                $this->assertNotEquals( $username, $user->getName() );
-               $this->assertEquals( 0, $session->getUser()->getId() );
+               $this->assertSame( 0, $session->getUser()->getId() );
                $this->assertSame( [
                        [ LogLevel::INFO, 'creating new user ({username}) - from: {from}' ],
                        [ LogLevel::ERROR, '{username} failed with message {msg}' ],
@@ -2727,8 +2723,8 @@ class AuthManagerTest extends \MediaWikiTestCase {
                } catch ( \Exception $ex ) {
                        $this->assertSame( 'Excepted', $ex->getMessage() );
                }
-               $this->assertEquals( 0, $user->getId() );
-               $this->assertEquals( 0, $session->getUser()->getId() );
+               $this->assertSame( 0, $user->getId() );
+               $this->assertSame( 0, $session->getUser()->getId() );
                $this->assertSame( [
                        [ LogLevel::INFO, 'creating new user ({username}) - from: {from}' ],
                        [ LogLevel::ERROR, '{username} failed with exception {exception}' ],
@@ -2794,7 +2790,7 @@ class AuthManagerTest extends \MediaWikiTestCase {
                $this->assertEquals( \Status::newGood(), $ret );
                $this->assertNotEquals( 0, $user->getId() );
                $this->assertEquals( $username, $user->getName() );
-               $this->assertEquals( 0, $session->getUser()->getId() );
+               $this->assertSame( 0, $session->getUser()->getId() );
                $this->assertSame( [
                        [ LogLevel::INFO, 'creating new user ({username}) - from: {from}' ],
                ], $logger->getBuffer() );