Merge pull request #297 from malberts/issue-295

Replace isLoggedIn()
ProfessionalWiki · Nov 6, 2021 · fbf0e91 · fbf0e91
2 parents 05de767 + 2bc1907
commit fbf0e91
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/Components/NavbarHorizontal/PersonalTools.php b/src/Components/NavbarHorizontal/PersonalTools.php
@@ -85,7 +85,7 @@ protected function getNewtalkNotifier() {
 			return '';
 		}
 
-		$talkClass = $user->isLoggedIn() ? 'pt-mytalk' : 'pt-anontalk';
+		$talkClass = $user->isRegistered() ? 'pt-mytalk' : 'pt-anontalk';
 
 		$newtalkNotifier = $this->indent( 1 ) . '<span class="badge badge-pill badge-info ' .
 			$talkClass . '" title="' . $newMessagesAlert . '" href="#"></span>';
@@ -102,7 +102,7 @@ protected function getNewtalkNotifier() {
 	protected function getUserName() {
 		if ( filter_var( $this->getAttribute( self::ATTR_SHOW_USER_NAME ), FILTER_VALIDATE_BOOLEAN ) ) {
 			$user = $this->getSkinTemplate()->getSkin()->getUser();
-			if ( $user->isLoggedIn() ) {
+			if ( $user->isRegistered() ) {
 				$username = !empty( $user->getRealName() ) ? $user->getRealName() : $user->getName();
 				return '<span class="user-name">' . htmlspecialchars( $username ) . '</span>';
 			}
@@ -187,7 +187,7 @@ protected function getEchoIcons() {
 	protected function getDropdownToggle(): string {
 		$user = $this->getSkinTemplate()->getSkin()->getUser();
 
-		if ( $user->isLoggedIn() ) {
+		if ( $user->isRegistered() ) {
 
 			$toolsClass = 'navbar-userloggedin';
 			$toolsLinkText = $this->getSkinTemplate()->getMsg( 'chameleon-loggedin' )->

diff --git a/tests/phpunit/Unit/Components/NavbarHorizontal/PersonalToolsTest.php b/tests/phpunit/Unit/Components/NavbarHorizontal/PersonalToolsTest.php
@@ -51,7 +51,7 @@ class PersonalToolsTest extends GenericComponentTestCase {
 	 */
 	public function testGetHtml_LoggedInUserHasNewMessages( $domElement ) {
 		$factory = MockupFactory::makeFactory( $this );
-		$factory->set( 'UserIsLoggedIn', true );
+		$factory->set( 'UserIsRegistered', true );
 		$chameleonTemplate = $factory->getChameleonSkinTemplateStub();
 		$chameleonTemplate->data = [ 'newtalk' => 'foo' ];
 
@@ -67,7 +67,7 @@ public function testGetHtml_LoggedInUserHasNewMessages( $domElement ) {
 	 */
 	public function testGetHtml_LoggedInUserHasNoNewMessages( $domElement ) {
 		$factory = MockupFactory::makeFactory( $this );
-		$factory->set( 'UserIsLoggedIn', true );
+		$factory->set( 'UserIsRegistered', true );
 		$chameleonTemplate = $factory->getChameleonSkinTemplateStub();
 		$chameleonTemplate->data = [ 'newtalk' => '' ];
 
@@ -83,7 +83,7 @@ public function testGetHtml_LoggedInUserHasNoNewMessages( $domElement ) {
 	 */
 	public function testGetHtml_LoggedOutUserHasNewMessages( $domElement ) {
 		$factory = MockupFactory::makeFactory( $this );
-		$factory->set( 'UserIsLoggedIn', false );
+		$factory->set( 'UserIsRegistered', false );
 		$chameleonTemplate = $factory->getChameleonSkinTemplateStub();
 		$chameleonTemplate->data = [ 'newtalk' => 'foo' ];
 
@@ -99,7 +99,7 @@ public function testGetHtml_LoggedOutUserHasNewMessages( $domElement ) {
 	 */
 	public function testGetHtml_LoggedOutUserHasNoNewMessages( $domElement ) {
 		$factory = MockupFactory::makeFactory( $this );
-		$factory->set( 'UserIsLoggedIn', false );
+		$factory->set( 'UserIsRegistered', false );
 		$chameleonTemplate = $factory->getChameleonSkinTemplateStub();
 		$chameleonTemplate->data = [ 'newtalk' => '' ];
 

diff --git a/tests/phpunit/Util/MockupFactory.php b/tests/phpunit/Util/MockupFactory.php
@@ -51,7 +51,7 @@ class MockupFactory {
 
 	private $testCase;
 	private $configuration = [
-		'UserIsLoggedIn'      => false,
+		'UserIsRegistered'    => false,
 		'UserEffectiveGroups' => [ '*' ],
 		'UserRights' => [],
 	];
@@ -331,8 +331,8 @@ protected function getUserStub() {
 			->getMock();
 
 		$user->expects( $this->testCase->any() )
-			->method( 'isLoggedIn' )
-			->will( $this->testCase->returnValue( $this->get( 'UserIsLoggedIn', true ) ) );
+			->method( 'isRegistered' )
+			->will( $this->testCase->returnValue( $this->get( 'UserIsRegistered', true ) ) );
 
 		$user->expects( $this->testCase->any() )
 			->method( 'getEffectiveGroups' )