src/Entity/Access/GroupAccessControlHandler.php

@@ -4,6 +4,7 @@ namespace Drupal\group\Entity\Access;
 
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Cache\RefinableCacheableDependencyInterface;
 use Drupal\Core\Entity\EntityAccessControlHandler;
 use Drupal\Core\Entity\EntityHandlerInterface;
 use Drupal\Core\Entity\EntityInterface;
@@ -117,6 +118,7 @@ class GroupAccessControlHandler extends EntityAccessControlHandler implements En
         $access = $access->andIf($this->access($entity, $entity_operation, $account, TRUE));
       }
 
+      assert($access instanceof RefinableCacheableDependencyInterface);
       return $access->addCacheableDependency($cacheability);
     }
 

src/Entity/Access/GroupLatestRevisionCheck.php

@@ -2,12 +2,12 @@
 
 namespace Drupal\group\Entity\Access;
 
-use Drupal\content_moderation\ModerationInformationInterface;
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Routing\Access\AccessInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
+use Drupal\content_moderation\ModerationInformationInterface;
 use Drupal\group\Access\GroupAccessResult;
 use Drupal\group\Entity\GroupInterface;
 use Symfony\Component\Routing\Route;

src/Entity/Access/GroupRelationshipAccessControlHandler.php

@@ -2,10 +2,10 @@
 
 namespace Drupal\group\Entity\Access;
 
-use Drupal\Core\Entity\EntityHandlerInterface;
-use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\EntityAccessControlHandler;
+use Drupal\Core\Entity\EntityHandlerInterface;
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\group\Entity\GroupRelationshipInterface;
 use Drupal\group\Entity\GroupRelationshipTypeInterface;
@@ -55,7 +55,7 @@ class GroupRelationshipAccessControlHandler extends EntityAccessControlHandler i
    * {@inheritdoc}
    */
   protected function checkCreateAccess(AccountInterface $account, array $context, $entity_bundle = NULL) {
-    $relationship_type = $this->entityTypeManager->getStorage('group_content_type')->load($entity_bundle);
+    $relationship_type = $this->entityTypeManager->getStorage('group_relationship_type')->load($entity_bundle);
     assert($relationship_type instanceof GroupRelationshipTypeInterface);
     $access_control = $this->groupRelationTypeManager->getAccessControlHandler($relationship_type->getPluginId());
     return $access_control->relationshipCreateAccess($context['group'], $account, TRUE);

src/Entity/Access/GroupRelationshipTypeAccessControlHandler.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\group\Entity\Access;
 
+use Drupal\Core\Cache\RefinableCacheableDependencyInterface;
 use Drupal\Core\Entity\EntityAccessControlHandler;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Session\AccountInterface;
@@ -19,10 +20,14 @@ class GroupRelationshipTypeAccessControlHandler extends EntityAccessControlHandl
    */
   protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) {
     assert($entity instanceof GroupRelationshipTypeInterface);
+    $access = parent::checkAccess($entity, $operation, $account);
+    assert($access instanceof RefinableCacheableDependencyInterface);
+
     if ($operation == 'delete') {
-      return parent::checkAccess($entity, $operation, $account)->addCacheableDependency($entity);
+      return $access->addCacheableDependency($entity);
     }
-    return parent::checkAccess($entity, $operation, $account);
+
+    return $access;
   }
 
 }

src/Entity/Access/GroupRoleAccessControlHandler.php

@@ -3,6 +3,7 @@
 namespace Drupal\group\Entity\Access;
 
 use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Cache\RefinableCacheableDependencyInterface;
 use Drupal\Core\Entity\EntityAccessControlHandler;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Session\AccountInterface;
