diff --git a/core/modules/image/src/Normalizer/ImageItemNormalizerTrait.php b/core/modules/image/src/Normalizer/ImageItemNormalizerTrait.php index d5e850d..c2b9b16 100644 --- a/core/modules/image/src/Normalizer/ImageItemNormalizerTrait.php +++ b/core/modules/image/src/Normalizer/ImageItemNormalizerTrait.php @@ -38,7 +38,7 @@ protected function decorateWithImageStyles(ImageItem $item, array &$normalizatio 'width' => empty($dimensions['width']) ? NULL : $dimensions['width'], ]; if (!empty($context['cacheable_metadata'])) { - $context['cacheable_metadata']->addCacheableDependency(CacheableMetadata::createFromObject($style)); + $context['cacheable_metadata']->addCacheableDependency($style); } } } diff --git a/core/modules/image/tests/src/Kernel/Normalizer/ImageItemNormalizerTestBase.php b/core/modules/image/tests/src/Kernel/Normalizer/ImageItemNormalizerTestBase.php index 4870af7..a3045d2 100644 --- a/core/modules/image/tests/src/Kernel/Normalizer/ImageItemNormalizerTestBase.php +++ b/core/modules/image/tests/src/Kernel/Normalizer/ImageItemNormalizerTestBase.php @@ -108,11 +108,11 @@ public function testNormalize() { $original_entity->save(); $entity = clone $original_entity; - $cacheability_metadata = new CacheableMetadata(); - $normalization = $this->serializer->normalize($entity, $this->format, ['cacheable_metadata' => $cacheability_metadata]); + $cacheable_metadata = new CacheableMetadata(); + $normalization = $this->serializer->normalize($entity, $this->format, ['cacheability_metadata' => $cacheable_metadata]); $normalized_image_styles = $this->getNormalizedImageStyles($normalization); - $this->assertEquals($this->getExpectedCacheability(), $cacheability_metadata); + $this->assertEquals($this->getExpectedCacheability(), $cacheable_metadata); $expect_dimensions = [ 'large' => [ 'width' => '422',