From c5e82addc5e83e60c0571d3bd0b2b6886d1beb8d Mon Sep 17 00:00:00 2001
From: Johnathan Bamber <jbamber@topfloortech.com>
Date: Fri, 26 Aug 2022 11:54:48 -0400
Subject: [PATCH 1/3] Initial Commit

---
 name_prepopulate.info.yml     |  2 +-
 name_prepopulate.module       |  4 ++--
 src/NamePrepopulateHelper.php | 10 ++--------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/name_prepopulate.info.yml b/name_prepopulate.info.yml
index 6377dbe..cf31e40 100644
--- a/name_prepopulate.info.yml
+++ b/name_prepopulate.info.yml
@@ -1,5 +1,5 @@
 name: Name Prepopulate
 description: Prepopulates name fields from the user account.
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^9
 package: Fields
 type: module
diff --git a/name_prepopulate.module b/name_prepopulate.module
index 455f2f0..23041c0 100644
--- a/name_prepopulate.module
+++ b/name_prepopulate.module
@@ -6,7 +6,7 @@ use Drupal\name_prepopulate\NamePrepopulateHelper;
  * Implements hook_entity_prepare_form().
  */
 function name_prepopulate_entity_prepare_form(\Drupal\Core\Entity\EntityInterface $entity, $operation, \Drupal\Core\Form\FormStateInterface $form_state) {
-  $nameField = 'field_name';
+  $nameField = 'name';
 
   $types = ['contact_message'];
 
@@ -27,7 +27,7 @@ function name_prepopulate_entity_prepare_form(\Drupal\Core\Entity\EntityInterfac
  * Implements hook_entity_presave().
  */
 function name_prepopulate_entity_presave(Drupal\Core\Entity\EntityInterface $entity) {
-  $nameField = 'field_name';
+  $nameField = 'name';
 
   $types = ['contact_message'];
 
diff --git a/src/NamePrepopulateHelper.php b/src/NamePrepopulateHelper.php
index 98a8d0e..bc62fb6 100644
--- a/src/NamePrepopulateHelper.php
+++ b/src/NamePrepopulateHelper.php
@@ -5,7 +5,6 @@
 use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\field\Entity\FieldConfig;
-use Drupal\name\NameFormatParser;
 use Drupal\user\Entity\User;
 
 class NamePrepopulateHelper {
@@ -51,19 +50,14 @@ public function prepopulateFromAccount() {
   }
 
   protected function getNameString() {
-    /** @var \Drupal\Core\Field\FieldConfigInterface $fieldConfig; */
-    $fieldConfig = FieldConfig::loadByName($this->entity->getEntityTypeId(), $this->entity->bundle(), $this->fieldName);
-
-    /** @var \Drupal\name\NameFormatInterface $format */
-    $format = \Drupal::entityTypeManager()->getStorage('name_format')->load($fieldConfig->getSetting('override_format'));
-
     $field = $this->getField();
 
     if ($field->isEmpty()) {
       return '';
     }
 
-    return NameFormatParser::parse($field->get(0)->getValue(), $format->get('pattern'), ['object' => $this->entity, 'type' => $this->entity->getEntityTypeId()]);
+    // Drupal\Component\Render\HtmlEscapedText
+    return ($field->get(0)->getValue())['value']->__toString();
   }
 
   protected function getField() {

From e4dd1b4261aae39c7d1b6b6877cce07d95611ffa Mon Sep 17 00:00:00 2001
From: Johnathan Bamber <jbamber@topfloortech.com>
Date: Tue, 13 Sep 2022 01:16:21 -0400
Subject: [PATCH 2/3] Check if field value in getNameString() is
 \Drupal\Component\Render\HtmlEscapedText

---
 src/NamePrepopulateHelper.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/NamePrepopulateHelper.php b/src/NamePrepopulateHelper.php
index bc62fb6..22db8b2 100644
--- a/src/NamePrepopulateHelper.php
+++ b/src/NamePrepopulateHelper.php
@@ -56,8 +56,12 @@ protected function getNameString() {
       return '';
     }
 
-    // Drupal\Component\Render\HtmlEscapedText
-    return ($field->get(0)->getValue())['value']->__toString();
+    $value = ($field->get(0)->getValue())['value'];
+    if ($value instanceof \Drupal\Component\Render\HtmlEscapedText) {
+        return $value->__toString();
+    } else {
+        return $value;
+    }
   }
 
   protected function getField() {

From a1c9f1169a6283690b7a5c070e18e7592c99bb3a Mon Sep 17 00:00:00 2001
From: Scott Sawyer <scott@scottsawyerconsulting.com>
Date: Fri, 7 Jun 2024 13:04:46 -0400
Subject: [PATCH 3/3] Update name_prepopulate.info.yml

Adds D10 support, also declare dependencies.
---
 name_prepopulate.info.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/name_prepopulate.info.yml b/name_prepopulate.info.yml
index cf31e40..abcbc35 100644
--- a/name_prepopulate.info.yml
+++ b/name_prepopulate.info.yml
@@ -1,5 +1,7 @@
 name: Name Prepopulate
 description: Prepopulates name fields from the user account.
-core_version_requirement: ^9
+core_version_requirement: ^9 || ^10
 package: Fields
 type: module
+dependencies:
+  - name:name