@@ -20,9 +21,6 @@ class GroupRoleAccessControlHandler extends EntityAccessControlHandler {
    */
   protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) {
     assert($entity instanceof GroupRoleInterface);
-    if ($operation == 'delete') {
-      return parent::checkAccess($entity, $operation, $account)->addCacheableDependency($entity);
-    }
 
     // Group roles have no 'view' route but may be used in views to show what
     // roles a member has. We therefore allow 'view' access so field formatters
@@ -31,7 +29,14 @@ class GroupRoleAccessControlHandler extends EntityAccessControlHandler {
       return AccessResult::allowed()->addCacheableDependency($entity);
     }
 
-    return parent::checkAccess($entity, $operation, $account);
+    $access = parent::checkAccess($entity, $operation, $account);
+    assert($access instanceof RefinableCacheableDependencyInterface);
+
+    if ($operation == 'delete') {
+      return $access->addCacheableDependency($entity);
+    }
+
+    return $access;
   }
 
 }

src/Entity/Access/GroupTypeAccessControlHandler.php

@@ -3,6 +3,7 @@
 namespace Drupal\group\Entity\Access;
 
 use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Cache\RefinableCacheableDependencyInterface;
 use Drupal\Core\Entity\EntityAccessControlHandler;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Session\AccountInterface;
@@ -20,9 +21,6 @@ class GroupTypeAccessControlHandler extends EntityAccessControlHandler {
    */
   protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) {
     assert($entity instanceof GroupTypeInterface);
-    if ($operation == 'delete') {
-      return parent::checkAccess($entity, $operation, $account)->addCacheableDependency($entity);
-    }
 
     // Group types have no 'view' route but may be used in views to show what
     // type a group is. We therefore allow 'view' access so field formatters
@@ -31,7 +29,14 @@ class GroupTypeAccessControlHandler extends EntityAccessControlHandler {
       return AccessResult::allowed()->addCacheableDependency($entity);
     }
 
-    return parent::checkAccess($entity, $operation, $account);
+    $access = parent::checkAccess($entity, $operation, $account);
+    assert($access instanceof RefinableCacheableDependencyInterface);
+
+    if ($operation == 'delete') {
+      return $access->addCacheableDependency($entity);
+    }
+
+    return $access;
   }
 
 }

src/Entity/Access/QueryAccessHandlerBase.php

@@ -80,15 +80,15 @@ abstract class QueryAccessHandlerBase implements EntityHandlerInterface, QueryAc
   /**
    * {@inheritdoc}
    */
