From 7cedd936f5241d5569a32774c3c8a3535f74976d Mon Sep 17 00:00:00 2001 From: Seth Shaw <108362375+seth-shaw-asu@users.noreply.github.com> Date: Mon, 20 Nov 2023 14:18:59 -0800 Subject: [PATCH 1/2] Use FileUrlGeneratorInterface --- src/Plugin/Field/FieldFormatter/IslandoraImageFormatter.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Plugin/Field/FieldFormatter/IslandoraImageFormatter.php b/src/Plugin/Field/FieldFormatter/IslandoraImageFormatter.php index 6667f4f4a..cbd10bd35 100644 --- a/src/Plugin/Field/FieldFormatter/IslandoraImageFormatter.php +++ b/src/Plugin/Field/FieldFormatter/IslandoraImageFormatter.php @@ -5,7 +5,7 @@ use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Field\FieldDefinitionInterface; use Drupal\Core\Field\FieldItemListInterface; -use Drupal\Core\File\FileUrlGenerator; +use Drupal\Core\File\FileUrlGeneratorInterface; use Drupal\Core\Session\AccountInterface; use Drupal\image\Plugin\Field\FieldFormatter\ImageFormatter; use Drupal\islandora\IslandoraUtils; @@ -71,7 +71,7 @@ public function __construct( AccountInterface $current_user, EntityStorageInterface $image_style_storage, IslandoraUtils $utils, - FileUrlGenerator $file_url_generator + FileUrlGeneratorInterface $file_url_generator ) { parent::__construct( $plugin_id, From 42b3f227fd1b7fc201a2cf66bbba96962e12e2c3 Mon Sep 17 00:00:00 2001 From: Seth Shaw <108362375+seth-shaw-asu@users.noreply.github.com> Date: Tue, 21 Nov 2023 10:58:42 -0800 Subject: [PATCH 2/2] Use FileUrlGeneratorInterface --- src/Plugin/Field/FieldFormatter/IslandoraImageFormatter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Plugin/Field/FieldFormatter/IslandoraImageFormatter.php b/src/Plugin/Field/FieldFormatter/IslandoraImageFormatter.php index cbd10bd35..deb6c7690 100644 --- a/src/Plugin/Field/FieldFormatter/IslandoraImageFormatter.php +++ b/src/Plugin/Field/FieldFormatter/IslandoraImageFormatter.php @@ -57,7 +57,7 @@ class IslandoraImageFormatter extends ImageFormatter { * The image style storage. * @param \Drupal\islandora\IslandoraUtils $utils * Islandora utils. - * @param \Drupal\Core\File\FileUrlGenerator $file_url_generator + * @param \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator * The File URL Generator. */ public function __construct(