Issue #3280431: Create FillPdfForm::getDefaultEntityType()

src/Entity/FillPdfForm.php

@@ -222,6 +222,14 @@ class FillPdfForm extends ContentEntityBase implements FillPdfFormInterface {
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getDefaultEntityType(): ?string {
+    $default_entity_type = $this->get('default_entity_type');
+    return count($default_entity_type) ? $default_entity_type->first()->value : NULL;
+  }
+
   /**
    * {@inheritdoc}
    */

src/FillPdfFormInterface.php

@@ -9,6 +9,14 @@ namespace Drupal\fillpdf;
  */
 interface FillPdfFormInterface extends ExportableContentEntityInterface {
 
+  /**
+   * Returns the default entity type ID for this FillPdfForm.
+   *
+   * @return string|null
+   *   The entity type ID or NULL if there is none set.
+   */
+  public function getDefaultEntityType(): ?string;
+
   /**
    * Returns all FillPdfFormFields associated with this FillPdfForm.
    *

src/Form/FillPdfFormForm.php

@@ -147,9 +147,7 @@ class FillPdfFormForm extends ContentEntityForm {
 
     $form['title']['token_tree'] = $this->adminFormHelper->getAdminTokenForm();
 
-    // @todo Encapsulate this logic into a ::getDefaultEntityType() method on FillPdfForm
-    $stored_default_entity_type = $fillpdf_form->get('default_entity_type');
-    $default_entity_type = count($stored_default_entity_type) ? $stored_default_entity_type->first()->value : NULL;
+    $default_entity_type = $fillpdf_form->getDefaultEntityType();
 
     $form['default_entity_type'] = [
       '#type' => 'select',