diff --git a/core/lib/Drupal/Core/Entity/ContentEntityDatabaseStorage.php b/core/lib/Drupal/Core/Entity/ContentEntityDatabaseStorage.php index 74a821c..3d506d0 100644 --- a/core/lib/Drupal/Core/Entity/ContentEntityDatabaseStorage.php +++ b/core/lib/Drupal/Core/Entity/ContentEntityDatabaseStorage.php @@ -43,7 +43,7 @@ class ContentEntityDatabaseStorage extends ContentEntityStorageBase implements S /** * A mapping of schema fields that will be stored per entity table. * - * @var \Drupal\Core\Entity\Sql\DefaultTableMapping + * @var \Drupal\Core\Entity\Sql\TableMappingInterface */ protected $tableMapping; @@ -269,7 +269,6 @@ public function getTableMapping() { // denormalized in the base table but also stored in the revision table // together with the entity ID and the revision ID as identifiers. $this->tableMapping->setFieldNames($this->baseTable, array_diff($all_fields, $revision_metadata_fields)); - $revision_key_fields = array($this->idKey, $this->revisionKey); $this->tableMapping->setFieldNames($this->revisionTable, array_merge($revision_key_fields, $revisionable_fields)); } diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlStorageInterface.php b/core/lib/Drupal/Core/Entity/Sql/SqlStorageInterface.php index d16b3c8..8a0bc1b 100644 --- a/core/lib/Drupal/Core/Entity/Sql/SqlStorageInterface.php +++ b/core/lib/Drupal/Core/Entity/Sql/SqlStorageInterface.php @@ -5,6 +5,7 @@ */ namespace Drupal\Core\Entity\Sql; + use Drupal\Core\Entity\EntityStorageInterface; /**