diff --git a/core/includes/entity.api.php b/core/includes/entity.api.php index da9c1b8..b73173e 100644 --- a/core/includes/entity.api.php +++ b/core/includes/entity.api.php @@ -173,7 +173,7 @@ function hook_entity_info_alter(&$entity_info) { function hook_entity_create(\Drupal\Core\Entity\EntityInterface $entity) { // @todo Remove the check for EntityNG once all entity types have been // converted to it. - if (!isset($entity->foo) && ($entity instanceof \Drupal\Core\Entity\EntityNG)) { + if (!isset($entity->foo) && ($entity instanceof \Drupal\Core\Entity\ContentEntityBase)) { $entity->foo->value = 'some_initial_value'; } } diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php index 14d3f18..fa9e71b 100644 --- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php +++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php @@ -75,4 +75,12 @@ public function setStatus($status); */ public function status(); + /** + * Retrieves the exportable properties of the entity. + * + * @return array + * An array of exportable properties and their values. + */ + public function getExportProperties(); + } diff --git a/core/lib/Drupal/Core/Entity/EntityNG.php b/core/lib/Drupal/Core/Entity/ContentEntityBase.php similarity index 88% rename from core/lib/Drupal/Core/Entity/EntityNG.php rename to core/lib/Drupal/Core/Entity/ContentEntityBase.php index ac975d1..c9de1bf 100644 --- a/core/lib/Drupal/Core/Entity/EntityNG.php +++ b/core/lib/Drupal/Core/Entity/ContentEntityBase.php @@ -2,7 +2,7 @@ /** * @file - * Contains \Drupal\Core\Entity\EntityNG. + * Contains \Drupal\Core\Entity\ContentEntityBase. */ namespace Drupal\Core\Entity; @@ -24,7 +24,7 @@ * @todo: Once all entity types have been converted, merge improvements into the * Entity class and overhaul the EntityInterface. */ -class EntityNG extends Entity { +class ContentEntityBase extends Entity implements ContentEntityInterface { /** * Status code indentifying a removed translation. @@ -135,6 +135,20 @@ class EntityNG extends Entity { protected $translationInitialize = FALSE; /** + * Boolean indicating whether a new revision should be created on save. + * + * @var bool + */ + protected $newRevision = FALSE; + + /** + * Indicates whether this is the default revision. + * + * @var bool + */ + protected $isDefaultRevision = TRUE; + + /** * Overrides Entity::__construct(). */ public function __construct(array $values, $entity_type, $bundle = FALSE, $translations = array()) { @@ -168,6 +182,142 @@ public function __construct(array $values, $entity_type, $bundle = FALSE, $trans } /** + * {@inheritdoc} + */ + public function setNewRevision($value = TRUE) { + $this->newRevision = $value; + } + /** + * {@inheritdoc} + */ + public function isNewRevision() { + $info = $this->entityInfo(); + return $this->newRevision || (!empty($info['entity_keys']['revision']) && !$this->getRevisionId()); + } + + /** + * {@inheritdoc} + */ + public function getRevisionId() { + return NULL; + } + + /** + * {@inheritdoc} + */ + public function isTranslatable() { + // @todo Inject the entity manager and retrieve bundle info from it. + $bundles = entity_get_bundles($this->entityType); + return !empty($bundles[$this->bundle()]['translatable']); + } + + /** + * {@inheritdoc} + */ + public function preSaveRevision(EntityStorageControllerInterface $storage_controller, \stdClass $record) { + } + + /** + * {@inheritdoc} + */ + public function getDefinition() { + // @todo: This does not make much sense, so remove once TypedDataInterface + // is removed. See https://drupal.org/node/2002138. + if ($this->bundle() != $this->entityType()) { + $type = 'entity:' . $this->entityType() . ':' . $this->bundle(); + } + else { + $type = 'entity:' . $this->entityType(); + } + return array('type' => $type); + } + + /** + * {@inheritdoc} + */ + public function getValue() { + // @todo: This does not make much sense, so remove once TypedDataInterface + // is removed. See https://drupal.org/node/2002138. + return $this->getPropertyValues(); + } + + /** + * Implements \Drupal\Core\TypedData\TypedDataInterface::setValue(). + */ + public function setValue($value, $notify = TRUE) { + // @todo: This does not make much sense, so remove once TypedDataInterface + // is removed. See https://drupal.org/node/2002138. + $this->setPropertyValues($value); + } + + /** + * {@inheritdoc} + */ + public function getString() { + return $this->label(); + } + + /** + * {@inheritdoc} + */ + public function validate() { + // @todo: Add the typed data manager as proper dependency. + return \Drupal::typedData()->getValidator()->validate($this); + } + + /** + * {@inheritdoc} + */ + public function applyDefaultValue($notify = TRUE) { + foreach ($this->getProperties() as $property) { + $property->applyDefaultValue(FALSE); + } + } + + /** + * {@inheritdoc} + */ + public function getConstraints() { + return array(); + } + + /** + * Implements \Drupal\Core\TypedData\TypedDataInterface::getName(). + */ + public function getName() { + return NULL; + } + + /** + * Implements \Drupal\Core\TypedData\TypedDataInterface::getRoot(). + */ + public function getRoot() { + return $this; + } + + /** + * Implements \Drupal\Core\TypedData\TypedDataInterface::getPropertyPath(). + */ + public function getPropertyPath() { + return ''; + } + + /** + * Implements \Drupal\Core\TypedData\TypedDataInterface::getParent(). + */ + public function getParent() { + return NULL; + } + + /** + * Implements \Drupal\Core\TypedData\TypedDataInterface::setContext(). + */ + public function setContext($name = NULL, TypedDataInterface $parent = NULL) { + // As entities are always the root of the tree of typed data, we do not need + // to set any parent or name. + } + + /** * Initialize the object. Invoked upon construction and wake up. */ protected function init() { diff --git a/core/lib/Drupal/Core/Entity/ContentEntityInterface.php b/core/lib/Drupal/Core/Entity/ContentEntityInterface.php index 9f2186f..6acdd1a 100644 --- a/core/lib/Drupal/Core/Entity/ContentEntityInterface.php +++ b/core/lib/Drupal/Core/Entity/ContentEntityInterface.php @@ -7,9 +7,23 @@ namespace Drupal\Core\Entity; +use Drupal\Core\TypedData\ComplexDataInterface; +use Drupal\Core\TypedData\TranslatableInterface; + /** * Defines a common interface for all content entity objects. */ -interface ContentEntityInterface extends EntityInterface { +interface ContentEntityInterface extends EntityInterface, RevisionableInterface, TranslatableInterface, ComplexDataInterface { + + /** + * Marks the translation identified by the given language code as existing. + * + * @todo Remove this as soon as translation metadata have been converted to + * regular fields. + * + * @param string $langcode + * The language code identifying the translation to be initialized. + */ + public function initTranslation($langcode); } diff --git a/core/lib/Drupal/Core/Entity/Entity.php b/core/lib/Drupal/Core/Entity/Entity.php index 3fc660d..a831f9b 100644 --- a/core/lib/Drupal/Core/Entity/Entity.php +++ b/core/lib/Drupal/Core/Entity/Entity.php @@ -46,20 +46,6 @@ class Entity implements IteratorAggregate, EntityInterface { protected $enforceIsNew; /** - * Boolean indicating whether a new revision should be created on save. - * - * @var bool - */ - protected $newRevision = FALSE; - - /** - * Indicates whether this is the default revision. - * - * @var bool - */ - protected $isDefaultRevision = TRUE; - - /** * Constructs an Entity object. * * @param array $values @@ -98,14 +84,6 @@ public function isNew() { } /** - * Implements \Drupal\Core\Entity\EntityInterface::isNewRevision(). - */ - public function isNewRevision() { - $info = $this->entityInfo(); - return $this->newRevision || (!empty($info['entity_keys']['revision']) && !$this->getRevisionId()); - } - - /** * Implements \Drupal\Core\Entity\EntityInterface::enforceIsNew(). */ public function enforceIsNew($value = TRUE) { @@ -113,13 +91,6 @@ public function enforceIsNew($value = TRUE) { } /** - * Implements \Drupal\Core\Entity\EntityInterface::setNewRevision(). - */ - public function setNewRevision($value = TRUE) { - $this->newRevision = $value; - } - - /** * Implements \Drupal\Core\Entity\EntityInterface::entityType(). */ public function entityType() { @@ -197,7 +168,7 @@ public function uriRelationships() { /** * Implements \Drupal\Core\Entity\EntityInterface::get(). */ - public function get($property_name, $langcode = NULL) { + public function get($property_name) { // @todo: Replace by EntityNG implementation once all entity types have been // converted to use the entity field API. return isset($this->{$property_name}) ? $this->{$property_name} : NULL; @@ -212,62 +183,6 @@ public function set($property_name, $value, $notify = TRUE) { $this->{$property_name} = $value; } - /** - * Implements \Drupal\Core\TypedData\ComplexDataInterface::getProperties(). - */ - public function getProperties($include_computed = FALSE) { - // @todo: Replace by EntityNG implementation once all entity types have been - // converted to use the entity field API. - } - - /** - * Implements \Drupal\Core\TypedData\ComplexDataInterface::getPropertyValues(). - */ - public function getPropertyValues() { - // @todo: Replace by EntityNG implementation once all entity types have been - // converted to use the entity field API. - } - - /** - * Implements \Drupal\Core\TypedData\ComplexDataInterface::setPropertyValues(). - */ - public function setPropertyValues($values) { - // @todo: Replace by EntityNG implementation once all entity types have been - // converted to use the entity field API. - } - - /** - * Implements \Drupal\Core\TypedData\ComplexDataInterface::getPropertyDefinition(). - */ - public function getPropertyDefinition($name) { - // @todo: Replace by EntityNG implementation once all entity types have been - // converted to use the entity field API. - } - - /** - * Implements \Drupal\Core\TypedData\ComplexDataInterface::getPropertyDefinitions(). - */ - public function getPropertyDefinitions() { - // @todo: Replace by EntityNG implementation once all entity types have been - // converted to use the entity field API. - } - - /** - * Implements \Drupal\Core\TypedData\ComplexDataInterface::isEmpty(). - */ - public function isEmpty() { - // @todo: Replace by EntityNG implementation once all entity types have been - // converted to use the entity field API. - } - - /** - * Implements \Drupal\Core\TypedData\ComplexDataInterface::getIterator(). - */ - public function getIterator() { - // @todo: Replace by EntityNG implementation once all entity types have been - // converted to use the entity field API. - return new \ArrayIterator(array()); - } /** * Implements \Drupal\Core\TypedData\AccessibleInterface::access(). @@ -284,7 +199,7 @@ public function access($operation = 'view', AccountInterface $account = NULL) { } /** - * Implements \Drupal\Core\TypedData\TranslatableInterface::language(). + * {@inheritdoc} */ public function language() { // @todo: Replace by EntityNG implementation once all entity types have been @@ -298,28 +213,6 @@ public function language() { } /** - * Implements \Drupal\Core\TypedData\TranslatableInterface::getTranslation(). - * - * @return \Drupal\Core\Entity\EntityInterface - */ - public function getTranslation($langcode) { - // @todo: Replace by EntityNG implementation once all entity types have been - // converted to use the entity field API. - return $this; - } - - /** - * Returns the languages the entity is translated to. - * - * @todo: Remove once all entity types implement the entity field API. - * This is deprecated by - * \Drupal\Core\TypedData\TranslatableInterface::getTranslationLanguages(). - */ - public function translations() { - return $this->getTranslationLanguages(FALSE); - } - - /** * Implements \Drupal\Core\TypedData\TranslatableInterface::getTranslationLanguages(). */ public function getTranslationLanguages($include_default = TRUE) { @@ -328,7 +221,6 @@ public function getTranslationLanguages($include_default = TRUE) { $default_language = $this->language(); $languages = array($default_language->id => $default_language); $entity_info = $this->entityInfo(); - if ($entity_info['fieldable']) { // Go through translatable properties and determine all languages for // which translated values are available. @@ -351,6 +243,11 @@ public function getTranslationLanguages($include_default = TRUE) { } /** + * {@inheritdoc} + */ + public function getTranslation($langcode) { } + + /** * Implements \Drupal\Core\Entity\EntityInterface::save(). */ public function save() { @@ -390,13 +287,6 @@ public function entityInfo() { } /** - * Implements \Drupal\Core\Entity\EntityInterface::getRevisionId(). - */ - public function getRevisionId() { - return NULL; - } - - /** * Implements \Drupal\Core\Entity\EntityInterface::isDefaultRevision(). */ public function isDefaultRevision($new_value = NULL) { @@ -408,143 +298,6 @@ public function isDefaultRevision($new_value = NULL) { } /** - * Implements \Drupal\Core\Entity\EntityInterface::getExportProperties(). - */ - public function getExportProperties() { - return array(); - } - - /** - * Implements \Drupal\Core\Entity\EntityInterface::getBCEntity(). - */ - public function getBCEntity() { - return $this; - } - - /** - * Implements \Drupal\Core\Entity\EntityInterface::getNGEntity(). - */ - public function getNGEntity() { - return $this; - } - - /** - * {@inheritdoc} - */ - public function getDefinition() { - // @todo: This does not make much sense, so remove once TypedDataInterface - // is removed. See https://drupal.org/node/2002138. - if ($this->bundle() != $this->entityType()) { - $type = 'entity:' . $this->entityType() . ':' . $this->bundle(); - } - else { - $type = 'entity:' . $this->entityType(); - } - return array('type' => $type); - } - - /** - * {@inheritdoc} - */ - public function getValue() { - // @todo: This does not make much sense, so remove once TypedDataInterface - // is removed. See https://drupal.org/node/2002138. - return $this->getPropertyValues(); - } - - /** - * Implements \Drupal\Core\TypedData\TypedDataInterface::setValue(). - */ - public function setValue($value, $notify = TRUE) { - // @todo: This does not make much sense, so remove once TypedDataInterface - // is removed. See https://drupal.org/node/2002138. - $this->setPropertyValues($value); - } - - /** - * {@inheritdoc} - */ - public function getString() { - return $this->label(); - } - - /** - * {@inheritdoc} - */ - public function getConstraints() { - return array(); - } - - /** - * {@inheritdoc} - */ - public function validate() { - // @todo: Add the typed data manager as proper dependency. - return \Drupal::typedData()->getValidator()->validate($this); - } - - /** - * {@inheritdoc} - */ - public function applyDefaultValue($notify = TRUE) { - foreach ($this->getProperties() as $property) { - $property->applyDefaultValue(FALSE); - } - } - - /** - * Implements \Drupal\Core\TypedData\ComplexDataInterface::onChange(). - */ - public function onChange($property_name) { - // Nothing to do. - } - - /** - * Implements \Drupal\Core\TypedData\TypedDataInterface::getName(). - */ - public function getName() { - return NULL; - } - - /** - * Implements \Drupal\Core\TypedData\TypedDataInterface::getRoot(). - */ - public function getRoot() { - return $this; - } - - /** - * Implements \Drupal\Core\TypedData\TypedDataInterface::getPropertyPath(). - */ - public function getPropertyPath() { - return ''; - } - - /** - * Implements \Drupal\Core\TypedData\TypedDataInterface::getParent(). - */ - public function getParent() { - return NULL; - } - - /** - * Implements \Drupal\Core\TypedData\TypedDataInterface::setContext(). - */ - public function setContext($name = NULL, TypedDataInterface $parent = NULL) { - // As entities are always the root of the tree of typed data, we do not need - // to set any parent or name. - } - - /** - * Implements \Drupal\Core\Entity\EntityInterface::isTranslatable(). - */ - public function isTranslatable() { - // @todo Inject the entity manager and retrieve bundle info from it. - $bundles = entity_get_bundles($this->entityType); - return !empty($bundles[$this->bundle()]['translatable']); - } - - /** * {@inheritdoc} */ public function preSave(EntityStorageControllerInterface $storage_controller) { @@ -587,51 +340,26 @@ public static function postLoad(EntityStorageControllerInterface $storage_contro } /** - * {@inheritdoc} - */ - public function preSaveRevision(EntityStorageControllerInterface $storage_controller, \stdClass $record) { - } - - /** - * {@inheritdoc} - */ - public function getUntranslated() { - return $this->getTranslation(Language::LANGCODE_DEFAULT); - } - - /** - * {@inheritdoc} - */ - public function hasTranslation($langcode) { - $translations = $this->getTranslationLanguages(); - return isset($translations[$langcode]); - } - - /** - * {@inheritdoc} + * Implements \Drupal\Core\TypedData\ComplexDataInterface::getIterator(). */ - public function addTranslation($langcode, array $values = array()) { - // @todo Config entities do not support entity translation hence we need to - // move the TranslatableInterface implementation to EntityNG. See - // http://drupal.org/node/2004244 + public function getIterator() { + // @todo: Replace by EntityNG implementation once all entity types have been + // converted to use the entity field API. + return new \ArrayIterator(array()); } /** - * {@inheritdoc} + * Implements \Drupal\Core\Entity\EntityInterface::getBCEntity(). */ - public function removeTranslation($langcode) { - // @todo Config entities do not support entity translation hence we need to - // move the TranslatableInterface implementation to EntityNG. See - // http://drupal.org/node/2004244 + public function getBCEntity() { + return $this; } /** - * {@inheritdoc} + * Implements \Drupal\Core\Entity\EntityInterface::getNGEntity(). */ - public function initTranslation($langcode) { - // @todo Config entities do not support entity translation hence we need to - // move the TranslatableInterface implementation to EntityNG. See - // http://drupal.org/node/2004244 + public function getNGEntity() { + return $this; } } diff --git a/core/lib/Drupal/Core/Entity/EntityBCDecorator.php b/core/lib/Drupal/Core/Entity/EntityBCDecorator.php index b0be82e..66c84fd 100644 --- a/core/lib/Drupal/Core/Entity/EntityBCDecorator.php +++ b/core/lib/Drupal/Core/Entity/EntityBCDecorator.php @@ -38,7 +38,7 @@ * * @todo: Remove once everything is converted to use the new entity field API. */ -class EntityBCDecorator implements IteratorAggregate, EntityInterface { +class EntityBCDecorator implements IteratorAggregate, EntityInterface, TypedDataInterface { /** * The EntityInterface object being decorated. @@ -62,7 +62,7 @@ class EntityBCDecorator implements IteratorAggregate, EntityInterface { * @param array &$definitions * An array of field definitions. */ - function __construct(EntityNG $decorated, array &$definitions) { + function __construct(ContentEntityBase $decorated, array &$definitions) { $this->decorated = $decorated; $this->definitions = &$definitions; } diff --git a/core/lib/Drupal/Core/Entity/EntityFormController.php b/core/lib/Drupal/Core/Entity/EntityFormController.php index ceb09de..b871a3a 100644 --- a/core/lib/Drupal/Core/Entity/EntityFormController.php +++ b/core/lib/Drupal/Core/Entity/EntityFormController.php @@ -7,6 +7,7 @@ namespace Drupal\Core\Entity; +use Drupal\Core\TypedData\TranslatableInterface; use Drupal\entity\EntityFormDisplayInterface; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Language\Language; @@ -191,9 +192,19 @@ public function form(array $form, array &$form_state) { // If the form did not specify otherwise, default to keeping the existing // language of the entity or defaulting to the site default language for // new entities. + if (!$entity->isNew()) { + if ($entity instanceof TranslatableInterface) { + $langcode = $entity->getUntranslated()->language()->id; + } + else { + $langcode = $entity->language()->id; + } + } + else + $langcode = language_default()->id; $form['langcode'] = array( '#type' => 'value', - '#value' => !$entity->isNew() ? $entity->getUntranslated()->language()->id : language_default()->id, + '#value' => $langcode, ); } return $form; @@ -300,7 +311,7 @@ public function validate(array $form, array &$form_state) { $violations = array(); // @todo Simplify when all entity types are converted to EntityNG. - if ($entity instanceof EntityNG) { + if ($entity instanceof ContentEntityBase) { foreach ($entity as $field_name => $field) { $field_violations = $field->validate(); if (count($field_violations)) { @@ -402,7 +413,7 @@ public function getFormLangcode(array $form_state) { if (!empty($form_state['langcode'])) { $langcode = $form_state['langcode']; } - else { + elseif ($entity instanceof TranslatableInterface) { // If no form langcode was provided we default to the current content // language and inspect existing translations to find a valid fallback, // if any. @@ -416,14 +427,30 @@ public function getFormLangcode(array $form_state) { // If the site is not multilingual or no translation for the given form // language is available, fall back to the entity language. - return !empty($langcode) ? $langcode : $entity->getUntranslated()->language()->id; + if (!empty($langcode)) { + return $langcode; + } + elseif ($entity instanceof TranslatableInterface) { + // If the entity is translatable, return the original language. + return $entity->getUntranslated()->language()->id; + } + else { + // Fall back to the current language of the entity. + return $entity->language()->id; + } } /** * Implements \Drupal\Core\Entity\EntityFormControllerInterface::isDefaultFormLangcode(). */ public function isDefaultFormLangcode(array $form_state) { - return $this->getFormLangcode($form_state) == $this->entity->getUntranslated()->language()->id; + if ($this->entity instanceof TranslatableInterface) { + return $this->getFormLangcode($form_state) == $this->entity->getUntranslated()->language()->id; + } + else { + // If the entity is not translatable, this is always the default language. + return TRUE; + } } /** @@ -505,10 +532,15 @@ public function getEntity() { * A keyed array containing the current state of the form. */ protected function getTranslatedEntity(array $form_state) { - $langcode = $this->getFormLangcode($form_state); - $translation = $this->entity->getTranslation($langcode); - // Ensure that the entity object is a BC entity if the original one is. - return $this->entity instanceof EntityBCDecorator ? $translation->getBCEntity() : $translation; + if ($this->entity instanceof TranslatableInterface) { + $langcode = $this->getFormLangcode($form_state); + $translation = $this->entity->getTranslation($langcode); + // Ensure that the entity object is a BC entity if the original one is. + return $this->entity instanceof EntityBCDecorator ? $translation->getBCEntity() : $translation; + } + else { + return $this->entity; + } } /** diff --git a/core/lib/Drupal/Core/Entity/EntityInterface.php b/core/lib/Drupal/Core/Entity/EntityInterface.php index e965b8e..87460ae 100644 --- a/core/lib/Drupal/Core/Entity/EntityInterface.php +++ b/core/lib/Drupal/Core/Entity/EntityInterface.php @@ -8,9 +8,7 @@ namespace Drupal\Core\Entity; use Drupal\Core\TypedData\AccessibleInterface; -use Drupal\Core\TypedData\ComplexDataInterface; use Drupal\Core\TypedData\IdentifiableInterface; -use Drupal\Core\TypedData\TranslatableInterface; /** * Defines a common interface for all entity objects. @@ -28,7 +26,7 @@ * @see \Drupal\Core\TypedData\TypedDataManager * @see \Drupal\Core\Field\FieldInterface */ -interface EntityInterface extends IdentifiableInterface, ComplexDataInterface, AccessibleInterface, TranslatableInterface { +interface EntityInterface extends IdentifiableInterface, AccessibleInterface { /** * Returns the entity UUID (Universally Unique Identifier). @@ -42,6 +40,14 @@ public function uuid(); /** + * Returns the default language. + * + * @return + * The language object. + */ + public function language(); + + /** * Returns whether the entity is new. * * Usually an entity is new if no ID exists for it yet. However, entities may @@ -55,26 +61,6 @@ public function uuid(); public function isNew(); /** - * Returns whether a new revision should be created on save. - * - * @return bool - * TRUE if a new revision should be created. - * - * @see \Drupal\Core\Entity\EntityInterface::setNewRevision() - */ - public function isNewRevision(); - - /** - * Enforces an entity to be saved as a new revision. - * - * @param bool $value - * (optional) Whether a new revision should be saved. - * - * @see \Drupal\Core\Entity\EntityInterface::isNewRevision() - */ - public function setNewRevision($value = TRUE); - - /** * Enforces an entity to be new. * * Allows migrations to create entities with pre-defined IDs by forcing the @@ -165,16 +151,6 @@ public function delete(); public function preSave(EntityStorageControllerInterface $storage_controller); /** - * Acts on a revision before it gets saved. - * - * @param EntityStorageControllerInterface $storage_controller - * The entity storage controller object. - * @param \stdClass $record - * The revision object. - */ - public function preSaveRevision(EntityStorageControllerInterface $storage_controller, \stdClass $record); - - /** * Acts on a saved entity before the insert or update hook is invoked. * * Used after the entity is saved, but before invoking the insert or update @@ -259,35 +235,6 @@ public function createDuplicate(); public function entityInfo(); /** - * Returns the revision identifier of the entity. - * - * @return - * The revision identifier of the entity, or NULL if the entity does not - * have a revision identifier. - */ - public function getRevisionId(); - - /** - * Checks if this entity is the default revision. - * - * @param bool $new_value - * (optional) A Boolean to (re)set the isDefaultRevision flag. - * - * @return bool - * TRUE if the entity is the default revision, FALSE otherwise. If - * $new_value was passed, the previous value is returned. - */ - public function isDefaultRevision($new_value = NULL); - - /** - * Retrieves the exportable properties of the entity. - * - * @return array - * An array of exportable properties and their values. - */ - public function getExportProperties(); - - /** * Gets a backward compatibility decorator entity. * * @return \Drupal\Core\Entity\EntityInterface @@ -307,23 +254,4 @@ public function getBCEntity(); */ public function getNGEntity(); - /** - * Returns the translation support status. - * - * @return bool - * TRUE if the entity bundle has translation support enabled. - */ - public function isTranslatable(); - - /** - * Marks the translation identified by the given language code as existing. - * - * @todo Remove this as soon as translation metadata have been converted to - * regular fields. - * - * @param string $langcode - * The language code identifying the translation to be initialized. - */ - public function initTranslation($langcode); - } diff --git a/core/lib/Drupal/Core/Entity/RevisionableInterface.php b/core/lib/Drupal/Core/Entity/RevisionableInterface.php new file mode 100644 index 0000000..d246d24 --- /dev/null +++ b/core/lib/Drupal/Core/Entity/RevisionableInterface.php @@ -0,0 +1,66 @@ +assertIdentical($empty->get('langcode'), $default_langcode); // Verify Entity properties/methods on the newly created empty entity. - $this->assertIdentical($empty->isNewRevision(), FALSE); $this->assertIdentical($empty->entityType(), 'config_test'); $uri = $empty->uri(); $this->assertIdentical($uri['path'], 'admin/structure/config_test/manage/'); - $this->assertIdentical($empty->isDefaultRevision(), TRUE); // Verify that an empty entity cannot be saved. try { @@ -108,10 +106,8 @@ function testCRUD() { $expected['uuid'] = $config_test->uuid(); $this->assertIdentical($config_test->label(), $expected['label']); - $this->assertIdentical($config_test->isNewRevision(), FALSE); $uri = $config_test->uri(); $this->assertIdentical($uri['path'], 'admin/structure/config_test/manage/' . $expected['id']); - $this->assertIdentical($config_test->isDefaultRevision(), TRUE); // Verify that the entity can be saved. try { diff --git a/core/modules/contact/lib/Drupal/contact/Entity/Message.php b/core/modules/contact/lib/Drupal/contact/Entity/Message.php index 0c398d9..09aaa2e 100644 --- a/core/modules/contact/lib/Drupal/contact/Entity/Message.php +++ b/core/modules/contact/lib/Drupal/contact/Entity/Message.php @@ -9,7 +9,7 @@ use Drupal\Core\Entity\Annotation\EntityType; use Drupal\Core\Annotation\Translation; -use Drupal\Core\Entity\EntityNG; +use Drupal\Core\Entity\ContentEntityBase; use Drupal\contact\MessageInterface; /** @@ -36,7 +36,7 @@ * } * ) */ -class Message extends EntityNG implements MessageInterface { +class Message extends ContentEntityBase implements MessageInterface { /** * Overrides Drupal\Core\Entity\Entity::id(). diff --git a/core/modules/contact/lib/Drupal/contact/MessageInterface.php b/core/modules/contact/lib/Drupal/contact/MessageInterface.php index bf797e4..f4efb1c 100644 --- a/core/modules/contact/lib/Drupal/contact/MessageInterface.php +++ b/core/modules/contact/lib/Drupal/contact/MessageInterface.php @@ -7,12 +7,12 @@ namespace Drupal\contact; -use Drupal\Core\Entity\EntityInterface; +use Drupal\Core\Entity\ContentEntityInterface; /** * Provides an interface defining a contant message entity */ -interface MessageInterface extends EntityInterface { +interface MessageInterface extends ContentEntityInterface { /** * Returns the category this contact message belongs to. diff --git a/core/modules/content_translation/content_translation.module b/core/modules/content_translation/content_translation.module index 34e918c..eb24d60 100644 --- a/core/modules/content_translation/content_translation.module +++ b/core/modules/content_translation/content_translation.module @@ -5,11 +5,13 @@ * Allows entities to be translated into different languages. */ -use Drupal\Core\Language\Language; -use Drupal\Core\Session\AccountInterface; +use Drupal\Core\Entity\ContentEntityInterface; use Drupal\Core\Entity\EntityFormControllerInterface; use Drupal\Core\Entity\EntityInterface; -use Drupal\Core\Entity\EntityNG; +use Drupal\Core\Entity\ContentEntityBase; +use Drupal\Core\Language\Language; +use Drupal\Core\Session\AccountInterface; +use Drupal\Core\TypedData\TranslatableInterface; /** * Implements hook_help(). @@ -277,7 +279,7 @@ function _content_translation_menu_strip_loaders($path) { */ function content_translation_translate_access(EntityInterface $entity) { $entity_type = $entity->entityType(); - return empty($entity->getUntranslated()->language()->locked) && language_multilingual() && $entity->isTranslatable() && + return $entity instanceof ContentEntityInterface && empty($entity->getUntranslated()->language()->locked) && language_multilingual() && $entity->isTranslatable() && (user_access('create content translations') || user_access('update content translations') || user_access('delete content translations')); } @@ -598,7 +600,7 @@ function content_translation_permission() { * Implements hook_form_alter(). */ function content_translation_form_alter(array &$form, array &$form_state) { - if (($form_controller = content_translation_form_controller($form_state)) && ($entity = $form_controller->getEntity()) && !$entity->isNew() && $entity->isTranslatable()) { + if (($form_controller = content_translation_form_controller($form_state)) && ($entity = $form_controller->getEntity()) && !$entity->isNew() && $entity instanceof TranslatableInterface && $entity->isTranslatable()) { $controller = content_translation_controller($entity->entityType()); $controller->entityFormAlter($form, $form_state, $entity); @@ -611,7 +613,7 @@ function content_translation_form_alter(array &$form, array &$form_state) { // translation available or a new one is being created. if (!$entity->isNew() && (!isset($translations[$form_langcode]) || count($translations) > 1)) { $entity = $entity->getNGEntity(); - if ($entity instanceof EntityNG) { + if ($entity instanceof ContentEntityBase) { foreach ($entity->getPropertyDefinitions() as $property_name => $definition) { if (isset($form[$property_name])) { $form[$property_name]['#multilingual'] = !empty($definition['translatable']); @@ -639,7 +641,7 @@ function content_translation_field_language_alter(&$display_language, $context) $entity = $context['entity']; $entity_type = $entity->entityType(); - if (isset($entity->translation[$context['langcode']]) && $entity->isTranslatable() && !content_translation_view_access($entity, $context['langcode'])) { + if ($entity->getNGEntity() instanceof ContentEntityInterface && isset($entity->translation[$context['langcode']]) && $entity->isTranslatable() && !content_translation_view_access($entity, $context['langcode'])) { $instances = field_info_instances($entity_type, $entity->bundle()); // Avoid altering the real entity. $entity = clone($entity); @@ -675,7 +677,7 @@ function content_translation_entity_load(array $entities, $entity_type) { if (content_translation_enabled($entity_type)) { foreach ($entities as $entity) { - if ($entity->isTranslatable()) { + if ($entity instanceof ContentEntityInterface && $entity->isTranslatable()) { $enabled_entities[$entity->id()] = $entity; } } @@ -718,7 +720,7 @@ function content_translation_load_translation_metadata(array $entities, $entity_ */ function content_translation_entity_insert(EntityInterface $entity) { // Only do something if translation support for the given entity is enabled. - if (!$entity->isTranslatable()) { + if (!($entity instanceof ContentEntityInterface) || !$entity->isTranslatable()) { return; } @@ -758,7 +760,7 @@ function content_translation_entity_insert(EntityInterface $entity) { */ function content_translation_entity_delete(EntityInterface $entity) { // Only do something if translation support for the given entity is enabled. - if (!$entity->isTranslatable()) { + if (!($entity instanceof ContentEntityInterface) || !$entity->isTranslatable()) { return; } @@ -773,7 +775,7 @@ function content_translation_entity_delete(EntityInterface $entity) { */ function content_translation_entity_update(EntityInterface $entity) { // Only do something if translation support for the given entity is enabled. - if (!$entity->isTranslatable()) { + if (!($entity instanceof ContentEntityInterface) || !$entity->isTranslatable()) { return; } @@ -867,7 +869,7 @@ function content_translation_field_info_alter(&$info) { * Implements hook_entity_presave(). */ function content_translation_entity_presave(EntityInterface $entity) { - if ($entity->isTranslatable()) { + if ($entity instanceof ContentEntityInterface && $entity->isTranslatable()) { // @todo Avoid using request attributes once translation metadata become // regular fields. $attributes = Drupal::request()->attributes; diff --git a/core/modules/content_translation/content_translation.pages.inc b/core/modules/content_translation/content_translation.pages.inc index e277791..5bf2a74 100644 --- a/core/modules/content_translation/content_translation.pages.inc +++ b/core/modules/content_translation/content_translation.pages.inc @@ -7,7 +7,7 @@ use Drupal\Core\Language\Language; use Drupal\Core\Entity\EntityInterface; -use Drupal\Core\Entity\EntityNG; +use Drupal\Core\Entity\ContentEntityBase; /** * Translations overview page callback. @@ -239,7 +239,7 @@ function content_translation_edit_page(EntityInterface $entity, Language $langua function content_translation_prepare_translation(EntityInterface $entity, Language $source, Language $target) { // @todo Unify field and property handling. $entity = $entity->getNGEntity(); - if ($entity instanceof EntityNG) { + if ($entity instanceof ContentEntityBase) { $source_translation = $entity->getTranslation($source->id); $entity->addTranslation($target->id, $source_translation->getPropertyValues()); } diff --git a/core/modules/content_translation/lib/Drupal/content_translation/FieldTranslationSynchronizer.php b/core/modules/content_translation/lib/Drupal/content_translation/FieldTranslationSynchronizer.php index 9fd4b0e..7928a23 100644 --- a/core/modules/content_translation/lib/Drupal/content_translation/FieldTranslationSynchronizer.php +++ b/core/modules/content_translation/lib/Drupal/content_translation/FieldTranslationSynchronizer.php @@ -9,7 +9,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\EntityManager; -use Drupal\Core\Entity\EntityNG; +use Drupal\Core\Entity\ContentEntityBase; /** * Provides field translation synchronization capabilities. @@ -39,7 +39,7 @@ public function __construct(EntityManager $entityManager) { public function synchronizeFields(EntityInterface $entity, $sync_langcode, $original_langcode = NULL) { // Field synchronization is only supported for NG entities. $entity = $entity->getNGEntity(); - if (!($entity instanceof EntityNG)) { + if (!($entity instanceof ContentEntityBase)) { return; } diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationUITest.php b/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationUITest.php index 74b779b..b051e58 100644 --- a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationUITest.php +++ b/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationUITest.php @@ -8,7 +8,7 @@ namespace Drupal\content_translation\Tests; use Drupal\Core\Entity\EntityInterface; -use Drupal\Core\Entity\EntityNG; +use Drupal\Core\Entity\ContentEntityBase; use Drupal\Core\Language\Language; /** @@ -260,7 +260,7 @@ protected function getFormSubmitAction(EntityInterface $entity) { protected function getTranslation(EntityInterface $entity, $langcode) { // @todo remove once EntityBCDecorator is gone. $entity = $entity->getNGEntity(); - return $entity instanceof EntityNG ? $entity->getTranslation($langcode) : $entity; + return $entity instanceof ContentEntityBase ? $entity->getTranslation($langcode) : $entity; } /** @@ -279,7 +279,7 @@ protected function getTranslation(EntityInterface $entity, $langcode) { protected function getValue(EntityInterface $translation, $property, $langcode) { $key = $property == 'user_id' ? 'target_id' : 'value'; // @todo remove EntityBCDecorator condition once EntityBCDecorator is gone. - if (($translation instanceof EntityInterface) && !($translation instanceof EntityNG) && !($translation instanceof EntityBCDecorator)) { + if (($translation instanceof EntityInterface) && !($translation instanceof ContentEntityBase) && !($translation instanceof EntityBCDecorator)) { return is_array($translation->$property) ? $translation->{$property}[$langcode][0][$key] : $translation->$property; } else { diff --git a/core/modules/field/field.attach.inc b/core/modules/field/field.attach.inc index fc86871..9de387a 100644 --- a/core/modules/field/field.attach.inc +++ b/core/modules/field/field.attach.inc @@ -6,7 +6,7 @@ */ use Drupal\Core\Entity\EntityInterface; -use Drupal\Core\Entity\EntityNG; +use Drupal\Core\Entity\ContentEntityBase; use Drupal\entity\Entity\EntityDisplay; use Drupal\entity\Entity\EntityFormDisplay; use Drupal\Core\Language\Language; @@ -768,7 +768,7 @@ function field_attach_load_revision($entity_type, $entities, $options = array()) */ function field_attach_form_validate(EntityInterface $entity, $form, &$form_state, array $options = array()) { // Only support NG entities. - if (!($entity->getNGEntity() instanceof EntityNG)) { + if (!($entity->getNGEntity() instanceof ContentEntityBase)) { return; } diff --git a/core/modules/field/field.module b/core/modules/field/field.module index c2eda35..dcdf8f8 100644 --- a/core/modules/field/field.module +++ b/core/modules/field/field.module @@ -9,7 +9,7 @@ use Drupal\Core\Template\Attribute; use Drupal\field\FieldInterface; use Drupal\field\FieldInstanceInterface; -use Drupal\Core\Entity\EntityNG; +use Drupal\Core\Entity\ContentEntityBase; /* * Load all public Field API functions. Drupal currently has no diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php index f40e32a..1592426 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php @@ -208,7 +208,7 @@ public function submitForm(array &$form, array &$form_state) { * The field item object. */ protected function getFieldItem(EntityInterface $entity, $field_name) { - if ($entity instanceof \Drupal\Core\Entity\EntityNG) { + if ($entity instanceof \Drupal\Core\Entity\ContentEntityBase) { $item = $entity->get($field_name)->offsetGet(0); } else { diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php index 046e012..5e83099 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php @@ -10,7 +10,7 @@ use Drupal\Core\Controller\ControllerInterface; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\EntityManager; -use Drupal\Core\Entity\EntityNG; +use Drupal\Core\Entity\ContentEntityBase; use Drupal\Core\Entity\Field\FieldTypePluginManager; use Drupal\Core\Form\FormInterface; use Drupal\Core\Language\Language; @@ -319,7 +319,7 @@ protected function getDefaultValueWidget($field, array &$form, &$form_state) { * The field item object. */ protected function getFieldItem(EntityInterface $entity, $field_name) { - if ($entity instanceof EntityNG) { + if ($entity instanceof ContentEntityBase) { $item = $entity->get($field_name)->offsetGet(0); } else { diff --git a/core/modules/file/lib/Drupal/file/Entity/File.php b/core/modules/file/lib/Drupal/file/Entity/File.php index dfe97cb..f8af4f9 100644 --- a/core/modules/file/lib/Drupal/file/Entity/File.php +++ b/core/modules/file/lib/Drupal/file/Entity/File.php @@ -7,7 +7,7 @@ namespace Drupal\file\Entity; -use Drupal\Core\Entity\EntityNG; +use Drupal\Core\Entity\ContentEntityBase; use Drupal\Core\Entity\Annotation\EntityType; use Drupal\Core\Entity\EntityStorageControllerInterface; use Drupal\Core\Annotation\Translation; @@ -34,7 +34,7 @@ * } * ) */ -class File extends EntityNG implements FileInterface { +class File extends ContentEntityBase implements FileInterface { /** * The plain data values of the contained properties. diff --git a/core/modules/hal/lib/Drupal/hal/Normalizer/EntityNormalizer.php b/core/modules/hal/lib/Drupal/hal/Normalizer/EntityNormalizer.php index 751de28..4ee475b 100644 --- a/core/modules/hal/lib/Drupal/hal/Normalizer/EntityNormalizer.php +++ b/core/modules/hal/lib/Drupal/hal/Normalizer/EntityNormalizer.php @@ -8,7 +8,7 @@ namespace Drupal\hal\Normalizer; use Drupal\Component\Utility\NestedArray; -use Drupal\Core\Entity\EntityNG; +use Drupal\Core\Entity\ContentEntityBase; use Drupal\Core\Language\Language; use Symfony\Component\Serializer\Exception\UnexpectedValueException; diff --git a/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php b/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php index f51b585..1ad4ca8 100644 --- a/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php +++ b/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php @@ -264,6 +264,70 @@ class MenuLink extends Entity implements \ArrayAccess, MenuLinkInterface { protected $routeObject; /** + * Boolean indicating whether a new revision should be created on save. + * + * @var bool + */ + protected $newRevision = FALSE; + + /** + * Indicates whether this is the default revision. + * + * @var bool + */ + protected $isDefaultRevision = TRUE; + + /** + * {@inheritdoc} + */ + public function setNewRevision($value = TRUE) { + $this->newRevision = $value; + } + /** + * {@inheritdoc} + */ + public function isNewRevision() { + $info = $this->entityInfo(); + return $this->newRevision || (!empty($info['entity_keys']['revision']) && !$this->getRevisionId()); + } + + /** + * {@inheritdoc} + */ + public function getRevisionId() { + return NULL; + } + + /** + * {@inheritdoc} + */ + public function isTranslatable() { + // @todo Inject the entity manager and retrieve bundle info from it. + $bundles = entity_get_bundles($this->entityType); + return !empty($bundles[$this->bundle()]['translatable']); + } + + /** + * Implements \Drupal\Core\TypedData\TranslatableInterface::language(). + */ + public function language() { + // @todo: Replace by EntityNG implementation once all entity types have been + // converted to use the entity field API. + $language = language_load($this->langcode); + if (!$language) { + // Make sure we return a proper language object. + $language = new Language(array('id' => Language::LANGCODE_NOT_SPECIFIED)); + } + return $language; + } + + /** + * {@inheritdoc} + */ + public function preSaveRevision(EntityStorageControllerInterface $storage_controller, \stdClass $record) { + } + + /** * Overrides Entity::id(). */ public function id() { diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkInterface.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkInterface.php index f4c4e0e..7107eed 100644 --- a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkInterface.php +++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkInterface.php @@ -15,7 +15,7 @@ /** * Provides an interface defining a menu link entity. */ -interface MenuLinkInterface extends ContentEntityInterface { +interface MenuLinkInterface extends EntityInterface { /** * Returns the Route object associated with this link, if any. diff --git a/core/modules/node/lib/Drupal/node/Entity/Node.php b/core/modules/node/lib/Drupal/node/Entity/Node.php index 0452e99..ee34ec5 100644 --- a/core/modules/node/lib/Drupal/node/Entity/Node.php +++ b/core/modules/node/lib/Drupal/node/Entity/Node.php @@ -7,7 +7,7 @@ namespace Drupal\node\Entity; -use Drupal\Core\Entity\EntityNG; +use Drupal\Core\Entity\ContentEntityBase; use Drupal\Core\Entity\EntityStorageControllerInterface; use Drupal\Core\Entity\Annotation\EntityType; use Drupal\Core\Annotation\Translation; @@ -58,7 +58,7 @@ * } * ) */ -class Node extends EntityNG implements NodeInterface { +class Node extends ContentEntityBase implements NodeInterface { /** * Implements Drupal\Core\Entity\EntityInterface::id(). diff --git a/core/modules/node/lib/Drupal/node/NodeAccessController.php b/core/modules/node/lib/Drupal/node/NodeAccessController.php index b1f120a..a2d4b93 100644 --- a/core/modules/node/lib/Drupal/node/NodeAccessController.php +++ b/core/modules/node/lib/Drupal/node/NodeAccessController.php @@ -14,7 +14,7 @@ use Drupal\Core\Language\Language; use Drupal\Core\Entity\EntityAccessController; use Drupal\Core\Entity\EntityInterface; -use Drupal\Core\Entity\EntityNG; +use Drupal\Core\Entity\ContentEntityBase; use Drupal\Core\Session\AccountInterface; use Drupal\user\Entity\User; use Symfony\Component\DependencyInjection\ContainerInterface; diff --git a/core/modules/node/lib/Drupal/node/NodeGrantDatabaseStorage.php b/core/modules/node/lib/Drupal/node/NodeGrantDatabaseStorage.php index b274a1f..2f3b4d7 100644 --- a/core/modules/node/lib/Drupal/node/NodeGrantDatabaseStorage.php +++ b/core/modules/node/lib/Drupal/node/NodeGrantDatabaseStorage.php @@ -10,7 +10,7 @@ use Drupal\Core\Database\Connection; use Drupal\Core\Database\Query\SelectInterface; use Drupal\Core\Entity\EntityInterface; -use Drupal\Core\Entity\EntityNG; +use Drupal\Core\Entity\ContentEntityBase; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Session\AccountInterface; use Drupal\user\Entity\User; diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/Field/FieldRdfaTestBase.php b/core/modules/rdf/lib/Drupal/rdf/Tests/Field/FieldRdfaTestBase.php index af2aeb9..5c885f7 100644 --- a/core/modules/rdf/lib/Drupal/rdf/Tests/Field/FieldRdfaTestBase.php +++ b/core/modules/rdf/lib/Drupal/rdf/Tests/Field/FieldRdfaTestBase.php @@ -34,7 +34,7 @@ /** * The entity to render for testing. * - * @var \Drupal\Core\Entity\EntityNG + * @var \Drupal\Core\Entity\ContentEntityBase */ protected $entity; @@ -87,7 +87,7 @@ protected function createTestField() { /** * Gets the absolute URI of an entity. * - * @param \Drupal\Core\Entity\EntityNG $entity + * @param \Drupal\Core\Entity\ContentEntityBase $entity * The entity for which to generate the URI. * * @return string diff --git a/core/modules/serialization/lib/Drupal/serialization/Tests/EntitySerializationTest.php b/core/modules/serialization/lib/Drupal/serialization/Tests/EntitySerializationTest.php index c8a4862..2b08044 100644 --- a/core/modules/serialization/lib/Drupal/serialization/Tests/EntitySerializationTest.php +++ b/core/modules/serialization/lib/Drupal/serialization/Tests/EntitySerializationTest.php @@ -29,7 +29,7 @@ class EntitySerializationTest extends NormalizerTestBase { /** * The test entity. * - * @var \Drupal\Core\Entity\EntityNG + * @var \Drupal\Core\Entity\ContentEntityBase */ protected $entity; diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTest.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTest.php index b7ddfe2..fcaccbb 100644 --- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTest.php +++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTest.php @@ -7,7 +7,7 @@ namespace Drupal\entity_test\Entity; -use Drupal\Core\Entity\EntityNG; +use Drupal\Core\Entity\ContentEntityBase; use Drupal\Core\Entity\Annotation\EntityType; use Drupal\Core\Annotation\Translation; use Drupal\Core\Language\Language; @@ -39,7 +39,7 @@ * menu_base_path = "entity-test/manage/%entity_test" * ) */ -class EntityTest extends EntityNG { +class EntityTest extends ContentEntityBase { /** * The entity ID. diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestCache.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestCache.php index 504bdc8..9c6ff76 100644 --- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestCache.php +++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestCache.php @@ -7,7 +7,7 @@ namespace Drupal\entity_test\Entity; -use Drupal\Core\Entity\EntityNG; +use Drupal\Core\Entity\ContentEntityBase; use Drupal\Core\Entity\Annotation\EntityType; use Drupal\Core\Annotation\Translation; use Drupal\Core\Language\Language; @@ -38,7 +38,7 @@ * menu_base_path = "entity-test/manage/%entity_test" * ) */ -class EntityTestCache extends EntityNG { +class EntityTestCache extends ContentEntityBase { /** * The entity ID. diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Term.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Term.php index 9dd69d7..02a2391 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Term.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Term.php @@ -7,7 +7,7 @@ namespace Drupal\taxonomy\Entity; -use Drupal\Core\Entity\EntityNG; +use Drupal\Core\Entity\ContentEntityBase; use Drupal\Core\Entity\Annotation\EntityType; use Drupal\Core\Entity\EntityStorageControllerInterface; use Drupal\Core\Annotation\Translation; @@ -54,7 +54,7 @@ * permission_granularity = "bundle" * ) */ -class Term extends EntityNG implements TermInterface { +class Term extends ContentEntityBase implements TermInterface { /** * The taxonomy term ID. diff --git a/core/modules/user/lib/Drupal/user/Entity/User.php b/core/modules/user/lib/Drupal/user/Entity/User.php index 4e87d15..790d739 100644 --- a/core/modules/user/lib/Drupal/user/Entity/User.php +++ b/core/modules/user/lib/Drupal/user/Entity/User.php @@ -7,9 +7,9 @@ namespace Drupal\user\Entity; +use Drupal\Core\Entity\ContentEntityBase; use Drupal\Core\Entity\EntityStorageControllerInterface; use Drupal\Core\Entity\EntityMalformedException; -use Drupal\Core\Entity\EntityNG; use Drupal\Core\Entity\Annotation\EntityType; use Drupal\Core\Annotation\Translation; use Drupal\user\UserInterface; @@ -47,7 +47,7 @@ * } * ) */ -class User extends EntityNG implements UserInterface { +class User extends ContentEntityBase implements UserInterface { /** * {@inheritdoc} diff --git a/core/modules/user/lib/Drupal/user/UserInterface.php b/core/modules/user/lib/Drupal/user/UserInterface.php index 3400abf..4fbe5b3 100644 --- a/core/modules/user/lib/Drupal/user/UserInterface.php +++ b/core/modules/user/lib/Drupal/user/UserInterface.php @@ -7,13 +7,13 @@ namespace Drupal\user; -use Drupal\Core\Entity\EntityInterface; +use Drupal\Core\Entity\ContentEntityInterface; use Drupal\Core\Session\AccountInterface; /** * Provides an interface defining a user entity. */ -interface UserInterface extends EntityInterface, AccountInterface { +interface UserInterface extends ContentEntityInterface, AccountInterface { /** * Returns a list of roles. diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php b/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php index 33b81a6..3a3194b 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php +++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php @@ -835,20 +835,6 @@ public function bundle() { } /** - * Implements \Drupal\Core\Entity\EntityInterface::isDefaultRevision(). - */ - public function isDefaultRevision($new_value = NULL) { - return $this->storage->isDefaultRevision($new_value); - } - - /** - * Implements \Drupal\Core\Entity\EntityInterface::getRevisionId(). - */ - public function getRevisionId() { - return $this->storage->getRevisionId(); - } - - /** * Implements \Drupal\Core\Entity\EntityInterface::entityInfo(). */ public function entityInfo() { @@ -891,20 +877,6 @@ public function label($langcode = NULL) { } /** - * Implements \Drupal\Core\Entity\EntityInterface::isNewRevision(). - */ - public function isNewRevision() { - return $this->storage->isNewRevision(); - } - - /** - * Implements \Drupal\Core\Entity\EntityInterface::setNewRevision(). - */ - public function setNewRevision($value = TRUE) { - return $this->storage->setNewRevision($value); - } - - /** * Implements \Drupal\Core\Entity\EntityInterface::enforceIsNew(). */ public function enforceIsNew($value = TRUE) { @@ -918,23 +890,9 @@ public function getExportProperties() { return $this->storage->getExportProperties(); } - /** - * Implements \Drupal\Core\TypedData\TranslatableInterface::getTranslation(). - */ - public function getTranslation($langcode) { - // @todo Revisit this once config entities are converted to NG. - return $this; - } - - /** - * Implements \Drupal\Core\TypedData\TranslatableInterface::getTranslationLanguages(). - */ - public function getTranslationLanguages($include_default = TRUE) { - return $this->storage->getTranslationLanguages($include_default); - } /** - * Implements \Drupal\Core\TypedData\TranslatableInterface::language)(). + * {@inheritdoc} */ public function language() { return $this->storage->language(); @@ -1219,13 +1177,6 @@ public static function postLoad(EntityStorageControllerInterface $storage_contro /** * {@inheritdoc} */ - public function preSaveRevision(EntityStorageControllerInterface $storage_controller, \stdClass $record) { - $this->storage->preSaveRevision($storage_controller, $record); - } - - /** - * {@inheritdoc} - */ public function mergeDefaultDisplaysOptions() { $this->storage->mergeDefaultDisplaysOptions(); } diff --git a/core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewUIObjectTest.php b/core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewUIObjectTest.php index 9b52116..18a383f 100644 --- a/core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewUIObjectTest.php +++ b/core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewUIObjectTest.php @@ -39,10 +39,8 @@ public function testEntityDecoration() { $method_args = array(); $method_args['setOriginalID'] = array(12); $method_args['setStatus'] = array(TRUE); - $method_args['setNewRevision'] = array(FALSE); $method_args['enforceIsNew'] = array(FALSE); $method_args['label'] = array(Language::LANGCODE_NOT_SPECIFIED); - $method_args['isDefaultRevision'] = array(TRUE); $reflection = new \ReflectionClass('Drupal\Core\Config\Entity\ConfigEntityInterface'); $interface_methods = array();