core/lib/Drupal/Core/Session/AccountProxy.php

@@ -98,6 +98,22 @@ public function getRoles($exclude_locked_roles = FALSE) {
     return $this->getAccount()->getRoles($exclude_locked_roles);
   }
 
+  /**
+   * Whether a user has a certain role.
+   *
+   * @param string $rid
+   *   The role ID to check.
+   *
+   * @return bool
+   *   Returns TRUE if the user has the role, otherwise FALSE.
+   *
+   * @todo in Drupal 11, add method to Drupal\Core\Session\AccountInterface.
+   * @see https://www.drupal.org/node/3228209
+   */
+  public function hasRole(string $rid): bool {
+    return $this->getAccount()->hasRole($rid);
+  }
+
   /**
    * {@inheritdoc}
    */

core/lib/Drupal/Core/Session/UserSession.php

@@ -100,6 +100,22 @@ public function getRoles($exclude_locked_roles = FALSE) {
     return $roles;
   }
 
+  /**
+   * Whether a user has a certain role.
+   *
+   * @param string $rid
+   *   The role ID to check.
+   *
+   * @return bool
+   *   Returns TRUE if the user has the role, otherwise FALSE.
+   *
+   * @todo in Drupal 11, add method to Drupal\Core\Session\AccountInterface.
+   * @see https://www.drupal.org/node/3228209
+   */
+  public function hasRole(string $rid): bool {
+    return in_array($rid, $this->getRoles(), TRUE);
+  }
+
   /**
    * {@inheritdoc}
    */

core/modules/user/src/UserInterface.php

@@ -58,6 +58,9 @@ interface UserInterface extends ContentEntityInterface, EntityChangedInterface,
    *
    * @return bool
    *   Returns TRUE if the user has the role, otherwise FALSE.
+   *
+   * @todo in Drupal 11, move method to Drupal\Core\Session\AccountInterface.
+   * @see https://www.drupal.org/node/3228209
    */
   public function hasRole($rid);
 

core/modules/views/src/Views.php

@@ -284,12 +284,12 @@ public static function getDisabledViews() {
    * @param string $filter
    *   Filters the views on status. Can either be 'all' (default), 'enabled' or
    *   'disabled'
-   * @param mixed $exclude_view
+   * @param \Drupal\views\ViewExecutable|string $exclude_view
    *   View or current display to exclude.
    *   Either a:
-   *   - views object (containing $exclude_view->storage->name and $exclude_view->current_display)
-   *   - views name as string:  e.g. my_view
-   *   - views name and display id (separated by ':'): e.g. my_view:default
+   *   - Views executable object
+   *   - views name, for example 'my_view'
+   *   - views name and display ID separated by ':', for example 'my_view:page'
    * @param bool $optgroup
    *   If TRUE, returns an array with optgroups for each view (will be ignored for
    *   $views_only = TRUE). Can be used by select
@@ -298,7 +298,7 @@ public static function getDisabledViews() {
    *
    * @return array
    *   An associative array for use in select.
-   *   - key: view name and display id separated by ':', or the view name only.
+   *   - key: view name and display ID separated by ':', or the view name only.
    */
   public static function getViewsAsOptions($views_only = FALSE, $filter = 'all', $exclude_view = NULL, $optgroup = FALSE, $sort = FALSE) {
 

core/tests/Drupal/Tests/Core/Session/AccountProxyTest.php

@@ -4,7 +4,9 @@
 
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Session\AccountProxy;
+use Drupal\Core\Session\UserSession;
 use Drupal\Tests\UnitTestCase;
+use Drupal\user\RoleInterface;
 use Prophecy\Argument;
 use Symfony\Contracts\EventDispatcher\Event;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
@@ -49,4 +51,20 @@ public function testSetInitialAccountIdException() {
     $account_proxy->setInitialAccountId(1);
   }
 
+  /**
+   * @covers ::hasRole
+   */
+  public function testHasRole() {
+    $dispatcher = $this->prophesize(EventDispatcherInterface::class);
+    $dispatcher->dispatch(Argument::any(), Argument::any())->willReturn(new Event());
+    $account_proxy = new AccountProxy($dispatcher->reveal());
+    $this->assertTrue($account_proxy->hasRole(RoleInterface::ANONYMOUS_ID));
+
+    $current_user = $this->prophesize(UserSession::class);
+    $current_user->id()->willReturn(2);
+    $current_user->hasRole(RoleInterface::AUTHENTICATED_ID)->willReturn(TRUE);
+    $account_proxy->setAccount($current_user->reveal());
+    $this->assertTrue($account_proxy->hasRole(RoleInterface::AUTHENTICATED_ID));
+  }
+
 }

core/tests/Drupal/Tests/Core/Session/UserSessionTest.php

@@ -162,4 +162,17 @@ public function testUserGetRoles() {
     $this->assertEquals(['role_two'], $this->users['user_three']->getRoles(TRUE));
   }
 
+  /**
+   * Tests the hasRole method.
+   *
+   * @covers ::hasRole
+   */
+  public function testHasRole() {
+    $this->assertTrue($this->users['user_one']->hasRole('role_one'));
+    $this->assertFalse($this->users['user_two']->hasRole('no role'));
+    $this->assertTrue($this->users['user_three']->hasRole(RoleInterface::AUTHENTICATED_ID));
+    $this->assertFalse($this->users['user_three']->hasRole(RoleInterface::ANONYMOUS_ID));
+    $this->assertTrue($this->users['user_last']->hasRole(RoleInterface::ANONYMOUS_ID));
+  }
+
 }