Fix user roles

phpstan-baseline.neon

@@ -55,6 +55,11 @@ parameters:
 			count: 1
 			path: src/DB.php
 
+		-
+			message: "#^Plugin definitions cannot be altered\\.$#"
+			count: 1
+			path: src/Entity/EntityTypeManager.php
+
 		-
 			message: "#^Method Retrofit\\\\Drupal\\\\Entity\\\\WrappedConfigEntity\\:\\:__get\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -520,11 +525,6 @@ parameters:
 			count: 1
 			path: src/Theme/HookPreprocess.php
 
-		-
-			message: "#^Method Retrofit\\\\Drupal\\\\User\\\\GlobalUser\\:\\:__get\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/User/GlobalUser.php
-
 		-
 			message: "#^Method Retrofit\\\\Drupal\\\\User\\\\GlobalUser\\:\\:__set\\(\\) has parameter \\$value with no type specified\\.$#"
 			count: 1

src/Entity/EntityTypeManager.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Retrofit\Drupal\Entity;
+
+use Drupal\Core\Entity\EntityTypeInterface;
+
+class EntityTypeManager extends \Drupal\Core\Entity\EntityTypeManager
+{
+    /**
+     * @param EntityTypeInterface[] $definitions
+     */
+    protected function alterDefinitions(&$definitions): void
+    {
+        if (isset($definitions['user_role'])) {
+            $definitions['user_role']->setClass(Role::class);
+        }
+        parent::alterDefinitions($definitions);
+    }
+}

src/Entity/Role.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Retrofit\Drupal\Entity;
+
+use Drupal\user\Entity\Role as CoreRole;
+
+class Role extends CoreRole
+{
+    public function __toString()
+    {
+        return $this->label;
+    }
+
+    public function __set(string $name, string $value): void
+    {
+        match ($name) {
+            'rid' => $this->id = $value,
+            'name' => $this->label = $value,
+            default => null
+        };
+    }
+
+    public function __get(string $name): mixed
+    {
+        return match ($name) {
+            'rid' => $this->id,
+            'name' => $this->label,
+            default => null
+        };
+    }
+
+    public function __isset(string $name): bool
+    {
+        return match ($name) {
+            'rid', 'name' => true,
+            default => false
+        };
+    }
+}

src/Provider.php

@@ -10,6 +10,7 @@
 use Retrofit\Drupal\Asset\RetrofitJsCollectionRenderer;
 use Retrofit\Drupal\Asset\RetrofitLibraryDiscovery;
 use Retrofit\Drupal\Controller\RetrofitTitleResolver;
+use Retrofit\Drupal\Entity\EntityTypeManager;
 use Retrofit\Drupal\Field\FieldTypePluginManager;
 use Retrofit\Drupal\Form\FormBuilder;
 use Retrofit\Drupal\Language\GlobalLanguageSetter;
@@ -151,6 +152,12 @@ public function register(ContainerBuilder $container)
             (new ChildDefinition('path.current'))
             ->setDecoratedService('path.current')
         );
+
+        $container->setDefinition(
+            EntityTypeManager::class,
+            (new ChildDefinition('entity_type.manager'))
+            ->setDecoratedService('entity_type.manager')
+        );
     }
 
     public function alter(ContainerBuilder $container)

src/User/GlobalUser.php

@@ -5,6 +5,7 @@
 namespace Retrofit\Drupal\User;
 
 use Drupal\Core\Session\AccountInterface;
+use Retrofit\Drupal\Entity\Role;
 
 final class GlobalUser implements AccountInterface
 {
@@ -20,16 +21,7 @@ public function id()
 
     public function getRoles($exclude_locked_roles = false)
     {
-        $roles = $this->inner->getRoles($exclude_locked_roles);
-        // Drupal 7 appended `user` to locked roles, so we need to do the same.
-        if (!$exclude_locked_roles) {
-            if ($this->isAuthenticated()) {
-                $roles[] = 'authenticated user';
-            } else {
-                $roles[] = 'anonymous user';
-            }
-        }
-        return $roles;
+        return $this->inner->getRoles($exclude_locked_roles);
     }
 
     public function hasPermission($permission)
@@ -82,10 +74,20 @@ public function getLastAccessedTime()
         return $this->inner->getLastAccessedTime();
     }
 
-    public function __get(string $name)
+    public function __get(string $name): mixed
     {
         return match ($name) {
-            'roles' => $this->getRoles(),
+            'roles' => array_map(
+                fn($role) => match ($role->id()) {
+                    'anonymous',
+                    'authenticated' => strtolower((string) $role->label()),
+                    default => (string) $role->label(),
+                },
+                array_filter(array_map(
+                    [Role::class, 'load'],
+                    array_combine($this->getRoles(), $this->getRoles())
+                ))
+            ),
             'name' => $this->getAccountName(),
             default => null,
         };

src/functions/user.php

@@ -3,6 +3,8 @@
 declare(strict_types=1);
 
 use Drupal\Core\Session\AccountInterface;
+use Drupal\user\RoleInterface;
+use Retrofit\Drupal\Entity\Role;
 
 function user_access(string $string, ?AccountInterface $account = null): bool
 {
@@ -21,3 +23,13 @@ function user_is_logged_in(): bool
 {
     return \Drupal::currentUser()->isAuthenticated();
 }
+
+function user_role_load(string $rid): ?RoleInterface
+{
+    return Role::load($rid);
+}
+
+function user_role_load_by_name(string $role_name): RoleInterface|false
+{
+    return Role::load($role_name) ?? false;
+}

tests/src/Integration/Routing/HookMenuRoutesTest.php

@@ -37,6 +37,7 @@ public function register(ContainerBuilder $container): void
     protected function setUp(): void
     {
         parent::setUp();
+        $this->installConfig(['user']);
         $this->config('system.site')
           ->set('name', 'Drupal')
           ->save();