From 35f7400eb8af65c8ed34239ddd8310c1d6cf071e Mon Sep 17 00:00:00 2001
From: megachriz <megachriz@hotmail.com>
Date: Fri, 29 Sep 2017 12:32:24 +0200
Subject: [PATCH 1/2] issue #152: Fixed
 EventType::getIdentityTypeEntityFormMode() should return a form mode string.

---
 src/Entity/EventType.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Entity/EventType.php b/src/Entity/EventType.php
index 7b0abaa..a8a412b 100644
--- a/src/Entity/EventType.php
+++ b/src/Entity/EventType.php
@@ -211,7 +211,7 @@ public function setIdentityTypeCreate($entity_type, $bundle, $enabled) {
    */
   public function getIdentityTypeEntityFormMode($entity_type, $bundle) {
     $key = $this->getIdentityTypeKey($entity_type, $bundle);
-    return !empty($this->people_types[$key]['entity_form_mode']);
+    return !empty($this->people_types[$key]['entity_form_mode']) ? $this->people_types[$key]['entity_form_mode'] : 'default';
   }
 
   /**

From a5c77ce16ee6ea75850ec30a3cf614d4fcab21b1 Mon Sep 17 00:00:00 2001
From: megachriz <megachriz@hotmail.com>
Date: Mon, 2 Oct 2017 10:57:39 +0200
Subject: [PATCH 2/2] Issue: #152: added automated test for
 EventType::getIdentityTypeEntityFormMode().

---
 tests/src/Kernel/RngEventTypeEntityTest.php | 35 +++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/tests/src/Kernel/RngEventTypeEntityTest.php b/tests/src/Kernel/RngEventTypeEntityTest.php
index 52c0e73..f971a71 100644
--- a/tests/src/Kernel/RngEventTypeEntityTest.php
+++ b/tests/src/Kernel/RngEventTypeEntityTest.php
@@ -13,6 +13,41 @@
  */
 class RngEventTypeEntityTest extends RngKernelTestBase {
 
+  /**
+   * Tests getting a single identity type form mode.
+   *
+   * @covers ::getIdentityTypeEntityFormMode
+   */
+  public function testGetIdentityTypeEntityFormMode() {
+    $people_type = [
+      'entity_type' => $this->randomMachineName(),
+      'bundle' => $this->randomMachineName(),
+      'entity_form_mode' => $this->randomMachineName(),
+    ];
+    $values['people_types'][] = $people_type;
+    $event_type = $this->createEventTypeBase($values);
+
+    $result = $event_type->getIdentityTypeEntityFormMode($people_type['entity_type'], $people_type['bundle']);
+    $this->assertEquals($people_type['entity_form_mode'], $result);
+  }
+
+  /**
+   * Tests getting a single identity type form mode when no defaults set.
+   *
+   * @covers ::getIdentityTypeEntityFormMode
+   */
+  public function testGetIdentityTypeEntityFormModeNoDefaults() {
+    $people_type = [
+      'entity_type' => $this->randomMachineName(),
+      'bundle' => $this->randomMachineName(),
+    ];
+    $values['people_types'][] = $people_type;
+    $event_type = $this->createEventTypeBase($values);
+
+    $result = $event_type->getIdentityTypeEntityFormMode($people_type['entity_type'], $people_type['bundle']);
+    $this->assertEquals('default', $result);
+  }
+
   /**
    * Test getting all identity type form modes.
    *