Code clean-up

src/TwigTweakExtension.php

@@ -547,7 +547,7 @@ class TwigTweakExtension extends AbstractExtension {
       /** @var \Drupal\Core\Entity\Plugin\DataType\EntityAdapter $parent */
       if ($parent = $object->getParent()) {
         CacheableMetadata::createFromRenderArray($build)
-          ->merge(CacheableMetadata::createFromObject($parent->getEntity()))
+          ->addCacheableDependency($parent->getEntity())
           ->applyTo($build);
       }
     }

src/View/BlockViewBuilder.php

@@ -162,8 +162,8 @@ class BlockViewBuilder {
     }
 
     CacheableMetadata::createFromRenderArray($build)
-      ->merge(CacheableMetadata::createFromObject($access))
+      ->addCacheableDependency($access)
-      ->merge(CacheableMetadata::createFromObject($block_plugin))
+      ->addCacheableDependency($block_plugin)
       ->applyTo($build);
 
     if (!isset($build['#cache']['keys'])) {

src/View/EntityFormViewBuilder.php

@@ -50,8 +50,8 @@ class EntityFormViewBuilder {
     }
 
     CacheableMetadata::createFromRenderArray($build)
-      ->merge(CacheableMetadata::createFromObject($entity))
+      ->addCacheableDependency($access)
-      ->merge(CacheableMetadata::createFromObject($access))
+      ->addCacheableDependency($entity)
       ->applyTo($build);
 
     return $build;

src/View/EntityViewBuilder.php

@@ -38,8 +38,8 @@ class EntityViewBuilder {
         ->view($entity, $view_mode, $langcode);
     }
     CacheableMetadata::createFromRenderArray($build)
-      ->merge(CacheableMetadata::createFromObject($entity))
+      ->addCacheableDependency($access)
-      ->merge(CacheableMetadata::createFromObject($access))
+      ->addCacheableDependency($entity)
       ->applyTo($build);
     return $build;
   }

src/View/FieldViewBuilder.php

@@ -64,8 +64,8 @@ class FieldViewBuilder {
     }
 
     CacheableMetadata::createFromRenderArray($build)
-      ->merge(CacheableMetadata::createFromObject($access))
+      ->addCacheableDependency($access)
-      ->merge(CacheableMetadata::createFromObject($entity))
+      ->addCacheableDependency($entity)
       ->applyTo($build);
 
     return $build;

src/View/ImageViewBuilder.php

@@ -52,7 +52,8 @@ class ImageViewBuilder {
     }
 
     CacheableMetadata::createFromRenderArray($build)
-      ->merge(CacheableMetadata::createFromObject($access))
+      ->addCacheableDependency($access)
+      ->addCacheableDependency($file)
       ->applyTo($build);
 
     return $build;

src/View/RegionViewBuilder.php

@@ -89,7 +89,7 @@ class RegionViewBuilder {
     /** @var \Drupal\block\BlockInterface[] $blocks */
     foreach ($blocks as $id => $block) {
       $access = $block->access('view', NULL, TRUE);
-      $cache_metadata = $cache_metadata->merge(CacheableMetadata::createFromObject($access));
+      $cache_metadata = $cache_metadata->addCacheableDependency($access);
       if ($access->isAllowed()) {
         $block_plugin = $block->getPlugin();
         if ($block_plugin instanceof TitleBlockPluginInterface) {

tests/src/Kernel/ImageViewBuilderTest.php

@@ -76,7 +76,10 @@ final class ImageViewBuilderTest extends KernelTestBase {
           'user',
           'user.permissions',
         ],
-        'tags' => ['tag_for_public://ocean.jpg'],
+        'tags' => [
+          'file:1',
+          'tag_for_public://ocean.jpg',
+        ],
         'max-age' => 70,
       ],
     ];
@@ -95,7 +98,10 @@ final class ImageViewBuilderTest extends KernelTestBase {
           'user',
           'user.permissions',
         ],
-        'tags' => ['tag_for_public://ocean.jpg'],
+        'tags' => [
+          'file:1',
+          'tag_for_public://ocean.jpg',
+        ],
         'max-age' => 70,
       ],
     ];
@@ -114,7 +120,10 @@ final class ImageViewBuilderTest extends KernelTestBase {
           'user',
           'user.permissions',
         ],
-        'tags' => ['tag_for_public://ocean.jpg'],
+        'tags' => [
+          'file:1',
+          'tag_for_public://ocean.jpg',
+        ],
         'max-age' => 70,
       ],
     ];
@@ -126,7 +135,10 @@ final class ImageViewBuilderTest extends KernelTestBase {
     $expected_build = [
       '#cache' => [
         'contexts' => ['user'],
-        'tags' => ['tag_for_private://sea.jpg'],
+        'tags' => [
+          'file:2',
+          'tag_for_private://sea.jpg',
+        ],
         'max-age' => 70,
       ],
     ];
@@ -141,7 +153,7 @@ final class ImageViewBuilderTest extends KernelTestBase {
       '#theme' => 'image',
       '#cache' => [
         'contexts' => [],
-        'tags' => [],
+        'tags' => ['file:2'],
         'max-age' => Cache::PERMANENT,
       ],
     ];