diff --git a/core/modules/entity/config/schema/entity.data_types.schema.yml b/core/config/schema/core.entity.data_types.schema.yml similarity index 100% rename from core/modules/entity/config/schema/entity.data_types.schema.yml rename to core/config/schema/core.entity.data_types.schema.yml diff --git a/core/modules/entity/config/schema/entity.schema.yml b/core/config/schema/core.entity.schema.yml similarity index 96% rename from core/modules/entity/config/schema/entity.schema.yml rename to core/config/schema/core.entity.schema.yml index a924badd6cc..e5db26db74f 100644 --- a/core/modules/entity/config/schema/entity.schema.yml +++ b/core/config/schema/core.entity.schema.yml @@ -1,6 +1,6 @@ # Schema for Configuration files of the entity module. -entity.view_mode.*.*: +core.entity_view_mode.*.*: type: mapping label: 'Entity view mode settings' mapping: @@ -29,7 +29,7 @@ entity.view_mode.*.*: type: config_dependencies label: 'Dependencies' -entity.form_mode.*.*: +core.entity_form_mode.*.*: type: config_entity label: 'Entity form mode settings' mapping: @@ -47,7 +47,7 @@ entity.form_mode.*.*: label: 'Cache' # Overview configuration information for view mode or form mode displays. -entity.view_display.*.*.*: +core.entity_view_display.*.*.*: type: config_entity label: 'Entity display' mapping: @@ -79,7 +79,7 @@ entity.view_display.*.*.*: label: 'Value' # Overview configuration information for form mode displays. -entity.form_display.*.*.*: +core.entity_form_display.*.*.*: type: config_entity label: 'Entity form display' mapping: diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php index 9916615b8a5..3a6bbf41a15 100644 --- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php +++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php @@ -250,7 +250,7 @@ abstract class ConfigEntityBase extends Entity implements ConfigEntityInterface $id_key = $this->getEntityType()->getKey('id'); foreach (array_keys($definition['mapping']) as $name) { // Special handling for IDs so that computed compound IDs work. - // @see \Drupal\entity\EntityDisplayBase::id() + // @see \Drupal\Core\Entity\EntityDisplayBase::id() if ($name == $id_key) { $properties[$name] = $this->id(); } diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBundleBase.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBundleBase.php index de398da99cc..9cdd75fc3fa 100644 --- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBundleBase.php +++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBundleBase.php @@ -7,6 +7,8 @@ namespace Drupal\Core\Config\Entity; +use Drupal\Core\Entity\Entity\EntityFormDisplay; +use Drupal\Core\Entity\Entity\EntityViewDisplay; use Drupal\Core\Entity\EntityStorageInterface; /** @@ -17,6 +19,48 @@ use Drupal\Core\Entity\EntityStorageInterface; */ abstract class ConfigEntityBundleBase extends ConfigEntityBase { + /** + * Renames displays when a bundle is renamed. + */ + protected function renameDisplays() { + // Rename entity displays. + if ($this->getOriginalId() !== $this->id()) { + foreach ($this->loadDisplays('entity_view_display') as $display) { + $new_id = $this->getEntityType()->getBundleOf() . '.' . $this->id() . '.' . $display->mode; + $display->set('id', $new_id); + $display->bundle = $this->id(); + $display->save(); + } + } + + // Rename entity form displays. + if ($this->getOriginalId() !== $this->id()) { + foreach ($this->loadDisplays('entity_form_display') as $form_display) { + $new_id = $this->getEntityType()->getBundleOf() . '.' . $this->id() . '.' . $form_display->mode; + $form_display->set('id', $new_id); + $form_display->bundle = $this->id(); + $form_display->save(); + } + } + } + + /** + * Deletes display if a bundle is deleted. + */ + protected function deleteDisplays() { + // Remove entity displays of the deleted bundle. + if ($displays = $this->loadDisplays('entity_view_display')) { + $storage = $this->entityManager()->getStorage('entity_view_display'); + $storage->delete($displays); + } + + // Remove entity form displays of the deleted bundle. + if ($displays = $this->loadDisplays('entity_form_display')) { + $storage = $this->entityManager()->getStorage('entity_form_display'); + $storage->delete($displays); + } + } + /** * {@inheritdoc} */ @@ -27,6 +71,7 @@ abstract class ConfigEntityBundleBase extends ConfigEntityBase { entity_invoke_bundle_hook('create', $this->getEntityType()->getBundleOf(), $this->id()); } elseif ($this->getOriginalId() != $this->id()) { + $this->renameDisplays(); entity_invoke_bundle_hook('rename', $this->getEntityType()->getBundleOf(), $this->getOriginalId(), $this->id()); } } @@ -38,8 +83,29 @@ abstract class ConfigEntityBundleBase extends ConfigEntityBase { parent::postDelete($storage, $entities); foreach ($entities as $entity) { + $entity->deleteDisplays(); entity_invoke_bundle_hook('delete', $entity->getEntityType()->getBundleOf(), $entity->id()); } } + /** + * Returns view or form displays for this bundle. + * + * @param string $entity_type_id + * The entity type ID of the display type to load. + * + * @return \Drupal\Core\Entity\Display\EntityDisplayInterface[] + * A list of matching displays. + */ + protected function loadDisplays($entity_type_id) { + $ids = \Drupal::entityQuery($entity_type_id) + ->condition('id', $this->getEntityType()->getBundleOf() . '.' . $this->getOriginalId() . '.', 'STARTS_WITH') + ->execute(); + if ($ids) { + $storage = $this->entityManager()->getStorage($entity_type_id); + return $storage->loadMultiple($ids); + } + return array(); + } + } diff --git a/core/lib/Drupal/Core/Entity/ContentEntityForm.php b/core/lib/Drupal/Core/Entity/ContentEntityForm.php index 5a1244e782c..87883bd036e 100644 --- a/core/lib/Drupal/Core/Entity/ContentEntityForm.php +++ b/core/lib/Drupal/Core/Entity/ContentEntityForm.php @@ -8,8 +8,8 @@ namespace Drupal\Core\Entity; use Drupal\Core\Entity\Display\EntityFormDisplayInterface; +use Drupal\Core\Entity\Entity\EntityFormDisplay; use Drupal\Core\Form\FormStateInterface; -use Drupal\entity\Entity\EntityFormDisplay; use Symfony\Component\DependencyInjection\ContainerInterface; /** diff --git a/core/modules/entity/src/Entity/EntityFormDisplay.php b/core/lib/Drupal/Core/Entity/Entity/EntityFormDisplay.php similarity index 98% rename from core/modules/entity/src/Entity/EntityFormDisplay.php rename to core/lib/Drupal/Core/Entity/Entity/EntityFormDisplay.php index cbaa689604f..6339c184309 100644 --- a/core/modules/entity/src/Entity/EntityFormDisplay.php +++ b/core/lib/Drupal/Core/Entity/Entity/EntityFormDisplay.php @@ -2,15 +2,15 @@ /** * @file - * Contains \Drupal\entity\Entity\EntityFormDisplay. + * Contains \Drupal\Core\Entity\Entity\EntityFormDisplay. */ -namespace Drupal\entity\Entity; +namespace Drupal\Core\Entity\Entity; use Drupal\Core\Entity\ContentEntityInterface; use Drupal\Core\Entity\Display\EntityFormDisplayInterface; +use Drupal\Core\Entity\EntityDisplayBase; use Drupal\Core\Form\FormStateInterface; -use Drupal\entity\EntityDisplayBase; /** * Configuration entity that contains widget options for all components of a @@ -19,7 +19,6 @@ use Drupal\entity\EntityDisplayBase; * @ConfigEntityType( * id = "entity_form_display", * label = @Translation("Entity form display"), - * config_prefix = "form_display", * entity_keys = { * "id" = "id", * "status" = "status" diff --git a/core/modules/entity/src/Entity/EntityFormMode.php b/core/lib/Drupal/Core/Entity/Entity/EntityFormMode.php similarity index 60% rename from core/modules/entity/src/Entity/EntityFormMode.php rename to core/lib/Drupal/Core/Entity/Entity/EntityFormMode.php index 7af8e0605f6..7f8371ad249 100644 --- a/core/modules/entity/src/Entity/EntityFormMode.php +++ b/core/lib/Drupal/Core/Entity/Entity/EntityFormMode.php @@ -2,16 +2,16 @@ /** * @file - * Contains \Drupal\entity\Entity\EntityFormMode. + * Contains \Drupal\Core\Entity\Entity\EntityFormMode. */ -namespace Drupal\entity\Entity; +namespace Drupal\Core\Entity\Entity; -use Drupal\entity\EntityDisplayModeBase; -use Drupal\entity\EntityFormModeInterface; +use Drupal\Core\Entity\EntityDisplayModeBase; +use Drupal\Core\Entity\EntityFormModeInterface; /** - * Defines the form mode configuration entity class. + * Defines the entity form mode configuration entity class. * * Form modes allow entity forms to be displayed differently depending on the * context. For instance, the user entity form can be displayed with a set of @@ -26,27 +26,13 @@ use Drupal\entity\EntityFormModeInterface; * * @see \Drupal\Core\Entity\EntityManagerInterface::getAllFormModes() * @see \Drupal\Core\Entity\EntityManagerInterface::getFormModes() - * @see hook_entity_form_mode_info_alter() * * @ConfigEntityType( - * id = "form_mode", + * id = "entity_form_mode", * label = @Translation("Form mode"), - * handlers = { - * "list_builder" = "Drupal\entity\EntityFormModeListBuilder", - * "form" = { - * "add" = "Drupal\entity\Form\EntityFormModeAddForm", - * "edit" = "Drupal\entity\Form\EntityDisplayModeEditForm", - * "delete" = "Drupal\entity\Form\EntityDisplayModeDeleteForm" - * } - * }, - * admin_permission = "administer display modes", * entity_keys = { * "id" = "id", * "label" = "label" - * }, - * links = { - * "delete-form" = "entity.form_mode.delete_form", - * "edit-form" = "entity.form_mode.edit_form" * } * ) */ diff --git a/core/modules/entity/src/Entity/EntityViewDisplay.php b/core/lib/Drupal/Core/Entity/Entity/EntityViewDisplay.php similarity index 96% rename from core/modules/entity/src/Entity/EntityViewDisplay.php rename to core/lib/Drupal/Core/Entity/Entity/EntityViewDisplay.php index 1e4b827b19f..57041e92a1b 100644 --- a/core/modules/entity/src/Entity/EntityViewDisplay.php +++ b/core/lib/Drupal/Core/Entity/Entity/EntityViewDisplay.php @@ -2,15 +2,15 @@ /** * @file - * Contains \Drupal\entity\Entity\EntityViewDisplay. + * Contains \Drupal\Core\Entity\Entity\EntityViewDisplay. */ -namespace Drupal\entity\Entity; +namespace Drupal\Core\Entity\Entity; use Drupal\Component\Utility\NestedArray; use Drupal\Core\Entity\Display\EntityViewDisplayInterface; use Drupal\Core\Entity\ContentEntityInterface; -use Drupal\entity\EntityDisplayBase; +use Drupal\Core\Entity\EntityDisplayBase; /** * Configuration entity that contains display options for all components of a @@ -19,10 +19,6 @@ use Drupal\entity\EntityDisplayBase; * @ConfigEntityType( * id = "entity_view_display", * label = @Translation("Entity view display"), - * handlers = { - * "storage" = "Drupal\Core\Config\Entity\ConfigEntityStorage" - * }, - * config_prefix = "view_display", * entity_keys = { * "id" = "id", * "status" = "status" diff --git a/core/modules/entity/src/Entity/EntityViewMode.php b/core/lib/Drupal/Core/Entity/Entity/EntityViewMode.php similarity index 63% rename from core/modules/entity/src/Entity/EntityViewMode.php rename to core/lib/Drupal/Core/Entity/Entity/EntityViewMode.php index 67e27f4f4b8..80a38758a88 100644 --- a/core/modules/entity/src/Entity/EntityViewMode.php +++ b/core/lib/Drupal/Core/Entity/Entity/EntityViewMode.php @@ -2,16 +2,16 @@ /** * @file - * Contains \Drupal\entity\Entity\EntityViewMode. + * Contains \Drupal\Core\Entity\Entity\EntityViewMode. */ -namespace Drupal\entity\Entity; +namespace Drupal\Core\Entity\Entity; -use Drupal\entity\EntityDisplayModeBase; -use Drupal\entity\EntityViewModeInterface; +use Drupal\Core\Entity\EntityDisplayModeBase; +use Drupal\Core\Entity\EntityViewModeInterface; /** - * Defines the view mode configuration entity class. + * Defines the entity view mode configuration entity class. * * View modes let entities be displayed differently depending on the context. * For instance, a node can be displayed differently on its own page ('full' @@ -30,24 +30,11 @@ use Drupal\entity\EntityViewModeInterface; * @see hook_entity_view_mode_info_alter() * * @ConfigEntityType( - * id = "view_mode", + * id = "entity_view_mode", * label = @Translation("View mode"), - * handlers = { - * "list_builder" = "Drupal\entity\EntityDisplayModeListBuilder", - * "form" = { - * "add" = "Drupal\entity\Form\EntityDisplayModeAddForm", - * "edit" = "Drupal\entity\Form\EntityDisplayModeEditForm", - * "delete" = "Drupal\entity\Form\EntityDisplayModeDeleteForm" - * } - * }, - * admin_permission = "administer display modes", * entity_keys = { * "id" = "id", * "label" = "label" - * }, - * links = { - * "delete-form" = "entity.view_mode.delete_form", - * "edit-form" = "entity.view_mode.edit_form" * } * ) */ diff --git a/core/modules/entity/src/EntityDisplayBase.php b/core/lib/Drupal/Core/Entity/EntityDisplayBase.php similarity index 97% rename from core/modules/entity/src/EntityDisplayBase.php rename to core/lib/Drupal/Core/Entity/EntityDisplayBase.php index 8b108a218f3..3710507a59f 100644 --- a/core/modules/entity/src/EntityDisplayBase.php +++ b/core/lib/Drupal/Core/Entity/EntityDisplayBase.php @@ -2,13 +2,12 @@ /** * @file - * Contains \Drupal\entity\EntityDisplayBase. + * Contains \Drupal\Core\Entity\EntityDisplayBase. */ -namespace Drupal\entity; +namespace Drupal\Core\Entity; use Drupal\Core\Config\Entity\ConfigEntityBase; -use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Field\FieldDefinitionInterface; use Drupal\Core\Entity\Display\EntityDisplayInterface; use Drupal\field\Entity\FieldInstanceConfig; @@ -186,7 +185,7 @@ abstract class EntityDisplayBase extends ConfigEntityBase implements EntityDispl } // Depend on configured modes. if ($this->mode != 'default') { - $mode_entity = \Drupal::entityManager()->getStorage($this->displayContext . '_mode')->load($target_entity_type->id() . '.' . $this->mode); + $mode_entity = \Drupal::entityManager()->getStorage('entity_' . $this->displayContext . '_mode')->load($target_entity_type->id() . '.' . $this->mode); $this->addDependency('entity', $mode_entity->getConfigDependencyName()); } return $this->dependencies; diff --git a/core/modules/entity/src/EntityDisplayModeBase.php b/core/lib/Drupal/Core/Entity/EntityDisplayModeBase.php similarity index 91% rename from core/modules/entity/src/EntityDisplayModeBase.php rename to core/lib/Drupal/Core/Entity/EntityDisplayModeBase.php index 4dadc56bf9a..01fefaf85a0 100644 --- a/core/modules/entity/src/EntityDisplayModeBase.php +++ b/core/lib/Drupal/Core/Entity/EntityDisplayModeBase.php @@ -2,14 +2,13 @@ /** * @file - * Contains \Drupal\entity\EntityDisplayModeBase. + * Contains \Drupal\Core\Entity\EntityDisplayModeBase. */ -namespace Drupal\entity; +namespace Drupal\Core\Entity; use Drupal\Core\Config\Entity\ConfigEntityBase; use Drupal\Core\Config\Entity\ConfigEntityInterface; -use Drupal\Core\Entity\EntityStorageInterface; /** * Base class for config entity types that hold settings for form and view modes. @@ -63,8 +62,8 @@ abstract class EntityDisplayModeBase extends ConfigEntityBase implements EntityD * {@inheritdoc} */ public static function sort(ConfigEntityInterface $a, ConfigEntityInterface $b) { - /** @var \Drupal\entity\EntityDisplayModeInterface $a */ - /** @var \Drupal\entity\EntityDisplayModeInterface $b */ + /** @var \Drupal\Core\Entity\EntityDisplayModeInterface $a */ + /** @var \Drupal\Core\Entity\EntityDisplayModeInterface $b */ // Sort by the type of entity the view mode is used for. $a_type = $a->getTargetType(); $b_type = $b->getTargetType(); diff --git a/core/modules/entity/src/EntityDisplayModeInterface.php b/core/lib/Drupal/Core/Entity/EntityDisplayModeInterface.php similarity index 81% rename from core/modules/entity/src/EntityDisplayModeInterface.php rename to core/lib/Drupal/Core/Entity/EntityDisplayModeInterface.php index 178df61eecd..bf21c93f2da 100644 --- a/core/modules/entity/src/EntityDisplayModeInterface.php +++ b/core/lib/Drupal/Core/Entity/EntityDisplayModeInterface.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\entity\EntityDisplayModeInterface. + * Contains \Drupal\Core\Entity\EntityDisplayModeInterface. */ -namespace Drupal\entity; +namespace Drupal\Core\Entity; use Drupal\Core\Config\Entity\ConfigEntityInterface; diff --git a/core/modules/entity/src/EntityFormModeInterface.php b/core/lib/Drupal/Core/Entity/EntityFormModeInterface.php similarity index 66% rename from core/modules/entity/src/EntityFormModeInterface.php rename to core/lib/Drupal/Core/Entity/EntityFormModeInterface.php index e298e114762..6fdecee5c65 100644 --- a/core/modules/entity/src/EntityFormModeInterface.php +++ b/core/lib/Drupal/Core/Entity/EntityFormModeInterface.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\entity\EntityFormModeInterface. + * Contains \Drupal\Core\Entity\EntityFormModeInterface. */ -namespace Drupal\entity; +namespace Drupal\Core\Entity; /** * Provides an interface defining an entity form mode entity type. diff --git a/core/lib/Drupal/Core/Entity/EntityManager.php b/core/lib/Drupal/Core/Entity/EntityManager.php index 6b54aaf998f..26eac4eda97 100644 --- a/core/lib/Drupal/Core/Entity/EntityManager.php +++ b/core/lib/Drupal/Core/Entity/EntityManager.php @@ -832,13 +832,14 @@ class EntityManager extends DefaultPluginManager implements EntityManagerInterfa protected function getAllDisplayModesByEntityType($display_type) { if (!isset($this->displayModeInfo[$display_type])) { $key = 'entity_' . $display_type . '_info'; + $entity_type_id = 'entity_' . $display_type; $langcode = $this->languageManager->getCurrentLanguage(LanguageInterface::TYPE_INTERFACE)->id; if ($cache = $this->cacheBackend->get("$key:$langcode")) { $this->displayModeInfo[$display_type] = $cache->data; } else { $this->displayModeInfo[$display_type] = array(); - foreach ($this->getStorage($display_type)->loadMultiple() as $display_mode) { + foreach ($this->getStorage($entity_type_id)->loadMultiple() as $display_mode) { list($display_mode_entity_type, $display_mode_name) = explode('.', $display_mode->id(), 2); $this->displayModeInfo[$display_type][$display_mode_entity_type][$display_mode_name] = $display_mode->toArray(); } diff --git a/core/lib/Drupal/Core/Entity/EntityViewBuilder.php b/core/lib/Drupal/Core/Entity/EntityViewBuilder.php index 802aa5d425d..cd27e7dd0b7 100644 --- a/core/lib/Drupal/Core/Entity/EntityViewBuilder.php +++ b/core/lib/Drupal/Core/Entity/EntityViewBuilder.php @@ -10,14 +10,13 @@ namespace Drupal\Core\Entity; use Drupal\Component\Utility\NestedArray; use Drupal\Core\Cache\Cache; use Drupal\Core\Entity\Display\EntityViewDisplayInterface; -use Drupal\Core\Entity\ContentEntityInterface; use Drupal\Core\Field\FieldItemInterface; use Drupal\Core\Field\FieldItemListInterface; use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Language\LanguageManagerInterface; use Drupal\Core\TypedData\TranslatableInterface; use Drupal\Core\Render\Element; -use Drupal\entity\Entity\EntityViewDisplay; +use Drupal\Core\Entity\Entity\EntityViewDisplay; use Symfony\Component\DependencyInjection\ContainerInterface; /** diff --git a/core/modules/entity/src/EntityViewModeInterface.php b/core/lib/Drupal/Core/Entity/EntityViewModeInterface.php similarity index 66% rename from core/modules/entity/src/EntityViewModeInterface.php rename to core/lib/Drupal/Core/Entity/EntityViewModeInterface.php index 7ff4e51c2ed..f2bfe7ce763 100644 --- a/core/modules/entity/src/EntityViewModeInterface.php +++ b/core/lib/Drupal/Core/Entity/EntityViewModeInterface.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\entity\EntityViewModeInterface. + * Contains \Drupal\Core\Entity\EntityViewModeInterface. */ -namespace Drupal\entity; +namespace Drupal\Core\Entity; /** * Provides an interface defining an entity view mode entity type. diff --git a/core/lib/Drupal/Core/Extension/ModuleHandler.php b/core/lib/Drupal/Core/Extension/ModuleHandler.php index cb65449c1b8..aa36d42246b 100644 --- a/core/lib/Drupal/Core/Extension/ModuleHandler.php +++ b/core/lib/Drupal/Core/Extension/ModuleHandler.php @@ -942,7 +942,19 @@ class ModuleHandler implements ModuleHandlerInterface { // the module already, which means that it might be loaded, but not // necessarily installed. $schema_store = \Drupal::keyValue('system.schema'); + $entity_manager = \Drupal::entityManager(); foreach ($module_list as $module) { + + // Clean up all entity bundles (including field instances) of every entity + // type provided by the module that is being uninstalled. + foreach ($entity_manager->getDefinitions() as $entity_type_id => $entity_type) { + if ($entity_type->getProvider() == $module) { + foreach (array_keys($entity_manager->getBundleInfo($entity_type_id)) as $bundle) { + entity_invoke_bundle_hook('delete', $entity_type_id, $bundle); + } + } + } + // Allow modules to react prior to the uninstallation of a module. $this->invokeAll('module_preuninstall', array($module)); @@ -954,7 +966,7 @@ class ModuleHandler implements ModuleHandlerInterface { \Drupal::service('config.manager')->uninstall('module', $module); // Remove any entity schemas belonging to the module. - $entity_manager = \Drupal::entityManager(); + $schema = \Drupal::database()->schema(); foreach ($entity_manager->getDefinitions() as $entity_type) { if ($entity_type->getProvider() == $module) { diff --git a/core/modules/aggregator/config/install/entity.view_mode.aggregator_item.summary.yml b/core/modules/aggregator/config/install/core.entity_view_mode.aggregator_item.summary.yml similarity index 100% rename from core/modules/aggregator/config/install/entity.view_mode.aggregator_item.summary.yml rename to core/modules/aggregator/config/install/core.entity_view_mode.aggregator_item.summary.yml diff --git a/core/modules/block_content/config/install/entity.view_mode.block_content.full.yml b/core/modules/block_content/config/install/core.entity_view_mode.block_content.full.yml similarity index 100% rename from core/modules/block_content/config/install/entity.view_mode.block_content.full.yml rename to core/modules/block_content/config/install/core.entity_view_mode.block_content.full.yml diff --git a/core/modules/block_content/src/Tests/BlockContentCreationTest.php b/core/modules/block_content/src/Tests/BlockContentCreationTest.php index e659088e0e7..e60b7a46dc9 100644 --- a/core/modules/block_content/src/Tests/BlockContentCreationTest.php +++ b/core/modules/block_content/src/Tests/BlockContentCreationTest.php @@ -24,7 +24,7 @@ class BlockContentCreationTest extends BlockContentTestBase { * * @var array */ - public static $modules = array('block_content_test', 'dblog'); + public static $modules = array('block_content_test', 'dblog', 'entity'); /** * Sets the test up. diff --git a/core/modules/book/config/install/entity.view_mode.node.print.yml b/core/modules/book/config/install/core.entity_view_mode.node.print.yml similarity index 100% rename from core/modules/book/config/install/entity.view_mode.node.print.yml rename to core/modules/book/config/install/core.entity_view_mode.node.print.yml diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module index f9fae08887b..46a41f5257e 100644 --- a/core/modules/comment/comment.module +++ b/core/modules/comment/comment.module @@ -20,7 +20,7 @@ use Drupal\Core\Entity\ContentEntityInterface; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Routing\RouteMatchInterface; -use Drupal\entity\Entity\EntityViewDisplay; +use Drupal\Core\Entity\Entity\EntityViewDisplay; use Drupal\Core\Entity\Display\EntityViewDisplayInterface; use Drupal\Core\Field\FieldDefinitionInterface; use Drupal\Core\Render\Element; diff --git a/core/modules/comment/config/install/entity.view_mode.comment.full.yml b/core/modules/comment/config/install/core.entity_view_mode.comment.full.yml similarity index 100% rename from core/modules/comment/config/install/entity.view_mode.comment.full.yml rename to core/modules/comment/config/install/core.entity_view_mode.comment.full.yml diff --git a/core/modules/comment/src/CommentViewBuilder.php b/core/modules/comment/src/CommentViewBuilder.php index 6d4b2d18a5b..fc8da5e984c 100644 --- a/core/modules/comment/src/CommentViewBuilder.php +++ b/core/modules/comment/src/CommentViewBuilder.php @@ -14,7 +14,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Entity\EntityTypeInterface; use Drupal\Core\Entity\EntityViewBuilder; -use Drupal\entity\Entity\EntityViewDisplay; +use Drupal\Core\Entity\Entity\EntityViewDisplay; use Drupal\Core\Language\LanguageManagerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; diff --git a/core/modules/datetime/src/Tests/DateTimeFieldTest.php b/core/modules/datetime/src/Tests/DateTimeFieldTest.php index 1ecb656eb84..2a45c4a4591 100644 --- a/core/modules/datetime/src/Tests/DateTimeFieldTest.php +++ b/core/modules/datetime/src/Tests/DateTimeFieldTest.php @@ -7,7 +7,7 @@ namespace Drupal\datetime\Tests; -use Drupal\entity\Entity\EntityViewDisplay; +use Drupal\Core\Entity\Entity\EntityViewDisplay; use Drupal\simpletest\WebTestBase; use Drupal\Core\Datetime\DrupalDateTime; diff --git a/core/modules/entity/entity.info.yml b/core/modules/entity/entity.info.yml index 770aec543a5..bb9f14f38eb 100644 --- a/core/modules/entity/entity.info.yml +++ b/core/modules/entity/entity.info.yml @@ -4,4 +4,3 @@ description: 'Generic entity functionality.' package: Core version: VERSION core: 8.x -required: true diff --git a/core/modules/entity/entity.links.action.yml b/core/modules/entity/entity.links.action.yml index 85dd31fe8d0..d1917919f4d 100644 --- a/core/modules/entity/entity.links.action.yml +++ b/core/modules/entity/entity.links.action.yml @@ -1,13 +1,13 @@ -entity.view_mode_add: - route_name: entity.view_mode_add +entity.entity_view_mode_add: + route_name: entity.entity_view_mode_add title: 'Add new view mode' weight: 1 appears_on: - - entity.view_mode_list + - entity.entity_view_mode_list -entity.form_mode_add: - route_name: entity.form_mode_add +entity.entity_form_mode_add: + route_name: entity.entity_form_mode_add title: 'Add new form mode' weight: 1 appears_on: - - entity.form_mode_list + - entity.entity_form_mode_list diff --git a/core/modules/entity/entity.links.menu.yml b/core/modules/entity/entity.links.menu.yml index 66c67c644c6..9a7b6a4be0a 100644 --- a/core/modules/entity/entity.links.menu.yml +++ b/core/modules/entity/entity.links.menu.yml @@ -3,13 +3,13 @@ entity.display_mode: description: 'Configure what displays are available for your content and forms.' route_name: entity.display_mode parent: system.admin_structure -entity.view_mode_list: +entity.entity_view_mode_list: title: 'View modes' description: 'Manage custom view modes.' - route_name: entity.view_mode_list + route_name: entity.entity_view_mode_list parent: entity.display_mode -entity.form_mode_list: +entity.entity_form_mode_list: title: 'Form modes' description: 'Manage custom form modes.' - route_name: entity.form_mode_list + route_name: entity.entity_form_mode_list parent: entity.display_mode diff --git a/core/modules/entity/entity.links.task.yml b/core/modules/entity/entity.links.task.yml index ebda709530f..fbb5f9b36dd 100644 --- a/core/modules/entity/entity.links.task.yml +++ b/core/modules/entity/entity.links.task.yml @@ -1,19 +1,19 @@ -entity.view_mode.edit_form: +entity.entity_view_mode.edit_form: title: 'Edit' - route_name: entity.view_mode.edit_form - base_route: entity.view_mode.edit_form + route_name: entity.entity_view_mode.edit_form + base_route: entity.entity_view_mode.edit_form -entity.form_mode.edit_form: +entity.entity_form_mode.edit_form: title: 'Edit' - route_name: entity.form_mode.edit_form - base_route: entity.form_mode.edit_form + route_name: entity.entity_form_mode.edit_form + base_route: entity.entity_form_mode.edit_form -entity.view_mode_list: +entity.entity_view_mode_list: title: List - route_name: entity.view_mode_list - base_route: entity.view_mode_list + route_name: entity.entity_view_mode_list + base_route: entity.entity_view_mode_list -entity.form_mode_list: +entity.entity_form_mode_list: title: List - route_name: entity.form_mode_list - base_route: entity.form_mode_list + route_name: entity.entity_form_mode_list + base_route: entity.entity_form_mode_list diff --git a/core/modules/entity/entity.module b/core/modules/entity/entity.module index d3590a1fc75..b70d4e3a0ef 100644 --- a/core/modules/entity/entity.module +++ b/core/modules/entity/entity.module @@ -8,7 +8,6 @@ * entity system. */ -use Drupal\Core\Config\Entity\ConfigEntityStorage; use Drupal\Core\Routing\RouteMatchInterface; /** @@ -26,9 +25,9 @@ function entity_help($route_name, RouteMatchInterface $route_match) { $output .= '

