Merge "Add temporary users to a 'temp' group, and stop adding them to 'user'"

includes/user/UserGroupManager.php

@@ -291,7 +291,7 @@ class UserGroupManager implements IDBAccessObject {
 		) {
 			$groups = [ '*' ];
 			if ( $this->tempUserConfig->isTempName( $user->getName() ) ) {
-				$groups[] = 'user';
+				$groups[] = 'temp';
 			} elseif ( $user->isRegistered() ) {
 				$groups[] = 'user';
 				if ( $this->tempUserConfig->isEnabled() ) {

languages/i18n/en.json

@@ -1292,6 +1292,7 @@
 	"group": "Group:",
 	"group-user": "Users",
 	"group-named": "Registered users",
+	"group-temp": "Temporary users",
 	"group-autoconfirmed": "Autoconfirmed users",
 	"group-bot": "Bots",
 	"group-sysop": "Administrators",
@@ -1301,6 +1302,7 @@
 	"group-all": "(all)",
 	"group-user-member": "{{GENDER:$1|user}}",
 	"group-named-member": "{{GENDER:$1|registered user}}",
+	"group-temp-member": "{{GENDER:$1|temporary user}}",
 	"group-autoconfirmed-member": "{{GENDER:$1|autoconfirmed user}}",
 	"group-bot-member": "{{GENDER:$1|bot}}",
 	"group-sysop-member": "{{GENDER:$1|administrator}}",
@@ -1309,6 +1311,7 @@
 	"group-suppress-member": "{{GENDER:$1|suppressor}}",
 	"grouppage-user": "{{ns:project}}:Users",
 	"grouppage-named": "{{ns:project}}:Registered users",
+	"grouppage-temp": "{{ns:project}}:Temporary users",
 	"grouppage-autoconfirmed": "{{ns:project}}:Autoconfirmed users",
 	"grouppage-bot": "{{ns:project}}:Bots",
 	"grouppage-sysop": "{{ns:project}}:Administrators",
@@ -3284,6 +3287,7 @@
 	"noscript.css": "/* CSS placed here will affect users with JavaScript disabled */",
 	"group-autoconfirmed.css": "/* CSS placed here will affect autoconfirmed users only */",
 	"group-user.css": "/* CSS placed here will affect registered users only */",
+	"group-temp.css": "/* CSS placed here will affect temporary users only */",
 	"group-bot.css": "/* CSS placed here will affect bots only */",
 	"group-sysop.css": "/* CSS placed here will affect sysops only */",
 	"group-bureaucrat.css": "/* CSS placed here will affect bureaucrats only */",
@@ -3291,6 +3295,7 @@
 	"common.js": "/* Any JavaScript here will be loaded for all users on every page load. */",
 	"group-autoconfirmed.js": "/* Any JavaScript here will be loaded for autoconfirmed users only */",
 	"group-user.js": "/* Any JavaScript here will be loaded for registered users only */",
+	"group-temp.js": "/* Any JavaScript here will be loaded for temporary users only */",
 	"group-bot.js": "/* Any JavaScript here will be loaded for bots only */",
 	"group-sysop.js": "/* Any JavaScript here will be loaded for sysops only */",
 	"group-bureaucrat.js": "/* Any JavaScript here will be loaded for bureaucrats only */",

languages/i18n/qqq.json

@@ -1544,6 +1544,7 @@
 	"group": "{{Identical|Group}}",
 	"group-user": "{{doc-group|user}}\n{{Identical|User}}",
 	"group-named": "{{doc-group|named}}\nThe name of the group that contains regular logged-in users, not including auto-created temporary users.",
+	"group-temp": "{{doc-group|named}}\nThe name of the group that contains auto-created temporary users.",
 	"group-autoconfirmed": "{{doc-group|autoconfirmed}}\nOn Wikimedia sites, autoconfirmed users are users which are older than 4 days. After those 4 days, they have more rights.",
 	"group-bot": "{{doc-group|bot}}\n{{Identical|Bot}}",
 	"group-sysop": "{{doc-group|sysop}}\n{{Identical|Administrator}}",
@@ -1553,6 +1554,7 @@
 	"group-all": "The name of the user group that contains all users, including anonymous users\n\n{{Identical|All}}",
 	"group-user-member": "{{doc-group|user|member}}\n{{Identical|User}}",
 	"group-named-member": "{{doc-group|user|named}}\n{{Identical|User}}",
+	"group-temp-member": "{{doc-group|user|temp}}",
 	"group-autoconfirmed-member": "{{doc-group|autoconfirmed|member}}",
 	"group-bot-member": "{{doc-group|bot|member}}",
 	"group-sysop-member": "{{doc-group|sysop|member}}\n{{Identical|Administrator}}",
@@ -1561,6 +1563,7 @@
 	"group-suppress-member": "{{doc-group|suppress|member}}\nThis is a member of the optional (disabled by default) user group, meant for the [[mw:RevisionDelete|RevisionDelete]] feature, to change the visibility of revisions through [[Special:RevisionDelete]].\n\n{{Identical|Suppress}}",
 	"grouppage-user": "{{doc-group|user|page}}\n{{Identical|User}}",
 	"grouppage-named": "{{doc-group|named|page}}",
+	"grouppage-temp": "{{doc-group|temp|page}}",
 	"grouppage-autoconfirmed": "{{doc-group|autoconfirmed|page}}",
 	"grouppage-bot": "{{doc-group|bot|page}}\n{{Identical|Bot}}",
 	"grouppage-sysop": "{{doc-group|sysop|page}}",
@@ -3536,6 +3539,7 @@
 	"noscript.css": "{{optional}}",
 	"group-autoconfirmed.css": "{{doc-group|autoconfirmed|css}}",
 	"group-user.css": "{{doc-group|user|css}}",
+	"group-temp.css": "{{doc-group|temp|css}}",
 	"group-bot.css": "{{doc-group|bot|css}}",
 	"group-sysop.css": "{{doc-group|sysop|css}}",
 	"group-bureaucrat.css": "{{doc-group|bureaucrat|css}}",
@@ -3543,6 +3547,7 @@
 	"common.js": "{{optional}}\nJS for all users.",
 	"group-autoconfirmed.js": "{{doc-group|autoconfirmed|js}}",
 	"group-user.js": "{{doc-group|user|js}}",
+	"group-temp.js": "{{doc-group|temp|js}}",
 	"group-bot.js": "{{doc-group|bot|js}}",
 	"group-sysop.js": "{{doc-group|sysop|js}}",
 	"group-bureaucrat.js": "{{doc-group|bureaucrat|js}}",

tests/phpunit/includes/Permissions/PermissionManagerTest.php

@@ -431,7 +431,7 @@ class PermissionManagerTest extends MediaWikiLangTestCase {
 			],
 			MainConfigNames::GroupPermissions => [
 				'*' => [ 'edit' => false ],
-				'user' => [ 'edit' => true, 'createpage' => true ],
+				'temp' => [ 'edit' => true, 'createpage' => true ],
 			]
 		] );
 		$services = $this->getServiceContainer();

tests/phpunit/includes/user/UserGroupManagerTest.php

@@ -227,7 +227,7 @@ class UserGroupManagerTest extends MediaWikiIntegrationTestCase {
 		$user = new User;
 		$user->setName( '*Unregistered 1234' );
 		$this->assertArrayEquals(
-			[ '*', 'user' ],
+			[ '*', 'temp' ],
 			$manager->getUserImplicitGroups( $user )
 		);
 	}