diff --git a/core/lib/Drupal/Core/Entity/ContentEntityBase.php b/core/lib/Drupal/Core/Entity/ContentEntityBase.php index b5fccbd..3494fb3 100644 --- a/core/lib/Drupal/Core/Entity/ContentEntityBase.php +++ b/core/lib/Drupal/Core/Entity/ContentEntityBase.php @@ -335,6 +335,13 @@ public function getRevisionId() { /** * {@inheritdoc} */ + public function getRevisionUuid() { + return $this->getEntityKey('revision_uuid'); + } + + /** + * {@inheritdoc} + */ public function isTranslatable() { // Check that the bundle is translatable, the entity has a language defined // and if we have more than one language on the site. @@ -996,6 +1003,12 @@ public function createDuplicate() { // Check whether the entity type supports revisions and initialize it if so. if ($entity_type->isRevisionable()) { $duplicate->{$entity_type->getKey('revision')}->value = NULL; + + // Check if the entity type supports revision UUIDs and generate a new one + // if so. + if ($entity_type->hasKey('revision_uuid')) { + $duplicate->{$entity_type->getKey('revision_uuid')}->value = $this->uuidGenerator()->generate(); + } } return $duplicate; @@ -1133,6 +1146,11 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) { ->setReadOnly(TRUE) ->setSetting('unsigned', TRUE); } + if ($entity_type->hasKey('revision_uuid')) { + $fields[$entity_type->getKey('revision_uuid')] = BaseFieldDefinition::create('uuid') + ->setLabel(new TranslatableMarkup('Revision UUID')) + ->setReadOnly(TRUE); + } if ($entity_type->hasKey('langcode')) { $fields[$entity_type->getKey('langcode')] = BaseFieldDefinition::create('language') ->setLabel(new TranslatableMarkup('Language')) diff --git a/core/lib/Drupal/Core/Entity/EntityType.php b/core/lib/Drupal/Core/Entity/EntityType.php index a63415b..96b9925 100644 --- a/core/lib/Drupal/Core/Entity/EntityType.php +++ b/core/lib/Drupal/Core/Entity/EntityType.php @@ -288,10 +288,18 @@ public function __construct($definition) { // Ensure defaults. $this->entity_keys += array( 'revision' => '', + 'revision_uuid' => '', 'bundle' => '', 'langcode' => '', 'default_langcode' => 'default_langcode', ); + + // If the entity type is revisionable, provide a default value for the + // 'revision_uuid' key. + if (!empty($this->entity_keys['revision'])) { + $this->entity_keys['revision_uuid'] = 'revision_uuid'; + } + $this->handlers += array( 'access' => 'Drupal\Core\Entity\EntityAccessControlHandler', ); diff --git a/core/lib/Drupal/Core/Entity/EntityTypeInterface.php b/core/lib/Drupal/Core/Entity/EntityTypeInterface.php index 398347f..1a67f9b 100644 --- a/core/lib/Drupal/Core/Entity/EntityTypeInterface.php +++ b/core/lib/Drupal/Core/Entity/EntityTypeInterface.php @@ -88,6 +88,9 @@ public function getOriginalClass(); * revision ID of the entity. The Field API assumes that all revision IDs * are unique across all entities of a type. If this entry is omitted * the entities of this type are not revisionable. + * - revision_uuid: (optional) The name of the property that contains the + * revision UUID of the entity. Defaults to "revision_uuid" if the + * 'revision' key is set. * - bundle: (optional) The name of the property that contains the bundle * name for the entity. The bundle name defines which set of fields are * attached to the entity (e.g. what nodes call "content type"). This diff --git a/core/lib/Drupal/Core/Entity/RevisionableInterface.php b/core/lib/Drupal/Core/Entity/RevisionableInterface.php index 14690e3..8497183 100644 --- a/core/lib/Drupal/Core/Entity/RevisionableInterface.php +++ b/core/lib/Drupal/Core/Entity/RevisionableInterface.php @@ -40,6 +40,15 @@ public function setNewRevision($value = TRUE); public function getRevisionId(); /** + * Gets the revision universally-unique identifier of the entity. + * + * @return string + * The revision UUID of the entity, or NULL if the entity does not + * have a revision UUID. + */ + public function getRevisionUuid(); + + /** * Checks if this entity is the default revision. * * @param bool $new_value diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php index 391e3444..79b2d1b 100644 --- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php +++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php @@ -2,6 +2,7 @@ namespace Drupal\Core\Entity\Sql; +use Drupal\Component\Uuid\UuidInterface; use Drupal\Core\Cache\CacheBackendInterface; use Drupal\Core\Database\Connection; use Drupal\Core\Database\Database; @@ -55,6 +56,15 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt protected $revisionKey = FALSE; /** + * Name of entity's revision UUID database field, if it supports revisions. + * + * Has the value FALSE if this entity does not use revisions. + * + * @var string + */ + protected $revisionUuidKey = FALSE; + + /** * The entity langcode key. * * @var string|bool @@ -126,7 +136,8 @@ public static function createInstance(ContainerInterface $container, EntityTypeI $container->get('database'), $container->get('entity.manager'), $container->get('cache.entity'), - $container->get('language_manager') + $container->get('language_manager'), + $container->get('uuid') ); } @@ -154,11 +165,14 @@ public function getFieldStorageDefinitions() { * The cache backend to be used. * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager * The language manager. + * @param \Drupal\Component\Uuid\UuidInterface $uuid_service + * The UUID service. */ - public function __construct(EntityTypeInterface $entity_type, Connection $database, EntityManagerInterface $entity_manager, CacheBackendInterface $cache, LanguageManagerInterface $language_manager) { + public function __construct(EntityTypeInterface $entity_type, Connection $database, EntityManagerInterface $entity_manager, CacheBackendInterface $cache, LanguageManagerInterface $language_manager, UuidInterface $uuid_service) { parent::__construct($entity_type, $entity_manager, $cache); $this->database = $database; $this->languageManager = $language_manager; + $this->uuidService = $uuid_service; $this->initTableLayout(); } @@ -170,6 +184,7 @@ protected function initTableLayout() { // are correctly reflected in the table layout. $this->tableMapping = NULL; $this->revisionKey = NULL; + $this->revisionUuidKey = NULL; $this->revisionTable = NULL; $this->dataTable = NULL; $this->revisionDataTable = NULL; @@ -180,6 +195,7 @@ protected function initTableLayout() { $revisionable = $this->entityType->isRevisionable(); if ($revisionable) { $this->revisionKey = $this->entityType->getKey('revision') ?: 'revision_id'; + $this->revisionUuidKey = $this->entityType->getKey('revision_uuid') ?: 'revision_uuid'; $this->revisionTable = $this->entityType->getRevisionTable() ?: $this->entityTypeId . '_revision'; } $translatable = $this->entityType->isTranslatable(); @@ -286,7 +302,7 @@ public function getTableMapping(array $storage_definitions = NULL) { return $table_mapping->allowsSharedTableStorage($definition); }); - $key_fields = array_values(array_filter(array($this->idKey, $this->revisionKey, $this->bundleKey, $this->uuidKey, $this->langcodeKey))); + $key_fields = array_values(array_filter(array($this->idKey, $this->revisionKey, $this->bundleKey, $this->uuidKey, $this->revisionUuidKey, $this->langcodeKey))); $all_fields = array_keys($shared_table_definitions); $revisionable_fields = array_keys(array_filter($shared_table_definitions, function (FieldStorageDefinitionInterface $definition) { return $definition->isRevisionable(); @@ -316,7 +332,7 @@ public function getTableMapping(array $storage_definitions = NULL) { // denormalized in the base table but also stored in the revision table // together with the entity ID and the revision ID as identifiers. $table_mapping->setFieldNames($this->baseTable, array_diff($all_fields, $revision_metadata_fields)); - $revision_key_fields = array($this->idKey, $this->revisionKey); + $revision_key_fields = array($this->idKey, $this->revisionKey, $this->revisionUuidKey); $table_mapping->setFieldNames($this->revisionTable, array_merge($revision_key_fields, $revisionable_fields)); } elseif (!$revisionable && $translatable) { @@ -343,10 +359,10 @@ public function getTableMapping(array $storage_definitions = NULL) { // Like in the multilingual, non-revisionable case the UUID is not // in the data table. Additionally, do not store revision metadata // fields in the data table. - $data_fields = array_values(array_diff($all_fields, array($this->uuidKey), $revision_metadata_fields)); + $data_fields = array_values(array_diff($all_fields, array($this->uuidKey, $this->revisionUuidKey), $revision_metadata_fields)); $table_mapping->setFieldNames($this->dataTable, $data_fields); - $revision_base_fields = array_merge(array($this->idKey, $this->revisionKey, $this->langcodeKey), $revision_metadata_fields); + $revision_base_fields = array_merge(array($this->idKey, $this->revisionKey, $this->revisionUuidKey, $this->langcodeKey), $revision_metadata_fields); $table_mapping->setFieldNames($this->revisionTable, $revision_base_fields); $revision_data_key_fields = array($this->idKey, $this->revisionKey, $this->langcodeKey); @@ -1022,6 +1038,11 @@ protected function saveRevision(ContentEntityInterface $entity) { $entity->preSaveRevision($this, $record); if ($entity->isNewRevision()) { + // Generating a new revision should generate a new revision UUID. + if ($this->revisionUuidKey) { + $record->{$this->revisionUuidKey} = $this->uuidService->generate(); + } + $insert_id = $this->database ->insert($this->revisionTable, array('return' => Database::RETURN_INSERT_ID)) ->fields((array) $record) @@ -1033,7 +1054,10 @@ protected function saveRevision(ContentEntityInterface $entity) { } if ($entity->isDefaultRevision()) { $this->database->update($this->entityType->getBaseTable()) - ->fields(array($this->revisionKey => $record->{$this->revisionKey})) + ->fields([ + $this->revisionKey => $record->{$this->revisionKey}, + $this->revisionUuidKey => $record->{$this->revisionUuidKey}, + ]) ->condition($this->idKey, $record->{$this->idKey}) ->execute(); } @@ -1046,8 +1070,11 @@ protected function saveRevision(ContentEntityInterface $entity) { ->execute(); } - // Make sure to update the new revision key for the entity. + // Make sure to update the new revision ID and UUID keys for the entity. $entity->{$this->revisionKey}->value = $record->{$this->revisionKey}; + if ($this->revisionUuidKey) { + $entity->{$this->revisionUuidKey}->value = $record->{$this->revisionUuidKey}; + } return $record->{$this->revisionKey}; } diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php index ec3ebaf..63af197 100644 --- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php +++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php @@ -1153,7 +1153,9 @@ protected function createSharedTableSchema(FieldStorageDefinitionInterface $stor } if (!empty($schema[$table_name]['unique keys'])) { foreach ($schema[$table_name]['unique keys'] as $name => $specifier) { - $schema_handler->addUniqueKey($table_name, $name, $specifier); + // Check if the unique key exists because it might already have + // been created as part of the earlier entity type update event. + $this->addUniqueKey($table_name, $name, $specifier); } } } diff --git a/core/modules/block_content/block_content.install b/core/modules/block_content/block_content.install index 4279cde..2d7d37c 100644 --- a/core/modules/block_content/block_content.install +++ b/core/modules/block_content/block_content.install @@ -61,3 +61,13 @@ function block_content_update_8003() { \Drupal::entityDefinitionUpdateManager() ->installFieldStorageDefinition('revision_user', 'block_content', 'block_content', $revision_user); } + +/** + * Install new revision_uuid schema. + */ +function block_content_update_8004() { + /** @var \Drupal\Core\Entity\EntityDefinitionUpdateManagerInterface $manager */ + $manager = \Drupal::entityDefinitionUpdateManager(); + $manager->updateEntityType($manager->getEntityType('block_content')); + $manager->installFieldStorageDefinition('revision_uuid', 'block_content', 'block_content', \Drupal::service('entity_field.manager')->getFieldStorageDefinitions('block_content')['revision_uuid']); +} diff --git a/core/modules/block_content/src/Entity/BlockContent.php b/core/modules/block_content/src/Entity/BlockContent.php index 9e0531e..1da567d 100644 --- a/core/modules/block_content/src/Entity/BlockContent.php +++ b/core/modules/block_content/src/Entity/BlockContent.php @@ -160,6 +160,11 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) { $fields['type']->setLabel(t('Block type')) ->setDescription(t('The block type.')); + $fields['revision_uuid'] = BaseFieldDefinition::create('uuid') + ->setLabel(t('Revision UUID')) + ->setDescription(t('The revision UUID.')) + ->setReadOnly(TRUE); + $fields['info'] = BaseFieldDefinition::create('string') ->setLabel(t('Block description')) ->setDescription(t('A brief description of your block.')) diff --git a/core/modules/comment/src/CommentStorage.php b/core/modules/comment/src/CommentStorage.php index cc4fdcf..0931f41 100644 --- a/core/modules/comment/src/CommentStorage.php +++ b/core/modules/comment/src/CommentStorage.php @@ -2,6 +2,7 @@ namespace Drupal\comment; +use Drupal\Component\Uuid\UuidInterface; use Drupal\Core\Cache\CacheBackendInterface; use Drupal\Core\Database\Connection; use Drupal\Core\Entity\EntityManagerInterface; @@ -43,9 +44,11 @@ class CommentStorage extends SqlContentEntityStorage implements CommentStorageIn * Cache backend instance to use. * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager * The language manager. + * @param \Drupal\Component\Uuid\UuidInterface $uuid_service + * The UUID service. */ - public function __construct(EntityTypeInterface $entity_info, Connection $database, EntityManagerInterface $entity_manager, AccountInterface $current_user, CacheBackendInterface $cache, LanguageManagerInterface $language_manager) { - parent::__construct($entity_info, $database, $entity_manager, $cache, $language_manager); + public function __construct(EntityTypeInterface $entity_info, Connection $database, EntityManagerInterface $entity_manager, AccountInterface $current_user, CacheBackendInterface $cache, LanguageManagerInterface $language_manager, UuidInterface $uuid_service) { + parent::__construct($entity_info, $database, $entity_manager, $cache, $language_manager, $uuid_service); $this->currentUser = $current_user; } @@ -59,7 +62,8 @@ public static function createInstance(ContainerInterface $container, EntityTypeI $container->get('entity.manager'), $container->get('current_user'), $container->get('cache.entity'), - $container->get('language_manager') + $container->get('language_manager'), + $container->get('uuid') ); } diff --git a/core/modules/node/node.install b/core/modules/node/node.install index c754880..758a6d8 100644 --- a/core/modules/node/node.install +++ b/core/modules/node/node.install @@ -218,3 +218,13 @@ function node_update_8003() { $manager->updateFieldStorageDefinition($manager->getFieldStorageDefinition($field_name, 'node')); } } + +/** + * Install new revision_uuid schema. + */ +function node_update_8004() { + /** @var \Drupal\Core\Entity\EntityDefinitionUpdateManagerInterface $manager */ + $manager = \Drupal::entityDefinitionUpdateManager(); + $manager->updateEntityType($manager->getEntityType('node')); + $manager->installFieldStorageDefinition('revision_uuid', 'node', 'node', \Drupal::service('entity_field.manager')->getFieldStorageDefinitions('node')['revision_uuid']); +} diff --git a/core/modules/system/src/Tests/Entity/EntityDefinitionTestTrait.php b/core/modules/system/src/Tests/Entity/EntityDefinitionTestTrait.php index 0123597..0dc7053 100644 --- a/core/modules/system/src/Tests/Entity/EntityDefinitionTestTrait.php +++ b/core/modules/system/src/Tests/Entity/EntityDefinitionTestTrait.php @@ -36,6 +36,7 @@ protected function updateEntityTypeToRevisionable() { $keys = $entity_type->getKeys(); $keys['revision'] = 'revision_id'; + $keys['revision_uuid'] = 'revision_uuid'; $entity_type->set('entity_keys', $keys); $this->state->set('entity_test_update.entity_type', $entity_type); diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php index 23cf034..8b6b7e4 100644 --- a/core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php +++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php @@ -102,6 +102,7 @@ public function testEntityTypeUpdateWithoutData() { $expected = array( 'entity_test_update' => array( t('The %entity_type entity type needs to be updated.', ['%entity_type' => $this->entityManager->getDefinition('entity_test_update')->getLabel()]), + t('The %field_name field needs to be installed.', ['%field_name' => $this->entityManager->getFieldStorageDefinitions('entity_test_update')['revision_uuid']->getLabel()]), ), ); $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected); //, 'EntityDefinitionUpdateManager reports the expected change summary.'); diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityTypeTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityTypeTest.php index 8ee7478..a6cbbed 100644 --- a/core/tests/Drupal/Tests/Core/Entity/EntityTypeTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/EntityTypeTest.php @@ -117,9 +117,9 @@ public function providerTestSet() { */ public function providerTestGetKeys() { return array( - array(array(), array('revision' => '', 'bundle' => '', 'langcode' => '')), - array(array('id' => 'id'), array('id' => 'id', 'revision' => '', 'bundle' => '', 'langcode' => '')), - array(array('bundle' => 'bundle'), array('bundle' => 'bundle', 'revision' => '', 'langcode' => '')), + array(array(), array('revision' => '', 'revision_uuid' => '', 'bundle' => '', 'langcode' => '')), + array(array('id' => 'id'), array('id' => 'id', 'revision' => '', 'revision_uuid' => '', 'bundle' => '', 'langcode' => '')), + array(array('bundle' => 'bundle'), array('bundle' => 'bundle', 'revision' => '', 'revision_uuid' => '', 'langcode' => '')), ); } diff --git a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php index 02970d7..c794c57 100644 --- a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php @@ -92,6 +92,13 @@ class SqlContentEntityStorageTest extends UnitTestCase { protected $connection; /** + * The UUID service. + * + * @var \Drupal\Component\Uuid\UuidInterface + */ + protected $uuidService; + + /** * {@inheritdoc} */ protected function setUp() { @@ -113,6 +120,7 @@ protected function setUp() { $this->connection = $this->getMockBuilder('Drupal\Core\Database\Connection') ->disableOriginalConstructor() ->getMock(); + $this->uuidService = $this->getMock('Drupal\Component\Uuid\UuidInterface'); } /** @@ -342,7 +350,7 @@ public function testOnEntityTypeCreate() { ->will($this->returnValue($schema_handler)); $storage = $this->getMockBuilder('Drupal\Core\Entity\Sql\SqlContentEntityStorage') - ->setConstructorArgs(array($this->entityType, $this->connection, $this->entityManager, $this->cache, $this->languageManager)) + ->setConstructorArgs(array($this->entityType, $this->connection, $this->entityManager, $this->cache, $this->languageManager, $this->uuidService)) ->setMethods(array('getStorageSchema')) ->getMock(); @@ -520,6 +528,7 @@ public function testGetTableMappingRevisionable(array $entity_keys) { 'revision' => 'test_revision', 'bundle' => $entity_keys['bundle'], 'uuid' => $entity_keys['uuid'], + 'revision_uuid' => 'test_revision_uuid', ); $this->entityType->expects($this->exactly(2)) @@ -532,6 +541,7 @@ public function testGetTableMappingRevisionable(array $entity_keys) { array('uuid', $entity_keys['uuid']), array('bundle', $entity_keys['bundle']), array('revision', $entity_keys['revision']), + array('revision_uuid', $entity_keys['revision_uuid']), ))); $this->setUpEntityStorage(); @@ -543,7 +553,7 @@ public function testGetTableMappingRevisionable(array $entity_keys) { $expected = array_values(array_filter($entity_keys)); $this->assertEquals($expected, $mapping->getFieldNames('entity_test')); - $expected = array($entity_keys['id'], $entity_keys['revision']); + $expected = array($entity_keys['id'], $entity_keys['revision'], $entity_keys['revision_uuid']); $this->assertEquals($expected, $mapping->getFieldNames('entity_test_revision')); $this->assertEquals(array(), $mapping->getExtraColumns('entity_test')); @@ -568,6 +578,7 @@ public function testGetTableMappingRevisionableWithFields(array $entity_keys) { 'revision' => 'test_revision', 'bundle' => $entity_keys['bundle'], 'uuid' => $entity_keys['uuid'], + 'revision_uuid' => 'test_revision_uuid', ); // PHPUnit does not allow for multiple data providers. @@ -602,6 +613,7 @@ public function testGetTableMappingRevisionableWithFields(array $entity_keys) { array('uuid', $entity_keys['uuid']), array('bundle', $entity_keys['bundle']), array('revision', $entity_keys['revision']), + array('revision_uuid', $entity_keys['revision_uuid']), ))); $this->setUpEntityStorage(); @@ -613,7 +625,7 @@ public function testGetTableMappingRevisionableWithFields(array $entity_keys) { $this->assertEquals($field_names, $mapping->getFieldNames('entity_test')); $expected = array_merge( - array($entity_keys['id'], $entity_keys['revision']), + array($entity_keys['id'], $entity_keys['revision'], $entity_keys['revision_uuid']), $revisionable_field_names, $revision_metadata_field_names ); @@ -756,6 +768,7 @@ public function testGetTableMappingRevisionableTranslatable(array $entity_keys) $entity_keys = array( 'id' => $entity_keys['id'], 'revision' => 'test_revision', + 'revision_uuid' => 'test_revision_uuid', 'bundle' => $entity_keys['bundle'], 'uuid' => $entity_keys['uuid'], 'langcode' => 'langcode', @@ -777,6 +790,7 @@ public function testGetTableMappingRevisionableTranslatable(array $entity_keys) array('uuid', $entity_keys['uuid']), array('bundle', $entity_keys['bundle']), array('revision', $entity_keys['revision']), + array('revision_uuid', $entity_keys['revision_uuid']), array('langcode', $entity_keys['langcode']), ))); @@ -798,6 +812,7 @@ public function testGetTableMappingRevisionableTranslatable(array $entity_keys) $entity_keys['revision'], $entity_keys['bundle'], $entity_keys['uuid'], + $entity_keys['revision_uuid'], $entity_keys['langcode'], ))); $actual = $mapping->getFieldNames('entity_test'); @@ -807,6 +822,7 @@ public function testGetTableMappingRevisionableTranslatable(array $entity_keys) $expected = array_values(array_filter(array( $entity_keys['id'], $entity_keys['revision'], + $entity_keys['revision_uuid'], $entity_keys['langcode'], ))); $actual = $mapping->getFieldNames('entity_test_revision'); @@ -856,6 +872,7 @@ public function testGetTableMappingRevisionableTranslatableWithFields(array $ent $entity_keys = array( 'id' => $entity_keys['id'], 'revision' => 'test_revision', + 'revision_uuid' => 'test_revision_uuid', 'bundle' => $entity_keys['bundle'], 'uuid' => $entity_keys['uuid'], 'langcode' => 'langcode', @@ -898,6 +915,7 @@ public function testGetTableMappingRevisionableTranslatableWithFields(array $ent array('uuid', $entity_keys['uuid']), array('bundle', $entity_keys['bundle']), array('revision', $entity_keys['revision']), + array('revision_uuid', $entity_keys['revision_uuid']), array('langcode', $entity_keys['langcode']), ))); @@ -927,6 +945,7 @@ public function testGetTableMappingRevisionableTranslatableWithFields(array $ent $entity_keys['revision'], $entity_keys['bundle'], $entity_keys['uuid'], + $entity_keys['revision_uuid'], $entity_keys['langcode'], ))); $actual = $mapping->getFieldNames('entity_test'); @@ -936,6 +955,7 @@ public function testGetTableMappingRevisionableTranslatableWithFields(array $ent $expected = array_merge(array_filter(array( $entity_keys['id'], $entity_keys['revision'], + $entity_keys['revision_uuid'], $entity_keys['langcode'], )), $revision_metadata_field_names); $actual = $mapping->getFieldNames('entity_test_revision'); @@ -1085,7 +1105,7 @@ protected function setUpEntityStorage() { ->method('getBaseFieldDefinitions') ->will($this->returnValue($this->fieldDefinitions)); - $this->entityStorage = new SqlContentEntityStorage($this->entityType, $this->connection, $this->entityManager, $this->cache, $this->languageManager); + $this->entityStorage = new SqlContentEntityStorage($this->entityType, $this->connection, $this->entityManager, $this->cache, $this->languageManager, $this->uuidService); } /** @@ -1162,7 +1182,7 @@ public function testLoadMultipleNoPersistentCache() { ->method('set'); $entity_storage = $this->getMockBuilder('Drupal\Core\Entity\Sql\SqlContentEntityStorage') - ->setConstructorArgs(array($this->entityType, $this->connection, $this->entityManager, $this->cache, $this->languageManager)) + ->setConstructorArgs(array($this->entityType, $this->connection, $this->entityManager, $this->cache, $this->languageManager, $this->uuidService)) ->setMethods(array('getFromStorage', 'invokeStorageLoadHook')) ->getMock(); $entity_storage->method('invokeStorageLoadHook') @@ -1214,7 +1234,7 @@ public function testLoadMultiplePersistentCacheMiss() { ->with($key, $entity, CacheBackendInterface::CACHE_PERMANENT, array($this->entityTypeId . '_values', 'entity_field_info')); $entity_storage = $this->getMockBuilder('Drupal\Core\Entity\Sql\SqlContentEntityStorage') - ->setConstructorArgs(array($this->entityType, $this->connection, $this->entityManager, $this->cache, $this->languageManager)) + ->setConstructorArgs(array($this->entityType, $this->connection, $this->entityManager, $this->cache, $this->languageManager, $this->uuidService)) ->setMethods(array('getFromStorage', 'invokeStorageLoadHook')) ->getMock(); $entity_storage->method('invokeStorageLoadHook') @@ -1271,7 +1291,7 @@ public function testHasData() { ->method('getBaseFieldDefinitions') ->will($this->returnValue($this->fieldDefinitions)); - $this->entityStorage = new SqlContentEntityStorage($this->entityType, $database, $this->entityManager, $this->cache, $this->languageManager); + $this->entityStorage = new SqlContentEntityStorage($this->entityType, $database, $this->entityManager, $this->cache, $this->languageManager, $this->uuidService); $result = $this->entityStorage->hasData();