Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2388023 by GoZ: File/Image field formatters don't add a cache tag for the file they display

8.0.x
Alex Pott 2015-04-16 14:35:09 +02:00
parent be15ea2be7
commit 9def61241e
5 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/modules/file/src/Plugin/Field/FieldFormatter/GenericFileFormatter.php
View File

@ -34,6 +34,9 @@ class GenericFileFormatter extends FileFormatterBase {
'#theme' => 'file_link',
'#file' => $file,
'#description' => $item->description,
'#cache' => array(
'tags' => $file->getCacheTags(),
),
);
// Pass field item attributes to the theme function.
if (isset($item->_attributes)) {

3
core/modules/file/src/Plugin/Field/FieldFormatter/TableFormatter.php
View File

@ -37,6 +37,9 @@ class TableFormatter extends FileFormatterBase {
'data' => array(
'#theme' => 'file_link',
'#file' => $file,
'#cache' => array(
'tags' => $file->getCacheTags(),
),
),
),
array('data' => format_size($file->getSize())),

7
core/modules/file/src/Plugin/Field/FieldFormatter/UrlPlainFormatter.php
View File

@ -29,7 +29,12 @@ class UrlPlainFormatter extends FileFormatterBase {
$elements = array();
foreach ($this->getEntitiesToView($items) as $delta => $file) {
$elements[$delta] = array('#markup' => file_create_url($file->getFileUri()));
$elements[$delta] = array(
'#markup' => file_create_url($file->getFileUri()),
'#cache' => array(
'tags' => $file->getCacheTags(),
),
);
}
return $elements;

2
core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php
View File

@ -17,6 +17,7 @@ use Drupal\Core\Url;
use Drupal\Core\Utility\LinkGeneratorInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Cache\Cache;
/**
* Plugin implementation of the 'image' formatter.
@ -211,6 +212,7 @@ class ImageFormatter extends ImageFormatterBase implements ContainerFactoryPlugi
$image_uri = $file->getFileUri();
$url = Url::fromUri(file_create_url($image_uri));
}
$cache_tags = Cache::mergeTags($cache_tags, $file->getCacheTags());
// Extract field item attributes for the theme function, and unset them
// from the $item so that the field template does not re-render them.

20
core/modules/image/src/Tests/ImageFieldDisplayTest.php
View File

@ -94,7 +94,8 @@ class ImageFieldDisplayTest extends ImageFieldTestBase {
$node = $node_storage->load($nid);
// Test that the default formatter is being used.
$image_uri = file_load($node->{$field_name}->target_id)->getFileUri();
$file = $node->{$field_name}->entity;
$image_uri = $file->getFileUri();
$image = array(
'#theme' => 'image',
'#uri' => $image_uri,
@ -123,6 +124,7 @@ class ImageFieldDisplayTest extends ImageFieldTestBase {
);
$default_output = '<a href="' . file_create_url($image_uri) . '">' . drupal_render($image) . '</a>';
$this->drupalGet('node/' . $nid);
$this->assertCacheTag($file->getCacheTags()[0]);
$cache_tags_header = $this->drupalGetHeader('X-Drupal-Cache-Tags');
$this->assertTrue(!preg_match('/ image_style\:/', $cache_tags_header), 'No image style cache tag found.');
$this->assertRaw($default_output, 'Image linked to file formatter displaying correctly on full node view.');
@ -154,6 +156,7 @@ class ImageFieldDisplayTest extends ImageFieldTestBase {
'#height' => 20,
);
$this->drupalGet('node/' . $nid);
$this->assertCacheTag($file->getCacheTags()[0]);
$cache_tags_header = $this->drupalGetHeader('X-Drupal-Cache-Tags');
$this->assertTrue(!preg_match('/ image_style\:/', $cache_tags_header), 'No image style cache tag found.');
$elements = $this->xpath(
@ -187,8 +190,8 @@ class ImageFieldDisplayTest extends ImageFieldTestBase {
);
$default_output = drupal_render($image_style);
$this->drupalGet('node/' . $nid);
$cache_tags = explode(' ', $this->drupalGetHeader('X-Drupal-Cache-Tags'));
$this->assertTrue(in_array('config:image.style.thumbnail', $cache_tags));
$image_style = ImageStyle::load('thumbnail');
$this->assertCacheTag($image_style->getCacheTags()[0]);
$this->assertRaw($default_output, 'Image style thumbnail formatter displaying correctly on full node view.');
if ($scheme == 'private') {
@ -247,9 +250,10 @@ class ImageFieldDisplayTest extends ImageFieldTestBase {
// style.
$node_storage->resetCache(array($nid));
$node = $node_storage->load($nid);
$file = $node->{$field_name}->entity;
$image_style = array(
'#theme' => 'image_style',
'#uri' => file_load($node->{$field_name}->target_id)->getFileUri(),
'#uri' => $file->getFileUri(),
'#width' => 40,
'#height' => 20,
'#style_name' => 'medium',
@ -260,7 +264,7 @@ class ImageFieldDisplayTest extends ImageFieldTestBase {
// Add alt/title fields to the image and verify that they are displayed.
$image = array(
'#theme' => 'image',
'#uri' => file_load($node->{$field_name}->target_id)->getFileUri(),
'#uri' => $file->getFileUri(),
'#alt' => $alt,
'#title' => $this->randomMachineName(),
'#width' => 40,
@ -362,6 +366,7 @@ class ImageFieldDisplayTest extends ImageFieldTestBase {
);
$default_output = str_replace("\n", NULL, drupal_render($image));
$this->drupalGet('node/' . $node->id());
$this->assertCacheTag($file->getCacheTags()[0]);
$cache_tags_header = $this->drupalGetHeader('X-Drupal-Cache-Tags');
$this->assertTrue(!preg_match('/ image_style\:/', $cache_tags_header), 'No image style cache tag found.');
$this->assertRaw($default_output, 'Default image displayed when no user supplied image is present.');
@ -375,15 +380,17 @@ class ImageFieldDisplayTest extends ImageFieldTestBase {
$nid = $this->uploadNodeImage($images[1], $field_name, 'article', $alt);
$node_storage->resetCache(array($nid));
$node = $node_storage->load($nid);
$file = $node->{$field_name}->entity;
$image = array(
'#theme' => 'image',
'#uri' => file_load($node->{$field_name}->target_id)->getFileUri(),
'#uri' => $file->getFileUri(),
'#width' => 40,
'#height' => 20,
'#alt' => $alt,
);
$image_output = str_replace("\n", NULL, drupal_render($image));
$this->drupalGet('node/' . $nid);
$this->assertCacheTag($file->getCacheTags()[0]);
$cache_tags_header = $this->drupalGetHeader('X-Drupal-Cache-Tags');
$this->assertTrue(!preg_match('/ image_style\:/', $cache_tags_header), 'No image style cache tag found.');
$this->assertNoRaw($default_output, 'Default image is not displayed when user supplied image is present.');
@ -431,6 +438,7 @@ class ImageFieldDisplayTest extends ImageFieldTestBase {
);
$default_output = str_replace("\n", NULL, drupal_render($image));
$this->drupalGet('node/' . $node->id());
$this->assertCacheTag($file->getCacheTags()[0]);
$cache_tags_header = $this->drupalGetHeader('X-Drupal-Cache-Tags');
$this->assertTrue(!preg_match('/ image_style\:/', $cache_tags_header), 'No image style cache tag found.');
$this->assertRaw($default_output, 'Default private image displayed when no user supplied image is present.');