-  public function getConditions($operation, AccountInterface $account = NULL) {
+  public function getConditions($operation, ?AccountInterface $account = NULL) {
     $account = $account ?: $this->currentUser;
     $entity_type_id = $this->entityType->id();
     $conditions = $this->buildConditions($operation, $account);
 
     // Allow other modules to modify the conditions before they are used.
     $event = new QueryAccessEvent($conditions, $operation, $account, $entity_type_id);
-    $this->eventDispatcher->dispatch("entity.query_access", $event);
-    $this->eventDispatcher->dispatch("entity.query_access.{$entity_type_id}", $event);
+    $this->eventDispatcher->dispatch($event, "entity.query_access");
+    $this->eventDispatcher->dispatch($event, "entity.query_access.{$entity_type_id}");
 
     return $conditions;
   }

src/Entity/ConfigWrapper.php

@@ -69,6 +69,7 @@ class ConfigWrapper extends ContentEntityBase implements ConfigWrapperInterface
    * {@inheritdoc}
    */
   public static function bundleFieldDefinitions(EntityTypeInterface $entity_type, $bundle, array $base_field_definitions) {
+    assert($base_field_definitions['entity_id'] instanceof BaseFieldDefinition);
     $fields['entity_id'] = clone $base_field_definitions['entity_id'];
     $fields['entity_id']->setSetting('target_type', $bundle);
     return $fields;

src/Entity/Controller/GroupController.php

@@ -6,8 +6,8 @@ use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Entity\EntityFormBuilderInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Render\RendererInterface;
-use Drupal\group\Entity\GroupTypeInterface;
 use Drupal\Core\TempStore\PrivateTempStoreFactory;
+use Drupal\group\Entity\GroupTypeInterface;
 use Drupal\group\Entity\Storage\GroupRelationshipTypeStorageInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -113,15 +113,16 @@ class GroupController extends ControllerBase {
     }
     // Wizard step 2: Group membership form.
     else {
-      $relationship_type_storage = $this->entityTypeManager()->getStorage('group_content_type');
+      $relationship_type_storage = $this->entityTypeManager()->getStorage('group_relationship_type');
       assert($relationship_type_storage instanceof GroupRelationshipTypeStorageInterface);
 
       // Create an empty group membership that does not yet have a group set.
       $values = [
         'type' => $relationship_type_storage->getRelationshipTypeId($group_type->id(), 'group_membership'),
         'entity_id' => $this->currentUser()->id(),
+        'group_roles' => $group_type->getCreatorRoleIds(),
       ];
-      $entity = $this->entityTypeManager()->getStorage('group_content')->create($values);
+      $entity = $this->entityTypeManager()->getStorage('group_relationship')->create($values);
     }
 
     // Return the entity form with the configuration gathered above.

src/Entity/Controller/GroupListBuilder.php

@@ -104,12 +104,12 @@ class GroupListBuilder extends EntityListBuilder {
       ],
       'type' => [
         'data' => $this->t('Type'),
-        'specifier' =>'type',
+        'specifier' => 'type',
         'field' => 'type',
       ],
       'status' => [
         'data' => $this->t('Status'),
-        'specifier' =>'status',
+        'specifier' => 'status',
         'field' => 'status',
       ],
       'uid' => [
@@ -158,7 +158,7 @@ class GroupListBuilder extends EntityListBuilder {
       $query->pager($this->limit);
     }
 
-    return $query->execute();
+    return $query->accessCheck()->execute();
   }
 
   /**

src/Entity/Controller/GroupRelationshipController.php

@@ -9,9 +9,9 @@ use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Link;
 use Drupal\Core\Render\RendererInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\TempStore\PrivateTempStoreFactory;
 use Drupal\Core\Url;
 use Drupal\group\Entity\GroupInterface;
-use Drupal\Core\TempStore\PrivateTempStoreFactory;
 use Drupal\group\Entity\Storage\GroupRelationshipTypeStorageInterface;
 use Drupal\group\Plugin\Group\Relation\GroupRelationTypeManagerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -121,12 +121,16 @@ class GroupRelationshipController extends ControllerBase {
     }
 
     // Filter out the bundles the user doesn't have access to.
-    $access_control_handler = $this->entityTypeManager->getAccessControlHandler('group_content');
     foreach ($relationship_types as $relationship_type_id => $relationship_type) {
-      $access = $access_control_handler->createAccess($relationship_type_id, NULL, ['group' => $group], TRUE);
+      $access_control_handler = $this->groupRelationTypeManager->getAccessControlHandler($relationship_type->getPluginId());
+      $access = $create_mode
+        ? $access_control_handler->entityCreateAccess($group, $this->currentUser(), TRUE)
+        : $access_control_handler->relationshipCreateAccess($group, $this->currentUser(), TRUE);
+
       if (!$access->isAllowed()) {
         unset($relationship_types[$relationship_type_id]);
       }
+
       $this->renderer->addCacheableDependency($build, $access);
     }
 
@@ -156,7 +160,7 @@ class GroupRelationshipController extends ControllerBase {
     }
 
     // Add the list cache tags for the GroupRelationshipType entity type.
-    $bundle_entity_type = $this->entityTypeManager->getDefinition('group_content_type');
+    $bundle_entity_type = $this->entityTypeManager->getDefinition('group_relationship_type');
     $build['#cache']['tags'] = $bundle_entity_type->getListCacheTags();
 
     return $build;
@@ -180,7 +184,7 @@ class GroupRelationshipController extends ControllerBase {
    * @see ::addPage()
    */
   protected function addPageBundles(GroupInterface $group, $create_mode, $base_plugin_id) {
-    $storage = $this->entityTypeManager->getStorage('group_content_type');
+    $storage = $this->entityTypeManager->getStorage('group_relationship_type');
     assert($storage instanceof GroupRelationshipTypeStorageInterface);
 
     $relationship_types = $storage->loadByGroupType($group->getGroupType());
@@ -188,7 +192,7 @@ class GroupRelationshipController extends ControllerBase {
       $relation = $relationship_type->getPlugin();
 
       // Check the base plugin ID if a plugin filter was specified.
-      if ($base_plugin_id && $relation->getBaseId() === $base_plugin_id) {
+      if ($base_plugin_id && $relation->getBaseId() !== $base_plugin_id) {
         unset($relationship_types[$relationship_type_id]);
       }
       // Skip the bundle if we are listing bundles that allow you to create an
@@ -237,8 +241,8 @@ class GroupRelationshipController extends ControllerBase {
    */
   protected function addPageFormRoute(GroupInterface $group, $create_mode) {
     return $create_mode
-      ? 'entity.group_content.create_form'
-      : 'entity.group_content.add_form';
+      ? 'entity.group_relationship.create_form'
+      : 'entity.group_relationship.add_form';
   }
 
   /**
@@ -253,20 +257,20 @@ class GroupRelationshipController extends ControllerBase {
    *   A group submission form.
    */
   public function addForm(GroupInterface $group, $plugin_id) {
-    $storage = $this->entityTypeManager()->getStorage('group_content_type');
+    $storage = $this->entityTypeManager()->getStorage('group_relationship_type');
     assert($storage instanceof GroupRelationshipTypeStorageInterface);
 
     $values = [
       'type' => $storage->getRelationshipTypeId($group->bundle(), $plugin_id),
       'gid' => $group->id(),
     ];
-    $group_relationship = $this->entityTypeManager()->getStorage('group_content')->create($values);
+    $group_relationship = $this->entityTypeManager()->getStorage('group_relationship')->create($values);
 
     return $this->entityFormBuilder->getForm($group_relationship, 'add');
   }
 
   /**
-   * The _title_callback for the entity.group_content.add_form route.
+   * The _title_callback for the entity.group_relationship.add_form route.
    *
    * @param \Drupal\group\Entity\GroupInterface $group
    *   The group to add the relationship to.
@@ -281,7 +285,7 @@ class GroupRelationshipController extends ControllerBase {
   }
 
   /**
-   * The _title_callback for the entity.group_content.edit_form route.
+   * The _title_callback for the entity.group_relationship.edit_form route.
    *
    * Overrides the Drupal\Core\Entity\Controller\EntityController::editTitle().
    *
@@ -293,14 +297,15 @@ class GroupRelationshipController extends ControllerBase {
    * @return string|null
    *   The title for the entity edit page, if an entity was found.
    */
-  public function editFormTitle(RouteMatchInterface $route_match, EntityInterface $_entity = NULL) {
-    if ($entity = $route_match->getParameter('group_content')) {
+  public function editFormTitle(RouteMatchInterface $route_match, ?EntityInterface $_entity = NULL) {
+    if ($entity = $route_match->getParameter('group_relationship')) {
       return $this->t('Edit %label', ['%label' => $entity->label()]);
     }
+    return NULL;
   }
 
   /**
-   * The _title_callback for the entity.group_content.collection route.
+   * The _title_callback for the entity.group_relationship.collection route.
    *
    * @param \Drupal\group\Entity\GroupInterface $group
    *   The group to add the relationship to.
@@ -369,7 +374,7 @@ class GroupRelationshipController extends ControllerBase {
     }
     // Wizard step 2: Group relationship form.
     else {
-      $relationship_type_storage = $this->entityTypeManager()->getStorage('group_content_type');
+      $relationship_type_storage = $this->entityTypeManager()->getStorage('group_relationship_type');
       assert($relationship_type_storage instanceof GroupRelationshipTypeStorageInterface);
 
       // Create an empty relationship entity.
@@ -377,7 +382,7 @@ class GroupRelationshipController extends ControllerBase {
         'type' => $relationship_type_storage->getRelationshipTypeId($group->bundle(), $plugin_id),
         'gid' => $group->id(),
       ];
-      $entity = $this->entityTypeManager()->getStorage('group_content')->create($values);
+      $entity = $this->entityTypeManager()->getStorage('group_relationship')->create($values);
 
       // Group relationship entities have an add form handler.
       $operation = 'add';
@@ -388,7 +393,7 @@ class GroupRelationshipController extends ControllerBase {
   }
 
   /**
-   * The _title_callback for the entity.group_content.create_form route.
+   * The _title_callback for the entity.group_relationship.create_form route.
    *
    * @param \Drupal\group\Entity\GroupInterface $group
    *   The group to create the relationship for.

src/Entity/Controller/GroupRelationshipListBuilder.php

@@ -28,7 +28,7 @@ class GroupRelationshipListBuilder extends EntityListBuilder {
   /**
    * The entity type manager.
    *
-   * @var \Drupal\Core\Routing\RedirectDestinationInterface
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
    */
   protected $entityTypeManager;
 
@@ -86,7 +86,7 @@ class GroupRelationshipListBuilder extends EntityListBuilder {
       $query->pager($this->limit);
     }
 
-    return $query->execute();
+    return $query->accessCheck()->execute();
   }
 
   /**

src/Entity/Controller/GroupRoleController.php

@@ -9,12 +9,12 @@ use Drupal\Core\Routing\RouteMatchInterface;
 /**
  * Returns responses for GroupRole routes.
  */
-class GroupRoleController extends EntityController  {
+class GroupRoleController extends EntityController {
 
   /**
    * {@inheritdoc}
    */
-  protected function doGetEntity(RouteMatchInterface $route_match, EntityInterface $_entity = NULL) {
+  protected function doGetEntity(RouteMatchInterface $route_match, ?EntityInterface $_entity = NULL) {
     if ($_entity) {
       $entity = $_entity;
     }
@@ -28,6 +28,7 @@ class GroupRoleController extends EntityController  {
     if (isset($entity)) {
       return $this->entityRepository->getTranslationFromContext($entity);
     }
+    return NULL;
   }
 
 }

src/Entity/Controller/GroupRoleListBuilder.php

@@ -2,14 +2,14 @@
 
 namespace Drupal\group\Entity\Controller;
 
-use Drupal\group\Entity\GroupRoleInterface;
-use Drupal\group\Entity\GroupTypeInterface;
-use Drupal\Core\Url;
 use Drupal\Core\Config\Entity\DraggableListBuilder;
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Url;
+use Drupal\group\Entity\GroupRoleInterface;
+use Drupal\group\Entity\GroupTypeInterface;
 use Drupal\group\PermissionScopeInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -23,7 +23,7 @@ class GroupRoleListBuilder extends DraggableListBuilder {
   /**
    * The group type to check for roles.
    *
-   * @var GroupTypeInterface $groupType
+   * @var \Drupal\group\Entity\GroupTypeInterface
    */
   protected $groupType;
 
@@ -70,7 +70,7 @@ class GroupRoleListBuilder extends DraggableListBuilder {
       $query->pager($this->limit);
     }
 
-    return array_values($query->execute());
+    return array_values($query->accessCheck()->execute());
   }
 
   /**
@@ -144,7 +144,7 @@ class GroupRoleListBuilder extends DraggableListBuilder {
 
     $build += parent::render();
     $build['table']['#empty'] = $this->t('No group roles available. <a href="@link">Add group role</a>.', [
-      '@link' => Url::fromRoute('entity.group_role.add_form', ['group_type' => $this->groupType->id()])->toString()
+      '@link' => Url::fromRoute('entity.group_role.add_form', ['group_type' => $this->groupType->id()])->toString(),
     ]);
 
     return $build;

src/Entity/Controller/GroupTypeController.php

@@ -2,12 +2,13 @@
 
 namespace Drupal\group\Entity\Controller;
 
+use Drupal\Core\Controller\ControllerBase;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Extension\ModuleExtensionList;
+use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\group\Entity\GroupTypeInterface;
 use Drupal\group\Plugin\Group\Relation\GroupRelationTypeInterface;
 use Drupal\group\Plugin\Group\Relation\GroupRelationTypeManagerInterface;
-use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -30,9 +31,9 @@ class GroupTypeController extends ControllerBase {
   protected $pluginManager;
 
   /**
-   * The module manager.
+   * The module extension list.
    *
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface
+   * @var \Drupal\Core\Extension\ModuleExtensionList
    */
   protected $moduleHandler;
 
@@ -46,14 +47,18 @@ class GroupTypeController extends ControllerBase {
   /**
    * Constructs a new GroupTypeController.
    *
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler.
+   * @param \Drupal\Core\Extension\ModuleExtensionList|\Drupal\Core\Extension\ModuleHandlerInterface $module_handler
+   *   The module extension list.
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
    *   The entity type manager.
    * @param \Drupal\group\Plugin\Group\Relation\GroupRelationTypeManagerInterface $plugin_manager
    *   The group relation type manager.
    */
-  public function __construct(ModuleHandlerInterface $module_handler, EntityTypeManagerInterface $entity_type_manager, GroupRelationTypeManagerInterface $plugin_manager) {
+  public function __construct(ModuleHandlerInterface|ModuleExtensionList $module_handler, EntityTypeManagerInterface $entity_type_manager, GroupRelationTypeManagerInterface $plugin_manager) {
+    if ($module_handler instanceof ModuleHandlerInterface) {
+      @trigger_error('Calling ' . __METHOD__ . '() with a $module_handler argument as \Drupal\Core\Extension\ModuleHandlerInterface instead of \Drupal\Core\Extension\ModuleExtensionList is deprecated in group:3.3.0 and will be required in group:4.0.0. See https://www.drupal.org/node/3431243', E_USER_DEPRECATED);
+      $module_handler = \Drupal::service('extension.list.module');
+    }
     $this->moduleHandler = $module_handler;
     $this->entityTypeManager = $entity_type_manager;
     $this->pluginManager = $plugin_manager;
@@ -64,7 +69,7 @@ class GroupTypeController extends ControllerBase {
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('module_handler'),
+      $container->get('extension.list.module'),
       $container->get('entity_type.manager'),
       $container->get('group_relation_type.manager')
     );
@@ -97,7 +102,7 @@ class GroupTypeController extends ControllerBase {
       '#title' => $this->t('Information about content plugins'),
     ];
 
-    $page['information']['intro']['#markup'] = $this->t('<p>In order to be able to add entities as content to groups of this group type, a so-called content plugin needs to be installed. This plugin informs the Group module on how the entity type can be added to a group, what rules apply and whether it should control access over said entity type. When a plugin is installed, you should check out its configuration form to see what options are available to further customize the plugin behavior.</p>');
+    $page['information']['intro']['#markup'] = $this->t('<p>In order to be able to relate entities to groups of this group type, a so-called relation plugin needs to be installed. This plugin informs the Group module on how the entity type can be added to a group, what rules apply and whether it should control access over said entity type. When a plugin is installed, you should check out its configuration form to see what options are available to further customize the plugin behavior.</p>');
     $page['information']['fields']['#markup'] = $this->t('<p>Should you choose to show the relationship entities that track which entity belongs to which group or should the module that provided the module enforce this, you can control which fields are available on that relation entity and how they are presented in the front-end.</p>');
     $page['information']['install_types'] = [
       '#theme' => 'item_list',
@@ -164,10 +169,10 @@ class GroupTypeController extends ControllerBase {
         ],
       ],
       'provider' => [
-        '#markup' => $this->moduleHandler->getName($group_relation_type->getProvider())
+        '#markup' => $this->moduleHandler->getName($group_relation_type->getProvider()),
       ],
       'entity_type_id' => [
-        '#markup' => $this->entityTypeManager->getDefinition($group_relation_type->getEntityTypeId())->getLabel()
+        '#markup' => $this->entityTypeManager->getDefinition($group_relation_type->getEntityTypeId())->getLabel(),
       ],
       'status' => ['#markup' => $status],
       'install_type' => ['#markup' => $install_type],

src/Entity/Controller/GroupTypeListBuilder.php

@@ -3,8 +3,8 @@
 namespace Drupal\group\Entity\Controller;
 
 use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
-use Drupal\Core\Url;
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Url;
 use Drupal\group\Entity\GroupTypeInterface;
 
 /**
@@ -83,7 +83,7 @@ class GroupTypeListBuilder extends ConfigEntityListBuilder {
   public function render() {
     $build = parent::render();
     $build['table']['#empty'] = $this->t('No group types available. <a href="@link">Add group type</a>.', [
-      '@link' => Url::fromRoute('entity.group_type.add_form')->toString()
+      '@link' => Url::fromRoute('entity.group_type.add_form')->toString(),
     ]);
     return $build;
   }

src/Entity/Form/GroupForm.php

@@ -4,7 +4,6 @@ namespace Drupal\group\Entity\Form;
 
 use Drupal\Core\Entity\ContentEntityForm;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\group\Entity\GroupInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -14,6 +13,13 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  */
 class GroupForm extends ContentEntityForm {
 
+  /**
+   * The entity being used by this form.
+   *
+   * @var \Drupal\group\Entity\GroupInterface
+   */
+  protected $entity;
+
   /**
    * The private store factory.
    *
@@ -36,9 +42,7 @@ class GroupForm extends ContentEntityForm {
   protected function actions(array $form, FormStateInterface $form_state) {
     $actions = parent::actions($form, $form_state);
 
-    $group = $this->getEntity();
-    assert($group instanceof GroupInterface);
-    $group_type = $group->getGroupType();
+    $group_type = $this->entity->getGroupType();
     $replace = ['@group_type' => $group_type->label()];
 
     // We need to adjust the actions when using the group creator wizard.
@@ -49,12 +53,12 @@ class GroupForm extends ContentEntityForm {
         // until the end of the wizard to save.
         $actions['submit']['#submit'] = ['::submitForm', '::store'];
 
-        // Update the label to be more user friendly by indicating that the user
+        // Update the label to be more user-friendly by indicating that the user
         // needs to go through an extra step to finish the group creation.
         $actions['submit']['#value'] = $this->t('Create @group_type and complete your membership', $replace);
 
         // Add a cancel button to clear the private temp store. This exits the
-        // wizard without saving,
+        // wizard without saving.
         $actions['cancel'] = [
           '#type' => 'submit',
           '#value' => $this->t('Cancel'),

src/Entity/Form/GroupRelationshipDeleteForm.php

@@ -34,15 +34,16 @@ class GroupRelationshipDeleteForm extends ContentEntityConfirmFormBase {
   /**
    * {@inheritdoc}
    */
+  // phpcs:ignore
   public function getCancelURL() {
     $group_relationship = $this->getEntity();
     assert($group_relationship instanceof GroupRelationshipInterface);
     $group = $group_relationship->getGroup();
     $route_params = [
       'group' => $group->id(),
-      'group_content' => $group_relationship->id(),
+      'group_relationship' => $group_relationship->id(),
     ];
-    return new Url('entity.group_content.canonical', $route_params);
+    return new Url('entity.group_relationship.canonical', $route_params);
   }
 
   /**
@@ -61,7 +62,7 @@ class GroupRelationshipDeleteForm extends ContentEntityConfirmFormBase {
     $group = $group_relationship->getGroup();
     $group_relationship->delete();
 
-    \Drupal::logger('group_content')->notice('@type: deleted %title.', [
+    \Drupal::logger('group_relationship')->notice('@type: deleted %title.', [
       '@type' => $group_relationship->bundle(),
       '%title' => $group_relationship->label(),
     ]);

src/Entity/Form/GroupRelationshipForm.php

@@ -4,7 +4,6 @@ namespace Drupal\group\Entity\Form;
 
 use Drupal\Core\Entity\ContentEntityForm;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\group\Entity\GroupRelationshipInterface;
 use Drupal\group\Entity\Storage\ConfigWrapperStorageInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -15,6 +14,13 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  */
 class GroupRelationshipForm extends ContentEntityForm {
 
+  /**
+   * The entity being used by this form.
+   *
+   * @var \Drupal\group\Entity\GroupRelationshipInterface
+   */
+  protected $entity;
+
   /**
    * The private store factory.
    *
@@ -38,9 +44,7 @@ class GroupRelationshipForm extends ContentEntityForm {
    *   The responsible group relation.
    */
   protected function getPlugin() {
-    $group_relationship = $this->getEntity();
-    assert($group_relationship instanceof GroupRelationshipInterface);
-    return $group_relationship->getPlugin();
+    return $this->entity->getPlugin();
   }
 
   /**
@@ -88,7 +92,7 @@ class GroupRelationshipForm extends ContentEntityForm {
           $entity_type = $this->entityTypeManager->getDefinition($entity_type_id);
           $replace = [
             '@entity_type' => $entity_type->getSingularLabel(),
-            '@group' => $this->getEntity()->getGroup()->label(),
+            '@group' => $this->entity->getGroup()->label(),
           ];
           $actions['submit']['#value'] = $this->t('Add new @entity_type to @group', $replace);
         }
@@ -108,21 +112,18 @@ class GroupRelationshipForm extends ContentEntityForm {
   public function save(array $form, FormStateInterface $form_state) {
     $return = parent::save($form, $form_state);
 
-    $group_relationship = $this->getEntity();
-    assert($group_relationship instanceof GroupRelationshipInterface);
-
     // The below redirect ensures the user will be redirected to something they
     // can view in the following order: The relationship, the target entity
     // itself, the group and finally the front page. This only applies if there
     // was no destination GET parameter set in the URL.
-    if ($group_relationship->access('view')) {
-      $form_state->setRedirectUrl($group_relationship->toUrl());
+    if ($this->entity->access('view')) {
+      $form_state->setRedirectUrl($this->entity->toUrl());
     }
-    elseif ($group_relationship->getEntity()->access('view')) {
-      $form_state->setRedirectUrl($group_relationship->getEntity()->toUrl());
+    elseif ($this->entity->getEntity()->access('view')) {
+      $form_state->setRedirectUrl($this->entity->getEntity()->toUrl());
     }
-    elseif ($group_relationship->getGroup()->access('view')) {
-      $form_state->setRedirectUrl($group_relationship->getGroup()->toUrl());
+    elseif ($this->entity->getGroup()->access('view')) {
+      $form_state->setRedirectUrl($this->entity->getGroup()->toUrl());
     }
     else {
       $form_state->setRedirect('<front>');

src/Entity/Form/GroupRelationshipTypeDeleteForm.php

@@ -61,7 +61,7 @@ class GroupRelationshipTypeDeleteForm extends EntityDeleteForm {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $entity_count = $this->entityTypeManager->getStorage('group_content')
+    $entity_count = $this->entityTypeManager->getStorage('group_relationship')
       ->getQuery()
       ->accessCheck(FALSE)
       ->condition('type', $this->entity->id())
@@ -71,7 +71,7 @@ class GroupRelationshipTypeDeleteForm extends EntityDeleteForm {
     if (!empty($entity_count)) {
       $form['#title'] = $this->getQuestion();
       $form['description'] = [
-        '#markup' => '<p>' . $this->t('You can not uninstall this content plugin until you have removed all of the content that uses it.') . '</p>'
+        '#markup' => '<p>' . $this->t('You can not uninstall this content plugin until you have removed all of the content that uses it.') . '</p>',
       ];
 
       return $form;
@@ -90,7 +90,7 @@ class GroupRelationshipTypeDeleteForm extends EntityDeleteForm {
     $group_relation_type = $relationship_type->getPlugin()->getRelationType();
 
     $relationship_type->delete();
-    \Drupal::logger('group_content_type')->notice('Uninstalled %plugin from %group_type.', [
+    \Drupal::logger('group_relationship_type')->notice('Uninstalled %plugin from %group_type.', [
       '%plugin' => $group_relation_type->getLabel(),
       '%group_type' => $group_type->label(),
     ]);