From afc682269618297f2206210e4d3a3471295554ff Mon Sep 17 00:00:00 2001
From: Stephen Cox <stephen@agile.coop>
Date: Fri, 9 Aug 2024 15:40:35 +0100
Subject: [PATCH 1/2] Added return docstring for
 EntityChildRelationshipUi::referencedChildren #273

---
 .../src/EntityChildRelationshipUi.php                          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/localgov_services_navigation/src/EntityChildRelationshipUi.php b/modules/localgov_services_navigation/src/EntityChildRelationshipUi.php
index e4508c7..5b46253 100644
--- a/modules/localgov_services_navigation/src/EntityChildRelationshipUi.php
+++ b/modules/localgov_services_navigation/src/EntityChildRelationshipUi.php
@@ -198,6 +198,9 @@ protected function childrenField(NodeInterface $node) {
    *
    * @param \Drupal\node\NodeInterface $node
    *   The `localgov_service_landing` or `localgov_service_sublanding`.
+   *
+   * @return array
+   *   Array of node IDs.
    */
   public static function referencedChildren(NodeInterface $node) {
     $linked = [];

From 3f046a962bf18a79a96986b48b7ac8fb72cefa96 Mon Sep 17 00:00:00 2001
From: Stephen Cox <stephen@agile.coop>
Date: Fri, 9 Aug 2024 15:41:12 +0100
Subject: [PATCH 2/2] Use EntityReferenceFieldCreationTrait rather than the
 deprecated EntityReferenceTestTrait

---
 .../EntityReferenceServicesAutocompleteTest.php            | 7 ++-----
 .../tests/src/Kernel/ChildReferencesTest.php               | 7 ++-----
 .../tests/src/Kernel/ParentFieldPathautoTest.php           | 7 ++-----
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/modules/localgov_services_navigation/tests/src/FunctionalJavascript/EntityReferenceServicesAutocompleteTest.php b/modules/localgov_services_navigation/tests/src/FunctionalJavascript/EntityReferenceServicesAutocompleteTest.php
index 8c6f979..198c800 100644
--- a/modules/localgov_services_navigation/tests/src/FunctionalJavascript/EntityReferenceServicesAutocompleteTest.php
+++ b/modules/localgov_services_navigation/tests/src/FunctionalJavascript/EntityReferenceServicesAutocompleteTest.php
@@ -4,7 +4,7 @@
 
 use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
 use Drupal\node\NodeInterface;
-use Drupal\Tests\field\Traits\EntityReferenceTestTrait;
+use Drupal\Tests\field\Traits\EntityReferenceFieldCreationTrait;
 use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
 use Drupal\Tests\node\Traits\NodeCreationTrait;
 
@@ -16,10 +16,7 @@
 class EntityReferenceServicesAutocompleteTest extends WebDriverTestBase {
 
   use ContentTypeCreationTrait;
-  // FIXME: Replace with EntityReferenceFieldCreationTrait when Drupal 10.1 is
-  // end of life.
-  // @phpstan-ignore-next-line.
-  use EntityReferenceTestTrait;
+  use EntityReferenceFieldCreationTrait;
   use NodeCreationTrait;
 
   /**
diff --git a/modules/localgov_services_navigation/tests/src/Kernel/ChildReferencesTest.php b/modules/localgov_services_navigation/tests/src/Kernel/ChildReferencesTest.php
index 4a456dc..3659620 100644
--- a/modules/localgov_services_navigation/tests/src/Kernel/ChildReferencesTest.php
+++ b/modules/localgov_services_navigation/tests/src/Kernel/ChildReferencesTest.php
@@ -10,7 +10,7 @@
 use Drupal\node\NodeInterface;
 use Drupal\paragraphs\Entity\Paragraph;
 use Drupal\taxonomy\Entity\Term;
-use Drupal\Tests\field\Traits\EntityReferenceTestTrait;
+use Drupal\Tests\field\Traits\EntityReferenceFieldCreationTrait;
 use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
 use Drupal\Tests\node\Traits\NodeCreationTrait;
 use Drupal\Tests\pathauto\Functional\PathautoTestHelperTrait;
@@ -24,10 +24,7 @@
 class ChildReferencesTest extends KernelTestBase {
 
   use ContentTypeCreationTrait;
-  // FIXME: Replace with EntityReferenceFieldCreationTrait when Drupal 10.1 is
-  // end of life.
-  // @phpstan-ignore-next-line.
-  use EntityReferenceTestTrait;
+  use EntityReferenceFieldCreationTrait;
   use NodeCreationTrait;
   use PathautoTestHelperTrait;
 
diff --git a/modules/localgov_services_navigation/tests/src/Kernel/ParentFieldPathautoTest.php b/modules/localgov_services_navigation/tests/src/Kernel/ParentFieldPathautoTest.php
index 5191078..ca529b1 100644
--- a/modules/localgov_services_navigation/tests/src/Kernel/ParentFieldPathautoTest.php
+++ b/modules/localgov_services_navigation/tests/src/Kernel/ParentFieldPathautoTest.php
@@ -5,7 +5,7 @@
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\node\NodeInterface;
-use Drupal\Tests\field\Traits\EntityReferenceTestTrait;
+use Drupal\Tests\field\Traits\EntityReferenceFieldCreationTrait;
 use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
 use Drupal\Tests\node\Traits\NodeCreationTrait;
 use Drupal\Tests\pathauto\Functional\PathautoTestHelperTrait;
@@ -18,10 +18,7 @@
 class ParentFieldPathautoTest extends KernelTestBase {
 
   use ContentTypeCreationTrait;
-  // FIXME: Replace with EntityReferenceFieldCreationTrait when Drupal 10.1 is
-  // end of life.
-  // @phpstan-ignore-next-line.
-  use EntityReferenceTestTrait;
+  use EntityReferenceFieldCreationTrait;
   use NodeCreationTrait;
   use PathautoTestHelperTrait;