X-Git-Url: https://git.cyclocoop.org/%242?a=blobdiff_plain;f=includes%2Fauth%2FAuthManager.php;h=e223e16e69a1d52154daed31e8b337f4bf88928e;hb=bcd377cd008f8a8628ab727c3fa90090725d6c10;hp=89a22f8402140116eac90fc702fd897dc95ef2d4;hpb=55572b08a6845e892870abcac4b8b0718b7c9075;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/auth/AuthManager.php b/includes/auth/AuthManager.php
index 89a22f8402..e223e16e69 100644
--- a/includes/auth/AuthManager.php
+++ b/includes/auth/AuthManager.php
@@ -606,6 +606,7 @@ class AuthManager implements LoggerAwareInterface {
 
 			$user = User::newFromName( $res->username, 'usable' );
 			if ( !$user ) {
+				$provider = $this->getAuthenticationProvider( $state['primary'] );
 				throw new \DomainException(
 					get_class( $provider ) . " returned an invalid username: {$res->username}"
 				);
@@ -681,6 +682,7 @@ class AuthManager implements LoggerAwareInterface {
 			$this->logger->info( 'Login for {user} succeeded', [
 				'user' => $user->getName(),
 			] );
+			/** @var RememberMeAuthenticationRequest $req */
 			$req = AuthenticationRequest::getRequestByClass(
 				$beginReqs, RememberMeAuthenticationRequest::class
 			);
@@ -1398,7 +1400,7 @@ class AuthManager implements LoggerAwareInterface {
 					'creator' => $creator->getName(),
 				] );
 				$status = $user->addToDatabase();
-				if ( !$status->isOk() ) {
+				if ( !$status->isOK() ) {
 					// @codeCoverageIgnoreStart
 					$ret = AuthenticationResponse::newFail( $status->getMessage() );
 					$this->callMethodOnProviders( 7, 'postAccountCreation', [ $user, $creator, $ret ] );
@@ -1429,6 +1431,7 @@ class AuthManager implements LoggerAwareInterface {
 					);
 					$logEntry->setPerformer( $isAnon ? $user : $creator );
 					$logEntry->setTarget( $user->getUserPage() );
+					/** @var CreationReasonAuthenticationRequest $req */
 					$req = AuthenticationRequest::getRequestByClass(
 						$state['reqs'], CreationReasonAuthenticationRequest::class
 					);
@@ -1601,7 +1604,7 @@ class AuthManager implements LoggerAwareInterface {
 			$this->logger->debug( __METHOD__ . ': name "{username}" is not creatable', [
 				'username' => $username,
 			] );
-			$session->set( 'AuthManager::AutoCreateBlacklist', 'noname', 600 );
+			$session->set( 'AuthManager::AutoCreateBlacklist', 'noname' );
 			$user->setId( 0 );
 			$user->loadFromId();
 			return Status::newFatal( 'noname' );
@@ -1614,7 +1617,7 @@ class AuthManager implements LoggerAwareInterface {
 				'username' => $username,
 				'ip' => $anon->getName(),
 			] );
-			$session->set( 'AuthManager::AutoCreateBlacklist', 'authmanager-autocreate-noperm', 600 );
+			$session->set( 'AuthManager::AutoCreateBlacklist', 'authmanager-autocreate-noperm' );
 			$session->persist();
 			$user->setId( 0 );
 			$user->loadFromId();
@@ -1649,7 +1652,7 @@ class AuthManager implements LoggerAwareInterface {
 					'username' => $username,
 					'reason' => $ret->getWikiText( null, null, 'en' ),
 				] );
-				$session->set( 'AuthManager::AutoCreateBlacklist', $status, 600 );
+				$session->set( 'AuthManager::AutoCreateBlacklist', $status );
 				$user->setId( 0 );
 				$user->loadFromId();
 				return $ret;
@@ -1678,7 +1681,7 @@ class AuthManager implements LoggerAwareInterface {
 		$trxProfiler->setSilenced( true );
 		try {
 			$status = $user->addToDatabase();
-			if ( !$status->isOk() ) {
+			if ( !$status->isOK() ) {
 				// Double-check for a race condition (T70012). We make use of the fact that when
 				// addToDatabase fails due to the user already existing, the user object gets loaded.
 				if ( $user->getId() ) {
@@ -1691,9 +1694,9 @@ class AuthManager implements LoggerAwareInterface {
 					$status = Status::newGood();
 					$status->warning( 'userexists' );
 				} else {
-					$this->logger->error( __METHOD__ . ': {username} failed with message {message}', [
+					$this->logger->error( __METHOD__ . ': {username} failed with message {msg}', [
 						'username' => $username,
-						'message' => $status->getWikiText( null, null, 'en' )
+						'msg' => $status->getWikiText( null, null, 'en' )
 					] );
 					$user->setId( 0 );
 					$user->loadFromId();