diff -u b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Field/FieldFormatter/EntityReferenceIdFormatter.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Field/FieldFormatter/EntityReferenceIdFormatter.php --- b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Field/FieldFormatter/EntityReferenceIdFormatter.php +++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Field/FieldFormatter/EntityReferenceIdFormatter.php @@ -40,7 +40,7 @@ '#cache' => array( 'tags' => array( $referenced_entity->getEntityTypeID() => $referenced_entity->id(), - $referenced_entity->getEntityTypeID() . '_view' => $referenced_entity->id(), + $referenced_entity->getEntityTypeID() . '_view' => TRUE, ), ), ); diff -u b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Field/FieldFormatter/EntityReferenceLabelFormatter.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Field/FieldFormatter/EntityReferenceLabelFormatter.php --- b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Field/FieldFormatter/EntityReferenceLabelFormatter.php +++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Field/FieldFormatter/EntityReferenceLabelFormatter.php @@ -81,7 +81,7 @@ } $elements[$delta]['#cache']['tags'] = array( $referenced_entity->getEntityTypeID() => $referenced_entity->id(), - $referenced_entity->getEntityTypeID() . '_view' => $referenced_entity->id(), + $referenced_entity->getEntityTypeID() . '_view' => TRUE, ); } } only in patch2: unchanged: --- a/core/modules/system/lib/Drupal/system/Tests/Theme/TwigDebugMarkupTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Theme/TwigDebugMarkupTest.php @@ -48,7 +48,8 @@ function testTwigDebugMarkup() { // Create a node and test different features of the debug markup. $node = $this->drupalCreateNode(); - $output = _theme('node', node_view($node)); + $build = node_view($node); + $output = drupal_render($build); $this->assertTrue(strpos($output, '') !== FALSE, 'Twig debug markup found in theme output when debug is enabled.'); $this->assertTrue(strpos($output, "CALL: _theme('node')") !== FALSE, 'Theme call information found.'); $this->assertTrue(strpos($output, 'x node--1' . $extension . PHP_EOL . ' * node--page' . $extension . PHP_EOL . ' * node' . $extension) !== FALSE, 'Suggested template files found in order and node ID specific template shown as current template.'); @@ -58,7 +59,8 @@ function testTwigDebugMarkup() { // Create another node and make sure the template suggestions shown in the // debug markup are correct. $node2 = $this->drupalCreateNode(); - $output = _theme('node', node_view($node2)); + $build = node_view($node2); + $output = drupal_render($build); $this->assertTrue(strpos($output, '* node--2' . $extension . PHP_EOL . ' * node--page' . $extension . PHP_EOL . ' x node' . $extension) !== FALSE, 'Suggested template files found in order and base template shown as current template.'); // Create another node and make sure the template suggestions shown in the only in patch2: unchanged: --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Field/FieldFormatter/LinkFormatter.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Field/FieldFormatter/LinkFormatter.php @@ -51,6 +51,12 @@ public function viewElements(FieldItemListInterface $items) { // formatter output and should not be rendered in the field template. unset($item->_attributes); } + + $elements[$delta]['#cache']['tags'] = array( + 'taxonomy_term' => $item->entity->id(), + 'taxonomy_term_view' => TRUE, + ); + } }