tests/modules/subgroup_test_events/src/EventSubscriber/LeafEventsSubscriber.php

@@ -15,7 +15,7 @@ class LeafEventsSubscriber implements EventSubscriberInterface {
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents() {
+  public static function getSubscribedEvents(): array {
     $events[LeafEvents::GROUP_LEAF_ADD] = 'onAddGroupLeaf';
     $events[LeafEvents::GROUP_LEAF_REMOVE] = 'onRemoveGroupLeaf';
     $events[LeafEvents::GROUP_TYPE_LEAF_ADD] = 'onAddGroupTypeLeaf';

tests/modules/subgroup_test_events/subgroup_test_events.info.yml

@@ -2,6 +2,6 @@ name: 'Subgroup event tests'
 description: 'Support module for Subgroup event tests.'
 package: 'Testing'
 type: 'module'
-core_version_requirement: ^8.8 || ^9
+core_version_requirement: ^9.5 || ^10
 dependencies:
   - 'subgroup:subgroup'

tests/modules/subgroup_test_views/subgroup_test_views.info.yml

@@ -2,7 +2,7 @@ name: 'Subgroup test views'
 description: 'Provides default views for Subgroup views tests.'
 package: 'Testing'
 type: 'module'
-core_version_requirement: ^8.8 || ^9
+core_version_requirement: ^9.5 || ^10
 dependencies:
   - 'group:group'
   - 'subgroup:subgroup'

tests/src/Kernel/GroupCreateTest.php

@@ -21,7 +21,7 @@ class GroupCreateTest extends SubgroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->accessControlHandler = $this->entityTypeManager->getAccessControlHandler('group');
@@ -31,7 +31,7 @@ class GroupCreateTest extends SubgroupKernelTestBase {
     $bar = $this->createGroupType(['id' => 'bar']);
 
     // Grant create access for the current user.
-    $this->setCurrentUser($this->createUser([], ['create foo group', 'create bar group']));
+    $this->setCurrentUser($this->createUser(['create foo group', 'create bar group']));
 
     /** @var \Drupal\subgroup\Entity\GroupTypeSubgroupHandler $group_type_handler */
     $group_type_handler = $this->entityTypeManager->getHandler('group_type', 'subgroup');
@@ -44,7 +44,7 @@ class GroupCreateTest extends SubgroupKernelTestBase {
    */
   public function testRegularCreateAccess() {
     $this->createGroupType(['id' => 'baz']);
-    $this->setCurrentUser($this->createUser([], ['create baz group']));
+    $this->setCurrentUser($this->createUser(['create baz group']));
     $this->assertTrue($this->accessControlHandler->createAccess('baz'), 'Group can be created just fine.');
   }
 

tests/src/Kernel/GroupDeleteTest.php

@@ -24,7 +24,7 @@ class GroupDeleteTest extends SubgroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->subgroupHandler = $this->entityTypeManager->getHandler('group', 'subgroup');
@@ -130,9 +130,10 @@ class GroupDeleteTest extends SubgroupKernelTestBase {
     $parent = $this->createGroup(['type' => 'foo']);
     $child = $this->createGroup(['type' => 'bar']);
 
-    // We deliberately do not use $parent->addRelationship() here because that would
-    // create a GroupRelationship entity for the relation and we want to test that
-    // the handler also has protection against deleting leaves with descendants.
+    // We deliberately do not use $parent->addRelationship() here because that
+    // would create a GroupRelationship entity for the relation and we want to
+    // test that the handler also has protection against deleting leaves with
+    // descendants.
     $this->subgroupHandler->initTree($parent);
     $this->subgroupHandler->addLeaf($parent, $child);
 

tests/src/Kernel/GroupLeafTest.php

@@ -23,7 +23,7 @@ class GroupLeafTest extends SubgroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $group_type = $this->createGroupType();

tests/src/Kernel/GroupRelationshipDeleteTest.php

@@ -31,10 +31,10 @@ class GroupRelationshipDeleteTest extends SubgroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->subgroupHandler = $this->entityTypeManager->getHandler('group_type', 'subgroup');
-    $this->storage = $this->entityTypeManager->getStorage('group_content');
+    $this->storage = $this->entityTypeManager->getStorage('group_relationship');
   }
 
   /**

tests/src/Kernel/GroupRelationshipInsertTest.php

@@ -33,11 +33,11 @@ class GroupRelationshipInsertTest extends SubgroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->groupSubgroupHandler = $this->entityTypeManager->getHandler('group', 'subgroup');
     $this->groupTypeSubgroupHandler = $this->entityTypeManager->getHandler('group_type', 'subgroup');
-    $this->storage = $this->entityTypeManager->getStorage('group_content');
+    $this->storage = $this->entityTypeManager->getStorage('group_relationship');
   }
 
   /**

tests/src/Kernel/GroupSubgroupHandlerTest.php

@@ -87,7 +87,7 @@ class GroupSubgroupHandlerTest extends SubgroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->subgroupHandler = $this->entityTypeManager->getHandler('group', 'subgroup');
 
@@ -428,7 +428,13 @@ class GroupSubgroupHandlerTest extends SubgroupKernelTestBase {
   public function testGetDescendants() {
     $descendants = $this->subgroupHandler->getDescendants($this->groupRoot);
     $this->assertCount(5, $descendants);
-    $this->assertEquals([$this->groupChildLeft->id(), $this->groupGrandchildLeft->id(), $this->groupChildMiddle->id(), $this->groupChildRight->id(), $this->groupGrandchildRight->id()], array_keys($descendants));
+    $this->assertEquals([
+      $this->groupChildLeft->id(),
+      $this->groupGrandchildLeft->id(),
+      $this->groupChildMiddle->id(),
+      $this->groupChildRight->id(),
+      $this->groupGrandchildRight->id(),
+    ], array_keys($descendants));
 
     $descendants = $this->subgroupHandler->getDescendants($this->groupChildLeft);
     $this->assertCount(1, $descendants);

tests/src/Kernel/GroupTypeDeleteTest.php

@@ -22,13 +22,13 @@ class GroupTypeDeleteTest extends SubgroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->subgroupHandler = $this->entityTypeManager->getHandler('group_type', 'subgroup');
 
     // Grant delete access for the current user.
-    $this->setCurrentUser($this->createUser([], ['administer group']));
+    $this->setCurrentUser($this->createUser(['administer group']));
   }
 
   /**

tests/src/Kernel/GroupTypeLeafImportTest.php

@@ -21,7 +21,7 @@ class GroupTypeLeafImportTest extends SubgroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     // The system.site key is required for import validation.
@@ -47,7 +47,7 @@ class GroupTypeLeafImportTest extends SubgroupKernelTestBase {
     $file_system = $this->container->get('file_system');
     $file_system->copy("$test_dir/group.type.parent.yml", "$sync_dir/group.type.parent.yml");
     $file_system->copy("$test_dir/group.type.child.yml", "$sync_dir/group.type.child.yml");
-    $file_system->copy("$test_dir/group.content_type.parent-subgroup-child.yml", "$sync_dir/group.content_type.parent-subgroup-child.yml");
+    $file_system->copy("$test_dir/group.relationship_type.parent-subgroup-child.yml", "$sync_dir/group.relationship_type.parent-subgroup-child.yml");
 
     // Import the content of the sync directory.
     $this->configImporter()->import();
@@ -58,7 +58,7 @@ class GroupTypeLeafImportTest extends SubgroupKernelTestBase {
     $this->assertNotNull($storage->load('child'), 'Child group type was loaded successfully.');
 
     // Check that the group relationship type was created.
-    $storage = $this->entityTypeManager->getStorage('group_content_type');
+    $storage = $this->entityTypeManager->getStorage('group_relationship_type');
     $this->assertNotNull($storage->load('parent-subgroup-child'), 'Group content type was loaded successfully.');
 
     // Check that subgroup plugin definitions were updated.

tests/src/Kernel/GroupTypeLeafTest.php

@@ -23,7 +23,7 @@ class GroupTypeLeafTest extends SubgroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $group_type = $this->createGroupType([
       'third_party_settings' => [

tests/src/Kernel/GroupTypeSubgroupHandlerTest.php

@@ -64,7 +64,7 @@ class GroupTypeSubgroupHandlerTest extends SubgroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->subgroupHandler = $this->entityTypeManager->getHandler('group_type', 'subgroup');
 
@@ -195,7 +195,7 @@ class GroupTypeSubgroupHandlerTest extends SubgroupKernelTestBase {
     $plugin_manager = $this->container->get('group_relation_type.manager');
 
     /** @var \Drupal\group\Entity\Storage\GroupRelationshipTypeStorageInterface $storage */
-    $storage = $this->entityTypeManager->getStorage('group_content_type');
+    $storage = $this->entityTypeManager->getStorage('group_relationship_type');
 
     $this->assertNull($plugin_manager->getDefinition('subgroup:grandchild_middle', FALSE), 'No plugin exists yet before adding the group type as a leaf.');
     $installed = $storage->loadByPluginId('subgroup:grandchild_middle');
@@ -310,7 +310,7 @@ class GroupTypeSubgroupHandlerTest extends SubgroupKernelTestBase {
     $plugin_manager = $this->container->get('group_relation_type.manager');
 
     /** @var \Drupal\group\Entity\Storage\GroupRelationshipTypeStorageInterface $storage */
-    $storage = $this->entityTypeManager->getStorage('group_content_type');
+    $storage = $this->entityTypeManager->getStorage('group_relationship_type');
 
     $this->assertNull($plugin_manager->getDefinition('subgroup:grandchild_middle', FALSE), 'No plugin exists any more after removing the group type as a leaf.');
     $installed = $storage->loadByPluginId('subgroup:grandchild_middle');
@@ -433,7 +433,11 @@ class GroupTypeSubgroupHandlerTest extends SubgroupKernelTestBase {
   public function testGetChildren() {
     $children = $this->subgroupHandler->getChildren($this->groupTypeRoot);
     $this->assertCount(3, $children);
-    $this->assertEquals([$this->groupTypeChildLeft->id(), $this->groupTypeChildMiddle->id(), $this->groupTypeChildRight->id()], array_keys($children));
+    $this->assertEquals([
+      $this->groupTypeChildLeft->id(),
+      $this->groupTypeChildMiddle->id(),
+      $this->groupTypeChildRight->id(),
+    ], array_keys($children));
 
     $children = $this->subgroupHandler->getChildren($this->groupTypeChildLeft);
     $this->assertCount(1, $children);
@@ -461,7 +465,13 @@ class GroupTypeSubgroupHandlerTest extends SubgroupKernelTestBase {
   public function testGetDescendants() {
     $descendants = $this->subgroupHandler->getDescendants($this->groupTypeRoot);
     $this->assertCount(5, $descendants);
-    $this->assertEquals([$this->groupTypeChildLeft->id(), $this->groupTypeGrandchildLeft->id(), $this->groupTypeChildMiddle->id(), $this->groupTypeChildRight->id(), $this->groupTypeGrandchildRight->id()], array_keys($descendants));
+    $this->assertEquals([
+      $this->groupTypeChildLeft->id(),
+      $this->groupTypeGrandchildLeft->id(),
+      $this->groupTypeChildMiddle->id(),
+      $this->groupTypeChildRight->id(),
+      $this->groupTypeGrandchildRight->id(),
+    ], array_keys($descendants));
 
     $descendants = $this->subgroupHandler->getDescendants($this->groupTypeChildLeft);
     $this->assertCount(1, $descendants);

tests/src/Kernel/GroupViewTest.php

@@ -19,12 +19,12 @@ class GroupViewTest extends SubgroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['subgroup_test_views', 'views'];
+  protected static $modules = ['subgroup_test_views', 'views'];
 
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->installConfig('subgroup_test_views');
@@ -122,7 +122,7 @@ class GroupViewTest extends SubgroupKernelTestBase {
    *   The message for the assertion.
    */
   protected function assertQueryAccessResult(array $expected, $message) {
-    $ids = $this->groupStorage->getQuery()->execute();
+    $ids = $this->groupStorage->getQuery()->accessCheck(TRUE)->execute();
     $this->assertEqualsCanonicalizing($expected, array_keys($ids), $message);
 
     $views_expected = [];

tests/src/Kernel/InheritedGroupPermissionCalculatorTest.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\subgroup\Kernel;
 
+use Drupal\group\Entity\GroupRoleInterface;
 use Drupal\group\PermissionScopeInterface;
 use Drupal\user\RoleInterface;
 
@@ -22,7 +23,7 @@ class InheritedGroupPermissionCalculatorTest extends SubgroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     // Set up some group types to form a tree.
@@ -233,7 +234,7 @@ class InheritedGroupPermissionCalculatorTest extends SubgroupKernelTestBase {
     // This might seem out of place, but it's to circumvent an annoying core
     // issue where entity reference fields become stale.
     // @see https://www.drupal.org/project/drupal/issues/3154443.
-    $this->entityTypeManager->getStorage('group_content')->resetCache();
+    $this->entityTypeManager->getStorage('group_relationship')->resetCache();
 
     $this->assertTrue($group_gt1->hasPermission('view group', $this->account), 'Regular permissions still apply.');
     $this->assertTrue($group_gt2->hasPermission('view group', $this->account), 'Account inherited member role from parent group.');
@@ -266,7 +267,7 @@ class InheritedGroupPermissionCalculatorTest extends SubgroupKernelTestBase {
     // This might seem out of place, but it's to circumvent an annoying core
     // issue where entity reference fields become stale.
     // @see https://www.drupal.org/project/drupal/issues/3154443.
-    $this->entityTypeManager->getStorage('group_content')->resetCache();
+    $this->entityTypeManager->getStorage('group_relationship')->resetCache();
 
     $this->assertTrue($group_gt1->hasPermission('view group', $this->account), 'Regular permissions still apply.');
     $this->assertTrue($group_gt2->hasPermission('view group', $this->account), 'Account inherited member role from parent group.');
@@ -299,9 +300,8 @@ class InheritedGroupPermissionCalculatorTest extends SubgroupKernelTestBase {
     $this->assertTrue($group_gt1->hasPermission('view group', $this->account), 'Regular permissions still apply.');
     $this->assertFalse($group_gt2->hasPermission('view group', $this->account), 'Regular permissions still apply.');
 
-    $membership = $group_gt1->getMember($this->account)->getGroupRelationship();
-    $membership->group_roles[] = 'gt1-viewer';
-    $membership->save();
+    $membership = $group_gt1->getMember($this->account);
+    $membership->addRole('gt1-viewer');
 
     $this->assertTrue($group_gt1->hasPermission('view group', $this->account), 'Regular permissions still apply.');
     $this->assertTrue($group_gt2->hasPermission('view group', $this->account), 'Account inherited member role from parent group.');
@@ -327,7 +327,9 @@ class InheritedGroupPermissionCalculatorTest extends SubgroupKernelTestBase {
     $this->assertTrue($group_gt2->hasPermission('view group', $this->account), 'Account inherited member role from parent group.');
 
     $storage = $this->entityTypeManager->getStorage('group_role');
-    $storage->save($storage->load('gt2-member')->revokePermission('view group'));
+    $group_role = $storage->load('gt2-member');
+    assert($group_role instanceof GroupRoleInterface);
+    $storage->save($group_role->revokePermission('view group'));
 
     $this->assertTrue($group_gt1->hasPermission('view group', $this->account), 'Regular permissions still apply.');
     $this->assertFalse($group_gt2->hasPermission('view group', $this->account), 'Account inherited member role from parent group, but permission was revoked.');

tests/src/Kernel/LeafEventsTest.php

@@ -14,7 +14,7 @@ class LeafEventsTest extends SubgroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['subgroup_test_events'];
+  protected static $modules = ['subgroup_test_events'];
 
   /**
    * Tests whether the group update hook dispatches events.

tests/src/Kernel/RoleInheritanceAccessControlHandlerTest.php

@@ -31,7 +31,7 @@ class RoleInheritanceAccessControlHandlerTest extends SubgroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->accessControlHandler = $this->entityTypeManager->getAccessControlHandler('subgroup_role_inheritance');
@@ -65,7 +65,7 @@ class RoleInheritanceAccessControlHandlerTest extends SubgroupKernelTestBase {
   public function testCreateAccess() {
     $access = $this->accessControlHandler->createAccess(NULL, NULL, [], TRUE);
     $this->assertFalse($access->isAllowed());
-    $this->setCurrentUser($this->createUser([], ['administer subgroup']));
+    $this->setCurrentUser($this->createUser(['administer subgroup']));
     $access = $this->accessControlHandler->createAccess(NULL, NULL, [], TRUE);
     $this->assertTrue($access->isAllowed());
   }
@@ -81,7 +81,7 @@ class RoleInheritanceAccessControlHandlerTest extends SubgroupKernelTestBase {
     $this->assertInstanceOf(AccessResultForbidden::class, $access, 'Group create access check returned an AccessResultForbidden.');
     $this->assertEquals('Role inheritance entities may not be updated after creation.', $access->getReason());
 
-    $this->setCurrentUser($this->createUser([], ['administer subgroup']));
+    $this->setCurrentUser($this->createUser(['administer subgroup']));
     $access = $this->accessControlHandler->access($this->roleInheritance, 'update', NULL, TRUE);
     $this->assertInstanceOf(AccessResultForbidden::class, $access, 'Group create access check returned an AccessResultForbidden.');
     $this->assertEquals('Role inheritance entities may not be updated after creation.', $access->getReason());
@@ -96,7 +96,7 @@ class RoleInheritanceAccessControlHandlerTest extends SubgroupKernelTestBase {
     $access = $this->accessControlHandler->access($this->roleInheritance, 'delete', NULL, TRUE);
     $this->assertFalse($access->isAllowed());
 
-    $this->setCurrentUser($this->createUser([], ['administer subgroup']));
+    $this->setCurrentUser($this->createUser(['administer subgroup']));
     $access = $this->accessControlHandler->access($this->roleInheritance, 'delete', NULL, TRUE);
     $this->assertTrue($access->isAllowed());
   }

tests/src/Kernel/RoleInheritanceStorageTest.php

@@ -41,7 +41,7 @@ class RoleInheritanceStorageTest extends SubgroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     // Set up two group types to form a tree.

tests/src/Kernel/RoleInheritanceTest.php

@@ -24,7 +24,7 @@ class RoleInheritanceTest extends SubgroupKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     // Set up two group types to form a tree.