Merge "auth: Follow up on e907d4328dc3e"

diff --git a/includes/auth/AuthManager.php b/includes/auth/AuthManager.php
index e82f2b8..0c9f615 100644 (file)
--- a/includes/auth/AuthManager.php
+++ b/includes/auth/AuthManager.php
@@ -1213,7 +1213,7 @@ class AuthManager implements LoggerAwareInterface {
                        $user->load( User::READ_LOCKING );
 
                        if ( $state['userid'] === 0 ) {
-                               if ( $user->getId() != 0 ) {
+                               if ( $user->getId() !== 0 ) {
                                        $this->logger->debug( __METHOD__ . ': User exists locally', [
                                                'user' => $user->getName(),
                                                'creator' => $creator->getName(),
@@ -1234,7 +1234,7 @@ class AuthManager implements LoggerAwareInterface {
                                                "User \"{$state['username']}\" should exist now, but doesn't!"
                                        );
                                }
-                               if ( $user->getId() != $state['userid'] ) {
+                               if ( $user->getId() !== $state['userid'] ) {
                                        $this->logger->debug( __METHOD__ . ': User ID/name mismatch', [
                                                'user' => $user->getName(),
                                                'creator' => $creator->getName(),
@@ -1243,7 +1243,7 @@ class AuthManager implements LoggerAwareInterface {
                                        ] );
                                        throw new \UnexpectedValueException(
                                                "User \"{$state['username']}\" exists, but " .
-                                                       "ID {$user->getId()} != {$state['userid']}!"
+                                                       "ID {$user->getId()} !== {$state['userid']}!"
                                        );
                                }
                        }
@@ -1565,7 +1565,7 @@ class AuthManager implements LoggerAwareInterface {
                // @codeCoverageIgnoreStart
                if (
                        !$localId &&
-                       MediaWikiServices::getInstance()->getDBLoadBalancer()->getReaderIndex() != 0
+                       MediaWikiServices::getInstance()->getDBLoadBalancer()->getReaderIndex() !== 0
                ) {
                        $localId = User::idFromName( $username, User::READ_LATEST );
                        $flags = User::READ_LATEST;
@@ -1930,10 +1930,10 @@ class AuthManager implements LoggerAwareInterface {
                                $session->remove( 'AuthManager::accountLinkState' );
                                return AuthenticationResponse::newFail( wfMessage( 'noname' ) );
                        }
-                       if ( $user->getId() != $state['userid'] ) {
+                       if ( $user->getId() !== $state['userid'] ) {
                                throw new \UnexpectedValueException(
                                        "User \"{$state['username']}\" is valid, but " .
-                                               "ID {$user->getId()} != {$state['userid']}!"
+                                               "ID {$user->getId()} !== {$state['userid']}!"
                                );
                        }
 

diff --git a/includes/auth/CreatedAccountAuthenticationRequest.php b/includes/auth/CreatedAccountAuthenticationRequest.php
index 48a6e1d..a7d2484 100644 (file)
--- a/includes/auth/CreatedAccountAuthenticationRequest.php
+++ b/includes/auth/CreatedAccountAuthenticationRequest.php
@@ -42,7 +42,7 @@ class CreatedAccountAuthenticationRequest extends AuthenticationRequest {
         * @param string $name Username
         */
        public function __construct( $id, $name ) {
-               $this->id = $id;
+               $this->id = (int)$id;
                $this->username = $name;
        }
 }

diff --git a/tests/phpunit/includes/auth/AuthManagerTest.php b/tests/phpunit/includes/auth/AuthManagerTest.php
index 6bdc569..564336e 100644 (file)
--- a/tests/phpunit/includes/auth/AuthManagerTest.php
+++ b/tests/phpunit/includes/auth/AuthManagerTest.php
@@ -15,7 +15,7 @@ use Wikimedia\TestingAccessWrapper;
 /**
  * @group AuthManager
  * @group Database
- * @covers MediaWiki\Auth\AuthManager
+ * @covers \MediaWiki\Auth\AuthManager
  */
 class AuthManagerTest extends \MediaWikiTestCase {
        /** @var WebRequest */
@@ -1831,7 +1831,7 @@ class AuthManagerTest extends \MediaWikiTestCase {
                        $this->fail( 'Expected exception not thrown' );
                } catch ( \UnexpectedValueException $ex ) {
                        $this->assertEquals(
-                               "User \"{$name}\" exists, but ID $id != " . ( $id + 1 ) . '!', $ex->getMessage()
+                               "User \"{$name}\" exists, but ID $id !== " . ( $id + 1 ) . '!', $ex->getMessage()
                        );
                }
                $this->unhook( 'LocalUserCreated' );
@@ -3384,7 +3384,7 @@ class AuthManagerTest extends \MediaWikiTestCase {
                        $this->fail( 'Expected exception not thrown' );
                } catch ( \UnexpectedValueException $ex ) {
                        $this->assertEquals(
-                               "User \"{$user->getName()}\" is valid, but ID $id != " . ( $id + 1 ) . '!',
+                               "User \"{$user->getName()}\" is valid, but ID $id !== " . ( $id + 1 ) . '!',
                                $ex->getMessage()
                        );
                }