Commit dd663c40 authored by alexpott's avatar alexpott

Issue #2031725 by fgm, fago, vladan.me, Nebel54, Berdir: Move all entity...

Issue #2031725 by fgm, fago, vladan.me, Nebel54, Berdir: Move all entity display interfaces to the core component.
parent 94cba6d2
......@@ -639,7 +639,7 @@ function entity_view_multiple(array $entities, $view_mode, $langcode = NULL, $re
* The view mode, or 'default' to retrieve the 'default' display object for
* this bundle.
*
* @return \Drupal\entity\Entity\EntityDisplay
* @return \Drupal\Core\Entity\Display\EntityViewDisplayInterface
* The display object associated to the view mode.
*/
function entity_get_display($entity_type, $bundle, $view_mode) {
......@@ -682,7 +682,7 @@ function entity_get_display($entity_type, $bundle, $view_mode) {
* @param string $view_mode
* The view mode being rendered.
*
* @return \Drupal\entity\Entity\EntityDisplay
* @return \Drupal\Core\Entity\Display\EntityViewDisplayInterface
* The display object that should be used to render the entity.
*
* @see entity_get_display().
......@@ -751,7 +751,7 @@ function entity_get_render_display(EntityInterface $entity, $view_mode) {
* @param string $form_mode
* The form mode.
*
* @return \Drupal\entity\Entity\EntityFormDisplay
* @return \Drupal\Core\Entity\Display\EntityFormDisplayInterface
* The EntityFormDisplay object associated to the form mode.
*/
function entity_get_form_display($entity_type, $bundle, $form_mode) {
......@@ -790,7 +790,7 @@ function entity_get_form_display($entity_type, $bundle, $form_mode) {
* @param string $form_mode
* The form mode being rendered.
*
* @return \Drupal\entity\Entity\EntityFormDisplay
* @return \Drupal\Core\Entity\Display\EntityFormDisplayInterface
* The form display object that should be used to render the entity form.
*
* @see entity_get_form_display().
......
......@@ -2,17 +2,15 @@
/**
* @file
* Contains \Drupal\entity\EntityDisplayBaseInterface.
* Contains \Drupal\Core\Entity\Display\EntityDisplayInterface.
*/
namespace Drupal\entity;
use Drupal\Core\Config\Entity\ConfigEntityInterface;
namespace Drupal\Core\Entity\Display;
/**
* Provides an interface defining an entity display entity.
* Provides a common interface for entity displays.
*/
interface EntityDisplayBaseInterface extends ConfigEntityInterface {
interface EntityDisplayInterface {
/**
* Creates a duplicate of the EntityDisplay object on a different view mode.
......@@ -23,7 +21,7 @@ interface EntityDisplayBaseInterface extends ConfigEntityInterface {
* @param $view_mode
* The view mode for the new object.
*
* @return \Drupal\entity\Entity\EntityDisplay
* @return self
* The new object.
*/
public function createCopy($view_mode);
......@@ -56,7 +54,7 @@ public function getComponent($name);
* @param array $options
* The display options.
*
* @return \Drupal\entity\Entity\EntityDisplay
* @return self
* The EntityDisplay object.
*/
public function setComponent($name, array $options = array());
......@@ -67,7 +65,7 @@ public function setComponent($name, array $options = array());
* @param string $name
* The name of the component.
*
* @return \Drupal\entity\Entity\EntityDisplay
* @return self
* The EntityDisplay object.
*/
public function removeComponent($name);
......
<?php
/**
* @file
* Contains \Drupal\Core\Entity\Display\EntityFormDisplayInterface.
*/
namespace Drupal\Core\Entity\Display;
/**
* Provides a common interface for entity form displays.
*/
interface EntityFormDisplayInterface extends EntityDisplayInterface {
}
<?php
/**
* @file
* Contains \Drupal\Core\Entity\Display\EntityViewDisplayInterface.
*/
namespace Drupal\Core\Entity\Display;
/**
* Provides a common interface for entity view displays.
*/
interface EntityViewDisplayInterface extends EntityDisplayInterface {
}
......@@ -7,12 +7,9 @@
namespace Drupal\Core\Entity;
use Drupal\Core\Entity\Display\EntityFormDisplayInterface;
use Drupal\Core\Form\FormBase;
use Drupal\Core\TypedData\TranslatableInterface;
use Drupal\entity\EntityFormDisplayInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Language\Language;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Base class for entity form controllers.
......
......@@ -7,10 +7,10 @@
namespace Drupal\Core\Entity;
use Drupal\Core\Entity\Display\EntityFormDisplayInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Form\BaseFormIdInterface;
use Drupal\Core\StringTranslation\TranslationInterface;
use Drupal\entity\EntityFormDisplayInterface;
/**
* Defines a common interface for entity form controller classes.
......@@ -64,7 +64,7 @@ public function getOperation();
* @param array $form_state
* An associative array containing the current state of the form.
*
* @return \Drupal\entity\EntityFormDisplayInterface
* @return \Drupal\Core\Entity\Display\EntityFormDisplayInterface.
* The current form display.
*/
public function getFormDisplay(array $form_state);
......@@ -75,7 +75,7 @@ public function getFormDisplay(array $form_state);
* Sets the form display which will be used for populating form element
* defaults.
*
* @param \Drupal\entity\EntityFormDisplayInterface $form_display
* @param \Drupal\Core\Entity\Display\EntityFormDisplayInterface $form_display
* The form display that the current form operates with.
* @param array $form_state
* An associative array containing the current state of the form.
......
......@@ -7,9 +7,8 @@
namespace Drupal\Core\Entity;
use Drupal\Core\Entity\EntityManager;
use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
use Drupal\Core\Language\Language;
use Drupal\entity\Entity\EntityDisplay;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
......@@ -163,7 +162,7 @@ protected function getBuildDefaults(EntityInterface $entity, $view_mode, $langco
* The render array that is being created.
* @param \Drupal\Core\Entity\EntityInterface $entity
* The entity to be prepared.
* @param \Drupal\entity\Entity\EntityDisplay $display
* @param \Drupal\Core\Entity\Display\EntityViewDisplayInterface $display
* The entity_display object holding the display options configured for
* the entity components.
* @param string $view_mode
......@@ -172,7 +171,7 @@ protected function getBuildDefaults(EntityInterface $entity, $view_mode, $langco
* (optional) For which language the entity should be prepared, defaults to
* the current content language.
*/
protected function alterBuild(array &$build, EntityInterface $entity, EntityDisplay $display, $view_mode, $langcode = NULL) { }
protected function alterBuild(array &$build, EntityInterface $entity, EntityViewDisplayInterface $display, $view_mode, $langcode = NULL) { }
/**
* {@inheritdoc}
......
......@@ -7,9 +7,9 @@
namespace Drupal\custom_block;
use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityViewBuilder;
use Drupal\entity\Entity\EntityDisplay;
/**
* Render controller for custom blocks.
......@@ -19,7 +19,7 @@ class CustomBlockViewBuilder extends EntityViewBuilder {
/**
* {@inheritdoc}
*/
protected function alterBuild(array &$build, EntityInterface $entity, EntityDisplay $display, $view_mode, $langcode = NULL) {
protected function alterBuild(array &$build, EntityInterface $entity, EntityViewDisplayInterface $display, $view_mode, $langcode = NULL) {
parent::alterBuild($build, $entity, $display, $view_mode, $langcode);
// Add contextual links for this custom block.
if (!$entity->isNew() && $view_mode == 'full') {
......
......@@ -9,10 +9,8 @@
use Drupal\node\NodeInterface;
use Drupal\node\NodeTypeInterface;
use Drupal\Core\Language\Language;
use Drupal\entity\Entity\EntityDisplay;
use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
use Drupal\Core\Template\Attribute;
use Drupal\menu_link\Entity\MenuLink;
use Drupal\menu_link\MenuLinkStorageController;
/**
* Implements hook_help().
......@@ -448,7 +446,7 @@ function book_node_load($nodes) {
/**
* Implements hook_node_view().
*/
function book_node_view(EntityInterface $node, EntityDisplay $display, $view_mode) {
function book_node_view(EntityInterface $node, EntityViewDisplayInterface $display, $view_mode) {
if ($view_mode == 'full') {
if (!empty($node->book['bid']) && empty($node->in_preview)) {
$book_navigation = array( '#theme' => 'book_navigation', '#book_link' => $node->book);
......
......@@ -86,7 +86,7 @@ function hook_comment_load(Drupal\comment\Comment $comments) {
*
* @param \Drupal\comment\Entity\Comment $comment $comment
* Passes in the comment the action is being performed on.
* @param \Drupal\entity\Entity\EntityDisplay $display
* @param \Drupal\Core\Entity\Display\EntityViewDisplayInterface $display
* The entity_display object holding the display options configured for the
* comment components.
* @param $view_mode
......@@ -96,7 +96,7 @@ function hook_comment_load(Drupal\comment\Comment $comments) {
*
* @see hook_entity_view()
*/
function hook_comment_view(\Drupal\comment\Entity\Comment $comment, \Drupal\entity\Entity\EntityDisplay $display, $view_mode, $langcode) {
function hook_comment_view(\Drupal\comment\Entity\Comment $comment, \Drupal\Core\Entity\Display\EntityViewDisplayInterface $display, $view_mode, $langcode) {
// Only do the extra work if the component is configured to be displayed.
// This assumes a 'mymodule_addition' extra field has been defined for the
// node type in hook_field_extra_fields().
......@@ -124,14 +124,14 @@ function hook_comment_view(\Drupal\comment\Entity\Comment $comment, \Drupal\enti
* A renderable array representing the comment.
* @param \Drupal\comment\Entity\Comment $comment
* The comment being rendered.
* @param \Drupal\entity\Entity\EntityDisplay $display
* @param \Drupal\Core\Entity\Display\EntityViewDisplayInterface $display
* The entity_display object holding the display options configured for the
* comment components.
*
* @see comment_view()
* @see hook_entity_view_alter()
*/
function hook_comment_view_alter(&$build, \Drupal\comment\Entity\Comment $comment, \Drupal\entity\Entity\EntityDisplay $display) {
function hook_comment_view_alter(&$build, \Drupal\comment\Entity\Comment $comment, \Drupal\Core\Entity\Display\EntityViewDisplayInterface $display) {
// Check for the existence of a field added by another module.
if ($build['#view_mode'] == 'full' && isset($build['an_additional_field'])) {
// Change its weight.
......
......@@ -14,7 +14,7 @@
use Drupal\Core\Entity\EntityChangedInterface;
use Drupal\comment\CommentInterface;
use Drupal\comment\Entity\Comment;
use Drupal\entity\Entity\EntityDisplay;
use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
use Drupal\field\FieldInstanceInterface;
use Drupal\field\FieldInterface;
use Drupal\file\FileInterface;
......@@ -456,7 +456,7 @@ function theme_comment_block($variables) {
/**
* Implements hook_entity_view().
*/
function comment_entity_view(EntityInterface $entity, EntityDisplay $display, $view_mode, $langcode) {
function comment_entity_view(EntityInterface $entity, EntityViewDisplayInterface $display, $view_mode, $langcode) {
if ($entity->entityType() != 'node') {
// Comment links are only added to node entity type for backwards
// compatibility. Should you require comment links for other entity types
......@@ -594,7 +594,7 @@ function comment_entity_view(EntityInterface $entity, EntityDisplay $display, $v
/**
* Implements hook_node_view_alter().
*/
function comment_node_view_alter(&$build, EntityInterface $node, EntityDisplay $display) {
function comment_node_view_alter(&$build, EntityInterface $node, EntityViewDisplayInterface $display) {
if (\Drupal::moduleHandler()->moduleExists('history')) {
$build['#attributes']['data-history-node-id'] = $node->id();
}
......
......@@ -9,12 +9,12 @@
use Drupal\Core\Access\CsrfTokenGenerator;
use Drupal\Core\Entity\EntityControllerInterface;
use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Entity\EntityViewBuilderInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Entity\EntityViewBuilder;
use Drupal\entity\Entity\EntityDisplay;
use Drupal\field\FieldInfo;
use Symfony\Component\DependencyInjection\ContainerInterface;
......@@ -271,7 +271,7 @@ protected static function buildLinks(CommentInterface $entity, EntityInterface $
/**
* {@inheritdoc}
*/
protected function alterBuild(array &$build, EntityInterface $comment, EntityDisplay $display, $view_mode, $langcode = NULL) {
protected function alterBuild(array &$build, EntityInterface $comment, EntityViewDisplayInterface $display, $view_mode, $langcode = NULL) {
parent::alterBuild($build, $comment, $display, $view_mode, $langcode);
if (empty($comment->in_preview)) {
$prefix = '';
......
......@@ -12,10 +12,7 @@
*/
use Drupal\Core\Entity\EntityInterface;
use Drupal\edit\Form\EditFieldForm;
use Drupal\Component\Utility\NestedArray;
use Drupal\entity\Entity\EntityDisplay;
use Drupal\user\TempStoreFactory;
use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
/**
* Implements hook_menu().
......@@ -197,7 +194,7 @@ function edit_preprocess_field(&$variables) {
/**
* Implements hook_entity_view_alter().
*/
function edit_entity_view_alter(&$build, EntityInterface $entity, EntityDisplay $display) {
function edit_entity_view_alter(&$build, EntityInterface $entity, EntityViewDisplayInterface $display) {
$build['#attributes']['data-edit-entity-id'] = $entity->entityType() . '/' . $entity->id();
}
......
......@@ -7,12 +7,12 @@
use Drupal\Core\Language\Language;
use Drupal\Core\Entity\EntityInterface;
use Drupal\entity\Entity\EntityDisplay;
use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
/**
* Implements hook_entity_view_alter().
*/
function edit_test_entity_view_alter(&$build, EntityInterface $entity, EntityDisplay $display) {
function edit_test_entity_view_alter(&$build, EntityInterface $entity, EntityViewDisplayInterface $display) {
if ($entity->entityType() == 'node' && $entity->bundle() == 'article') {
$build['pseudo'] = array(
'#theme' => 'field',
......
......@@ -7,10 +7,8 @@
namespace Drupal\entity\Entity;
use Drupal\Core\Entity\Annotation\EntityType;
use Drupal\Core\Annotation\Translation;
use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
use Drupal\entity\EntityDisplayBase;
use Drupal\entity\EntityDisplayInterface;
/**
* Configuration entity that contains display options for all components of a
......@@ -30,7 +28,7 @@
* }
* )
*/
class EntityDisplay extends EntityDisplayBase implements EntityDisplayInterface {
class EntityDisplay extends EntityDisplayBase implements EntityViewDisplayInterface {
/**
* {@inheritdoc}
......
......@@ -7,10 +7,8 @@
namespace Drupal\entity\Entity;
use Drupal\Core\Entity\Annotation\EntityType;
use Drupal\Core\Annotation\Translation;
use Drupal\Core\Entity\Display\EntityFormDisplayInterface;
use Drupal\entity\EntityDisplayBase;
use Drupal\entity\EntityFormDisplayInterface;
/**
* Configuration entity that contains widget options for all components of a
......
......@@ -8,13 +8,14 @@
namespace Drupal\entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\Core\Entity\Display\EntityDisplayInterface;
use Drupal\Core\Entity\ContentEntityInterface;
/**
* Base class for config entity types that store configuration for entity forms
* and displays.
*/
abstract class EntityDisplayBase extends ConfigEntityBase implements EntityDisplayBaseInterface {
abstract class EntityDisplayBase extends ConfigEntityBase implements EntityDisplayInterface {
/**
* Unique ID for the config entity.
......
<?php
/**
* @file
* Contains \Drupal\entity\EntityDisplayInterface.
*/
namespace Drupal\entity;
use Drupal\entity\EntityDisplayBaseInterface;
/**
* Provides an interface defining an entity display entity.
*/
interface EntityDisplayInterface extends EntityDisplayBaseInterface {
}
<?php
/**
* @file
* Contains \Drupal\entity\EntityFormDisplayInterface.
*/
namespace Drupal\entity;
use Drupal\entity\EntityDisplayBaseInterface;
/**
* Provides an interface defining an entity display entity.
*/
interface EntityFormDisplayInterface extends EntityDisplayBaseInterface {
}
......@@ -8,8 +8,8 @@
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\ContentEntityInterface;
use Drupal\Core\Language\Language;
use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
use Drupal\Core\Field\FieldDefinitionInterface;
use Drupal\entity\Entity\EntityDisplay;
use Drupal\field\Field;
/**
......@@ -720,7 +720,7 @@ function field_attach_prepare_view($entity_type, array $entities, array $display
*
* @param \Drupal\Core\Entity\EntityInterface $entity
* The entity with fields to render.
* @param \Drupal\entity\Entity\EntityDisplay $display
* @param \Drupal\Core\Entity\Display\EntityViewDisplayInterface $display
* The entity display object.
* @param $langcode
* The language the field values are to be shown in. If no language is
......@@ -734,7 +734,7 @@ function field_attach_prepare_view($entity_type, array $entities, array $display
*
* @deprecated as of Drupal 8.0. Use the entity system instead.
*/
function field_attach_view(EntityInterface $entity, EntityDisplay $display, $langcode = NULL, array $options = array()) {
function field_attach_view(EntityInterface $entity, EntityViewDisplayInterface $display, $langcode = NULL, array $options = array()) {
// For each field, call the view() method on the formatter object handed
// by the entity display.
$target_function = function (FieldDefinitionInterface $field_definition) use ($display) {
......
......@@ -7,9 +7,8 @@
namespace Drupal\field_ui;
use Drupal\Component\Utility\NestedArray;
use Drupal\entity\EntityDisplayBaseInterface;
use Drupal\field\FieldInstanceInterface;
use Drupal\Core\Entity\Display\EntityDisplayInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
......@@ -49,7 +48,7 @@ public function buildForm(array $form, array &$form_state, $entity_type = NULL,
/**
* {@inheritdoc}
*/
protected function buildFieldRow($field_id, FieldInstanceInterface $instance, EntityDisplayBaseInterface $entity_display, array $form, array &$form_state) {
protected function buildFieldRow($field_id, FieldInstanceInterface $instance, EntityDisplayInterface $entity_display, array $form, array &$form_state) {
$field_row = parent::buildFieldRow($field_id, $instance, $entity_display, $form, $form_state);
$display_options = $entity_display->getComponent($field_id);
......
......@@ -8,11 +8,10 @@
namespace Drupal\field_ui;
use Drupal\Component\Plugin\PluginManagerBase;
use Drupal\Core\Entity\Display\EntityDisplayInterface;
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Field\FieldTypePluginManager;
use Drupal\entity\EntityDisplayBaseInterface;
use Drupal\field\FieldInstanceInterface;
use Drupal\field_ui\OverviewBase;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
......@@ -209,7 +208,7 @@ public function buildForm(array $form, array &$form_state, $entity_type = NULL,
* The field ID.
* @param \Drupal\field\FieldInstanceInterface $instance
* The field instance.
* @param \Drupal\entity\EntityDisplayBaseInterface $entity_display
* @param \Drupal\Core\Entity\Display\EntityDisplayInterface $entity_display
* The entity display.
* @param array $form
* An associative array containing the structure of the form.
......@@ -219,7 +218,7 @@ public function buildForm(array $form, array &$form_state, $entity_type = NULL,
* @return array
* A table row array.
*/
protected function buildFieldRow($field_id, FieldInstanceInterface $instance, EntityDisplayBaseInterface $entity_display, array $form, array &$form_state) {
protected function buildFieldRow($field_id, FieldInstanceInterface $instance, EntityDisplayInterface $entity_display, array $form, array &$form_state) {
$display_options = $entity_display->getComponent($field_id);
$label = $instance->getLabel();
......@@ -388,7 +387,7 @@ protected function buildFieldRow($field_id, FieldInstanceInterface $instance, En
* The field ID.
* @param array $extra_field
* The pseudo-field element.
* @param \Drupal\entity\EntityDisplayBaseInterface $entity_display
* @param \Drupal\Core\Entity\Display\EntityDisplayInterface $entity_display
* The entity display.
*
* @return array
......@@ -626,7 +625,7 @@ public function multistepAjax($form, &$form_state) {
* @param string $mode
* A view or form mode.
*
* @return \Drupal\entity\EntityDisplayBaseInterface
* @return \Drupal\Core\Entity\Display\EntityDisplayInterface
* An entity display.
*/
abstract protected function getEntityDisplay($mode);
......
......@@ -8,7 +8,7 @@
namespace Drupal\field_ui;
use Drupal\Component\Utility\NestedArray;
use Drupal\entity\EntityDisplayBaseInterface;
use Drupal\Core\Entity\Display\EntityDisplayInterface;
use Drupal\field\FieldInstanceInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
......@@ -49,7 +49,7 @@ public function buildForm(array $form, array &$form_state, $entity_type = NULL,
/**
* {@inheritdoc}
*/
protected function buildFieldRow($field_id, FieldInstanceInterface $instance, EntityDisplayBaseInterface $entity_display, array $form, array &$form_state) {
protected function buildFieldRow($field_id, FieldInstanceInterface $instance, EntityDisplayInterface $entity_display, array $form, array &$form_state) {
$field_row = parent::buildFieldRow($field_id, $instance, $entity_display, $form, $form_state);
// Update the (invisible) title of the 'plugin' column.
......
......@@ -10,7 +10,7 @@
*/
use Drupal\Core\Entity\EntityInterface;
use Drupal\entity\Entity\EntityDisplay;
use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
/**
* Entities changed before this time are always shown as read.
......@@ -131,7 +131,7 @@ function history_cron() {
/**
* Implements hook_node_view_alter().
*/
function history_node_view_alter(&$build, EntityInterface $node, EntityDisplay $display) {
function history_node_view_alter(&$build, EntityInterface $node, EntityViewDisplayInterface $display) {
// Update the history table, stating that this user viewed this node.
if (($display->originalMode === 'full') && \Drupal::currentUser()->isAuthenticated()) {
$build['#attached'] = array(
......
......@@ -7,9 +7,9 @@
namespace Drupal\node;
use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityViewBuilder;
use Drupal\entity\Entity\EntityDisplay;
/**
* Render controller for nodes.
......@@ -136,7 +136,7 @@ protected static function buildLinks(NodeInterface $entity, $view_mode) {
/**
* {@inheritdoc}
*/
protected function alterBuild(array &$build, EntityInterface $entity, EntityDisplay $display, $view_mode, $langcode = NULL) {
protected function alterBuild(array &$build, EntityInterface $entity, EntityViewDisplayInterface $display, $view_mode, $langcode = NULL) {
parent::alterBuild($build, $entity, $display, $view_mode, $langcode);
if ($entity->id()) {
$build['#contextual_links']['node'] = array(
......
......@@ -788,7 +788,7 @@ function hook_node_submit(\Drupal\Core\Entity\EntityInterface $node, $form, &$fo
*
* @param \Drupal\Core\Entity\EntityInterface $node
* The node that is being assembled for rendering.
* @param \Drupal\entity\Entity\EntityDisplay $display
* @param \Drupal\Core\Entity\Display\EntityViewDisplayInterface $display
* The entity_display object holding the display options configured for the
* node components.
* @param string $view_mode
......@@ -801,7 +801,7 @@ function hook_node_submit(\Drupal\Core\Entity\EntityInterface $node, $form, &$fo
*
* @ingroup node_api_hooks
*/
function hook_node_view(\Drupal\Core\Entity\EntityInterface $node, \Drupal\entity\Entity\EntityDisplay $display, $view_mode, $langcode) {
function hook_node_view(\Drupal\Core\Entity\EntityInterface $node, \Drupal\Core\Entity\Display\EntityViewDisplayInterface $display, $view_mode, $langcode) {
// Only do the extra work if the component is configured to be displayed.
// This assumes a 'mymodule_addition' extra field has been defined for the
// node type in hook_field_extra_fields().
......@@ -830,7 +830,7 @@ function hook_node_view(\Drupal\Core\Entity\EntityInterface $node, \Drupal\entit
* A renderable array representing the node content.
* @param \Drupal\Core\Entity\EntityInterface $node
* The node being rendered.
* @param \Drupal\entity\Entity\EntityDisplay $display
* @param \Drupal\Core\Entity\Display\EntityViewDisplayInterface $display
* The entity_display object holding the display options configured for the
* node components.
*
......@@ -839,7 +839,7 @@ function hook_node_view(\Drupal\Core\Entity\EntityInterface $node, \Drupal\entit
*
* @ingroup node_api_hooks
*/
function hook_node_view_alter(&$build, \Drupal\Core\Entity\EntityInterface $node, \Drupal\entity\Entity\EntityDisplay $display) {
function hook_node_view_alter(&$build, \Drupal\Core\Entity\EntityInterface $node, \Drupal\Core\Entity\Display\EntityViewDisplayInterface $display) {
if ($build['#view_mode'] == 'full' && isset($build['an_additional_field'])) {
// Change its weight.
$build['an_additional_field']['#weight'] = -10;
......
......@@ -14,14 +14,12 @@
use Drupal\Core\Cache\CacheBackendInterface;
use Drupal\Core\Database\Query\AlterableInterface;
use Drupal\Core\Database\Query\SelectInterface;
use Drupal\Core\Datetime\DrupalDateTime;
use Drupal\node\NodeTypeInterface;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
use Drupal\Core\Entity\Display\EntityFormDisplayInterface;
use Drupal\Core\Template\Attribute;
use Drupal\entity\Entity\EntityDisplay;
use Drupal\entity\Entity\EntityFormDisplay;
use Drupal\file\Entity\File;
use Drupal\user\UserInterface;
/**
* Denotes that the node is not published.
......@@ -194,7 +192,7 @@ function node_entity_bundle_info() {
/**
* Implements hook_entity_display_alter().
*/
function node_entity_display_alter(EntityDisplay $display, $context) {
function node_entity_display_alter(EntityViewDisplayInterface $display, $context) {
if ($context['entity_type'] == 'node') {
// Hide field labels in search index.
if ($context['view_mode'] == 'search_index') {
......@@ -217,7 +215,7 @@ function node_entity_display_alter(EntityDisplay $display, $context) {
/**
* Implements hook_entity_form_display_alter().
*/
function node_entity_form_display_alter(EntityFormDisplay $form_display, $context) {
function node_entity_form_display_alter(EntityFormDisplayInterface $form_display, $context) {
if ($context['entity_type'] == 'node') {
// @todo Manage base field displays in the YAML:
// https://drupal.org/node/2144919.
......
......@@ -9,13 +9,13 @@
*/
use Drupal\Core\Entity\EntityInterface;
use Drupal\entity\Entity\EntityDisplay;
use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
use Drupal\node\NodeInterface;
/**
* Implements hook_node_view().
*/
function node_test_node_view(EntityInterface $node, EntityDisplay $display, $view_mode) {
function node_test_node_view(EntityInterface $node, EntityViewDisplayInterface $display, $view_mode) {
if ($view_mode == 'rss') {
// Add RSS elements and namespaces when building the RSS feed.
$node->rss_elements[] = array(
......
......@@ -6,8 +6,8 @@
*/
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
use Drupal\node\NodeInterface;
use Drupal\entity\Entity\EntityDisplay;
/**
* Implements hook_help().
......@@ -48,7 +48,7 @@ function statistics_permission() {
/**
* Implements hook_node_view().
*/
function statistics_node_view(EntityInterface $node, EntityDisplay $display, $view_mode) {
function statistics_node_view(EntityInterface $node, EntityViewDisplayInterface $display, $view_mode) {
if (!$node->isNew() && $view_mode == 'full' && node_is_page($node) && empty($node->in_preview)) {
$node->content['#attached']['library'][] = array('statistics', 'drupal.statistics');
$settings = array('data' => array('nid' => $node->id()), 'url' => url(drupal_get_path('module', 'statistics') . '/statistics.php'));
......
......@@ -436,7 +436,7 @@ function hook_entity_query_alter(\Drupal\Core\Entity\Query\QueryInterface $query
*
* @param \Drupal\Core\Entity\EntityInterface $entity
* The entity object.
* @param \Drupal\entity\Entity\EntityDisplay $display
* @param \Drupal\Core\Entity\Display\EntityViewDisplayInterface $display
* The entity_display object holding the display options configured for the
* entity components.
* @param $view_mode
......@@ -453,7 +453,7 @@ function hook_entity_query_alter(\Drupal\Core\Entity\Query\QueryInterface $query
* @see hook_node_view()
* @see hook_user_view()
*/
function hook_entity_view(\Drupal\Core\Entity\EntityInterface $entity, \Drupal\entity\Entity\EntityDisplay $display, $view_mode, $langcode) {
function hook_entity_view(\Drupal\Core\Entity\EntityInterface $entity, \Drupal\Core\Entity\Display\EntityViewDisplayInterface $display, $view_mode, $langcode) {
// Only do the extra work if the component is configured to be displayed.
// This assumes a 'mymodule_addition' extra field has been defined for the
// entity bundle in hook_field_extra_fields().
......@@ -482,7 +482,7 @@ function hook_entity_view(\Drupal\Core\Entity\EntityInterface $entity, \Drupal\e
* A renderable array representing the entity content.
* @param \Drupal\Core\Entity\EntityInterface $entity
* The entity object being rendered.
<