From 9fd63e5a8b64b9eeedffb2b87ca85ed3fde45b54 Mon Sep 17 00:00:00 2001
From: Rosie Le Faive <lefaive@gmail.com>
Date: Wed, 31 Jul 2024 14:33:29 -0300
Subject: [PATCH] Some deprecations in advance of Drupal 11 (#1026)

---
 .github/workflows/build-2.x.yml                      | 6 +++---
 src/Plugin/Field/FieldType/MediaTrackItem.php        | 2 +-
 tests/src/Functional/AddMediaToNodeTest.php          | 4 ++--
 tests/src/Functional/IslandoraFunctionalTestBase.php | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build-2.x.yml b/.github/workflows/build-2.x.yml
index 8677ddf4e..529aeff02 100644
--- a/.github/workflows/build-2.x.yml
+++ b/.github/workflows/build-2.x.yml
@@ -44,7 +44,7 @@ jobs:
           - 61613:61613
 
     steps:
-      
+
       - name: Checkout code
         uses: actions/checkout@v4
         with:
@@ -70,7 +70,7 @@ jobs:
           sudo apt-get install -y mysql-client
 
       - name: Cache Composer dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: /tmp/composer-cache
           key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}
@@ -101,7 +101,7 @@ jobs:
 
       - name: Test scripts
         run: $SCRIPT_DIR/travis_scripts.sh
-      
+
       - name: Start chromedriver
         if: matrix.test-suite == 'functional-javascript'
         run: |-
diff --git a/src/Plugin/Field/FieldType/MediaTrackItem.php b/src/Plugin/Field/FieldType/MediaTrackItem.php
index d281ed216..68756ae59 100644
--- a/src/Plugin/Field/FieldType/MediaTrackItem.php
+++ b/src/Plugin/Field/FieldType/MediaTrackItem.php
@@ -16,7 +16,7 @@
  *   id = "media_track",
  *   label = @Translation("Media track"),
  *   description = @Translation("This field stores the ID of a media track file as an integer value."),
- *   category = @Translation("Reference"),
+ *   category = "reference",
  *   default_widget = "media_track",
  *   default_formatter = "file_default",
  *   column_groups = {
diff --git a/tests/src/Functional/AddMediaToNodeTest.php b/tests/src/Functional/AddMediaToNodeTest.php
index 4b0b62c52..ab67a6604 100644
--- a/tests/src/Functional/AddMediaToNodeTest.php
+++ b/tests/src/Functional/AddMediaToNodeTest.php
@@ -3,7 +3,7 @@
 namespace Drupal\Tests\islandora\Functional;
 
 use Drupal\Core\Url;
-use Drupal\Tests\field\Traits\EntityReferenceTestTrait;
+use Drupal\Tests\field\Traits\EntityReferenceFieldCreationTrait;
 
 /**
  * Tests the RelatedLinkHeader view alter.
@@ -12,7 +12,7 @@
  */
 class AddMediaToNodeTest extends IslandoraFunctionalTestBase {
 
-  use EntityReferenceTestTrait;
+  use EntityReferenceFieldCreationTrait;
 
   /**
    * Node to hold the media.
diff --git a/tests/src/Functional/IslandoraFunctionalTestBase.php b/tests/src/Functional/IslandoraFunctionalTestBase.php
index 1ad8081d1..e58ec0162 100644
--- a/tests/src/Functional/IslandoraFunctionalTestBase.php
+++ b/tests/src/Functional/IslandoraFunctionalTestBase.php
@@ -8,7 +8,7 @@
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\link\LinkItemInterface;
 use Drupal\Tests\BrowserTestBase;
-use Drupal\Tests\field\Traits\EntityReferenceTestTrait;
+use Drupal\Tests\field\Traits\EntityReferenceFieldCreationTrait;
 use Drupal\Tests\media\Traits\MediaTypeCreationTrait;
 use Drupal\Tests\TestFileCreationTrait;
 
@@ -17,7 +17,7 @@
  */
 class IslandoraFunctionalTestBase extends BrowserTestBase {
 
-  use EntityReferenceTestTrait;
+  use EntityReferenceFieldCreationTrait;
   use TestFileCreationTrait;
   use MediaTypeCreationTrait;
   use StringTranslationTrait;