diff --git a/core/modules/entity/lib/Drupal/entity/EntityDisplayBaseInterface.php b/core/lib/Drupal/Core/Entity/Display/EntityDisplayInterface.php similarity index 82% rename from core/modules/entity/lib/Drupal/entity/EntityDisplayBaseInterface.php rename to core/lib/Drupal/Core/Entity/Display/EntityDisplayInterface.php index 93fa3bb..0eac67f 100644 --- a/core/modules/entity/lib/Drupal/entity/EntityDisplayBaseInterface.php +++ b/core/lib/Drupal/Core/Entity/Display/EntityDisplayInterface.php @@ -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 @@ * @param $view_mode * The view mode for the new object. * - * @return \Drupal\entity\Entity\EntityDisplay + * @return \Drupal\Core\Entity\Display\EntityDisplayInterface * 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 \Drupal\Core\Entity\Display\EntityDisplayInterface * 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 \Drupal\Core\Entity\Display\EntityDisplayInterface * The EntityDisplay object. */ public function removeComponent($name); diff --git a/core/lib/Drupal/Core/Entity/Display/EntityFormDisplayInterface.php b/core/lib/Drupal/Core/Entity/Display/EntityFormDisplayInterface.php new file mode 100644 index 0000000..1929d9a --- /dev/null +++ b/core/lib/Drupal/Core/Entity/Display/EntityFormDisplayInterface.php @@ -0,0 +1,15 @@ +id->value) && $view_mode == 'full') { diff --git a/core/modules/comment/lib/Drupal/comment/CommentViewBuilder.php b/core/modules/comment/lib/Drupal/comment/CommentViewBuilder.php index 22dfb09..c1d6e39 100644 --- a/core/modules/comment/lib/Drupal/comment/CommentViewBuilder.php +++ b/core/modules/comment/lib/Drupal/comment/CommentViewBuilder.php @@ -9,12 +9,12 @@ use Drupal\Core\Access\CsrfTokenGenerator; use Drupal\Core\Entity\EntityControllerInterface; +use Drupal\Core\Entity\Display\EntityDisplayInterface; 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; @@ -228,7 +228,7 @@ protected function buildLinks(CommentInterface $entity, EntityInterface $comment /** * {@inheritdoc} */ - protected function alterBuild(array &$build, EntityInterface $comment, EntityDisplay $display, $view_mode, $langcode = NULL) { + protected function alterBuild(array &$build, EntityInterface $comment, EntityDisplayInterface $display, $view_mode, $langcode = NULL) { parent::alterBuild($build, $comment, $display, $view_mode, $langcode); if (empty($comment->in_preview)) { $prefix = ''; diff --git a/core/modules/entity/lib/Drupal/entity/Entity/EntityDisplay.php b/core/modules/entity/lib/Drupal/entity/Entity/EntityDisplay.php index e684a59..deab49f 100644 --- a/core/modules/entity/lib/Drupal/entity/Entity/EntityDisplay.php +++ b/core/modules/entity/lib/Drupal/entity/Entity/EntityDisplay.php @@ -7,10 +7,11 @@ namespace Drupal\entity\Entity; +use Drupal\Core\Config\Entity\ConfigEntityInterface; use Drupal\Core\Entity\Annotation\EntityType; use Drupal\Core\Annotation\Translation; +use Drupal\Core\Entity\Display\EntityDisplayInterface; use Drupal\entity\EntityDisplayBase; -use Drupal\entity\EntityDisplayInterface; /** * Configuration entity that contains display options for all components of a @@ -30,7 +31,7 @@ * } * ) */ -class EntityDisplay extends EntityDisplayBase implements EntityDisplayInterface { +class EntityDisplay extends EntityDisplayBase implements EntityDisplayInterface, ConfigEntityInterface { /** * {@inheritdoc} @@ -69,5 +70,4 @@ public function getRenderer($field_name) { $this->plugins[$field_name] = $formatter; return $formatter; } - } diff --git a/core/modules/entity/lib/Drupal/entity/Entity/EntityFormDisplay.php b/core/modules/entity/lib/Drupal/entity/Entity/EntityFormDisplay.php index 461f7ce..8a30f24 100644 --- a/core/modules/entity/lib/Drupal/entity/Entity/EntityFormDisplay.php +++ b/core/modules/entity/lib/Drupal/entity/Entity/EntityFormDisplay.php @@ -7,10 +7,11 @@ namespace Drupal\entity\Entity; +use Drupal\Core\Config\Entity\ConfigEntityInterface; 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 @@ -30,7 +31,7 @@ * } * ) */ -class EntityFormDisplay extends EntityDisplayBase implements EntityFormDisplayInterface, \Serializable { +class EntityFormDisplay extends EntityDisplayBase implements EntityFormDisplayInterface, ConfigEntityInterface, \Serializable { /** * {@inheritdoc} diff --git a/core/modules/entity/lib/Drupal/entity/EntityDisplayBase.php b/core/modules/entity/lib/Drupal/entity/EntityDisplayBase.php index 0278c58..b77a84c 100644 --- a/core/modules/entity/lib/Drupal/entity/EntityDisplayBase.php +++ b/core/modules/entity/lib/Drupal/entity/EntityDisplayBase.php @@ -8,12 +8,13 @@ namespace Drupal\entity; use Drupal\Core\Config\Entity\ConfigEntityBase; +use Drupal\Core\Entity\Display\EntityDisplayInterface; /** * 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. diff --git a/core/modules/entity/lib/Drupal/entity/EntityDisplayInterface.php b/core/modules/entity/lib/Drupal/entity/EntityDisplayInterface.php deleted file mode 100644 index 08d49c0..0000000 --- a/core/modules/entity/lib/Drupal/entity/EntityDisplayInterface.php +++ /dev/null @@ -1,17 +0,0 @@ -getComponent($field_id); diff --git a/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverviewBase.php b/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverviewBase.php index c25bd43..928e4a2 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverviewBase.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverviewBase.php @@ -8,9 +8,9 @@ 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; @@ -207,7 +207,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\entity\EntityDisplayInterface $entity_display * The entity display. * @param array $form * An associative array containing the structure of the form. @@ -217,7 +217,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->getFieldLabel(); @@ -383,7 +383,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\entity\EntityDisplayInterface $entity_display * The entity display. * * @return array @@ -621,7 +621,7 @@ public function multistepAjax($form, &$form_state) { * @param string $mode * A view or form mode. * - * @return \Drupal\entity\EntityDisplayBaseInterface + * @return \Drupal\entity\EntityDisplayInterface * An entity display. */ abstract protected function getEntityDisplay($mode); diff --git a/core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php b/core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php index a1e8d8b..d1fe7e0 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php @@ -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; @@ -38,7 +38,7 @@ public function getFormId() { /** * {@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. diff --git a/core/modules/node/lib/Drupal/node/NodeViewBuilder.php b/core/modules/node/lib/Drupal/node/NodeViewBuilder.php index 374ec6e..0948ccd 100644 --- a/core/modules/node/lib/Drupal/node/NodeViewBuilder.php +++ b/core/modules/node/lib/Drupal/node/NodeViewBuilder.php @@ -7,9 +7,9 @@ namespace Drupal\node; +use Drupal\Core\Entity\Display\EntityDisplayInterface; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\EntityViewBuilder; -use Drupal\entity\Entity\EntityDisplay; /** * Render controller for nodes. @@ -80,7 +80,7 @@ public function buildContent(array $entities, array $displays, $view_mode, $lang /** * {@inheritdoc} */ - protected function alterBuild(array &$build, EntityInterface $entity, EntityDisplay $display, $view_mode, $langcode = NULL) { + protected function alterBuild(array &$build, EntityInterface $entity, EntityDisplayInterface $display, $view_mode, $langcode = NULL) { parent::alterBuild($build, $entity, $display, $view_mode, $langcode); if ($entity->id()) { $build['#contextual_links']['node'] = array('node', array($entity->id())); diff --git a/core/modules/system/entity.api.php b/core/modules/system/entity.api.php index 05f9e57..8f88540 100644 --- a/core/modules/system/entity.api.php +++ b/core/modules/system/entity.api.php @@ -426,7 +426,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 @@ -443,7 +443,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(). @@ -472,7 +472,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. - * @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. * @@ -482,7 +482,7 @@ function hook_entity_view(\Drupal\Core\Entity\EntityInterface $entity, \Drupal\e * @see hook_taxonomy_term_view_alter() * @see hook_user_view_alter() */ -function hook_entity_view_alter(&$build, Drupal\Core\Entity\EntityInterface $entity, \Drupal\entity\Entity\EntityDisplay $display) { +function hook_entity_view_alter(&$build, Drupal\Core\Entity\EntityInterface $entity, \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; @@ -551,7 +551,7 @@ function hook_entity_view_mode_alter(&$view_mode, Drupal\Core\Entity\EntityInter /** * Alters the settings used for displaying an entity. * - * @param \Drupal\entity\Entity\EntityDisplay $display + * @param \Drupal\Core\Entity\Display\EntityViewDisplayInterface $display * The entity_display object that will be used to display the entity * components. * @param array $context @@ -560,7 +560,7 @@ function hook_entity_view_mode_alter(&$view_mode, Drupal\Core\Entity\EntityInter * - bundle: The bundle, e.g., 'page' or 'article'. * - view_mode: The view mode, e.g. 'full', 'teaser'... */ -function hook_entity_display_alter(\Drupal\entity\Entity\EntityDisplay $display, array $context) { +function hook_entity_display_alter(\Drupal\Core\Entity\Display\EntityViewDisplayInterface $display, array $context) { // Leave field labels out of the search index. if ($context['entity_type'] == 'node' && $context['view_mode'] == 'search_index') { foreach ($display->getComponents() as $name => $options) { @@ -600,7 +600,7 @@ function hook_entity_prepare_form(\Drupal\Core\Entity\EntityInterface $entity, $ /** * Alters the settings used for displaying an entity form. * - * @param \Drupal\entity\Entity\EntityFormDisplay $form_display + * @param \Drupal\Core\Entity\Display\EntityFormDisplayInterface $form_display * The entity_form_display object that will be used to display the entity form * components. * @param array $context @@ -609,7 +609,7 @@ function hook_entity_prepare_form(\Drupal\Core\Entity\EntityInterface $entity, $ * - bundle: The bundle, e.g., 'page' or 'article'. * - form_mode: The form mode, e.g. 'default', 'profile', 'register'... */ -function hook_entity_form_display_alter(\Drupal\entity\Entity\EntityFormDisplay $form_display, array $context) { +function hook_entity_form_display_alter(\Drupal\Core\Entity\Display\EntityFormDisplayInterface $form_display, array $context) { // Hide the 'user_picture' field from the register form. if ($context['entity_type'] == 'user' && $context['form_mode'] == 'register') { $form_display->setComponent('user_picture', array( diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/TermViewBuilder.php b/core/modules/taxonomy/lib/Drupal/taxonomy/TermViewBuilder.php index 6e91524..24f5d5d 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/TermViewBuilder.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/TermViewBuilder.php @@ -7,9 +7,9 @@ namespace Drupal\taxonomy; +use Drupal\Core\Entity\Display\EntityDisplayInterface; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\EntityViewBuilder; -use Drupal\entity\Entity\EntityDisplay; /** * Render controller for taxonomy terms. @@ -51,7 +51,7 @@ protected function getBuildDefaults(EntityInterface $entity, $view_mode, $langco /** * {@inheritdoc} */ - protected function alterBuild(array &$build, EntityInterface $entity, EntityDisplay $display, $view_mode, $langcode = NULL) { + protected function alterBuild(array &$build, EntityInterface $entity, EntityDisplayInterface $display, $view_mode, $langcode = NULL) { parent::alterBuild($build, $entity, $display, $view_mode, $langcode); $build['#attached']['css'][] = drupal_get_path('module', 'taxonomy') . '/css/taxonomy.module.css'; $build['#contextual_links']['taxonomy'] = array('taxonomy/term', array($entity->id()));