From 1f09439e1e18308a4babad67acefdaf1801fba05 Mon Sep 17 00:00:00 2001
From: Rosie Le Faive <lefaive@gmail.com>
Date: Fri, 23 Jun 2023 15:01:43 -0300
Subject: [PATCH 01/12] Test: Breadcrumbs config dependencies missing schema.

---
 .../config/install/islandora_breadcrumbs.breadcrumbs.yml    | 6 ------
 .../islandora_breadcrumbs/islandora_breadcrumbs.info.yml    | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/modules/islandora_breadcrumbs/config/install/islandora_breadcrumbs.breadcrumbs.yml b/modules/islandora_breadcrumbs/config/install/islandora_breadcrumbs.breadcrumbs.yml
index ea34ee2e..aabb5891 100644
--- a/modules/islandora_breadcrumbs/config/install/islandora_breadcrumbs.breadcrumbs.yml
+++ b/modules/islandora_breadcrumbs/config/install/islandora_breadcrumbs.breadcrumbs.yml
@@ -2,9 +2,3 @@ maxDepth: -1
 includeSelf: FALSE
 referenceFields: 
   - field_member_of
-dependencies:
-  module:
-    - islandora
-  enforced:
-    module:
-      - islandora_breadcrumbs
diff --git a/modules/islandora_breadcrumbs/islandora_breadcrumbs.info.yml b/modules/islandora_breadcrumbs/islandora_breadcrumbs.info.yml
index 56a10bc1..c76020cb 100644
--- a/modules/islandora_breadcrumbs/islandora_breadcrumbs.info.yml
+++ b/modules/islandora_breadcrumbs/islandora_breadcrumbs.info.yml
@@ -5,4 +5,4 @@ core: 8.x
 core_version_requirement: ^8 || ^9
 package: Islandora
 dependencies:
-  - drupal:islandora
+  - islandora:islandora

From 8ee4fb5aff95b74ee8920dbb0b8d7fcbb4141657 Mon Sep 17 00:00:00 2001
From: Rosie Le Faive <lefaive@gmail.com>
Date: Fri, 23 Jun 2023 15:24:29 -0300
Subject: [PATCH 02/12] Inject fileUrlGenerator into Image Field formatter.

---
 .../Field/FieldFormatter/IslandoraImageFormatter.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Plugin/Field/FieldFormatter/IslandoraImageFormatter.php b/src/Plugin/Field/FieldFormatter/IslandoraImageFormatter.php
index 6c6e87da..6667f4f4 100644
--- a/src/Plugin/Field/FieldFormatter/IslandoraImageFormatter.php
+++ b/src/Plugin/Field/FieldFormatter/IslandoraImageFormatter.php
@@ -5,6 +5,7 @@ namespace Drupal\islandora\Plugin\Field\FieldFormatter;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\File\FileUrlGenerator;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\image\Plugin\Field\FieldFormatter\ImageFormatter;
 use Drupal\islandora\IslandoraUtils;
