X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fauth%2FTemporaryPasswordPrimaryAuthenticationProviderTest.php;h=bc7d65e81d8e6103645f44e644cac68a7045b57e;hb=22b38fbbb94e1dacb39e2611f3952707c7b5e685;hp=8161ed4206f1dfd01453829d51405f3d6bb71a37;hpb=59e7337ea612d03d08b67e6ada707e3d7ced738d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php b/tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php
index 8161ed4206..bc7d65e81d 100644
--- a/tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php
+++ b/tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php
@@ -2,6 +2,9 @@
 
 namespace MediaWiki\Auth;
 
+use MediaWiki\MediaWikiServices;
+use Wikimedia\ScopedCallback;
+
 /**
  * @group AuthManager
  * @group Database
@@ -30,7 +33,7 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC
 		}
 		$config = new \MultiConfig( [
 			$this->config,
-			\ConfigFactory::getDefaultInstance()->makeConfig( 'main' )
+			MediaWikiServices::getInstance()->getMainConfig()
 		] );
 
 		if ( !$this->manager ) {
@@ -70,7 +73,7 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC
 			} );
 		}
 
-		return new \ScopedCallback( function () {
+		return new ScopedCallback( function () {
 			\Hooks::clear( 'AlternateUserMailer' );
 			\Hooks::register( 'AlternateUserMailer', function () {
 				return false;
@@ -345,7 +348,6 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC
 			'wrongpassword',
 			$ret->message->getKey()
 		);
-
 	}
 
 	/**
@@ -414,7 +416,7 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC
 
 		$dbw = wfGetDB( DB_MASTER );
 		$oldHash = $dbw->selectField( 'user', 'user_newpassword', [ 'user_name' => $cuser ] );
-		$cb = new \ScopedCallback( function () use ( $dbw, $cuser, $oldHash ) {
+		$cb = new ScopedCallback( function () use ( $dbw, $cuser, $oldHash ) {
 			$dbw->update( 'user', [ 'user_newpassword' => $oldHash ], [ 'user_name' => $cuser ] );
 		} );
 
@@ -451,7 +453,7 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC
 		$changeReq->password = $newpass;
 		$resetMailer = $this->hookMailer();
 		$provider->providerChangeAuthenticationData( $changeReq );
-		\ScopedCallback::consume( $resetMailer );
+		ScopedCallback::consume( $resetMailer );
 
 		$loginReq->password = $oldpass;
 		$ret = $provider->beginPrimaryAuthentication( $loginReqs );
@@ -519,10 +521,6 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC
 		$provider = $this->getProvider( [ 'emailEnabled' => false ] );
 		$status = $provider->providerAllowsAuthenticationDataChange( $req, true );
 		$this->assertEquals( \StatusValue::newFatal( 'passwordreset-emaildisabled' ), $status );
-		$req->hasBackchannel = true;
-		$status = $provider->providerAllowsAuthenticationDataChange( $req, true );
-		$this->assertFalse( $status->hasMessage( 'passwordreset-emaildisabled' ) );
-		$req->hasBackchannel = false;
 
 		$provider = $this->getProvider( [ 'passwordReminderResendTime' => 10 ] );
 		$status = $provider->providerAllowsAuthenticationDataChange( $req, true );
@@ -573,7 +571,7 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC
 			return false;
 		} );
 		$provider->providerChangeAuthenticationData( $req );
-		\ScopedCallback::consume( $resetMailer );
+		ScopedCallback::consume( $resetMailer );
 		$this->assertTrue( $mailed );
 
 		$priv = \TestingAccessWrapper::newFromObject( $provider );
@@ -685,18 +683,10 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC
 		$provider = $this->getProvider( [ 'emailEnabled' => false ] );
 		$status = $provider->testForAccountCreation( $user, $creator, [ $req ] );
 		$this->assertEquals( \StatusValue::newFatal( 'emaildisabled' ), $status );
-		$req->hasBackchannel = true;
-		$status = $provider->testForAccountCreation( $user, $creator, [ $req ] );
-		$this->assertFalse( $status->hasMessage( 'emaildisabled' ) );
-		$req->hasBackchannel = false;
 
 		$provider = $this->getProvider( [ 'emailEnabled' => true ] );
 		$status = $provider->testForAccountCreation( $user, $creator, [ $req ] );
 		$this->assertEquals( \StatusValue::newFatal( 'noemailcreate' ), $status );
-		$req->hasBackchannel = true;
-		$status = $provider->testForAccountCreation( $user, $creator, [ $req ] );
-		$this->assertFalse( $status->hasMessage( 'noemailcreate' ) );
-		$req->hasBackchannel = false;
 
 		$user->setEmail( 'test@localhost.localdomain' );
 		$status = $provider->testForAccountCreation( $user, $creator, [ $req ] );
@@ -723,7 +713,7 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC
 		$this->assertSame( 'byemail', $provider->finishAccountCreation( $user, $creator, $res ) );
 		$this->assertTrue( $mailed );
 
-		\ScopedCallback::consume( $resetMailer );
+		ScopedCallback::consume( $resetMailer );
 		$this->assertTrue( $mailed );
 	}