Issue #3324506 by kristiaanvandeneynde, eojthebrave, LOBsTerr: Group...

Issue #3324506 by kristiaanvandeneynde, eojthebrave, LOBsTerr: Group relationship type no longer has a label, leading to PHP warnings all over the place

src/Entity/GroupRelationshipType.php

@@ -4,6 +4,7 @@ namespace Drupal\group\Entity;
 
 use Drupal\Core\Config\Entity\ConfigEntityBundleBase;
 use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\group\Entity\Storage\GroupRelationshipTypeStorageInterface;
 use Drupal\group\Plugin\Group\Relation\GroupRelationTypeManagerInterface;
 
@@ -50,6 +51,8 @@ use Drupal\group\Plugin\Group\Relation\GroupRelationTypeManagerInterface;
  */
 class GroupRelationshipType extends ConfigEntityBundleBase implements GroupRelationshipTypeInterface {
 
+  use StringTranslationTrait;
+
   /**
    * The machine name of the relationship type.
    *
@@ -93,6 +96,16 @@ class GroupRelationshipType extends ConfigEntityBundleBase implements GroupRelat
     return $this->id;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function label() {
+    return $this->t('INTERNAL USE ONLY -- @group_type -- @plugin', [
+      '@group_type' => $this->getGroupType()->label(),
+      '@plugin' => $this->getPlugin()->getPluginDefinition()->getLabel()
+    ]);
+  }
+
   /**
    * {@inheritdoc}
    */

tests/src/Kernel/GroupRelationshipTypeTest.php

@@ -3,6 +3,7 @@
 namespace Drupal\Tests\group\Kernel;
 
 use Drupal\Core\Entity\EntityTypeBundleInfo;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\group\Entity\Storage\GroupRelationshipTypeStorageInterface;
 
 /**
@@ -50,4 +51,24 @@ class GroupRelationshipTypeTest extends GroupKernelTestBase {
     $this->assertSame(['node_type'], array_keys($bundle_info->getBundleInfo('group_config_wrapper')));
   }
 
+  /**
+   * Test that the relationship type label is generated from the plugin label.
+   *
+   * @covers ::label
+   */
+  public function testBundleLabel() {
+    // Create a group type and enable relating users.
+    $group_type = $this->createGroupType();
+
+    $storage = $this->entityTypeManager->getStorage('group_relationship_type');
+    assert($storage instanceof GroupRelationshipTypeStorageInterface);
+    $group_relationship_type = $storage->load($storage->getRelationshipTypeId($group_type->id(), 'group_membership'));
+
+    $group_relation_type = $group_type->getPlugin('group_membership')->getRelationType();
+    $expected = new TranslatableMarkup('INTERNAL USE ONLY -- @group_type -- @plugin', [
+      '@group_type' => $group_type->label(),
+      '@plugin' => $group_relation_type->getLabel(),
+    ]);
+    $this->assertEquals($expected, $group_relationship_type->label());  }
+
 }