From a31b9fe9e5e78a4bf30e1c4d17f7220bb5c8a087 Mon Sep 17 00:00:00 2001
From: Igor Biki <ibiki@uwaterloo.ca>
Date: Tue, 23 Nov 2021 15:02:35 -0500
Subject: [PATCH] ISTWCMS-5175: Update to UWService to handle removed
image/media.
---
src/Service/UWService.php | 6 +++---
src/Service/UWServiceInterface.php | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/Service/UWService.php b/src/Service/UWService.php
index e3d5f586..e7980990 100644
--- a/src/Service/UWService.php
+++ b/src/Service/UWService.php
@@ -108,11 +108,11 @@ class UWService implements UWServiceInterface {
/**
* {@inheritDoc}
- */
- public function prepareResponsiveImage(EntityInterface $entity, string $image_style): array {
+ */
+ public function prepareResponsiveImage(?EntityInterface $entity, string $image_style): array {
// Ensure that we can load an entity on the media.
- if (isset($entity->field_media_image->entity)) {
+ if ($entity && isset($entity->field_media_image->entity)) {
// Load in the file object if we have one.
if ($file = $entity->field_media_image->entity) {
diff --git a/src/Service/UWServiceInterface.php b/src/Service/UWServiceInterface.php
index 209b3577..3cb259ac 100644
--- a/src/Service/UWServiceInterface.php
+++ b/src/Service/UWServiceInterface.php
@@ -30,15 +30,15 @@ interface UWServiceInterface {
/**
* Prepares responsive image.
*
- * @param \Drupal\Core\Entity\EntityInterface $entity
- * Image entity.
+ * @param \Drupal\Core\Entity\EntityInterface|null $entity
+ * Image entity or null.
* @param string $image_style
* Image style to be used for responsive image.
*
* @return array
* Array with details for responsive image.
*/
- public function prepareResponsiveImage(EntityInterface $entity, string $image_style): array;
+ public function prepareResponsiveImage(?EntityInterface $entity, string $image_style): array;
/**
* Get the UW images styles used in UW responsive image.
--
GitLab