X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FTestUser.php;h=ca2e99fc6aa922d981ad4d7a9c78de7312a0be58;hb=609091451b61739e2f0cd938880d897e99477494;hp=86f4ae789d53960d43ad0aa782a6111647e69635;hpb=61898ad28ed69c5b391eb43e0db9386279b9612c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/TestUser.php b/tests/phpunit/includes/TestUser.php
index 86f4ae789d..ca2e99fc6a 100644
--- a/tests/phpunit/includes/TestUser.php
+++ b/tests/phpunit/includes/TestUser.php
@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\MediaWikiServices;
+
 /**
  * Wraps the user object, so we can also retain full access to properties
  * like password if we log in via the API.
@@ -22,9 +24,7 @@ class TestUser {
 
 	private function assertNotReal() {
 		global $wgDBprefix;
-		if ( $wgDBprefix !== MediaWikiTestCase::DB_PREFIX &&
-			$wgDBprefix !== MediaWikiTestCase::ORA_DB_PREFIX
-		) {
+		if ( $wgDBprefix !== MediaWikiTestCase::DB_PREFIX ) {
 			throw new MWException( "Can't create user on real database" );
 		}
 	}
@@ -140,9 +140,8 @@ class TestUser {
 			throw new MWException( "Passed User has an ID but is not in the database?" );
 		}
 
-		$passwordFactory = new PasswordFactory();
-		$passwordFactory->init( RequestContext::getMain()->getConfig() );
-		if ( !$passwordFactory->newFromCiphertext( $row->user_password )->equals( $password ) ) {
+		$passwordFactory = MediaWikiServices::getInstance()->getPasswordFactory();
+		if ( !$passwordFactory->newFromCiphertext( $row->user_password )->verify( $password ) ) {
 			$passwordHash = $passwordFactory->newFromPlaintext( $password );
 			$dbw->update(
 				'user',