diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php b/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php index c2bc6d8..b1c1a54 100644 --- a/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php +++ b/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php @@ -114,7 +114,7 @@ public function addField($field, $type, $langcode) { if ($field_storage instanceof FieldStorageConfigInterface) { // Find the field column. $column = $field_storage->getMainPropertyName(); - /** @var \Drupal\Core\Entity\Sql\DefaultTableMappingInterface $table_mapping */ + /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */ $table_mapping = $this->entityManager->getStorage($entity_type_id)->getTableMapping(); if ($key < $count) { @@ -222,7 +222,7 @@ protected function ensureFieldTable($index_prefix, &$field, $type, $langcode, $b $field_name = $field->getName(); if (!isset($this->fieldTables[$index_prefix . $field_name])) { $entity_type_id = $this->sqlQuery->getMetaData('entity_type'); - /** @var \Drupal\Core\Entity\Sql\DefaultTableMappingInterface $table_mapping */ + /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */ $table_mapping = $this->entityManager->getStorage($entity_type_id)->getTableMapping(); $table = $this->sqlQuery->getMetaData('age') == EntityStorageInterface::FIELD_LOAD_CURRENT ? $table_mapping->getDedicatedDataTableName($field) : $table_mapping->getDedicatedRevisionTableName($field); if ($field->getCardinality() != 1) { diff --git a/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php b/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php index 31fbdc2..4e1546b 100644 --- a/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php +++ b/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php @@ -12,7 +12,7 @@ /** * Defines a default table mapping class. */ -class DefaultTableMapping implements DefaultTableMappingInterface { +class DefaultTableMapping implements TableMappingInterface { /** * A list of field storage definitions that are available for this mapping. @@ -187,7 +187,16 @@ public function getReservedColumns() { } /** - * {@inheritdoc} + * Generates a table name for a field data table. + * + * @param \Drupal\Core\Field\FieldStorageDefinitionInterface $storage_definition + * The field storage definition. + * @param bool $is_deleted + * (optional) Whether the table name holding the values of a deleted field + * should be returned. + * + * @return string + * A string containing the generated name for the database table. */ public function getDedicatedDataTableName(FieldStorageDefinitionInterface $storage_definition, $is_deleted = FALSE) { if ($is_deleted) { @@ -204,7 +213,16 @@ public function getDedicatedDataTableName(FieldStorageDefinitionInterface $stora } /** - * {@inheritdoc} + * Generates a table name for a field revision archive table. + * + * @param \Drupal\Core\Field\FieldStorageDefinitionInterface $storage_definition + * The field storage definition. + * @param bool $is_deleted + * (optional) Whether the table name holding the values of a deleted field + * should be returned. + * + * @return string + * A string containing the generated name for the database table. */ public function getDedicatedRevisionTableName(FieldStorageDefinitionInterface $storage_definition, $is_deleted = FALSE) { if ($is_deleted) { diff --git a/core/lib/Drupal/Core/Entity/Sql/DefaultTableMappingInterface.php b/core/lib/Drupal/Core/Entity/Sql/DefaultTableMappingInterface.php deleted file mode 100644 index ecb63b8..0000000 --- a/core/lib/Drupal/Core/Entity/Sql/DefaultTableMappingInterface.php +++ /dev/null @@ -1,45 +0,0 @@ -getTargetEntityTypeId(); $pseudo_field_name = 'reverse__' . $entity_type_id . '__' . $field_storage->getName(); - /** @var \Drupal\Core\Entity\Sql\DefaultTableMappingInterface $table_mapping */ + /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */ $table_mapping = \Drupal::entityManager()->getStorage($entity_type_id)->getTableMapping(); $data[$target_base_table][$pseudo_field_name]['relationship'] = array( 'title' => t('@label using @field_name', $args), diff --git a/core/modules/field/src/Plugin/views/field/Field.php b/core/modules/field/src/Plugin/views/field/Field.php index 92cc6e4..a42f4c2 100644 --- a/core/modules/field/src/Plugin/views/field/Field.php +++ b/core/modules/field/src/Plugin/views/field/Field.php @@ -355,7 +355,7 @@ public function clickSort($order) { $entity_type_id = $this->definition['entity_type']; $field_storage_definitions = $this->entityManager->getFieldStorageDefinitions($entity_type_id); $field_storage = $field_storage_definitions[$this->definition['field_name']]; - /** @var \Drupal\Core\Entity\Sql\DefaultTableMappingInterface $table_mapping */ + /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */ $table_mapping = $this->entityManager->getStorage($entity_type_id)->getTableMapping(); $column = $table_mapping->getFieldColumnName($field_storage, $this->options['click_sort_column']); if (!isset($this->aliases[$column])) { diff --git a/core/modules/field/src/Tests/BulkDeleteTest.php b/core/modules/field/src/Tests/BulkDeleteTest.php index 30d8e4b..d37d919 100644 --- a/core/modules/field/src/Tests/BulkDeleteTest.php +++ b/core/modules/field/src/Tests/BulkDeleteTest.php @@ -178,7 +178,7 @@ function testDeleteFieldInstance() { // Check that the actual stored content did not change during delete. $storage = \Drupal::entityManager()->getStorage($this->entity_type); - /** @var \Drupal\Core\Entity\Sql\DefaultTableMappingInterface $table_mapping */ + /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */ $table_mapping = $storage->getTableMapping(); $table = $table_mapping->getDedicatedDataTableName($field_storage); $column = $table_mapping->getFieldColumnName($field_storage, 'value'); diff --git a/core/modules/field/src/Tests/Views/ApiDataTest.php b/core/modules/field/src/Tests/Views/ApiDataTest.php index 5ad8a53..4e755dc 100644 --- a/core/modules/field/src/Tests/Views/ApiDataTest.php +++ b/core/modules/field/src/Tests/Views/ApiDataTest.php @@ -50,7 +50,7 @@ function testViewsData() { // Check the table and the joins of the first field. // Attached to node only. $field_storage = $this->fieldStorages[0]; - /** @var \Drupal\Core\Entity\Sql\DefaultTableMappingInterface $table_mapping */ + /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */ $table_mapping = \Drupal::entityManager()->getStorage('node')->getTableMapping(); $current_table = $table_mapping->getDedicatedDataTableName($field_storage); $revision_table = $table_mapping->getDedicatedRevisionTableName($field_storage); diff --git a/core/modules/file/file.views.inc b/core/modules/file/file.views.inc index eeb16fd..ee523b7 100644 --- a/core/modules/file/file.views.inc +++ b/core/modules/file/file.views.inc @@ -42,7 +42,7 @@ function file_field_views_data_views_data_alter(array &$data, FieldStorageConfig $entity_type = $entity_manager->getDefinition($entity_type_id); $field_name = $field_storage->getName(); $pseudo_field_name = 'reverse_' . $field_name . '_' . $entity_type_id; - /** @var \Drupal\Core\Entity\Sql\DefaultTableMappingInterface $table_mapping */ + /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */ $table_mapping = $entity_manager->getStorage($entity_type_id)->getTableMapping(); list($label) = field_views_field_label($entity_type_id, $field_name); diff --git a/core/modules/image/image.views.inc b/core/modules/image/image.views.inc index 04c32b9..2424b1a 100644 --- a/core/modules/image/image.views.inc +++ b/core/modules/image/image.views.inc @@ -41,7 +41,7 @@ function image_field_views_data_views_data_alter(array &$data, FieldStorageConfi $entity_manager = \Drupal::entityManager(); $entity_type = $entity_manager->getDefinition($entity_type_id); $pseudo_field_name = 'reverse_' . $field_name . '_' . $entity_type_id; - /** @var \Drupal\Core\Entity\Sql\DefaultTableMappingInterface $table_mapping */ + /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */ $table_mapping = $entity_manager->getStorage($entity_type_id)->getTableMapping(); list($label) = field_views_field_label($entity_type_id, $field_name); diff --git a/core/modules/system/src/Tests/Entity/EntityBundleFieldTest.php b/core/modules/system/src/Tests/Entity/EntityBundleFieldTest.php index 4ed1598..755527b 100644 --- a/core/modules/system/src/Tests/Entity/EntityBundleFieldTest.php +++ b/core/modules/system/src/Tests/Entity/EntityBundleFieldTest.php @@ -49,7 +49,7 @@ public function testCustomBundleFieldCreateDelete() { $this->assertNotNull($definition, 'Field definition found.'); // Make sure the table has been created. - /** @var \Drupal\Core\Entity\Sql\DefaultTableMappingInterface $table_mapping */ + /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */ $table_mapping = $this->entityManager->getStorage('entity_test')->getTableMapping(); $table = $table_mapping->getDedicatedDataTableName($definition); $this->assertTrue($this->database->schema()->tableExists($table), 'Table created'); @@ -89,7 +89,7 @@ public function testCustomBundleFieldUsage() { $this->assertEqual($entity->custom_field->value, 'cozy', 'Entity was updated correctly.'); $entity->delete(); - /** @var \Drupal\Core\Entity\Sql\DefaultTableMappingInterface $table_mapping */ + /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */ $table_mapping = $storage->getTableMapping(); $table = $table_mapping->getDedicatedDataTableName($entity->getFieldDefinition('custom_field')); $result = $this->database->select($table, 'f') diff --git a/core/modules/system/src/Tests/Entity/FieldSqlStorageTest.php b/core/modules/system/src/Tests/Entity/FieldSqlStorageTest.php index 4be7496..d3df71c 100644 --- a/core/modules/system/src/Tests/Entity/FieldSqlStorageTest.php +++ b/core/modules/system/src/Tests/Entity/FieldSqlStorageTest.php @@ -72,7 +72,7 @@ class FieldSqlStorageTest extends EntityUnitTestBase { /** * The table mapping for the tested entity type. * - * @var \Drupal\Core\Entity\Sql\DefaultTableMappingInterface $table_mapping + * @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */ protected $table_mapping; @@ -97,7 +97,7 @@ protected function setUp() { )); $this->instance->save(); - /** @var \Drupal\Core\Entity\Sql\DefaultTableMappingInterface $table_mapping */ + /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */ $table_mapping = \Drupal::entityManager()->getStorage($entity_type)->getTableMapping(); $this->table_mapping = $table_mapping; $this->table = $table_mapping->getDedicatedDataTableName($this->fieldStorage); diff --git a/core/modules/system/src/Tests/Entity/FieldTranslationSqlStorageTest.php b/core/modules/system/src/Tests/Entity/FieldTranslationSqlStorageTest.php index c2b30bd..2874aed 100644 --- a/core/modules/system/src/Tests/Entity/FieldTranslationSqlStorageTest.php +++ b/core/modules/system/src/Tests/Entity/FieldTranslationSqlStorageTest.php @@ -82,7 +82,7 @@ protected function assertFieldStorageLangcode(ContentEntityInterface $entity, $m $id = $entity->id(); $langcode = $entity->getUntranslated()->language()->id; $fields = array($this->field_name, $this->untranslatable_field_name); - /** @var \Drupal\Core\Entity\Sql\DefaultTableMappingInterface $table_mapping */ + /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */ $table_mapping = \Drupal::entityManager()->getStorage($entity_type)->getTableMapping(); foreach ($fields as $field_name) { diff --git a/core/modules/taxonomy/taxonomy.views.inc b/core/modules/taxonomy/taxonomy.views.inc index 42e0374..4de1876 100644 --- a/core/modules/taxonomy/taxonomy.views.inc +++ b/core/modules/taxonomy/taxonomy.views.inc @@ -95,7 +95,7 @@ function taxonomy_field_views_data_views_data_alter(array &$data, FieldStorageCo $entity_manager = \Drupal::entityManager(); $entity_type = $entity_manager->getDefinition($entity_type_id); $pseudo_field_name = 'reverse_' . $field_name . '_' . $entity_type_id; - /** @var \Drupal\Core\Entity\Sql\DefaultTableMappingInterface $table_mapping */ + /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */ $table_mapping = $entity_manager->getStorage($entity_type_id)->getTableMapping(); list($label) = field_views_field_label($entity_type_id, $field_name);