@@ -56,6 +57,8 @@ class IslandoraImageFormatter extends ImageFormatter {
    *   The image style storage.
    * @param \Drupal\islandora\IslandoraUtils $utils
    *   Islandora utils.
+   * @param \Drupal\Core\File\FileUrlGenerator $file_url_generator
+   *   The File URL Generator.
    */
   public function __construct(
     $plugin_id,
@@ -67,7 +70,8 @@ class IslandoraImageFormatter extends ImageFormatter {
     array $third_party_settings,
     AccountInterface $current_user,
     EntityStorageInterface $image_style_storage,
-    IslandoraUtils $utils
+    IslandoraUtils $utils,
+    FileUrlGenerator $file_url_generator
   ) {
     parent::__construct(
       $plugin_id,
@@ -78,7 +82,8 @@ class IslandoraImageFormatter extends ImageFormatter {
       $view_mode,
       $third_party_settings,
       $current_user,
-      $image_style_storage
+      $image_style_storage,
+      $file_url_generator
     );
     $this->utils = $utils;
   }
@@ -97,7 +102,8 @@ class IslandoraImageFormatter extends ImageFormatter {
       $configuration['third_party_settings'],
       $container->get('current_user'),
       $container->get('entity_type.manager')->getStorage('image_style'),
-      $container->get('islandora.utils')
+      $container->get('islandora.utils'),
+      $container->get('file_url_generator')
     );
   }
 

From 41e4dc6ffff3d8e7a0ef8b4037cbffe15dc32bab Mon Sep 17 00:00:00 2001
From: Rosie Le Faive <lefaive@gmail.com>
Date: Fri, 23 Jun 2023 16:39:34 -0300
Subject: [PATCH 03/12] Tests were not finding the media use field.

---
 .../tests/src/Functional/GenerateAudioDerivativeTest.php        | 2 +-
 .../tests/src/Functional/GenerateImageDerivativeTest.php        | 2 +-
 .../tests/src/Functional/GenerateVideoDerivativeTest.php        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/islandora_audio/tests/src/Functional/GenerateAudioDerivativeTest.php b/modules/islandora_audio/tests/src/Functional/GenerateAudioDerivativeTest.php
index 766ceac0..b528e8ba 100644
--- a/modules/islandora_audio/tests/src/Functional/GenerateAudioDerivativeTest.php
+++ b/modules/islandora_audio/tests/src/Functional/GenerateAudioDerivativeTest.php
@@ -66,7 +66,7 @@ class GenerateAudioDerivativeTest extends GenerateDerivativeTestBase {
       'name[0][value]' => 'Test Media',
       'files[field_media_file_0]' => __DIR__ . '/../../fixtures/test_file.txt',
       'field_media_of[0][target_id]' => 'Test Node',
-      'field_tags[0][target_id]' => 'Preservation Master',
+      'field_media_use[0][target_id]' => 'foo', # change back to $this->preservationMasterTerm->label()
     ];
     $this->drupalGet('media/add/' . $this->testMediaType->id());
     $this->submitForm($values, $this->t('Save'));
diff --git a/modules/islandora_image/tests/src/Functional/GenerateImageDerivativeTest.php b/modules/islandora_image/tests/src/Functional/GenerateImageDerivativeTest.php
index 295eae91..69672e0b 100644
--- a/modules/islandora_image/tests/src/Functional/GenerateImageDerivativeTest.php
+++ b/modules/islandora_image/tests/src/Functional/GenerateImageDerivativeTest.php
@@ -68,7 +68,7 @@ class GenerateImageDerivativeTest extends GenerateDerivativeTestBase {
       'name[0][value]' => 'Test Media',
       'files[field_media_file_0]' => __DIR__ . '/../../fixtures/test_file.txt',
       'field_media_of[0][target_id]' => 'Test Node',
-      'field_tags[0][target_id]' => 'Preservation Master',
+      'field_media_use[0][target_id]' => 'foo', # change back to $this->preservationMasterTerm->label()
     ];
     $this->drupalGet('media/add/' . $this->testMediaType->id());
     $this->submitForm($values, $this->t('Save'));
diff --git a/modules/islandora_video/tests/src/Functional/GenerateVideoDerivativeTest.php b/modules/islandora_video/tests/src/Functional/GenerateVideoDerivativeTest.php
index 17e8bd5b..f712e349 100644
--- a/modules/islandora_video/tests/src/Functional/GenerateVideoDerivativeTest.php
+++ b/modules/islandora_video/tests/src/Functional/GenerateVideoDerivativeTest.php
@@ -63,7 +63,7 @@ class GenerateVideoDerivativeTest extends GenerateDerivativeTestBase {
       'name[0][value]' => 'Test Media',
       'files[field_media_file_0]' => __DIR__ . '/../../fixtures/test_file.txt',
       'field_media_of[0][target_id]' => 'Test Node',
-      'field_tags[0][target_id]' => 'Preservation Master',
+      'field_media_use[0][target_id]' => 'foo', # change back to $this->preservationMasterTerm->label()
     ];
     $this->drupalGet('media/add/' . $this->testMediaType->id());
     $this->submitForm($values, $this->t('Save'));

From 54116efbab00aef408fee36e1f0a8848f8a8de77 Mon Sep 17 00:00:00 2001
From: Rosie Le Faive <lefaive@gmail.com>
Date: Mon, 26 Jun 2023 13:20:54 -0300
Subject: [PATCH 04/12] Use phpcs friendly comment...

---
 .../tests/src/Functional/GenerateAudioDerivativeTest.php        | 2 +-
 .../tests/src/Functional/GenerateImageDerivativeTest.php        | 2 +-
 .../tests/src/Functional/GenerateVideoDerivativeTest.php        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/islandora_audio/tests/src/Functional/GenerateAudioDerivativeTest.php b/modules/islandora_audio/tests/src/Functional/GenerateAudioDerivativeTest.php
index b528e8ba..a7425917 100644
--- a/modules/islandora_audio/tests/src/Functional/GenerateAudioDerivativeTest.php
+++ b/modules/islandora_audio/tests/src/Functional/GenerateAudioDerivativeTest.php
@@ -66,7 +66,7 @@ class GenerateAudioDerivativeTest extends GenerateDerivativeTestBase {
       'name[0][value]' => 'Test Media',
       'files[field_media_file_0]' => __DIR__ . '/../../fixtures/test_file.txt',
       'field_media_of[0][target_id]' => 'Test Node',
-      'field_media_use[0][target_id]' => 'foo', # change back to $this->preservationMasterTerm->label()
+      'field_media_use[0][target_id]' => 'foo', // change back to $this->preservationMasterTerm->label()
     ];
     $this->drupalGet('media/add/' . $this->testMediaType->id());
     $this->submitForm($values, $this->t('Save'));
diff --git a/modules/islandora_image/tests/src/Functional/GenerateImageDerivativeTest.php b/modules/islandora_image/tests/src/Functional/GenerateImageDerivativeTest.php
index 69672e0b..2e1f5591 100644
--- a/modules/islandora_image/tests/src/Functional/GenerateImageDerivativeTest.php
+++ b/modules/islandora_image/tests/src/Functional/GenerateImageDerivativeTest.php
@@ -68,7 +68,7 @@ class GenerateImageDerivativeTest extends GenerateDerivativeTestBase {
       'name[0][value]' => 'Test Media',
       'files[field_media_file_0]' => __DIR__ . '/../../fixtures/test_file.txt',
       'field_media_of[0][target_id]' => 'Test Node',
-      'field_media_use[0][target_id]' => 'foo', # change back to $this->preservationMasterTerm->label()
+      'field_media_use[0][target_id]' => 'foo', // change back to $this->preservationMasterTerm->label()
     ];
     $this->drupalGet('media/add/' . $this->testMediaType->id());
     $this->submitForm($values, $this->t('Save'));
diff --git a/modules/islandora_video/tests/src/Functional/GenerateVideoDerivativeTest.php b/modules/islandora_video/tests/src/Functional/GenerateVideoDerivativeTest.php
index f712e349..3a556987 100644
--- a/modules/islandora_video/tests/src/Functional/GenerateVideoDerivativeTest.php
+++ b/modules/islandora_video/tests/src/Functional/GenerateVideoDerivativeTest.php
@@ -63,7 +63,7 @@ class GenerateVideoDerivativeTest extends GenerateDerivativeTestBase {
       'name[0][value]' => 'Test Media',
       'files[field_media_file_0]' => __DIR__ . '/../../fixtures/test_file.txt',
       'field_media_of[0][target_id]' => 'Test Node',
-      'field_media_use[0][target_id]' => 'foo', # change back to $this->preservationMasterTerm->label()
+      'field_media_use[0][target_id]' => 'foo', // change back to $this->preservationMasterTerm->label()
     ];
     $this->drupalGet('media/add/' . $this->testMediaType->id());
     $this->submitForm($values, $this->t('Save'));

From 760593b4e02fb41cccc93e2fecde14aa66200bef Mon Sep 17 00:00:00 2001
From: Rosie Le Faive <lefaive@gmail.com>
Date: Mon, 26 Jun 2023 13:32:33 -0300
Subject: [PATCH 05/12] Remove problematic comments.

---
 .../tests/src/Functional/GenerateAudioDerivativeTest.php        | 2 +-
 .../tests/src/Functional/GenerateImageDerivativeTest.php        | 2 +-
 .../tests/src/Functional/GenerateVideoDerivativeTest.php        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/islandora_audio/tests/src/Functional/GenerateAudioDerivativeTest.php b/modules/islandora_audio/tests/src/Functional/GenerateAudioDerivativeTest.php
index a7425917..5c1b616e 100644
--- a/modules/islandora_audio/tests/src/Functional/GenerateAudioDerivativeTest.php
+++ b/modules/islandora_audio/tests/src/Functional/GenerateAudioDerivativeTest.php
@@ -66,7 +66,7 @@ class GenerateAudioDerivativeTest extends GenerateDerivativeTestBase {
       'name[0][value]' => 'Test Media',
       'files[field_media_file_0]' => __DIR__ . '/../../fixtures/test_file.txt',
       'field_media_of[0][target_id]' => 'Test Node',
-      'field_media_use[0][target_id]' => 'foo', // change back to $this->preservationMasterTerm->label()
+      'field_media_use[0][target_id]' => 'foo',
     ];
     $this->drupalGet('media/add/' . $this->testMediaType->id());
     $this->submitForm($values, $this->t('Save'));
diff --git a/modules/islandora_image/tests/src/Functional/GenerateImageDerivativeTest.php b/modules/islandora_image/tests/src/Functional/GenerateImageDerivativeTest.php
index 2e1f5591..7544cb65 100644
--- a/modules/islandora_image/tests/src/Functional/GenerateImageDerivativeTest.php
+++ b/modules/islandora_image/tests/src/Functional/GenerateImageDerivativeTest.php
@@ -68,7 +68,7 @@ class GenerateImageDerivativeTest extends GenerateDerivativeTestBase {
       'name[0][value]' => 'Test Media',
       'files[field_media_file_0]' => __DIR__ . '/../../fixtures/test_file.txt',
       'field_media_of[0][target_id]' => 'Test Node',
-      'field_media_use[0][target_id]' => 'foo', // change back to $this->preservationMasterTerm->label()
+      'field_media_use[0][target_id]' => 'foo',
     ];
     $this->drupalGet('media/add/' . $this->testMediaType->id());
     $this->submitForm($values, $this->t('Save'));
diff --git a/modules/islandora_video/tests/src/Functional/GenerateVideoDerivativeTest.php b/modules/islandora_video/tests/src/Functional/GenerateVideoDerivativeTest.php
index 3a556987..264cebb7 100644
--- a/modules/islandora_video/tests/src/Functional/GenerateVideoDerivativeTest.php
+++ b/modules/islandora_video/tests/src/Functional/GenerateVideoDerivativeTest.php
@@ -63,7 +63,7 @@ class GenerateVideoDerivativeTest extends GenerateDerivativeTestBase {
       'name[0][value]' => 'Test Media',
       'files[field_media_file_0]' => __DIR__ . '/../../fixtures/test_file.txt',
       'field_media_of[0][target_id]' => 'Test Node',
-      'field_media_use[0][target_id]' => 'foo', // change back to $this->preservationMasterTerm->label()
+      'field_media_use[0][target_id]' => 'foo',
     ];
     $this->drupalGet('media/add/' . $this->testMediaType->id());
     $this->submitForm($values, $this->t('Save'));

From c49c131ed8a8b3d87820ad5a697427880e9d36b2 Mon Sep 17 00:00:00 2001
From: Rosie Le Faive <lefaive@gmail.com>
Date: Tue, 27 Jun 2023 12:05:11 -0300
Subject: [PATCH 06/12] Fix tests.

---
 .../tests/src/Functional/GenerateAudioDerivativeTest.php      | 2 +-
 .../tests/src/Functional/GenerateImageDerivativeTest.php      | 2 +-
 .../tests/src/Functional/GenerateVideoDerivativeTest.php      | 2 +-
 ...core.entity_form_display.media.test_media_type.default.yml | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/islandora_audio/tests/src/Functional/GenerateAudioDerivativeTest.php b/modules/islandora_audio/tests/src/Functional/GenerateAudioDerivativeTest.php
index 5c1b616e..6b85cd1b 100644
--- a/modules/islandora_audio/tests/src/Functional/GenerateAudioDerivativeTest.php
+++ b/modules/islandora_audio/tests/src/Functional/GenerateAudioDerivativeTest.php
@@ -66,7 +66,7 @@ class GenerateAudioDerivativeTest extends GenerateDerivativeTestBase {
       'name[0][value]' => 'Test Media',
       'files[field_media_file_0]' => __DIR__ . '/../../fixtures/test_file.txt',
       'field_media_of[0][target_id]' => 'Test Node',
-      'field_media_use[0][target_id]' => 'foo',
+      'field_media_use[0][target_id]' => $this->preservationMasterTerm->label(),
     ];
     $this->drupalGet('media/add/' . $this->testMediaType->id());
     $this->submitForm($values, $this->t('Save'));
diff --git a/modules/islandora_image/tests/src/Functional/GenerateImageDerivativeTest.php b/modules/islandora_image/tests/src/Functional/GenerateImageDerivativeTest.php
index 7544cb65..44cdda58 100644
--- a/modules/islandora_image/tests/src/Functional/GenerateImageDerivativeTest.php
+++ b/modules/islandora_image/tests/src/Functional/GenerateImageDerivativeTest.php
@@ -68,7 +68,7 @@ class GenerateImageDerivativeTest extends GenerateDerivativeTestBase {
       'name[0][value]' => 'Test Media',
       'files[field_media_file_0]' => __DIR__ . '/../../fixtures/test_file.txt',
       'field_media_of[0][target_id]' => 'Test Node',
-      'field_media_use[0][target_id]' => 'foo',
+      'field_media_use[0][target_id]' => $this->preservationMasterTerm->label(),
     ];
     $this->drupalGet('media/add/' . $this->testMediaType->id());
     $this->submitForm($values, $this->t('Save'));
diff --git a/modules/islandora_video/tests/src/Functional/GenerateVideoDerivativeTest.php b/modules/islandora_video/tests/src/Functional/GenerateVideoDerivativeTest.php
index 264cebb7..de06ba2f 100644
--- a/modules/islandora_video/tests/src/Functional/GenerateVideoDerivativeTest.php
+++ b/modules/islandora_video/tests/src/Functional/GenerateVideoDerivativeTest.php
@@ -63,7 +63,7 @@ class GenerateVideoDerivativeTest extends GenerateDerivativeTestBase {
       'name[0][value]' => 'Test Media',
       'files[field_media_file_0]' => __DIR__ . '/../../fixtures/test_file.txt',
       'field_media_of[0][target_id]' => 'Test Node',
-      'field_media_use[0][target_id]' => 'foo',
+      'field_media_use[0][target_id]' => $this->preservationMasterTerm->label(),
     ];
     $this->drupalGet('media/add/' . $this->testMediaType->id());
     $this->submitForm($values, $this->t('Save'));
diff --git a/tests/fixtures/config/core.entity_form_display.media.test_media_type.default.yml b/tests/fixtures/config/core.entity_form_display.media.test_media_type.default.yml
index 19fe419b..d261542d 100644
--- a/tests/fixtures/config/core.entity_form_display.media.test_media_type.default.yml
+++ b/tests/fixtures/config/core.entity_form_display.media.test_media_type.default.yml
@@ -3,7 +3,7 @@ status: true
 dependencies:
   config:
     - field.field.media.test_media_type.field_media_of
-    - field.field.media.test_media_type.field_tags
+    - field.field.media.test_media_type.field_media_use
     - media.type.test_media_type
   module:
     - path
@@ -37,7 +37,7 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  field_tags:
+  field_media_use:
     type: entity_reference_autocomplete
     weight: 3
     region: content

From dd514a3eb0d66438de08098317c5dee2715e566d Mon Sep 17 00:00:00 2001
From: Rosie Le Faive <lefaive@gmail.com>
Date: Tue, 27 Jun 2023 12:23:44 -0300
Subject: [PATCH 07/12] Add accessCheck FALSE to all queries.

---
 src/IslandoraUtils.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/IslandoraUtils.php b/src/IslandoraUtils.php
index f81cb747..41f84cbe 100644
--- a/src/IslandoraUtils.php
+++ b/src/IslandoraUtils.php
@@ -148,6 +148,7 @@ class IslandoraUtils {
       return [];
     }
     $mids = $this->entityTypeManager->getStorage('media')->getQuery()
+      ->accessCheck(FALSE)
       ->condition(self::MEDIA_OF_FIELD, $node->id())
       ->execute();
     if (empty($mids)) {
@@ -208,6 +209,7 @@ class IslandoraUtils {
 
     // Query for media that reference this file.
     $query = $this->entityTypeManager->getStorage('media')->getQuery();
+    $query->accessCheck(FALSE);
     $group = $query->orConditionGroup();
     foreach ($conditions as $condition) {
       $group->condition($condition, $fid);
@@ -252,6 +254,7 @@ class IslandoraUtils {
     }
 
     $results = $query
+      ->accessCheck(FALSE)
       ->condition($orGroup)
       ->execute();
 
@@ -498,6 +501,7 @@ class IslandoraUtils {
     array_walk($node_fields, $remove_entity);
 
     $query = $this->entityTypeManager->getStorage('media')->getQuery();
+    $query->accessCheck(FALSE);
     $taxon_condition = $this->getEntityQueryOrCondition($query, $term_fields, $term->id());
     $query->condition($taxon_condition);
     $node_condition = $this->getEntityQueryOrCondition($query, $node_fields, $node->id());

From 4eae6363836dcee079fd31b547823ee38e634a2d Mon Sep 17 00:00:00 2001
From: Rosie Le Faive <lefaive@gmail.com>
Date: Tue, 27 Jun 2023 13:10:48 -0300
Subject: [PATCH 08/12] Change to check access (true).

---
 src/IslandoraUtils.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/IslandoraUtils.php b/src/IslandoraUtils.php
index 41f84cbe..a2df7589 100644
--- a/src/IslandoraUtils.php
+++ b/src/IslandoraUtils.php
@@ -148,7 +148,7 @@ class IslandoraUtils {
       return [];
     }
     $mids = $this->entityTypeManager->getStorage('media')->getQuery()
-      ->accessCheck(FALSE)
+      ->accessCheck(TRUE)
       ->condition(self::MEDIA_OF_FIELD, $node->id())
       ->execute();
     if (empty($mids)) {
@@ -209,7 +209,7 @@ class IslandoraUtils {
 
     // Query for media that reference this file.
     $query = $this->entityTypeManager->getStorage('media')->getQuery();
-    $query->accessCheck(FALSE);
+    $query->accessCheck(TRUE);
     $group = $query->orConditionGroup();
     foreach ($conditions as $condition) {
       $group->condition($condition, $fid);
@@ -254,7 +254,7 @@ class IslandoraUtils {
     }
 
     $results = $query
-      ->accessCheck(FALSE)
+      ->accessCheck(TRUE)
       ->condition($orGroup)
       ->execute();
 
@@ -501,7 +501,7 @@ class IslandoraUtils {
     array_walk($node_fields, $remove_entity);
 
     $query = $this->entityTypeManager->getStorage('media')->getQuery();
-    $query->accessCheck(FALSE);
+    $query->accessCheck(TRUE);
     $taxon_condition = $this->getEntityQueryOrCondition($query, $term_fields, $term->id());
     $query->condition($taxon_condition);
     $node_condition = $this->getEntityQueryOrCondition($query, $node_fields, $node->id());

From 05fc3f9b880190164e3998b2ae0e4fa142b6c44c Mon Sep 17 00:00:00 2001
From: Rosie Le Faive <lefaive@gmail.com>
Date: Wed, 28 Jun 2023 10:00:43 -0300
Subject: [PATCH 09/12] Test on 8.1.

---
 .github/workflows/build-2.x.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-2.x.yml b/.github/workflows/build-2.x.yml
index 261ab1de..27506495 100644
--- a/.github/workflows/build-2.x.yml
+++ b/.github/workflows/build-2.x.yml
@@ -24,11 +24,11 @@ jobs:
       fail-fast: false
       matrix:
         # PHP 8.1 fails - see https://github.com/Islandora/islandora/issues/887
-        php-versions: ["7.4", "8.0"]
+        php-versions: ["7.4", "8.0", "8.1"]
         # test-suite functional-javascript will appear to pass but will skip tests; missing chromedriver.
         test-suite: ["kernel", "functional", "functional-javascript"]
         # Not yet Drupal 10 ready - see https://github.com/Islandora/islandora/issues/888
-        drupal-version: ["9.4.x", "9.5.x-dev"]
+        drupal-version: ["9.4.x", "9.5.x"]
         mysql: ["8.0"]
         allowed_failure: [false]
 

From 0d7f5d927f13cce5b4081ba58f007ab648f1bb7b Mon Sep 17 00:00:00 2001
From: Rosie Le Faive <lefaive@gmail.com>
Date: Thu, 29 Jun 2023 13:34:11 -0300
Subject: [PATCH 10/12] Update fixtures to have config UUIDs.

---
 ..._display.media.test_media_type.default.yml |  5 ++++
 ...ty_form_display.node.test_type.default.yml | 29 ++++++++++++++-----
 ..._form_display.node.test_type.secondary.yml |  8 +++--
 .../core.entity_form_mode.node.secondary.yml  |  5 ++--
 ...ty_view_display.node.test_type.default.yml | 15 ++++++++--
 ...ity_view_display.node.test_type.teaser.yml | 16 ++++++----
 .../config/rest.resource.entity.file.yml      |  2 ++
 .../config/rest.resource.entity.media.yml     |  3 +-
 .../config/rest.resource.entity.node.yml      |  1 +
 .../rest.resource.entity.taxonomy_term.yml    |  1 +
 10 files changed, 64 insertions(+), 21 deletions(-)

diff --git a/tests/fixtures/config/core.entity_form_display.media.test_media_type.default.yml b/tests/fixtures/config/core.entity_form_display.media.test_media_type.default.yml
index d261542d..ea8eac00 100644
--- a/tests/fixtures/config/core.entity_form_display.media.test_media_type.default.yml
+++ b/tests/fixtures/config/core.entity_form_display.media.test_media_type.default.yml
@@ -1,7 +1,9 @@
+uuid: 9151a0fe-7729-4943-b506-dd6f8d12ceac
 langcode: en
 status: true
 dependencies:
   config:
+    - field.field.media.test_media_type.field_media_file
     - field.field.media.test_media_type.field_media_of
     - field.field.media.test_media_type.field_media_use
     - media.type.test_media_type
@@ -34,6 +36,7 @@ content:
     region: content
     settings:
       match_operator: CONTAINS
+      match_limit: 10
       size: 60
       placeholder: ''
     third_party_settings: {  }
@@ -43,6 +46,7 @@ content:
     region: content
     settings:
       match_operator: CONTAINS
+      match_limit: 10
       size: 60
       placeholder: ''
     third_party_settings: {  }
@@ -64,6 +68,7 @@ content:
     weight: 4
     settings:
       match_operator: CONTAINS
+      match_limit: 10
       size: 60
       placeholder: ''
     region: content
diff --git a/tests/fixtures/config/core.entity_form_display.node.test_type.default.yml b/tests/fixtures/config/core.entity_form_display.node.test_type.default.yml
index 2560ec6e..68724265 100644
--- a/tests/fixtures/config/core.entity_form_display.node.test_type.default.yml
+++ b/tests/fixtures/config/core.entity_form_display.node.test_type.default.yml
@@ -1,12 +1,13 @@
+uuid: 90a6909f-a2aa-44e8-8b61-4cd54ec6974f
 langcode: en
 status: true
 dependencies:
   config:
     - field.field.node.test_type.field_member_of
+    - field.field.node.test_type.field_model
     - node.type.test_type
   module:
     - path
-    - text
 id: node.test_type.default
 targetEntityType: node
 bundle: test_type
@@ -19,14 +20,25 @@ content:
     settings: {  }
     third_party_settings: {  }
   field_member_of:
+    type: entity_reference_autocomplete
     weight: 122
+    region: content
     settings:
       match_operator: CONTAINS
+      match_limit: 10
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  field_model:
     type: entity_reference_autocomplete
+    weight: 123
     region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
   langcode:
     type: language_select
     weight: 2
@@ -42,24 +54,24 @@ content:
     third_party_settings: {  }
   promote:
     type: boolean_checkbox
-    settings:
-      display_label: true
     weight: 15
     region: content
+    settings:
+      display_label: true
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    settings:
-      display_label: true
     weight: 120
     region: content
+    settings:
+      display_label: true
     third_party_settings: {  }
   sticky:
     type: boolean_checkbox
-    settings:
-      display_label: true
     weight: 16
     region: content
+    settings:
+      display_label: true
     third_party_settings: {  }
   title:
     type: string_textfield
@@ -72,10 +84,11 @@ content:
   uid:
     type: entity_reference_autocomplete
     weight: 5
+    region: content
     settings:
       match_operator: CONTAINS
+      match_limit: 10
       size: 60
       placeholder: ''
-    region: content
     third_party_settings: {  }
 hidden: {  }
diff --git a/tests/fixtures/config/core.entity_form_display.node.test_type.secondary.yml b/tests/fixtures/config/core.entity_form_display.node.test_type.secondary.yml
index b1fdb88e..f8f05beb 100644
--- a/tests/fixtures/config/core.entity_form_display.node.test_type.secondary.yml
+++ b/tests/fixtures/config/core.entity_form_display.node.test_type.secondary.yml
@@ -1,12 +1,12 @@
+uuid: e24c2b3c-60e4-4ff5-99cb-80e5e67e7b04
 langcode: en
 status: true
 dependencies:
   config:
+    - core.entity_form_mode.node.secondary
     - field.field.node.test_type.field_member_of
+    - field.field.node.test_type.field_model
     - node.type.test_type
-  module:
-    - path
-    - text
 id: node.test_type.secondary
 targetEntityType: node
 bundle: test_type
@@ -23,6 +23,8 @@ content:
 hidden:
   created: true
   field_media: true
+  field_member_of: true
+  field_model: true
   field_node: true
   langcode: true
   path: true
diff --git a/tests/fixtures/config/core.entity_form_mode.node.secondary.yml b/tests/fixtures/config/core.entity_form_mode.node.secondary.yml
index 07f45bbe..e1fc7634 100644
--- a/tests/fixtures/config/core.entity_form_mode.node.secondary.yml
+++ b/tests/fixtures/config/core.entity_form_mode.node.secondary.yml
@@ -1,9 +1,10 @@
+uuid: d9f22219-ff4c-48cc-a98a-6ccaad7a880d
 langcode: en
 status: true
 dependencies:
   module:
     - node
 id: node.secondary
-label: Secondary 
+label: Secondary
 targetEntityType: node
-cache: true
+cache: true
\ No newline at end of file
diff --git a/tests/fixtures/config/core.entity_view_display.node.test_type.default.yml b/tests/fixtures/config/core.entity_view_display.node.test_type.default.yml
index cf798265..e4414e61 100644
--- a/tests/fixtures/config/core.entity_view_display.node.test_type.default.yml
+++ b/tests/fixtures/config/core.entity_view_display.node.test_type.default.yml
@@ -1,11 +1,12 @@
+uuid: 36f4aecf-0e14-4281-a213-ca7d129da52a
 langcode: en
 status: true
 dependencies:
   config:
     - field.field.node.test_type.field_member_of
+    - field.field.node.test_type.field_model
     - node.type.test_type
   module:
-    - text
     - user
 id: node.test_type.default
 targetEntityType: node
@@ -13,14 +14,24 @@ bundle: test_type
 mode: default
 content:
   field_member_of:
-    weight: 102
+    type: entity_reference_label
     label: above
     settings:
       link: true
     third_party_settings: {  }
+    weight: 102
+    region: content
+  field_model:
     type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 103
     region: content
   links:
+    settings: {  }
+    third_party_settings: {  }
     weight: 100
     region: content
 hidden:
diff --git a/tests/fixtures/config/core.entity_view_display.node.test_type.teaser.yml b/tests/fixtures/config/core.entity_view_display.node.test_type.teaser.yml
index d67060f7..f7295428 100644
--- a/tests/fixtures/config/core.entity_view_display.node.test_type.teaser.yml
+++ b/tests/fixtures/config/core.entity_view_display.node.test_type.teaser.yml
@@ -1,19 +1,25 @@
-uuid: 0308339a-a9e5-4a04-8ce2-9f62ed504e34
+uuid: b337f462-8e64-4853-be65-9e03b94515bf
 langcode: en
 status: true
 dependencies:
   config:
     - core.entity_view_mode.node.teaser
+    - field.field.node.test_type.field_member_of
+    - field.field.node.test_type.field_model
     - node.type.test_type
   module:
-    - text
     - user
 id: node.test_type.teaser
 targetEntityType: node
 bundle: test_type
 mode: teaser
 content:
+  links:
+    settings: {  }
+    third_party_settings: {  }
+    weight: 100
+    region: content
 hidden:
-  body: true
-  links: true
-  langcode: true
+  field_member_of: true
+  field_model: true
+  langcode: true
\ No newline at end of file
diff --git a/tests/fixtures/config/rest.resource.entity.file.yml b/tests/fixtures/config/rest.resource.entity.file.yml
index 6a136c3c..dbd6bb62 100644
--- a/tests/fixtures/config/rest.resource.entity.file.yml
+++ b/tests/fixtures/config/rest.resource.entity.file.yml
@@ -1,3 +1,4 @@
+uuid: 11c4e25e-6b06-4270-b934-243e4f4aade1
 langcode: en
 status: true
 dependencies:
@@ -26,3 +27,4 @@ configuration:
     supported_auth:
       - basic_auth
       - jwt_auth
+      - cookie
diff --git a/tests/fixtures/config/rest.resource.entity.media.yml b/tests/fixtures/config/rest.resource.entity.media.yml
index 3ed0286e..cd89243d 100644
--- a/tests/fixtures/config/rest.resource.entity.media.yml
+++ b/tests/fixtures/config/rest.resource.entity.media.yml
@@ -1,3 +1,4 @@
+uuid: 9a5633b1-6a1a-40b2-8482-c24cf44122ff
 langcode: en
 status: true
 dependencies:
@@ -5,7 +6,7 @@ dependencies:
     - basic_auth
     - jsonld
     - jwt
-    - media_entity
+    - media
     - serialization
     - user
 id: entity.media
diff --git a/tests/fixtures/config/rest.resource.entity.node.yml b/tests/fixtures/config/rest.resource.entity.node.yml
index e7d4c7cc..a3e253e2 100644
--- a/tests/fixtures/config/rest.resource.entity.node.yml
+++ b/tests/fixtures/config/rest.resource.entity.node.yml
@@ -1,3 +1,4 @@
+uuid: 08a90469-0355-4b41-a4d6-cb6b53072b8c
 langcode: en
 status: true
 dependencies:
diff --git a/tests/fixtures/config/rest.resource.entity.taxonomy_term.yml b/tests/fixtures/config/rest.resource.entity.taxonomy_term.yml
index 25b6fbb2..16d96c3e 100644
--- a/tests/fixtures/config/rest.resource.entity.taxonomy_term.yml
+++ b/tests/fixtures/config/rest.resource.entity.taxonomy_term.yml
@@ -1,3 +1,4 @@
+uuid: 7534e393-12a7-498c-a4a3-a7bbe4ff9a5d
 langcode: en
 status: true
 dependencies:

From 58ab9a3b7023f43818200ef92fab286c6650eef5 Mon Sep 17 00:00:00 2001
From: Rosie Le Faive <lefaive@gmail.com>
Date: Thu, 29 Jun 2023 13:34:43 -0300
Subject: [PATCH 11/12] Stop using deprecated FILE_STATUS_PERMANENT.

---
 tests/src/Functional/DeleteNodeWithMediaAndFile.php  | 2 +-
 tests/src/Functional/IslandoraFunctionalTestBase.php | 2 +-
 tests/src/Functional/IslandoraImageFormatterTest.php | 2 +-
 tests/src/Functional/JsonldTypeAlterReactionTest.php | 2 +-
 tests/src/Functional/MediaSourceUpdateTest.php       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/src/Functional/DeleteNodeWithMediaAndFile.php b/tests/src/Functional/DeleteNodeWithMediaAndFile.php
index 40e469c5..5ee19b7c 100644
--- a/tests/src/Functional/DeleteNodeWithMediaAndFile.php
+++ b/tests/src/Functional/DeleteNodeWithMediaAndFile.php
@@ -42,8 +42,8 @@ class DeleteNodeWithMediaAndFile extends IslandoraFunctionalTestBase {
       'uri' => "public://test.jpeg",
       'filename' => "test.jpeg",
       'filemime' => "image/jpeg",
-      'status' => FILE_STATUS_PERMANENT,
     ]);
+    $file->setPermanent();
     $file->save();
 
     $this->drupalGet("node/1/delete");
diff --git a/tests/src/Functional/IslandoraFunctionalTestBase.php b/tests/src/Functional/IslandoraFunctionalTestBase.php
index 2e723561..016788d0 100644
--- a/tests/src/Functional/IslandoraFunctionalTestBase.php
+++ b/tests/src/Functional/IslandoraFunctionalTestBase.php
@@ -438,8 +438,8 @@ EOD;
         'uri' => "public://test_file.txt",
         'filename' => "test_file.txt",
         'filemime' => "text/plain",
-        'status' => FILE_STATUS_PERMANENT,
       ]);
+    $file->setPermanent();
     $file->save();
 
     // Get the source field for the media.
diff --git a/tests/src/Functional/IslandoraImageFormatterTest.php b/tests/src/Functional/IslandoraImageFormatterTest.php
index 84ea5517..1b40f7a8 100644
--- a/tests/src/Functional/IslandoraImageFormatterTest.php
+++ b/tests/src/Functional/IslandoraImageFormatterTest.php
@@ -59,8 +59,8 @@ class IslandoraImageFormatterTest extends IslandoraFunctionalTestBase {
       'uri' => "public://test.jpeg",
       'filename' => "test.jpeg",
       'filemime' => "image/jpeg",
-      'status' => FILE_STATUS_PERMANENT,
     ]);
+    $file->setPermanent();
     $file->save();
 
     // Make the media, and associate it with the image and node.
diff --git a/tests/src/Functional/JsonldTypeAlterReactionTest.php b/tests/src/Functional/JsonldTypeAlterReactionTest.php
index 80a6039c..658244ae 100644
--- a/tests/src/Functional/JsonldTypeAlterReactionTest.php
+++ b/tests/src/Functional/JsonldTypeAlterReactionTest.php
@@ -30,7 +30,7 @@ class JsonldTypeAlterReactionTest extends JsonldSelfReferenceReactionTest {
       'new_storage_type' => 'string',
       'label' => 'Typed Predicate',
       'field_name' => 'type_predicate',
-    ], $this->t('Save and continue'));
+    ], 'Save and continue');
     $this->submitForm([], $this->t('Save field settings'));
     $this->submitForm([], $this->t('Save settings'));
     $this->assertSession()->responseContains('field_type_predicate');
diff --git a/tests/src/Functional/MediaSourceUpdateTest.php b/tests/src/Functional/MediaSourceUpdateTest.php
index 3c97c695..3938e9b4 100644
--- a/tests/src/Functional/MediaSourceUpdateTest.php
+++ b/tests/src/Functional/MediaSourceUpdateTest.php
@@ -52,8 +52,8 @@ class MediaSourceUpdateTest extends IslandoraFunctionalTestBase {
       'uri' => "public://test_file.txt",
       'filename' => "test_file.txt",
       'filemime' => "text/plain",
-      'status' => FILE_STATUS_PERMANENT,
     ]);
+    $this->file->setPermanent();
     $this->file->save();
 
     // Get the source field for the media.

From f474f7b7453e5ac982398ae7f1bc558665ec35b6 Mon Sep 17 00:00:00 2001
From: Rosie Le Faive <lefaive@gmail.com>
Date: Fri, 30 Jun 2023 10:30:47 -0300
Subject: [PATCH 12/12] Remove duplicate line.

---
 tests/src/Kernel/EventGeneratorTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/src/Kernel/EventGeneratorTest.php b/tests/src/Kernel/EventGeneratorTest.php
index a9c1f082..28a4ec03 100644
--- a/tests/src/Kernel/EventGeneratorTest.php
+++ b/tests/src/Kernel/EventGeneratorTest.php
@@ -116,7 +116,6 @@ class EventGeneratorTest extends IslandoraKernelTestBase {
       ['event' => 'delete', 'queue' => 'islandora-indexing-fcrepo-delete']
     );
     $msg = json_decode($json, TRUE);
-    $msg = json_decode($json, TRUE);
 
     $this->assertBasicStructure($msg);
     $this->assertTrue($msg["type"] == "Delete", "Event must be of type 'Delete'.");