From e5a1f99c5710b051bb22f23a36d04b9110bf3787 Mon Sep 17 00:00:00 2001
From: Alexander O'Neill <aloneill@gmail.com>
Date: Thu, 19 May 2022 13:58:29 +0000
Subject: [PATCH] IIIF Manifest: Use dependency injection for EntityTypeManager
 service.

---
 .../src/Plugin/views/style/IIIFManifest.php      | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/modules/islandora_iiif/src/Plugin/views/style/IIIFManifest.php b/modules/islandora_iiif/src/Plugin/views/style/IIIFManifest.php
index 0ebc213e..13f83e7d 100644
--- a/modules/islandora_iiif/src/Plugin/views/style/IIIFManifest.php
+++ b/modules/islandora_iiif/src/Plugin/views/style/IIIFManifest.php
@@ -3,6 +3,7 @@
 namespace Drupal\islandora_iiif\Plugin\views\style;
 
 use Drupal\views\Plugin\views\style\StylePluginBase;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\Core\Url;
@@ -69,6 +70,13 @@ class IIIFManifest extends StylePluginBase {
    */
   protected $iiifConfig;
 
+  /**
+   * The Drupal Entity Type Manager service.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
   /**
    * The Drupal Filesystem.
    *
@@ -86,12 +94,13 @@ class IIIFManifest extends StylePluginBase {
   /**
    * {@inheritdoc}
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, SerializerInterface $serializer, Request $request, ImmutableConfig $iiif_config, FileSystemInterface $file_system, Client $http_client, MessengerInterface $messenger) {
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, SerializerInterface $serializer, Request $request, ImmutableConfig $iiif_config, EntityTypeManagerInterface $entity_type_manager, FileSystemInterface $file_system, Client $http_client, MessengerInterface $messenger) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
 
     $this->serializer = $serializer;
     $this->request = $request;
     $this->iiifConfig = $iiif_config;
+    $this->entityTypeManager = $entity_type_manager;
     $this->fileSystem = $file_system;
     $this->httpClient = $http_client;
     $this->messenger = $messenger;
@@ -108,6 +117,7 @@ class IIIFManifest extends StylePluginBase {
       $container->get('serializer'),
       $container->get('request_stack')->getCurrentRequest(),
       $container->get('config.factory')->get('islandora_iiif.settings'),
+      $container->get('entity_type.manager'),
       $container->get('file_system'),
       $container->get('http_client'),
       $container->get('messenger')
@@ -278,11 +288,11 @@ class IIIFManifest extends StylePluginBase {
     try {
       $params = Url::fromUserInput($content_path)->getRouteParameters();
       if (isset($params['node'])) {
-        $node = \Drupal::entityTypeManager()->getStorage('node')->load($params['node']);
+        $node = $this->entityTypeManager->getStorage('node')->load($params['node']);
         $entity_title = $node->getTitle();
       }
       elseif (isset($params['media'])) {
-        $media = \Drupal::entityTypeManager()->getStorage('media')->load($params['media']);
+        $media = $this->entityTypeManager->getStorage('media')->load($params['media']);
         $entity_title = $media->getName();
       }
     }