Issue #3054317 by iuana, yogeshmpawar, Berdir: Move...

Issue #3054317 by iuana, yogeshmpawar, Berdir: Move FieldLayoutEntityFormDisplay::getDefaultRegion() and FieldLayoutEntityViewDisplay::getDefaultRegion() to FieldLayoutEntityDisplayTrait

core/modules/field_layout/src/Entity/FieldLayoutEntityDisplayTrait.php

@@ -151,4 +151,11 @@ public function calculateDependencies() {
     return $this;
   }
 
+  /**
+   * Implements \Drupal\field_layout\Display\EntityDisplayWithLayoutInterface::getDefaultRegion().
+   */
+  public function getDefaultRegion() {
+    return $this->getLayoutDefinition($this->getLayoutId())->getDefaultRegion();
+  }
+
 }

core/modules/field_layout/src/Entity/FieldLayoutEntityFormDisplay.php

@@ -12,14 +12,4 @@ class FieldLayoutEntityFormDisplay extends EntityFormDisplay implements EntityDi
 
   use FieldLayoutEntityDisplayTrait;
 
-  /**
-   * {@inheritdoc}
-   */
-  public function getDefaultRegion() {
-    // This cannot be provided by the trait due to
-    // https://bugs.php.net/bug.php?id=71414 which is fixed in PHP 7.0.6.
-    // @todo Move to trait. https://www.drupal.org/node/3054317
-    return $this->getLayoutDefinition($this->getLayoutId())->getDefaultRegion();
-  }
-
 }

core/modules/field_layout/src/Entity/FieldLayoutEntityViewDisplay.php

@@ -12,14 +12,4 @@ class FieldLayoutEntityViewDisplay extends EntityViewDisplay implements EntityDi
 
   use FieldLayoutEntityDisplayTrait;
 
-  /**
-   * {@inheritdoc}
-   */
-  public function getDefaultRegion() {
-    // This cannot be provided by the trait due to
-    // https://bugs.php.net/bug.php?id=71414 which is fixed in PHP 7.0.6.
-    // @todo Move to trait. https://www.drupal.org/node/3054317
-    return $this->getLayoutDefinition($this->getLayoutId())->getDefaultRegion();
-  }
-
 }