' . t('Uses') . '

'; $output .= '
'; $output .= '
' . t('Managing view modes') . '
'; - $output .= '
' . t('Each content entity can have various "modes" for viewing. For instance, a content item could be viewed in full content mode on its own page, teaser mode in a list, or RSS mode in a feed. You can create, edit the names of, and delete view modes on the View modes page. Once a view mode has been set up, you can choose and format fields for the view mode within each entity sub-type on the Manage display page. See the Field UI module help page for more information.', array('!view-modes' => \Drupal::url('entity.view_mode_list'), '!field_ui' => \Drupal::url('help.page', array('name' => 'field_ui')))) . '
'; + $output .= '
' . t('Each content entity can have various "modes" for viewing. For instance, a content item could be viewed in full content mode on its own page, teaser mode in a list, or RSS mode in a feed. You can create, edit the names of, and delete view modes on the View modes page. Once a view mode has been set up, you can choose and format fields for the view mode within each entity sub-type on the Manage display page. See the Field UI module help page for more information.', array('!view-modes' => \Drupal::url('entity.entity_view_mode_list'), '!field_ui' => \Drupal::url('help.page', array('name' => 'field_ui')))) . '
'; $output .= '
' . t('Managing form modes') . '
'; - $output .= '
' . t('Each content entity can have various editing forms appropriate for different situations, which are known as "form modes". For instance, you might want to define a quick editing mode that allows users to edit the most important fields, and a full editing mode that gives access to all the fields. You can create, edit the names of, and delete form modes on the Manage custom form modes page. Once a form mode has been set up, you can choose which fields are available on that form within each entity sub-type on the Manage form display page. See the Field UI module help page for more information.', array('!form-modes' => \Drupal::url('entity.form_mode_list'), '!field_ui' => \Drupal::url('help.page', array('name' => 'field_ui')))) . '
'; + $output .= '
' . t('Each content entity can have various editing forms appropriate for different situations, which are known as "form modes". For instance, you might want to define a quick editing mode that allows users to edit the most important fields, and a full editing mode that gives access to all the fields. You can create, edit the names of, and delete form modes on the Manage custom form modes page. Once a form mode has been set up, you can choose which fields are available on that form within each entity sub-type on the Manage form display page. See the Field UI module help page for more information.', array('!form-modes' => \Drupal::url('entity.entity_form_mode_list'), '!field_ui' => \Drupal::url('help.page', array('name' => 'field_ui')))) . '
'; $output .= '
'; return $output; } @@ -46,70 +45,26 @@ function entity_permission() { } /** - * Implements hook_entity_bundle_rename(). + * Implements hook_entity_type_alter(). */ -function entity_entity_bundle_rename($entity_type_id, $bundle_old, $bundle_new) { - // Rename entity displays. - $entity_type = \Drupal::entityManager()->getDefinition('entity_view_display'); - if ($bundle_old !== $bundle_new) { - $ids = \Drupal::configFactory()->listAll('entity.view_display.' . $entity_type_id . '.' . $bundle_old . '.'); - foreach ($ids as $id) { - $id = ConfigEntityStorage::getIDFromConfigName($id, $entity_type->getConfigPrefix()); - $display = entity_load('entity_view_display', $id); - $new_id = $entity_type_id . '.' . $bundle_new . '.' . $display->mode; - $display->set('id', $new_id); - $display->bundle = $bundle_new; - $display->save(); - } - } +function entity_entity_type_alter(array &$entity_types) { + /** @var $entity_types \Drupal\Core\Entity\EntityTypeInterface[] */ + $form_mode = $entity_types['entity_form_mode']; + $form_mode->setListBuilderClass('Drupal\entity\EntityFormModeListBuilder'); + $form_mode->setFormClass('add', 'Drupal\entity\Form\EntityFormModeAddForm'); + $form_mode->setFormClass('edit', 'Drupal\entity\Form\EntityDisplayModeEditForm'); + $form_mode->setFormClass('delete', 'Drupal\entity\Form\EntityDisplayModeDeleteForm'); + $form_mode->set('admin_permission', 'administer display modes'); + $form_mode->setLinkTemplate('delete-form', 'entity.entity_form_mode.delete_form'); + $form_mode->setLinkTemplate('edit-form', 'entity.entity_form_mode.edit_form'); - // Rename entity form displays. - $entity_type = \Drupal::entityManager()->getDefinition('entity_form_display'); - if ($bundle_old !== $bundle_new) { - $ids = \Drupal::configFactory()->listAll('entity.form_display.' . $entity_type_id . '.' . $bundle_old . '.'); - foreach ($ids as $id) { - $id = ConfigEntityStorage::getIDFromConfigName($id, $entity_type->getConfigPrefix()); - $form_display = entity_load('entity_form_display', $id); - $new_id = $entity_type_id . '.' . $bundle_new . '.' . $form_display->mode; - $form_display->set('id', $new_id); - $form_display->bundle = $bundle_new; - $form_display->save(); - } - } + $view_mode = $entity_types['entity_view_mode']; + $view_mode->setListBuilderClass('Drupal\entity\EntityDisplayModeListBuilder'); + $view_mode->setFormClass('add', 'Drupal\entity\Form\EntityDisplayModeAddForm'); + $view_mode->setFormClass('edit', 'Drupal\entity\Form\EntityDisplayModeEditForm'); + $view_mode->setFormClass('delete', 'Drupal\entity\Form\EntityDisplayModeDeleteForm'); + $view_mode->set('admin_permission', 'administer display modes'); + $view_mode->setLinkTemplate('delete-form', 'entity.entity_view_mode.delete_form'); + $view_mode->setLinkTemplate('edit-form', 'entity.entity_view_mode.edit_form'); } -/** - * Implements hook_entity_bundle_delete(). - */ -function entity_entity_bundle_delete($entity_type_id, $bundle) { - // Remove entity displays of the deleted bundle. - $entity_type = \Drupal::entityManager()->getDefinition('entity_view_display'); - $ids = \Drupal::configFactory()->listAll('entity.view_display.' . $entity_type_id . '.' . $bundle . '.'); - foreach ($ids as &$id) { - $id = ConfigEntityStorage::getIDFromConfigName($id, $entity_type->getConfigPrefix()); - } - entity_delete_multiple('entity_view_display', $ids); - - // Remove entity form displays of the deleted bundle. - $entity_type = \Drupal::entityManager()->getDefinition('entity_form_display'); - $ids = \Drupal::configFactory()->listAll('entity.form_display.' . $entity_type_id . '.' . $bundle . '.'); - foreach ($ids as &$id) { - $id = ConfigEntityStorage::getIDFromConfigName($id, $entity_type->getConfigPrefix()); - } - entity_delete_multiple('entity_form_display', $ids); -} - -/** - * Implements hook_module_preuninstall(). - */ -function entity_module_preuninstall($module) { - // Clean up all entity bundles (including field instances) of every entity - // type provided by the module that is being uninstalled. - foreach (\Drupal::entityManager()->getDefinitions() as $entity_type_id => $entity_type) { - if ($entity_type->getProvider() == $module) { - foreach (array_keys(entity_get_bundles($entity_type_id)) as $bundle) { - entity_invoke_bundle_hook('delete', $entity_type_id, $bundle); - } - } - } -} diff --git a/core/modules/entity/entity.routing.yml b/core/modules/entity/entity.routing.yml index 212913ea51d..2064c0a0940 100644 --- a/core/modules/entity/entity.routing.yml +++ b/core/modules/entity/entity.routing.yml @@ -6,15 +6,15 @@ entity.display_mode: requirements: _permission: 'administer display modes' -entity.view_mode_list: +entity.entity_view_mode_list: path: '/admin/structure/display-modes/view' defaults: - _entity_list: 'view_mode' + _entity_list: 'entity_view_mode' _title: 'View modes' requirements: _permission: 'administer display modes' -entity.view_mode_add: +entity.entity_view_mode_add: path: '/admin/structure/display-modes/view/add' defaults: _content: '\Drupal\entity\Controller\EntityDisplayModeController::viewModeTypeSelection' @@ -22,39 +22,39 @@ entity.view_mode_add: requirements: _permission: 'administer display modes' -entity.view_mode_add_type: +entity.entity_view_mode_add_type: path: '/admin/structure/display-modes/view/add/{entity_type_id}' defaults: - _entity_form: 'view_mode.add' + _entity_form: 'entity_view_mode.add' _title: 'Add view mode' requirements: _permission: 'administer display modes' -entity.view_mode.edit_form: - path: '/admin/structure/display-modes/view/manage/{view_mode}' +entity.entity_view_mode.edit_form: + path: '/admin/structure/display-modes/view/manage/{entity_view_mode}' defaults: - _entity_form: 'view_mode.edit' + _entity_form: 'entity_view_mode.edit' _title: 'Edit view mode' requirements: - _entity_access: 'view_mode.update' + _entity_access: 'entity_view_mode.update' -entity.view_mode.delete_form: - path: '/admin/structure/display-modes/view/manage/{view_mode}/delete' +entity.entity_view_mode.delete_form: + path: '/admin/structure/display-modes/view/manage/{entity_view_mode}/delete' defaults: - _entity_form: 'view_mode.delete' + _entity_form: 'entity_view_mode.delete' _title: 'Delete view mode' requirements: - _entity_access: 'view_mode.delete' + _entity_access: 'entity_view_mode.delete' -entity.form_mode_list: +entity.entity_form_mode_list: path: '/admin/structure/display-modes/form' defaults: - _entity_list: 'form_mode' + _entity_list: 'entity_form_mode' _title: 'Form modes' requirements: _permission: 'administer display modes' -entity.form_mode_add: +entity.entity_form_mode_add: path: '/admin/structure/display-modes/form/add' defaults: _content: '\Drupal\entity\Controller\EntityDisplayModeController::formModeTypeSelection' @@ -62,26 +62,26 @@ entity.form_mode_add: requirements: _permission: 'administer display modes' -entity.form_mode_add_type: +entity.entity_form_mode_add_type: path: '/admin/structure/display-modes/form/add/{entity_type_id}' defaults: - _entity_form: 'form_mode.add' + _entity_form: 'entity_form_mode.add' _title: 'Add form mode' requirements: _permission: 'administer display modes' -entity.form_mode.edit_form: - path: '/admin/structure/display-modes/form/manage/{form_mode}' +entity.entity_form_mode.edit_form: + path: '/admin/structure/display-modes/form/manage/{entity_form_mode}' defaults: - _entity_form: 'form_mode.edit' + _entity_form: 'entity_form_mode.edit' _title: 'Edit form mode' requirements: - _entity_access: 'form_mode.update' + _entity_access: 'entity_form_mode.update' -entity.form_mode.delete_form: - path: '/admin/structure/display-modes/form/manage/{form_mode}/delete' +entity.entity_form_mode.delete_form: + path: '/admin/structure/display-modes/form/manage/{entity_form_mode}/delete' defaults: - _entity_form: 'form_mode.delete' + _entity_form: 'entity_form_mode.delete' _title: 'Delete form mode' requirements: - _entity_access: 'form_mode.delete' + _entity_access: 'entity_form_mode.delete' diff --git a/core/modules/entity/src/Controller/EntityDisplayModeController.php b/core/modules/entity/src/Controller/EntityDisplayModeController.php index af31044a287..562a0daf52a 100644 --- a/core/modules/entity/src/Controller/EntityDisplayModeController.php +++ b/core/modules/entity/src/Controller/EntityDisplayModeController.php @@ -27,7 +27,7 @@ class EntityDisplayModeController extends ControllerBase { if ($entity_type->isFieldable() && $entity_type->hasViewBuilderClass()) { $entity_types[$entity_type_id] = array( 'title' => $entity_type->getLabel(), - 'url' => new Url('entity.view_mode_add_type', array('entity_type_id' => $entity_type_id)), + 'url' => new Url('entity.entity_view_mode_add_type', array('entity_type_id' => $entity_type_id)), 'localized_options' => array(), ); } @@ -50,7 +50,7 @@ class EntityDisplayModeController extends ControllerBase { if ($entity_type->isFieldable() && $entity_type->hasFormClasses()) { $entity_types[$entity_type_id] = array( 'title' => $entity_type->getLabel(), - 'url' => new Url('entity.form_mode_add_type', array('entity_type_id' => $entity_type_id)), + 'url' => new Url('entity.entity_form_mode_add_type', array('entity_type_id' => $entity_type_id)), 'localized_options' => array(), ); } diff --git a/core/modules/entity/src/Tests/EntityDisplayModeTest.php b/core/modules/entity/src/Tests/EntityDisplayModeTest.php index 4373fd02ce3..003412026b2 100644 --- a/core/modules/entity/src/Tests/EntityDisplayModeTest.php +++ b/core/modules/entity/src/Tests/EntityDisplayModeTest.php @@ -21,7 +21,7 @@ class EntityDisplayModeTest extends WebTestBase { * * @var array */ - public static $modules = array('entity_test'); + public static $modules = array('entity_test', 'entity'); /** * Tests the EntityViewMode user interface. diff --git a/core/modules/entity/src/Tests/EntityDisplayTest.php b/core/modules/entity/src/Tests/EntityDisplayTest.php index 1efa671fac3..6d99ce9b1a2 100644 --- a/core/modules/entity/src/Tests/EntityDisplayTest.php +++ b/core/modules/entity/src/Tests/EntityDisplayTest.php @@ -7,6 +7,7 @@ namespace Drupal\entity\Tests; +use Drupal\Core\Entity\Entity\EntityViewMode; use Drupal\simpletest\DrupalUnitTestBase; /** @@ -78,12 +79,12 @@ class EntityDisplayTest extends DrupalUnitTestBase { // Check that CreateCopy() creates a new component that can be correclty // saved. - entity_create('view_mode', array('id' => $display->targetEntityType . '.other_view_mode', 'targetEntityType' => $display->targetEntityType))->save(); + EntityViewMode::create(array('id' => $display->targetEntityType . '.other_view_mode', 'targetEntityType' => $display->targetEntityType))->save(); $new_display = $display->createCopy('other_view_mode'); $new_display->save(); $new_display = entity_load('entity_view_display', $new_display->id()); $dependencies = $new_display->calculateDependencies(); - $this->assertEqual(array('entity' => array('entity.view_mode.entity_test.other_view_mode'), 'module' => array('entity_test')), $dependencies); + $this->assertEqual(array('entity' => array('core.entity_view_mode.entity_test.other_view_mode'), 'module' => array('entity_test')), $dependencies); $this->assertEqual($new_display->targetEntityType, $display->targetEntityType); $this->assertEqual($new_display->bundle, $display->bundle); $this->assertEqual($new_display->mode, 'other_view_mode'); @@ -233,7 +234,7 @@ class EntityDisplayTest extends DrupalUnitTestBase { // Check that saving the display only writes data for fields whose display // is configurable. $display->save(); - $config = \Drupal::config('entity.view_display.' . $display->id()); + $config = \Drupal::config('core.entity_view_display.' . $display->id()); $data = $config->get(); $this->assertFalse(isset($data['content']['test_no_display'])); $this->assertFalse(isset($data['hidden']['test_no_display'])); @@ -275,9 +276,9 @@ class EntityDisplayTest extends DrupalUnitTestBase { $type->type = 'article_rename'; $type->save(); $old_display = entity_load('entity_view_display', 'node.article.default'); - $this->assertFalse($old_display); + $this->assertFalse((bool) $old_display); $old_form_display = entity_load('entity_form_display', 'node.article.default'); - $this->assertFalse($old_form_display); + $this->assertFalse((bool) $old_form_display); $new_display = entity_load('entity_view_display', 'node.article_rename.default'); $this->assertEqual('article_rename', $new_display->bundle); $this->assertEqual('node.article_rename.default', $new_display->id); @@ -302,9 +303,9 @@ class EntityDisplayTest extends DrupalUnitTestBase { // Delete the bundle. $type->delete(); $display = entity_load('entity_view_display', 'node.article_rename.default'); - $this->assertFalse($display); + $this->assertFalse((bool) $display); $form_display = entity_load('entity_form_display', 'node.article_rename.default'); - $this->assertFalse($form_display); + $this->assertFalse((bool) $form_display); } /** @@ -326,7 +327,7 @@ class EntityDisplayTest extends DrupalUnitTestBase { $instance->save(); // Create default and teaser entity display. - entity_create('view_mode', array('id' => 'entity_test.teaser', 'targetEntityType' => 'entity_test'))->save(); + EntityViewMode::create(array('id' => 'entity_test.teaser', 'targetEntityType' => 'entity_test'))->save(); entity_create('entity_view_display', array( 'targetEntityType' => 'entity_test', 'bundle' => 'entity_test', diff --git a/core/modules/entity/src/Tests/EntityFormDisplayTest.php b/core/modules/entity/src/Tests/EntityFormDisplayTest.php index eaaec9a07f1..6723a49c849 100644 --- a/core/modules/entity/src/Tests/EntityFormDisplayTest.php +++ b/core/modules/entity/src/Tests/EntityFormDisplayTest.php @@ -7,6 +7,7 @@ namespace Drupal\entity\Tests; +use Drupal\Core\Entity\Entity\EntityFormMode; use Drupal\simpletest\DrupalUnitTestBase; /** @@ -146,7 +147,7 @@ class EntityFormDisplayTest extends DrupalUnitTestBase { // Check that saving the display only writes data for fields whose display // is configurable. $display->save(); - $config = \Drupal::config('entity.form_display.' . $display->id()); + $config = \Drupal::config('core.entity_form_display.' . $display->id()); $data = $config->get(); $this->assertFalse(isset($data['content']['test_no_display'])); $this->assertFalse(isset($data['hidden']['test_no_display'])); @@ -190,7 +191,7 @@ class EntityFormDisplayTest extends DrupalUnitTestBase { $instance->save(); // Create default and compact entity display. - entity_create('form_mode', array('id' => 'entity_test.compact', 'targetEntityType' => 'entity_test'))->save(); + EntityFormMode::create(array('id' => 'entity_test.compact', 'targetEntityType' => 'entity_test'))->save(); entity_create('entity_form_display', array( 'targetEntityType' => 'entity_test', 'bundle' => 'entity_test', diff --git a/core/modules/field/field.api.php b/core/modules/field/field.api.php index 8af955f7139..d905c69b268 100644 --- a/core/modules/field/field.api.php +++ b/core/modules/field/field.api.php @@ -119,7 +119,7 @@ function hook_field_storage_config_update_forbid(\Drupal\field\FieldStorageConfi * Widgets are @link forms_api_reference.html Form API @endlink * elements with additional processing capabilities. The methods of the * WidgetInterface object are typically called by respective methods in the - * \Drupal\entity\Entity\EntityFormDisplay class. + * \Drupal\Core\Entity\Entity\EntityFormDisplay class. * * @see field * @see field_types diff --git a/core/modules/field/src/Tests/DisplayApiTest.php b/core/modules/field/src/Tests/DisplayApiTest.php index 0b8b860483c..4753aef4671 100644 --- a/core/modules/field/src/Tests/DisplayApiTest.php +++ b/core/modules/field/src/Tests/DisplayApiTest.php @@ -7,6 +7,8 @@ namespace Drupal\field\Tests; +use Drupal\Core\Entity\Entity\EntityViewMode; + /** * Tests the field display API. * @@ -99,7 +101,7 @@ class DisplayApiTest extends FieldUnitTestBase { ->setComponent($this->field_name, $this->display_options['default']) ->save(); // Create a display for the teaser view mode. - entity_create('view_mode', array('id' => 'entity_test.teaser', 'targetEntityType' => 'entity_test'))->save(); + EntityViewMode::create(array('id' => 'entity_test.teaser', 'targetEntityType' => 'entity_test'))->save(); entity_get_display($instance['entity_type'], $instance['bundle'], 'teaser') ->setComponent($this->field_name, $this->display_options['teaser']) ->save(); diff --git a/core/modules/field/tests/modules/field_test/src/Form/NestedEntityTestForm.php b/core/modules/field/tests/modules/field_test/src/Form/NestedEntityTestForm.php index ea5a30e010c..b1f9d1c4cf0 100644 --- a/core/modules/field/tests/modules/field_test/src/Form/NestedEntityTestForm.php +++ b/core/modules/field/tests/modules/field_test/src/Form/NestedEntityTestForm.php @@ -10,7 +10,7 @@ namespace Drupal\field_test\Form; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Form\FormBase; use Drupal\Core\Form\FormStateInterface; -use Drupal\entity\Entity\EntityFormDisplay; +use Drupal\Core\Entity\Entity\EntityFormDisplay; /** * Provides a form for field_test routes. diff --git a/core/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module index 696d07a45fe..4cd3bceaa1f 100644 --- a/core/modules/field_ui/field_ui.module +++ b/core/modules/field_ui/field_ui.module @@ -9,7 +9,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Render\Element; use Drupal\Core\Routing\RouteMatchInterface; -use Drupal\entity\EntityViewModeInterface; +use Drupal\Core\Entity\EntityViewModeInterface; use Drupal\field_ui\FieldUI; use Drupal\field_ui\Plugin\Derivative\FieldUiLocalTask; diff --git a/core/modules/forum/config/install/entity.form_display.taxonomy_term.forums.default.yml b/core/modules/forum/config/install/core.entity_form_display.taxonomy_term.forums.default.yml similarity index 100% rename from core/modules/forum/config/install/entity.form_display.taxonomy_term.forums.default.yml rename to core/modules/forum/config/install/core.entity_form_display.taxonomy_term.forums.default.yml diff --git a/core/modules/forum/config/install/entity.view_display.taxonomy_term.forums.default.yml b/core/modules/forum/config/install/core.entity_view_display.taxonomy_term.forums.default.yml similarity index 100% rename from core/modules/forum/config/install/entity.view_display.taxonomy_term.forums.default.yml rename to core/modules/forum/config/install/core.entity_view_display.taxonomy_term.forums.default.yml diff --git a/core/modules/migrate/src/Plugin/migrate/destination/EntityViewMode.php b/core/modules/migrate/src/Plugin/migrate/destination/EntityViewMode.php index 0887d30ab28..87fe2048382 100644 --- a/core/modules/migrate/src/Plugin/migrate/destination/EntityViewMode.php +++ b/core/modules/migrate/src/Plugin/migrate/destination/EntityViewMode.php @@ -9,7 +9,7 @@ namespace Drupal\migrate\Plugin\migrate\destination; /** * @MigrateDestination( - * id = "entity:view_mode" + * id = "entity:entity_view_mode" * ) */ class EntityViewMode extends EntityConfigBase { diff --git a/core/modules/migrate/tests/src/destination/PerComponentEntityDisplayTest.php b/core/modules/migrate/tests/src/destination/PerComponentEntityDisplayTest.php index ac26f3aa275..4708179c799 100644 --- a/core/modules/migrate/tests/src/destination/PerComponentEntityDisplayTest.php +++ b/core/modules/migrate/tests/src/destination/PerComponentEntityDisplayTest.php @@ -33,7 +33,7 @@ class PerComponentEntityDisplayTest extends MigrateTestCase { foreach ($values as $key => $value) { $row->setDestinationProperty($key, $value); } - $entity = $this->getMockBuilder('Drupal\entity\Entity\EntityViewDisplay') + $entity = $this->getMockBuilder('Drupal\Core\Entity\Entity\EntityViewDisplay') ->disableOriginalConstructor() ->getMock(); $entity->expects($this->once()) diff --git a/core/modules/migrate/tests/src/destination/PerComponentEntityFormDisplayTest.php b/core/modules/migrate/tests/src/destination/PerComponentEntityFormDisplayTest.php index d1aa648bfc1..e2504a8404e 100644 --- a/core/modules/migrate/tests/src/destination/PerComponentEntityFormDisplayTest.php +++ b/core/modules/migrate/tests/src/destination/PerComponentEntityFormDisplayTest.php @@ -33,7 +33,7 @@ class PerComponentEntityFormDisplayTest extends MigrateTestCase { foreach ($values as $key => $value) { $row->setDestinationProperty($key, $value); } - $entity = $this->getMockBuilder('Drupal\entity\Entity\EntityFormDisplay') + $entity = $this->getMockBuilder('Drupal\Core\Entity\Entity\EntityFormDisplay') ->disableOriginalConstructor() ->getMock(); $entity->expects($this->once()) diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_view_modes.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_view_modes.yml index 4e5cfd118a7..5c4cc8e835d 100644 --- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_view_modes.yml +++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_view_modes.yml @@ -37,4 +37,4 @@ process: status: 'constants/status' destination: - plugin: entity:view_mode + plugin: entity:entity_view_mode diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php index c8f13aca7c8..11bb90a0ec9 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php @@ -11,7 +11,7 @@ use Drupal\migrate\MigrateExecutable; use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; /** - * Upgrade comment subject variable to entity.form_display.comment.*.default.yml + * Upgrade comment subject variable to core.entity_form_display.comment.*.default.yml * * @group migrate_drupal */ diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableEntityFormDisplayTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableEntityFormDisplayTest.php index 47efbfcd9be..f0b3dc54400 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableEntityFormDisplayTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableEntityFormDisplayTest.php @@ -8,7 +8,7 @@ namespace Drupal\migrate_drupal\Tests\d6; /** - * Upgrade comment variables to entity.form_display.node.*.default.yml. + * Upgrade comment variables to core.entity_form_display.node.*.default.yml. * * @group migrate_drupal */ diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldFormatterSettingsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldFormatterSettingsTest.php index 6e351105522..4be0bea39cc 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldFormatterSettingsTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldFormatterSettingsTest.php @@ -7,6 +7,7 @@ namespace Drupal\migrate_drupal\Tests\d6; +use Drupal\Core\Entity\Entity\EntityViewMode; use Drupal\migrate\MigrateExecutable; use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; @@ -33,7 +34,7 @@ class MigrateFieldFormatterSettingsTest extends MigrateDrupalTestBase { entity_create('node_type', array('type' => 'test_page'))->save(); entity_create('node_type', array('type' => 'story'))->save(); // Create the node preview view mode. - entity_create('view_mode', array('id' => 'node.preview', 'targetEntityType' => 'node'))->save(); + EntityViewMode::create(array('id' => 'node.preview', 'targetEntityType' => 'node'))->save(); // Add some id mappings for the dependant migrations. $id_mappings = array( diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateViewModesTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateViewModesTest.php index b887f18e3a8..8a7a48cbc10 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateViewModesTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateViewModesTest.php @@ -7,6 +7,7 @@ namespace Drupal\migrate_drupal\Tests\d6; +use Drupal\Core\Entity\Entity\EntityViewMode; use Drupal\migrate\MigrateExecutable; use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; @@ -43,7 +44,7 @@ class MigrateViewModesTest extends MigrateDrupalTestBase { */ public function testViewModes() { // Test a new view mode. - $view_mode = entity_load('view_mode', 'node.preview'); + $view_mode = EntityViewMode::load('node.preview'); $this->assertEqual(is_null($view_mode), FALSE, 'Preview view mode loaded.'); $this->assertEqual($view_mode->label(), 'Preview', 'View mode has correct label.'); // Test the Id Map. diff --git a/core/modules/node/config/install/entity.view_mode.node.full.yml b/core/modules/node/config/install/core.entity_view_mode.node.full.yml similarity index 100% rename from core/modules/node/config/install/entity.view_mode.node.full.yml rename to core/modules/node/config/install/core.entity_view_mode.node.full.yml diff --git a/core/modules/node/config/install/entity.view_mode.node.rss.yml b/core/modules/node/config/install/core.entity_view_mode.node.rss.yml similarity index 100% rename from core/modules/node/config/install/entity.view_mode.node.rss.yml rename to core/modules/node/config/install/core.entity_view_mode.node.rss.yml diff --git a/core/modules/node/config/install/entity.view_mode.node.search_index.yml b/core/modules/node/config/install/core.entity_view_mode.node.search_index.yml similarity index 100% rename from core/modules/node/config/install/entity.view_mode.node.search_index.yml rename to core/modules/node/config/install/core.entity_view_mode.node.search_index.yml diff --git a/core/modules/node/config/install/entity.view_mode.node.search_result.yml b/core/modules/node/config/install/core.entity_view_mode.node.search_result.yml similarity index 100% rename from core/modules/node/config/install/entity.view_mode.node.search_result.yml rename to core/modules/node/config/install/core.entity_view_mode.node.search_result.yml diff --git a/core/modules/node/config/install/entity.view_mode.node.teaser.yml b/core/modules/node/config/install/core.entity_view_mode.node.teaser.yml similarity index 100% rename from core/modules/node/config/install/entity.view_mode.node.teaser.yml rename to core/modules/node/config/install/core.entity_view_mode.node.teaser.yml diff --git a/core/modules/node/src/Form/NodePreviewForm.php b/core/modules/node/src/Form/NodePreviewForm.php index 4c5bb913892..cdca58cc61d 100644 --- a/core/modules/node/src/Form/NodePreviewForm.php +++ b/core/modules/node/src/Form/NodePreviewForm.php @@ -13,7 +13,6 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Form\FormBase; use Drupal\Core\Form\FormStateInterface; -use Drupal\Core\Url; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -141,9 +140,9 @@ class NodePreviewForm extends FormBase implements ContainerInjectionInterface { $view_modes = $this->entityManager->getViewModes('node'); // Get the list of available view modes for the current node's bundle. - $ids = $this->configFactory->listAll('entity.view_display.node.' . $node->bundle()); + $ids = $this->configFactory->listAll('core.entity_view_display.node.' . $node->bundle()); foreach ($ids as $id) { - $config_id = str_replace('entity.view_display' . '.', '', $id); + $config_id = str_replace('core.entity_view_display' . '.', '', $id); $load_ids[] = $config_id; } $displays = entity_load_multiple('entity_view_display', $load_ids); diff --git a/core/modules/node/src/Tests/NodeTypeRenameConfigImportTest.php b/core/modules/node/src/Tests/NodeTypeRenameConfigImportTest.php index 7c904d2ed0a..8e7f51dfd52 100644 --- a/core/modules/node/src/Tests/NodeTypeRenameConfigImportTest.php +++ b/core/modules/node/src/Tests/NodeTypeRenameConfigImportTest.php @@ -86,9 +86,9 @@ class NodeTypeRenameConfigImportTest extends WebTestBase { $expected = array( 'node.type.' . $active_type . '::node.type.' . $staged_type, 'core.base_field_override.node.' . $active_type . '.status::core.base_field_override.node.' . $staged_type . '.status', - 'entity.form_display.node.' . $active_type . '.default::entity.form_display.node.' . $staged_type . '.default', - 'entity.view_display.node.' . $active_type . '.default::entity.view_display.node.' . $staged_type . '.default', - 'entity.view_display.node.' . $active_type . '.teaser::entity.view_display.node.' . $staged_type . '.teaser', + 'core.entity_form_display.node.' . $active_type . '.default::core.entity_form_display.node.' . $staged_type . '.default', + 'core.entity_view_display.node.' . $active_type . '.default::core.entity_view_display.node.' . $staged_type . '.default', + 'core.entity_view_display.node.' . $active_type . '.teaser::core.entity_view_display.node.' . $staged_type . '.teaser', 'field.instance.node.' . $active_type . '.body::field.instance.node.' . $staged_type . '.body', ); $renames = $this->configImporter()->getUnprocessedConfiguration('rename'); diff --git a/core/modules/quickedit/src/Form/QuickEditFieldForm.php b/core/modules/quickedit/src/Form/QuickEditFieldForm.php index 3b4a5ee2b7f..a5c4b38b604 100644 --- a/core/modules/quickedit/src/Form/QuickEditFieldForm.php +++ b/core/modules/quickedit/src/Form/QuickEditFieldForm.php @@ -15,7 +15,7 @@ use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Form\FormBase; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Render\Element; -use Drupal\entity\Entity\EntityFormDisplay; +use Drupal\Core\Entity\Entity\EntityFormDisplay; use Drupal\user\TempStoreFactory; use Symfony\Component\DependencyInjection\ContainerInterface; diff --git a/core/modules/quickedit/src/MetadataGenerator.php b/core/modules/quickedit/src/MetadataGenerator.php index 1ae7975b50e..c510bf1b815 100644 --- a/core/modules/quickedit/src/MetadataGenerator.php +++ b/core/modules/quickedit/src/MetadataGenerator.php @@ -12,7 +12,7 @@ use Drupal\Component\Utility\String; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Field\FieldItemListInterface; use Drupal\quickedit\Access\EditEntityFieldAccessCheckInterface; -use Drupal\entity\Entity\EntityViewDisplay; +use Drupal\Core\Entity\Entity\EntityViewDisplay; /** * Generates in-place editing metadata for an entity field. diff --git a/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php b/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php index 94b27fc5178..795ed05f310 100644 --- a/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php +++ b/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php @@ -147,7 +147,7 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase { */ protected function selectViewMode($entity_type) { $view_modes = \Drupal::entityManager() - ->getStorage('view_mode') + ->getStorage('entity_view_mode') ->loadByProperties(array('targetEntityType' => $entity_type)); if (empty($view_modes)) { diff --git a/core/modules/system/tests/modules/entity_test/config/install/entity.view_mode.entity_test.full.yml b/core/modules/system/tests/modules/entity_test/config/install/core.entity_view_mode.entity_test.full.yml similarity index 100% rename from core/modules/system/tests/modules/entity_test/config/install/entity.view_mode.entity_test.full.yml rename to core/modules/system/tests/modules/entity_test/config/install/core.entity_view_mode.entity_test.full.yml diff --git a/core/modules/system/tests/modules/entity_test/config/install/entity.view_mode.entity_test.test.yml b/core/modules/system/tests/modules/entity_test/config/install/core.entity_view_mode.entity_test.test.yml similarity index 100% rename from core/modules/system/tests/modules/entity_test/config/install/entity.view_mode.entity_test.test.yml rename to core/modules/system/tests/modules/entity_test/config/install/core.entity_view_mode.entity_test.test.yml diff --git a/core/modules/system/tests/modules/entity_test/entity_test.module b/core/modules/system/tests/modules/entity_test/entity_test.module index c7db0200794..b0350879dd3 100644 --- a/core/modules/system/tests/modules/entity_test/entity_test.module +++ b/core/modules/system/tests/modules/entity_test/entity_test.module @@ -12,7 +12,7 @@ use Drupal\Core\Field\FieldDefinitionInterface; use Drupal\Core\Field\FieldItemListInterface; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Session\AccountInterface; -use Drupal\entity\Entity\EntityFormDisplay; +use Drupal\Core\Entity\Entity\EntityFormDisplay; /** * Filter that limits test entity list to revisable ones. diff --git a/core/modules/taxonomy/config/install/entity.view_mode.taxonomy_term.full.yml b/core/modules/taxonomy/config/install/core.entity_view_mode.taxonomy_term.full.yml similarity index 100% rename from core/modules/taxonomy/config/install/entity.view_mode.taxonomy_term.full.yml rename to core/modules/taxonomy/config/install/core.entity_view_mode.taxonomy_term.full.yml diff --git a/core/modules/user/config/install/entity.form_mode.user.register.yml b/core/modules/user/config/install/core.entity_form_mode.user.register.yml similarity index 100% rename from core/modules/user/config/install/entity.form_mode.user.register.yml rename to core/modules/user/config/install/core.entity_form_mode.user.register.yml diff --git a/core/modules/user/config/install/entity.view_mode.user.compact.yml b/core/modules/user/config/install/core.entity_view_mode.user.compact.yml similarity index 100% rename from core/modules/user/config/install/entity.view_mode.user.compact.yml rename to core/modules/user/config/install/core.entity_view_mode.user.compact.yml diff --git a/core/modules/user/config/install/entity.view_mode.user.full.yml b/core/modules/user/config/install/core.entity_view_mode.user.full.yml similarity index 100% rename from core/modules/user/config/install/entity.view_mode.user.full.yml rename to core/modules/user/config/install/core.entity_view_mode.user.full.yml diff --git a/core/modules/user/user.info.yml b/core/modules/user/user.info.yml index dbdb5207065..45a421a5ade 100644 --- a/core/modules/user/user.info.yml +++ b/core/modules/user/user.info.yml @@ -6,5 +6,3 @@ version: VERSION core: 8.x required: true configure: user.admin_index -dependencies: - - entity diff --git a/core/modules/views/src/Tests/Handler/AreaEntityTest.php b/core/modules/views/src/Tests/Handler/AreaEntityTest.php index 006e5b0dfd4..9082352f286 100644 --- a/core/modules/views/src/Tests/Handler/AreaEntityTest.php +++ b/core/modules/views/src/Tests/Handler/AreaEntityTest.php @@ -96,9 +96,9 @@ class AreaEntityTest extends ViewTestBase { $this->assertTrue(strpos(trim((string) $result[0]), 'full') !== FALSE, 'The rendered entity appeared in the right view mode.'); // Mark entity_test test view_mode as customizable. - $view_mode = \Drupal::entityManager()->getStorage('view_mode')->load('entity_test.test'); - $view_mode->enable(); - $view_mode->save(); + $entity_view_mode = \Drupal::entityManager()->getStorage('entity_view_mode')->load('entity_test.test'); + $entity_view_mode->enable(); + $entity_view_mode->save(); // Change the view mode of the area handler. $view = Views::getView('test_entity_area'); diff --git a/core/profiles/standard/config/install/entity.form_display.node.article.default.yml b/core/profiles/standard/config/install/core.entity_form_display.node.article.default.yml similarity index 100% rename from core/profiles/standard/config/install/entity.form_display.node.article.default.yml rename to core/profiles/standard/config/install/core.entity_form_display.node.article.default.yml diff --git a/core/profiles/standard/config/install/entity.form_display.user.user.default.yml b/core/profiles/standard/config/install/core.entity_form_display.user.user.default.yml similarity index 100% rename from core/profiles/standard/config/install/entity.form_display.user.user.default.yml rename to core/profiles/standard/config/install/core.entity_form_display.user.user.default.yml diff --git a/core/profiles/standard/config/install/entity.view_display.node.article.default.yml b/core/profiles/standard/config/install/core.entity_view_display.node.article.default.yml similarity index 100% rename from core/profiles/standard/config/install/entity.view_display.node.article.default.yml rename to core/profiles/standard/config/install/core.entity_view_display.node.article.default.yml diff --git a/core/profiles/standard/config/install/entity.view_display.node.article.teaser.yml b/core/profiles/standard/config/install/core.entity_view_display.node.article.teaser.yml similarity index 95% rename from core/profiles/standard/config/install/entity.view_display.node.article.teaser.yml rename to core/profiles/standard/config/install/core.entity_view_display.node.article.teaser.yml index d22ab13a533..114bc32fd47 100644 --- a/core/profiles/standard/config/install/entity.view_display.node.article.teaser.yml +++ b/core/profiles/standard/config/install/core.entity_view_display.node.article.teaser.yml @@ -27,7 +27,7 @@ content: label: above dependencies: entity: - - entity.view_mode.node.teaser + - core.entity_view_mode.node.teaser - field.instance.node.article.body - field.instance.node.article.field_image - field.instance.node.article.field_tags diff --git a/core/profiles/standard/config/install/entity.view_display.user.user.compact.yml b/core/profiles/standard/config/install/core.entity_view_display.user.user.compact.yml similarity index 89% rename from core/profiles/standard/config/install/entity.view_display.user.user.compact.yml rename to core/profiles/standard/config/install/core.entity_view_display.user.user.compact.yml index 2b0254295b4..410f3f3c653 100644 --- a/core/profiles/standard/config/install/entity.view_display.user.user.compact.yml +++ b/core/profiles/standard/config/install/core.entity_view_display.user.user.compact.yml @@ -16,7 +16,7 @@ hidden: status: true dependencies: entity: - - entity.view_mode.user.compact + - core.entity_view_mode.user.compact module: - image - user diff --git a/core/profiles/standard/config/install/entity.view_display.user.user.default.yml b/core/profiles/standard/config/install/core.entity_view_display.user.user.default.yml similarity index 100% rename from core/profiles/standard/config/install/entity.view_display.user.user.default.yml rename to core/profiles/standard/config/install/core.entity_view_display.user.user.default.yml diff --git a/core/profiles/standard/standard.info.yml b/core/profiles/standard/standard.info.yml index a1c07b23815..758a6b9b58e 100644 --- a/core/profiles/standard/standard.info.yml +++ b/core/profiles/standard/standard.info.yml @@ -19,6 +19,7 @@ dependencies: - block_content - quickedit - editor + - entity - entity_reference - help - image diff --git a/core/tests/Drupal/Tests/Core/Config/Entity/EntityDisplayModeBaseUnitTest.php b/core/tests/Drupal/Tests/Core/Config/Entity/EntityDisplayModeBaseUnitTest.php index 9b323426624..4e62f114fc4 100644 --- a/core/tests/Drupal/Tests/Core/Config/Entity/EntityDisplayModeBaseUnitTest.php +++ b/core/tests/Drupal/Tests/Core/Config/Entity/EntityDisplayModeBaseUnitTest.php @@ -11,7 +11,7 @@ use Drupal\Core\DependencyInjection\ContainerBuilder; use Drupal\Tests\UnitTestCase; /** - * @coversDefaultClass \Drupal\entity\EntityDisplayModeBase + * @coversDefaultClass \Drupal\Core\Entity\EntityDisplayModeBase * @group Config */ class EntityDisplayModeBaseUnitTest extends UnitTestCase { @@ -19,7 +19,7 @@ class EntityDisplayModeBaseUnitTest extends UnitTestCase { /** * The entity under test. * - * @var \Drupal\entity\EntityDisplayModeBase|\PHPUnit_Framework_MockObject_MockObject + * @var \Drupal\Core\Entity\EntityDisplayModeBase|\PHPUnit_Framework_MockObject_MockObject */ protected $entity; @@ -94,7 +94,7 @@ class EntityDisplayModeBaseUnitTest extends UnitTestCase { ->with($this->entityType) ->will($this->returnValue($this->entityInfo)); - $this->entity = $this->getMockBuilder('\Drupal\entity\EntityDisplayModeBase') + $this->entity = $this->getMockBuilder('\Drupal\Core\Entity\EntityDisplayModeBase') ->setConstructorArgs(array($values, $this->entityType)) ->setMethods(array('getFilterFormat')) ->getMock();