diff --git a/core/core.api.php b/core/core.api.php index 3b07651..8dcf24f 100644 --- a/core/core.api.php +++ b/core/core.api.php @@ -1910,7 +1910,7 @@ * * id = "comment", * * label = @Translation("Comment"), * * ... - * * base_table = "comment" + * * baseTable = "comment" * * ) * @endcode * diff --git a/core/lib/Drupal/Core/Entity/EntityType.php b/core/lib/Drupal/Core/Entity/EntityType.php index 19a52ca..15dd597 100644 --- a/core/lib/Drupal/Core/Entity/EntityType.php +++ b/core/lib/Drupal/Core/Entity/EntityType.php @@ -131,7 +131,7 @@ class EntityType extends PluginDefinition implements EntityTypeInterface { * * @var string|null */ - protected $base_table = NULL; + protected $baseTable = NULL; /** * The name of the entity type's revision data table. @@ -692,7 +692,7 @@ public function getBundleLabel() { * {@inheritdoc} */ public function getBaseTable() { - return $this->base_table; + return $this->baseTable; } /** diff --git a/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/DefaultSelection.php b/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/DefaultSelection.php index 2764866..f53f5f0 100644 --- a/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/DefaultSelection.php +++ b/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/DefaultSelection.php @@ -373,14 +373,14 @@ protected function buildEntityQuery($match = NULL, $match_operator = 'CONTAINS') * This allows Entity Reference to add a tag to an existing query so it can * ask access control mechanisms to alter it again. */ - protected function reAlterQuery(AlterableInterface $query, $tag, $base_table) { + protected function reAlterQuery(AlterableInterface $query, $tag, $baseTable) { // Save the old tags and metadata. // For some reason, those are public. $old_tags = $query->alterTags; $old_metadata = $query->alterMetaData; $query->alterTags = [$tag => TRUE]; - $query->alterMetaData['base_table'] = $base_table; + $query->alterMetaData['baseTable'] = $baseTable; $this->moduleHandler->alter(['query', 'query_' . $tag], $query); // Restore the tags and metadata. diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/Query.php b/core/lib/Drupal/Core/Entity/Query/Sql/Query.php index 50b81bb..2764b1f 100644 --- a/core/lib/Drupal/Core/Entity/Query/Sql/Query.php +++ b/core/lib/Drupal/Core/Entity/Query/Sql/Query.php @@ -88,12 +88,12 @@ public function execute() { */ protected function prepare() { if ($this->allRevisions) { - if (!$base_table = $this->entityType->getRevisionTable()) { + if (!$baseTable = $this->entityType->getRevisionTable()) { throw new QueryException("No revision table for " . $this->entityTypeId . ", invalid query."); } } else { - if (!$base_table = $this->entityType->getBaseTable()) { + if (!$baseTable = $this->entityType->getBaseTable()) { throw new QueryException("No base table for " . $this->entityTypeId . ", invalid query."); } } @@ -101,30 +101,30 @@ protected function prepare() { if ($this->entityType->getDataTable()) { $simple_query = FALSE; } - $this->sqlQuery = $this->connection->select($base_table, 'base_table', ['conjunction' => $this->conjunction]); + $this->sqlQuery = $this->connection->select($baseTable, 'baseTable', ['conjunction' => $this->conjunction]); $this->sqlQuery->addMetaData('entity_type', $this->entityTypeId); $id_field = $this->entityType->getKey('id'); // Add the key field for fetchAllKeyed(). if (!$revision_field = $this->entityType->getKey('revision')) { // When there is no revision support, the key field is the entity key. - $this->sqlFields["base_table.$id_field"] = ['base_table', $id_field]; + $this->sqlFields["baseTable.$id_field"] = ['baseTable', $id_field]; // Now add the value column for fetchAllKeyed(). This is always the // entity id. - $this->sqlFields["base_table.$id_field" . '_1'] = ['base_table', $id_field]; + $this->sqlFields["baseTable.$id_field" . '_1'] = ['baseTable', $id_field]; } else { // When there is revision support, the key field is the revision key. - $this->sqlFields["base_table.$revision_field"] = ['base_table', $revision_field]; + $this->sqlFields["baseTable.$revision_field"] = ['baseTable', $revision_field]; // Now add the value column for fetchAllKeyed(). This is always the // entity id. - $this->sqlFields["base_table.$id_field"] = ['base_table', $id_field]; + $this->sqlFields["baseTable.$id_field"] = ['baseTable', $id_field]; } // Add a self-join to the base revision table if we're querying only the // latest revisions. if ($this->latestRevision && $revision_field) { - $this->sqlQuery->leftJoin($base_table, 'base_table_2', "base_table.$id_field = base_table_2.$id_field AND base_table.$revision_field < base_table_2.$revision_field"); - $this->sqlQuery->isNull("base_table_2.$id_field"); + $this->sqlQuery->leftJoin($baseTable, 'baseTable_2', "baseTable.$id_field = baseTable_2.$id_field AND baseTable.$revision_field < baseTable_2.$revision_field"); + $this->sqlQuery->isNull("baseTable_2.$id_field"); } if ($this->accessCheck) { @@ -268,13 +268,13 @@ protected function result() { * * @return string * An expression that will select the given field for the given language in - * a SELECT query, such as 'base_table.id'. + * a SELECT query, such as 'baseTable.id'. */ protected function getSqlField($field, $langcode) { if (!isset($this->tables)) { $this->tables = $this->getTables($this->sqlQuery); } - $base_property = "base_table.$field"; + $base_property = "baseTable.$field"; if (isset($this->sqlFields[$base_property])) { return $base_property; } diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php b/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php index 0c54dc4..8acd214 100644 --- a/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php +++ b/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php @@ -1,4 +1,4 @@ -ensureFieldTable($index_prefix, $field_storage, $type, $langcode, $base_table, $entity_id_field, $field_id_field, $delta); + $table = $this->ensureFieldTable($index_prefix, $field_storage, $type, $langcode, $baseTable, $entity_id_field, $field_id_field, $delta); $sql_column = $table_mapping->getFieldColumnName($field_storage, $column); $property_definitions = $field_storage->getPropertyDefinitions(); if (isset($property_definitions[$column])) { @@ -190,17 +190,17 @@ public function addField($field, $type, $langcode) { $entity_tables = []; if ($all_revisions && $field_storage && $field_storage->isRevisionable()) { $data_table = $entity_type->getRevisionDataTable(); - $entity_base_table = $entity_type->getRevisionTable(); + $entityBaseTab = $entity_type->getRevisionTable(); } else { $data_table = $entity_type->getDataTable(); - $entity_base_table = $entity_type->getBaseTable(); + $entityBaseTab = $entity_type->getBaseTable(); } if ($data_table) { $this->sqlQuery->addMetaData('simple_query', FALSE); $entity_tables[$data_table] = $this->getTableMapping($data_table, $entity_type_id); } - $entity_tables[$entity_base_table] = $this->getTableMapping($entity_base_table, $entity_type_id); + $entity_tables[$entityBaseTab] = $this->getTableMapping($entityBaseTab, $entity_type_id); $sql_column = $specifier; // If there are more specifiers, get the right sql column name if the @@ -238,7 +238,7 @@ public function addField($field, $type, $langcode) { } } - $table = $this->ensureEntityTable($index_prefix, $sql_column, $type, $langcode, $base_table, $entity_id_field, $entity_tables); + $table = $this->ensureEntityTable($index_prefix, $sql_column, $type, $langcode, $baseTable, $entity_id_field, $entity_tables); // If there is a field storage (some specifiers are not), check for case // sensitivity. @@ -277,7 +277,7 @@ public function addField($field, $type, $langcode) { $entity_type = $this->entityManager->getDefinition($entity_type_id); $field_storage_definitions = $this->entityManager->getFieldStorageDefinitions($entity_type_id); // Add the new entity base table using the table and sql column. - $base_table = $this->addNextBaseTable($entity_type, $table, $sql_column, $field_storage); + $baseTable = $this->addNextBaseTable($entity_type, $table, $sql_column, $field_storage); $propertyDefinitions = []; $key++; $index_prefix .= "$next_index_prefix."; @@ -312,9 +312,9 @@ public function isFieldCaseSensitive($field_name) { * The join type, can either be INNER or LEFT. * @param string $langcode * The langcode we use on the join. - * @param string $base_table + * @param string $baseTable * The table to join to. It can be either the table name, its alias or the - * 'base_table' placeholder. + * 'baseTable' placeholder. * @param string $id_field * The name of the ID field/property for the current entity. For instance: * tid, nid, etc. @@ -330,7 +330,7 @@ public function isFieldCaseSensitive($field_name) { * @throws \Drupal\Core\Entity\Query\QueryException * When an invalid property has been passed. */ - protected function ensureEntityTable($index_prefix, $property, $type, $langcode, $base_table, $id_field, $entity_tables) { + protected function ensureEntityTable($index_prefix, $property, $type, $langcode, $baseTable, $id_field, $entity_tables) { foreach ($entity_tables as $table => $mapping) { if (isset($mapping[$property])) { // Ensure a table joined multiple times through different index prefixes @@ -338,9 +338,9 @@ protected function ensureEntityTable($index_prefix, $property, $type, $langcode, // and the base table alias. In this way i.e. if we join to the same // entity table several times for different entity reference fields, // each join gets a separate alias. - $key = $index_prefix . ($base_table === 'base_table' ? $table : $base_table); + $key = $index_prefix . ($baseTable === 'baseTable' ? $table : $baseTable); if (!isset($this->entityTables[$key])) { - $this->entityTables[$key] = $this->addJoin($type, $table, "%alias.$id_field = $base_table.$id_field", $langcode); + $this->entityTables[$key] = $this->addJoin($type, $table, "%alias.$id_field = $baseTable.$id_field", $langcode); } return $this->entityTables[$key]; } @@ -356,7 +356,7 @@ protected function ensureEntityTable($index_prefix, $property, $type, $langcode, * @return string * @throws \Drupal\Core\Entity\Query\QueryException */ - protected function ensureFieldTable($index_prefix, &$field, $type, $langcode, $base_table, $entity_id_field, $field_id_field, $delta) { + protected function ensureFieldTable($index_prefix, &$field, $type, $langcode, $baseTable, $entity_id_field, $field_id_field, $delta) { $field_name = $field->getName(); if (!isset($this->fieldTables[$index_prefix . $field_name])) { $entity_type_id = $this->sqlQuery->getMetaData('entity_type'); @@ -366,7 +366,7 @@ protected function ensureFieldTable($index_prefix, &$field, $type, $langcode, $b if ($field->getCardinality() != 1) { $this->sqlQuery->addMetaData('simple_query', FALSE); } - $this->fieldTables[$index_prefix . $field_name] = $this->addJoin($type, $table, "%alias.$field_id_field = $base_table.$entity_id_field", $langcode, $delta); + $this->fieldTables[$index_prefix . $field_name] = $this->addJoin($type, $table, "%alias.$field_id_field = $baseTable.$entity_id_field", $langcode, $delta); } return $this->fieldTables[$index_prefix . $field_name]; } diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php index 3349ebd..2b94bc1 100644 --- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php +++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php @@ -187,7 +187,7 @@ protected function hasSharedTableStructureChange(EntityTypeInterface $entity_typ * Returns TRUE if there have been changes. */ protected function hasSharedTableNameChanges(EntityTypeInterface $entity_type, EntityTypeInterface $original) { - $base_table = $this->database->schema()->tableExists($entity_type->getBaseTable()); + $baseTable = $this->database->schema()->tableExists($entity_type->getBaseTable()); $data_table = $this->database->schema()->tableExists($entity_type->getDataTable()); $revision_table = $this->database->schema()->tableExists($entity_type->getRevisionTable()); $revision_data_table = $this->database->schema()->tableExists($entity_type->getRevisionDataTable()); @@ -196,7 +196,7 @@ protected function hasSharedTableNameChanges(EntityTypeInterface $entity_type, E // have created it even though it wasn't specified in the entity type // definition. return - (!$base_table && $entity_type->getBaseTable() != $original->getBaseTable()) || + (!$baseTable && $entity_type->getBaseTable() != $original->getBaseTable()) || (!$data_table && $entity_type->getDataTable() != $original->getDataTable()) || (!$revision_table && $entity_type->getRevisionTable() != $original->getRevisionTable()) || (!$revision_data_table && $entity_type->getRevisionDataTable() != $original->getRevisionDataTable()); @@ -571,22 +571,22 @@ public function finalizePurge(FieldStorageDefinitionInterface $storage_definitio * An array of field column names for a shared table schema. * @param array $dedicated_table_field_columns * An array of field column names for a dedicated table schema. - * @param string $base_table + * @param string $baseTable * (optional) The name of the base entity table. Defaults to NULL. * * @return \Drupal\Core\Database\Query\SelectInterface * A database select query. */ - protected function getSelectQueryForFieldStorageDeletion($table_name, array $shared_table_field_columns, array $dedicated_table_field_columns, $base_table = NULL) { + protected function getSelectQueryForFieldStorageDeletion($table_name, array $shared_table_field_columns, array $dedicated_table_field_columns, $baseTable = NULL) { // Create a SELECT query that generates a result suitable for writing into // a dedicated field table. $select = $this->database->select($table_name, 'entity_table'); // Add the bundle column. if ($bundle = $this->entityType->getKey('bundle')) { - if ($base_table) { - $select->join($base_table, 'base_table', "entity_table.{$this->entityType->getKey('id')} = %alias.{$this->entityType->getKey('id')}"); - $select->addField('base_table', $bundle, 'bundle'); + if ($baseTable) { + $select->join($baseTable, 'baseTable', "entity_table.{$this->entityType->getKey('id')} = %alias.{$this->entityType->getKey('id')}"); + $select->addField('baseTable', $bundle, 'bundle'); } else { $select->addField('entity_table', $bundle, 'bundle'); @@ -691,7 +691,7 @@ protected function getEntitySchema(ContentEntityTypeInterface $entity_type, $res $tables = $this->getEntitySchemaTables(); // Initialize the table schema. - $schema[$tables['base_table']] = $this->initializeBaseTable($entity_type); + $schema[$tables['baseTable']] = $this->initializeBaseTable($entity_type); if (isset($tables['revision_table'])) { $schema[$tables['revision_table']] = $this->initializeRevisionTable($entity_type); } @@ -723,7 +723,7 @@ protected function getEntitySchema(ContentEntityTypeInterface $entity_type, $res } // Process tables after having gathered field information. - $this->processBaseTable($entity_type, $schema[$tables['base_table']]); + $this->processBaseTable($entity_type, $schema[$tables['baseTable']]); if (isset($tables['revision_table'])) { $this->processRevisionTable($entity_type, $schema[$tables['revision_table']]); } @@ -769,7 +769,7 @@ protected function getEntitySchema(ContentEntityTypeInterface $entity_type, $res */ protected function getEntitySchemaTables() { return array_filter([ - 'base_table' => $this->storage->getBaseTable(), + 'baseTable' => $this->storage->getBaseTable(), 'revision_table' => $this->storage->getRevisionTable(), 'data_table' => $this->storage->getDataTable(), 'revision_data_table' => $this->storage->getRevisionDataTable(), @@ -1815,7 +1815,7 @@ protected function getSharedTableFieldSchema(FieldStorageDefinitionInterface $st } $field_name = $storage_definition->getName(); - $base_table = $this->storage->getBaseTable(); + $baseTable = $this->storage->getBaseTable(); // Define the initial values, if any. $initial_value = $initial_value_from_field = []; @@ -1867,7 +1867,7 @@ protected function getSharedTableFieldSchema(FieldStorageDefinitionInterface $st // table is updated after the data has been inserted into the revision // table. For this reason the revision ID field cannot be marked as NOT // NULL. - if ($table_name == $base_table) { + if ($table_name == $baseTable) { unset($not_null_keys['revision']); } diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchemaConverter.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchemaConverter.php index 2d3edfc..c8a4cb9 100644 --- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchemaConverter.php +++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchemaConverter.php @@ -242,7 +242,7 @@ protected function copyData(array &$sandbox) { $original_table_mapping = $sandbox['original_table_mapping']; $original_entity_type = $sandbox['original_entity_type']; - $original_base_table = $original_entity_type->getBaseTable(); + $originalBaseTable = $original_entity_type->getBaseTable(); $revision_id_key = $temporary_entity_type->getKey('revision'); $revision_default_key = $temporary_entity_type->getRevisionMetadataKey('revision_default'); @@ -252,7 +252,7 @@ protected function copyData(array &$sandbox) { if (!isset($sandbox['progress'])) { $sandbox['progress'] = 0; $sandbox['current_id'] = 0; - $sandbox['max'] = $this->database->select($original_base_table) + $sandbox['max'] = $this->database->select($originalBaseTable) ->countQuery() ->execute() ->fetchField(); @@ -264,8 +264,8 @@ protected function copyData(array &$sandbox) { $step_size = Settings::get('entity_update_batch_size', 50); // Get the next entity IDs to migrate. - $entity_ids = $this->database->select($original_base_table) - ->fields($original_base_table, [$id]) + $entity_ids = $this->database->select($originalBaseTable) + ->fields($originalBaseTable, [$id]) ->condition($id, $sandbox['current_id'], '>') ->orderBy($id, 'ASC') ->range(0, $step_size) @@ -325,7 +325,7 @@ protected function copyData(array &$sandbox) { // If we're not in maintenance mode, the number of entities could change at // any time so make sure that we always use the latest record count. - $sandbox['max'] = $this->database->select($original_base_table) + $sandbox['max'] = $this->database->select($originalBaseTable) ->countQuery() ->execute() ->fetchField(); @@ -485,7 +485,7 @@ protected function createTemporaryDefinitions(array &$sandbox, array $fields_to_ $actual_entity_type = $this->entityTypeManager->getDefinition($this->entityTypeId); $temporary_entity_type = clone $actual_entity_type; - $temporary_entity_type->set('base_table', TemporaryTableMapping::getTempTableName($temporary_entity_type->getBaseTable())); + $temporary_entity_type->set('baseTable', TemporaryTableMapping::getTempTableName($temporary_entity_type->getBaseTable())); $temporary_entity_type->set('revision_table', TemporaryTableMapping::getTempTableName($temporary_entity_type->getRevisionTable())); if ($temporary_entity_type->isTranslatable()) { $temporary_entity_type->set('data_table', TemporaryTableMapping::getTempTableName($temporary_entity_type->getDataTable())); diff --git a/core/lib/Drupal/Core/Entity/entity.api.php b/core/lib/Drupal/Core/Entity/entity.api.php index 2b893fd..8e519b2 100644 --- a/core/lib/Drupal/Core/Entity/entity.api.php +++ b/core/lib/Drupal/Core/Entity/entity.api.php @@ -407,7 +407,7 @@ * to provide views data for the entity type. You can autogenerate most of * the views data by extending \Drupal\views\EntityViewsData. * - For content entities, the annotation will refer to a number of database - * tables and their fields. These annotation properties, such as 'base_table', + * tables and their fields. These annotation properties, such as 'baseTable', * 'data_table', 'entity_keys', etc., are documented on * \Drupal\Core\Entity\EntityType. * - For content entities that are displayed on their own pages, the annotation diff --git a/core/lib/Drupal/Core/Field/Annotation/FieldType.php b/core/lib/Drupal/Core/Field/Annotation/FieldType.php index 8bf54cb..0264e12 100644 --- a/core/lib/Drupal/Core/Field/Annotation/FieldType.php +++ b/core/lib/Drupal/Core/Field/Annotation/FieldType.php @@ -84,7 +84,7 @@ class FieldType extends DataType { * * @var bool */ - public $no_ui = FALSE; + public $noUi = FALSE; /** * {@inheritdoc} diff --git a/core/lib/Drupal/Core/Field/FieldTypePluginManager.php b/core/lib/Drupal/Core/Field/FieldTypePluginManager.php index 565fa4e..f962d2e 100644 --- a/core/lib/Drupal/Core/Field/FieldTypePluginManager.php +++ b/core/lib/Drupal/Core/Field/FieldTypePluginManager.php @@ -129,7 +129,7 @@ public function getUiDefinitions() { // Filter out definitions that can not be configured in Field UI. $definitions = array_filter($definitions, function ($definition) { - return empty($definition['no_ui']); + return empty($definition['noUi']); }); // Add preconfigured definitions. diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/ChangedItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/ChangedItem.php index 9c53665..68cfbb7 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/ChangedItem.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/ChangedItem.php @@ -12,7 +12,7 @@ * id = "changed", * label = @Translation("Last changed"), * description = @Translation("An entity field containing a UNIX timestamp of when the entity has been last updated."), - * no_ui = TRUE, + * noUi = TRUE, * default_widget = "datetime_timestamp", * default_formatter = "timestamp", * list_class = "\Drupal\Core\Field\ChangedFieldItemList" diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/CreatedItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/CreatedItem.php index da2e2a7..0b2bd2e 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/CreatedItem.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/CreatedItem.php @@ -9,7 +9,7 @@ * id = "created", * label = @Translation("Created"), * description = @Translation("An entity field containing a UNIX timestamp of when the entity has been created."), - * no_ui = TRUE, + * noUi = TRUE, * default_widget = "datetime_timestamp", * default_formatter = "timestamp" * ) diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/LanguageItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/LanguageItem.php index 1755ba6..124c8b8 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/LanguageItem.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/LanguageItem.php @@ -18,7 +18,7 @@ * description = @Translation("An entity field referencing a language."), * default_widget = "language_select", * default_formatter = "language", - * no_ui = TRUE, + * noUi = TRUE, * constraints = { * "ComplexData" = { * "value" = { diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/MapItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/MapItem.php index e15fe84..402d2f9 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/MapItem.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/MapItem.php @@ -12,7 +12,7 @@ * id = "map", * label = @Translation("Map"), * description = @Translation("An entity field for storing a serialized array of values."), - * no_ui = TRUE, + * noUi = TRUE, * list_class = "\Drupal\Core\Field\MapFieldItemList", * ) */ diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/PasswordItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/PasswordItem.php index f86eac7..470982c 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/PasswordItem.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/PasswordItem.php @@ -14,7 +14,7 @@ * id = "password", * label = @Translation("Password"), * description = @Translation("An entity field containing a password value."), - * no_ui = TRUE, + * noUi = TRUE, * ) */ class PasswordItem extends StringItem { diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UriItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UriItem.php index 8d1d6e6..2c1f22f 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UriItem.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UriItem.php @@ -18,7 +18,7 @@ * id = "uri", * label = @Translation("URI"), * description = @Translation("An entity field containing a URI."), - * no_ui = TRUE, + * noUi = TRUE, * default_formatter = "uri_link", * default_widget = "uri", * ) diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UuidItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UuidItem.php index a5f9401..99c930b 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UuidItem.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UuidItem.php @@ -14,7 +14,7 @@ * id = "uuid", * label = @Translation("UUID"), * description = @Translation("An entity field containing a UUID."), - * no_ui = TRUE, + * noUi = TRUE, * default_formatter = "string" * ) */ diff --git a/core/modules/action/tests/action_bulk_test/config/install/views.view.test_bulk_form.yml b/core/modules/action/tests/action_bulk_test/config/install/views.view.test_bulk_form.yml index f9c8cb2..94b6cbe 100644 --- a/core/modules/action/tests/action_bulk_test/config/install/views.view.test_bulk_form.yml +++ b/core/modules/action/tests/action_bulk_test/config/install/views.view.test_bulk_form.yml @@ -9,7 +9,7 @@ label: form module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/aggregator/config/optional/views.view.aggregator_rss_feed.yml b/core/modules/aggregator/config/optional/views.view.aggregator_rss_feed.yml index 9bbba23..6cd2caa 100644 --- a/core/modules/aggregator/config/optional/views.view.aggregator_rss_feed.yml +++ b/core/modules/aggregator/config/optional/views.view.aggregator_rss_feed.yml @@ -9,7 +9,7 @@ label: 'Aggregator RSS feed' module: aggregator description: '' tag: aggregator -base_table: aggregator_item +baseTable: aggregator_item base_field: iid core: 8.x display: diff --git a/core/modules/aggregator/config/optional/views.view.aggregator_sources.yml b/core/modules/aggregator/config/optional/views.view.aggregator_sources.yml index 643a794..8dbff5b 100644 --- a/core/modules/aggregator/config/optional/views.view.aggregator_sources.yml +++ b/core/modules/aggregator/config/optional/views.view.aggregator_sources.yml @@ -12,7 +12,7 @@ label: 'Aggregator sources' module: aggregator description: '' tag: aggregator -base_table: aggregator_feed +baseTable: aggregator_feed base_field: fid core: 8.x display: diff --git a/core/modules/aggregator/src/Entity/Feed.php b/core/modules/aggregator/src/Entity/Feed.php index e27450c..e921935 100644 --- a/core/modules/aggregator/src/Entity/Feed.php +++ b/core/modules/aggregator/src/Entity/Feed.php @@ -35,7 +35,7 @@ * "delete-form" = "/aggregator/sources/{aggregator_feed}/delete", * }, * field_ui_base_route = "aggregator.admin_overview", - * base_table = "aggregator_feed", + * baseTable = "aggregator_feed", * render_cache = FALSE, * entity_keys = { * "id" = "fid", diff --git a/core/modules/aggregator/src/Entity/Item.php b/core/modules/aggregator/src/Entity/Item.php index ef0c6d2..97089ee 100644 --- a/core/modules/aggregator/src/Entity/Item.php +++ b/core/modules/aggregator/src/Entity/Item.php @@ -24,7 +24,7 @@ * "views_data" = "Drupal\aggregator\AggregatorItemViewsData" * }, * uri_callback = "Drupal\aggregator\Entity\Item::buildUri", - * base_table = "aggregator_item", + * baseTable = "aggregator_item", * render_cache = FALSE, * list_cache_tags = { "aggregator_feed_list" }, * entity_keys = { diff --git a/core/modules/aggregator/src/Plugin/views/row/Rss.php b/core/modules/aggregator/src/Plugin/views/row/Rss.php index 464a285..c331237 100644 --- a/core/modules/aggregator/src/Plugin/views/row/Rss.php +++ b/core/modules/aggregator/src/Plugin/views/row/Rss.php @@ -13,7 +13,7 @@ * title = @Translation("Aggregator item"), * help = @Translation("Display the aggregator item using the data from the original source."), * base = {"aggregator_item"}, - * display_types = {"feed"} + * displayTypes = {"feed"} * ) */ class Rss extends RssPluginBase { @@ -23,14 +23,14 @@ class Rss extends RssPluginBase { * * @var string */ - public $base_table = 'aggregator_item'; + public $baseTable = 'aggregator_item'; /** * The actual field which is used to identify a aggregator item. * * @var string */ - public $base_field = 'iid'; + public $baseField = 'iid'; /** * {@inheritdoc} diff --git a/core/modules/aggregator/tests/modules/aggregator_test_views/test_views/views.view.test_aggregator_items.yml b/core/modules/aggregator/tests/modules/aggregator_test_views/test_views/views.view.test_aggregator_items.yml index db7b203..15b0dfc 100644 --- a/core/modules/aggregator/tests/modules/aggregator_test_views/test_views/views.view.test_aggregator_items.yml +++ b/core/modules/aggregator/tests/modules/aggregator_test_views/test_views/views.view.test_aggregator_items.yml @@ -8,7 +8,7 @@ label: test_aggregator_items module: views description: '' tag: '' -base_table: aggregator_item +baseTable: aggregator_item base_field: iid core: 8.x display: diff --git a/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block.yml b/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block.yml index d540aee..c3a79d1 100644 --- a/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block.yml +++ b/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block.yml @@ -6,7 +6,7 @@ label: test_view_block module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: id core: 8.x display: diff --git a/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block2.yml b/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block2.yml index 97ed6fb..92a1022 100644 --- a/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block2.yml +++ b/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block2.yml @@ -8,7 +8,7 @@ label: test_view_block2 module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: id core: 8.x display: diff --git a/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block_with_context.yml b/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block_with_context.yml index 4f8a841..c881c6a 100644 --- a/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block_with_context.yml +++ b/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block_with_context.yml @@ -9,7 +9,7 @@ label: test_view_block_with_context module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/block_content/config/optional/views.view.block_content.yml b/core/modules/block_content/config/optional/views.view.block_content.yml index 1be5a04..9d3f106 100644 --- a/core/modules/block_content/config/optional/views.view.block_content.yml +++ b/core/modules/block_content/config/optional/views.view.block_content.yml @@ -9,7 +9,7 @@ label: 'Custom block library' module: views description: 'Find and manage custom blocks.' tag: default -base_table: block_content_field_data +baseTable: block_content_field_data base_field: id core: 8.x display: diff --git a/core/modules/block_content/src/Entity/BlockContent.php b/core/modules/block_content/src/Entity/BlockContent.php index 3c8858f..8e06962 100644 --- a/core/modules/block_content/src/Entity/BlockContent.php +++ b/core/modules/block_content/src/Entity/BlockContent.php @@ -31,7 +31,7 @@ * "translation" = "Drupal\block_content\BlockContentTranslationHandler" * }, * admin_permission = "administer blocks", - * base_table = "block_content", + * baseTable = "block_content", * revision_table = "block_content_revision", * data_table = "block_content_field_data", * revision_data_table = "block_content_field_revision", diff --git a/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_redirect_destination.yml b/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_redirect_destination.yml index 72568c0..cebb135 100644 --- a/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_redirect_destination.yml +++ b/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_redirect_destination.yml @@ -8,7 +8,7 @@ label: 'Redirect destination' module: views description: '' tag: '' -base_table: block_content_field_data +baseTable: block_content_field_data base_field: id core: 8.x display: diff --git a/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_revision_id.yml b/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_revision_id.yml index e7a4810..351cab8 100644 --- a/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_revision_id.yml +++ b/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_revision_id.yml @@ -8,7 +8,7 @@ label: null module: views description: '' tag: '' -base_table: block_content_field_revision +baseTable: block_content_field_revision base_field: revision_id core: '8' display: diff --git a/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_revision_revision_id.yml b/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_revision_revision_id.yml index a304198..a28ff18 100644 --- a/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_revision_revision_id.yml +++ b/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_revision_revision_id.yml @@ -8,7 +8,7 @@ label: null module: views description: '' tag: '' -base_table: block_content_field_revision +baseTable: block_content_field_revision base_field: revision_id core: '8' display: diff --git a/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_view.yml b/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_view.yml index bd7a6e4..67db824 100644 --- a/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_view.yml +++ b/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_view.yml @@ -8,7 +8,7 @@ label: test_block_content_view module: views description: '' tag: '' -base_table: block_content_field_data +baseTable: block_content_field_data base_field: id core: 8.x display: diff --git a/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_field_filters.yml b/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_field_filters.yml index 45eb3af..76b9a35 100644 --- a/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_field_filters.yml +++ b/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_field_filters.yml @@ -8,7 +8,7 @@ label: 'Test field filters' module: views description: '' tag: '' -base_table: block_content_field_data +baseTable: block_content_field_data base_field: id core: 8.x display: diff --git a/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_field_type.yml b/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_field_type.yml index 9cccd50..fc5fb0e 100644 --- a/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_field_type.yml +++ b/core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_field_type.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: block_content_field_data +baseTable: block_content_field_data base_field: id core: '8' display: diff --git a/core/modules/book/src/BookOutlineStorage.php b/core/modules/book/src/BookOutlineStorage.php index 4f61b5c..84e725d 100644 --- a/core/modules/book/src/BookOutlineStorage.php +++ b/core/modules/book/src/BookOutlineStorage.php @@ -49,7 +49,7 @@ public function loadMultiple($nids, $access = TRUE) { if ($access) { $query->addTag('node_access'); - $query->addMetaData('base_table', 'book'); + $query->addMetaData('baseTable', 'book'); } return $query->execute(); diff --git a/core/modules/book/tests/modules/book_test_views/test_views/views.view.test_book_view.yml b/core/modules/book/tests/modules/book_test_views/test_views/views.view.test_book_view.yml index 3aeb3a6..620f84f 100644 --- a/core/modules/book/tests/modules/book_test_views/test_views/views.view.test_book_view.yml +++ b/core/modules/book/tests/modules/book_test_views/test_views/views.view.test_book_view.yml @@ -11,7 +11,7 @@ label: Book module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/comment/comment.views.inc b/core/modules/comment/comment.views.inc index 11abede..d81b43539 100644 --- a/core/modules/comment/comment.views.inc +++ b/core/modules/comment/comment.views.inc @@ -28,11 +28,11 @@ function comment_views_data_alter(&$data) { continue; } $fields = \Drupal::service('comment.manager')->getFields($entity_type_id); - $base_table = $entity_type->getDataTable() ?: $entity_type->getBaseTable(); + $baseTable = $entity_type->getDataTable() ?: $entity_type->getBaseTable(); $args = ['@entity_type' => $entity_type_id]; if ($fields) { - $data[$base_table]['comments_link'] = [ + $data[$baseTable]['comments_link'] = [ 'field' => [ 'title' => t('Add comment link'), 'help' => t('Display the standard add comment link used on regular @entity_type, which will only display if the viewing user has access to add a comment.', $args), @@ -67,7 +67,7 @@ function comment_views_data_alter(&$data) { ]; foreach ($fields as $field_name => $field) { - $data[$base_table][$field_name . '_cid'] = [ + $data[$baseTable][$field_name . '_cid'] = [ 'title' => t('Comments of the @entity_type using field: @field_name', $args + ['@field_name' => $field_name]), 'help' => t('Relate all comments on the @entity_type. This will create 1 duplicate record for every comment. Usually if you need this it is better to create a comment view.', $args), 'relationship' => [ diff --git a/core/modules/comment/config/optional/views.view.comment.yml b/core/modules/comment/config/optional/views.view.comment.yml index 4dbfb66..6945934 100644 --- a/core/modules/comment/config/optional/views.view.comment.yml +++ b/core/modules/comment/config/optional/views.view.comment.yml @@ -9,7 +9,7 @@ label: Comments module: comment description: 'Find and manage comments.' tag: default -base_table: comment_field_data +baseTable: comment_field_data base_field: cid core: 8.x display: diff --git a/core/modules/comment/config/optional/views.view.comments_recent.yml b/core/modules/comment/config/optional/views.view.comments_recent.yml index 28613e6..f8c6c5a 100644 --- a/core/modules/comment/config/optional/views.view.comments_recent.yml +++ b/core/modules/comment/config/optional/views.view.comments_recent.yml @@ -10,7 +10,7 @@ label: 'Recent comments' module: views description: 'Recent comments.' tag: default -base_table: comment_field_data +baseTable: comment_field_data base_field: cid core: 8.x display: diff --git a/core/modules/comment/src/CommentStorage.php b/core/modules/comment/src/CommentStorage.php index 2bcda91..ea269ea 100644 --- a/core/modules/comment/src/CommentStorage.php +++ b/core/modules/comment/src/CommentStorage.php @@ -267,7 +267,7 @@ public function loadThread(EntityInterface $entity, $field_name, $mode, $comment ->condition('c.default_langcode', 1) ->addTag('entity_access') ->addTag('comment_filter') - ->addMetaData('base_table', 'comment') + ->addMetaData('baseTable', 'comment') ->addMetaData('entity', $entity) ->addMetaData('field_name', $field_name); @@ -287,7 +287,7 @@ public function loadThread(EntityInterface $entity, $field_name, $mode, $comment ->condition('c.default_langcode', 1) ->addTag('entity_access') ->addTag('comment_filter') - ->addMetaData('base_table', 'comment') + ->addMetaData('baseTable', 'comment') ->addMetaData('entity', $entity) ->addMetaData('field_name', $field_name); $query->setCountQuery($count_query); diff --git a/core/modules/comment/src/Entity/Comment.php b/core/modules/comment/src/Entity/Comment.php index 233c752..851b233 100644 --- a/core/modules/comment/src/Entity/Comment.php +++ b/core/modules/comment/src/Entity/Comment.php @@ -41,7 +41,7 @@ * }, * "translation" = "Drupal\comment\CommentTranslationHandler" * }, - * base_table = "comment", + * baseTable = "comment", * data_table = "comment_field_data", * uri_callback = "comment_uri", * translatable = TRUE, diff --git a/core/modules/comment/src/Plugin/EntityReferenceSelection/CommentSelection.php b/core/modules/comment/src/Plugin/EntityReferenceSelection/CommentSelection.php index 414c5b2..f4055ae 100644 --- a/core/modules/comment/src/Plugin/EntityReferenceSelection/CommentSelection.php +++ b/core/modules/comment/src/Plugin/EntityReferenceSelection/CommentSelection.php @@ -73,7 +73,7 @@ public function entityQueryAlter(SelectInterface $query) { if (!isset($tables['comment_field_data']['alias'])) { // If no conditions join against the comment data table, it should be // joined manually to allow node access processing. - $query->innerJoin($data_table, NULL, "base_table.cid = $data_table.cid AND $data_table.default_langcode = 1"); + $query->innerJoin($data_table, NULL, "baseTable.cid = $data_table.cid AND $data_table.default_langcode = 1"); } // The Comment module doesn't implement any proper comment access, diff --git a/core/modules/comment/src/Plugin/views/row/Rss.php b/core/modules/comment/src/Plugin/views/row/Rss.php index cb9c104..1ac6525 100644 --- a/core/modules/comment/src/Plugin/views/row/Rss.php +++ b/core/modules/comment/src/Plugin/views/row/Rss.php @@ -14,7 +14,7 @@ * theme = "views_view_row_rss", * register_theme = FALSE, * base = {"comment_field_data"}, - * display_types = {"feed"} + * displayTypes = {"feed"} * ) */ class Rss extends RssPluginBase { @@ -22,7 +22,7 @@ class Rss extends RssPluginBase { /** * {@inheritdoc} */ - protected $base_table = 'comment_field_data'; + protected $baseTable = 'comment_field_data'; /** * {@inheritdoc} diff --git a/core/modules/comment/src/Plugin/views/wizard/Comment.php b/core/modules/comment/src/Plugin/views/wizard/Comment.php index 7cc5c63..7ece451 100644 --- a/core/modules/comment/src/Plugin/views/wizard/Comment.php +++ b/core/modules/comment/src/Plugin/views/wizard/Comment.php @@ -13,7 +13,7 @@ * * @ViewsWizard( * id = "comment", - * base_table = "comment_field_data", + * baseTable = "comment_field_data", * title = @Translation("Comments") * ) */ diff --git a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment.yml b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment.yml index 4b3b1b4..4a2c713 100644 --- a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment.yml +++ b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment.yml @@ -10,7 +10,7 @@ label: test_comment module: views description: '' tag: '' -base_table: comment_field_data +baseTable: comment_field_data base_field: cid core: 8.x display: diff --git a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_field_name.yml b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_field_name.yml index db8aedd..8205554 100644 --- a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_field_name.yml +++ b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_field_name.yml @@ -9,7 +9,7 @@ label: 'Comment field name test' module: views description: '' tag: '' -base_table: comment_field_data +baseTable: comment_field_data base_field: cid core: 8.x display: diff --git a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_operations.yml b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_operations.yml index 2537700..6268bac 100644 --- a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_operations.yml +++ b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_operations.yml @@ -9,7 +9,7 @@ label: test_comment_operations module: views description: '' tag: '' -base_table: comment_field_data +baseTable: comment_field_data base_field: cid core: 8.x display: diff --git a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rest.yml b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rest.yml index fabd46c..27c4d1d 100644 --- a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rest.yml +++ b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rest.yml @@ -14,7 +14,7 @@ label: 'Comments by node' module: views description: '' tag: '' -base_table: comment_field_data +baseTable: comment_field_data base_field: cid core: 8.x display: diff --git a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_row.yml b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_row.yml index 0b36ef8..376e688 100644 --- a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_row.yml +++ b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_row.yml @@ -10,7 +10,7 @@ label: test_comment_row module: views description: '' tag: '' -base_table: comment_field_data +baseTable: comment_field_data base_field: cid core: 8.x display: diff --git a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rss.yml b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rss.yml index 69dc586..3b1770f 100644 --- a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rss.yml +++ b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rss.yml @@ -10,7 +10,7 @@ label: test_comment_rss module: views description: '' tag: '' -base_table: comment_field_data +baseTable: comment_field_data base_field: cid core: 8.x display: diff --git a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_user_uid.yml b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_user_uid.yml index 030b4a7..4a83615 100644 --- a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_user_uid.yml +++ b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_user_uid.yml @@ -11,7 +11,7 @@ label: test_comment_user_uid module: comment_test_views description: '' tag: default -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_field_filters.yml b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_field_filters.yml index 76c67c6..7be64e0 100644 --- a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_field_filters.yml +++ b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_field_filters.yml @@ -10,7 +10,7 @@ label: 'Test field filters' module: views description: '' tag: '' -base_table: comment_field_data +baseTable: comment_field_data base_field: cid core: 8.x display: diff --git a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_new_comments.yml b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_new_comments.yml index e329976..3637511 100644 --- a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_new_comments.yml +++ b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_new_comments.yml @@ -10,7 +10,7 @@ label: '2505879' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/comment/tests/src/Kernel/Views/CommentUserNameTest.php b/core/modules/comment/tests/src/Kernel/Views/CommentUserNameTest.php index 2fb8c74..c93f9db 100644 --- a/core/modules/comment/tests/src/Kernel/Views/CommentUserNameTest.php +++ b/core/modules/comment/tests/src/Kernel/Views/CommentUserNameTest.php @@ -106,7 +106,7 @@ public function testUsername() { $view_id = $this->randomMachineName(); $view = View::create([ 'id' => $view_id, - 'base_table' => 'comment_field_data', + 'baseTable' => 'comment_field_data', 'display' => [ 'default' => [ 'display_plugin' => 'default', diff --git a/core/modules/comment/tests/src/Unit/Plugin/views/field/CommentBulkFormTest.php b/core/modules/comment/tests/src/Unit/Plugin/views/field/CommentBulkFormTest.php index 4e86bb7..b40c3c7 100644 --- a/core/modules/comment/tests/src/Unit/Plugin/views/field/CommentBulkFormTest.php +++ b/core/modules/comment/tests/src/Unit/Plugin/views/field/CommentBulkFormTest.php @@ -69,7 +69,7 @@ public function testConstructor() { $storage = $this->getMock('Drupal\views\ViewEntityInterface'); $storage->expects($this->any()) ->method('get') - ->with('base_table') + ->with('baseTable') ->will($this->returnValue('comment')); $executable = $this->getMockBuilder('Drupal\views\ViewExecutable') diff --git a/core/modules/config/tests/src/Functional/ConfigImportUITest.php b/core/modules/config/tests/src/Functional/ConfigImportUITest.php index fd76990..5618403 100644 --- a/core/modules/config/tests/src/Functional/ConfigImportUITest.php +++ b/core/modules/config/tests/src/Functional/ConfigImportUITest.php @@ -162,8 +162,8 @@ public function testImport() { // configuration. This verifies that the module's default configuration is // used during configuration import and, additionally, that after installing // a module, that configuration is not synced twice. - $recursion_limit_values = \Drupal::state()->get('ConfigImportUITest.action.settings.recursion_limit', []); - $this->assertIdentical($recursion_limit_values, [50]); + $recursionLimitValues = \Drupal::state()->get('ConfigImportUITest.action.settings.recursion_limit', []); + $this->assertIdentical($recursionLimitValues, [50]); $core_extension = $this->config('core.extension')->get(); unset($core_extension['module']['action']); diff --git a/core/modules/contact/tests/modules/contact_storage_test/contact_storage_test.module b/core/modules/contact/tests/modules/contact_storage_test/contact_storage_test.module index cef976c..d99ad1d 100644 --- a/core/modules/contact/tests/modules/contact_storage_test/contact_storage_test.module +++ b/core/modules/contact/tests/modules/contact_storage_test/contact_storage_test.module @@ -39,7 +39,7 @@ function contact_storage_test_entity_type_alter(array &$entity_types) { $keys = $entity_types['contact_message']->getKeys(); $keys['id'] = 'id'; $entity_types['contact_message']->set('entity_keys', $keys); - $entity_types['contact_message']->set('base_table', 'contact_message'); + $entity_types['contact_message']->set('baseTable', 'contact_message'); } /** diff --git a/core/modules/contact/tests/modules/contact_test_views/test_views/views.view.test_contact_link.yml b/core/modules/contact/tests/modules/contact_test_views/test_views/views.view.test_contact_link.yml index efc2109..a5c7088 100644 --- a/core/modules/contact/tests/modules/contact_test_views/test_views/views.view.test_contact_link.yml +++ b/core/modules/contact/tests/modules/contact_test_views/test_views/views.view.test_contact_link.yml @@ -9,7 +9,7 @@ label: test_contact_link module: views description: '' tag: '' -base_table: users_field_data +baseTable: users_field_data base_field: uid core: 8.x display: diff --git a/core/modules/content_moderation/config/optional/views.view.moderated_content.yml b/core/modules/content_moderation/config/optional/views.view.moderated_content.yml index 03076be..1d92ddb 100644 --- a/core/modules/content_moderation/config/optional/views.view.moderated_content.yml +++ b/core/modules/content_moderation/config/optional/views.view.moderated_content.yml @@ -10,7 +10,7 @@ label: 'Moderated content' module: views description: 'Find and moderate content.' tag: '' -base_table: node_field_revision +baseTable: node_field_revision base_field: vid core: 8.x display: diff --git a/core/modules/content_moderation/src/Entity/ContentModerationState.php b/core/modules/content_moderation/src/Entity/ContentModerationState.php index e54fbbe..20197b9 100644 --- a/core/modules/content_moderation/src/Entity/ContentModerationState.php +++ b/core/modules/content_moderation/src/Entity/ContentModerationState.php @@ -26,7 +26,7 @@ * "views_data" = "\Drupal\views\EntityViewsData", * "access" = "Drupal\content_moderation\ContentModerationStateAccessControlHandler", * }, - * base_table = "content_moderation_state", + * baseTable = "content_moderation_state", * revision_table = "content_moderation_state_revision", * data_table = "content_moderation_state_field_data", * revision_data_table = "content_moderation_state_field_revision", diff --git a/core/modules/content_moderation/src/Plugin/views/filter/ModerationStateFilter.php b/core/modules/content_moderation/src/Plugin/views/filter/ModerationStateFilter.php index 035ad3e..8c40409 100644 --- a/core/modules/content_moderation/src/Plugin/views/filter/ModerationStateFilter.php +++ b/core/modules/content_moderation/src/Plugin/views/filter/ModerationStateFilter.php @@ -173,17 +173,17 @@ protected function opSimple() { // If we have a list of moderated bundles, restrict the query to show only // entities in those bundles. if ($moderated_bundles) { - $entity_base_table_alias = $this->table; + $entityBaseTable_alias = $this->table; // The bundle field of an entity type is not revisionable so we need to // join the data table. - $entity_base_table = $entity_type->isTranslatable() ? $entity_type->getDataTable() : $entity_type->getBaseTable(); - $entity_revision_base_table = $entity_type->isTranslatable() ? $entity_type->getRevisionDataTable() : $entity_type->getRevisionTable(); - if ($this->table === $entity_revision_base_table) { + $entityBaseTable = $entity_type->isTranslatable() ? $entity_type->getDataTable() : $entity_type->getBaseTable(); + $entityRevisionBaseTable = $entity_type->isTranslatable() ? $entity_type->getRevisionDataTable() : $entity_type->getRevisionTable(); + if ($this->table === $entityRevisionBaseTable) { $configuration = [ - 'table' => $entity_base_table, + 'table' => $entityBaseTable, 'field' => $entity_type->getKey('id'), - 'left_table' => $entity_revision_base_table, + 'left_table' => $entityRevisionBaseTable, 'left_field' => $entity_type->getKey('id'), 'type' => 'INNER', ]; @@ -195,10 +195,10 @@ protected function opSimple() { } $join = Views::pluginManager('join')->createInstance('standard', $configuration); - $entity_base_table_alias = $this->query->addRelationship($entity_base_table, $join, $entity_revision_base_table); + $entityBaseTable_alias = $this->query->addRelationship($entityBaseTable, $join, $entityRevisionBaseTable); } - $this->query->addWhere($this->options['group'], "$entity_base_table_alias.{$entity_type->getKey('bundle')}", $moderated_bundles, 'IN'); + $this->query->addWhere($this->options['group'], "$entityBaseTable_alias.{$entity_type->getKey('bundle')}", $moderated_bundles, 'IN'); } // Otherwise, force the query to return an empty result. else { diff --git a/core/modules/content_moderation/src/ViewsData.php b/core/modules/content_moderation/src/ViewsData.php index 40be303..c4a88a4 100644 --- a/core/modules/content_moderation/src/ViewsData.php +++ b/core/modules/content_moderation/src/ViewsData.php @@ -58,8 +58,8 @@ public function getViewsData() { // Provides a relationship from moderated entity to its moderation state // entity. $content_moderation_state_entity_type = $this->entityTypeManager->getDefinition('content_moderation_state'); - $content_moderation_state_entity_base_table = $content_moderation_state_entity_type->getDataTable() ?: $content_moderation_state_entity_type->getBaseTable(); - $content_moderation_state_entity_revision_base_table = $content_moderation_state_entity_type->getRevisionDataTable() ?: $content_moderation_state_entity_type->getRevisionTable(); + $contentModerationStateEntityBaseTable = $content_moderation_state_entity_type->getDataTable() ?: $content_moderation_state_entity_type->getBaseTable(); + $contentModerationStateEntityRevisionTargetBaseTable = $content_moderation_state_entity_type->getRevisionDataTable() ?: $content_moderation_state_entity_type->getRevisionTable(); foreach ($entity_types_with_moderation as $entity_type_id => $entity_type) { $table = $entity_type->getDataTable() ?: $entity_type->getBaseTable(); @@ -68,7 +68,7 @@ public function getViewsData() { 'relationship' => [ 'id' => 'standard', 'label' => $this->t('@label moderation state', ['@label' => $entity_type->getLabel()]), - 'base' => $content_moderation_state_entity_base_table, + 'base' => $contentModerationStateEntityBaseTable, 'base field' => 'content_entity_id', 'relationship field' => $entity_type->getKey('id'), 'extra' => [ @@ -92,7 +92,7 @@ public function getViewsData() { 'relationship' => [ 'id' => 'standard', 'label' => $this->t('@label moderation state', ['@label' => $entity_type->getLabel()]), - 'base' => $content_moderation_state_entity_revision_base_table, + 'base' => $contentModerationStateEntityRevisionBaseTable, 'base field' => 'content_entity_revision_id', 'relationship field' => $entity_type->getKey('revision'), 'extra' => [ diff --git a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.latest.yml b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.latest.yml index 62e972e..ebc6003 100644 --- a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.latest.yml +++ b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.latest.yml @@ -11,7 +11,7 @@ label: Latest module: views description: '' tag: '' -base_table: node_field_revision +baseTable: node_field_revision base_field: vid core: 8.x display: diff --git a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_base_table_test.yml b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_base_table_test.yml index 343806f..e52c0c7 100644 --- a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_base_table_test.yml +++ b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_base_table_test.yml @@ -10,7 +10,7 @@ label: test_content_moderation_base_table_test module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_field_state_test.yml b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_field_state_test.yml index c0f511c..f1f03c8 100644 --- a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_field_state_test.yml +++ b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_field_state_test.yml @@ -10,7 +10,7 @@ label: test_content_moderation_field_state_test module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_revision_test.yml b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_revision_test.yml index 78fca38..588a0d6 100644 --- a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_revision_test.yml +++ b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_revision_test.yml @@ -8,7 +8,7 @@ label: test_content_moderation_revision_test module: views description: '' tag: '' -base_table: node_field_revision +baseTable: node_field_revision base_field: vid core: 8.x display: diff --git a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_base_table.yml b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_base_table.yml index e844f47..0acbe99 100644 --- a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_base_table.yml +++ b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_base_table.yml @@ -10,7 +10,7 @@ label: test_content_moderation_state_filter_base_table module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: @@ -258,4 +258,3 @@ display: - user.permissions tags: - 'config:workflow_list' - diff --git a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_base_table_filter_on_revision.yml b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_base_table_filter_on_revision.yml index 548e6db..f76286d 100644 --- a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_base_table_filter_on_revision.yml +++ b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_base_table_filter_on_revision.yml @@ -10,7 +10,7 @@ label: test_content_moderation_state_filter_base_table_filter_on_revision module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: @@ -220,4 +220,3 @@ display: - user.permissions tags: - 'config:workflow_list' - diff --git a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_entity_test.yml b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_entity_test.yml index 0683b98..b0b2777 100644 --- a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_entity_test.yml +++ b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_entity_test.yml @@ -9,7 +9,7 @@ label: test_content_moderation_state_filter_entity_test module: views description: '' tag: '' -base_table: entity_test_no_bundle +baseTable: entity_test_no_bundle base_field: id core: 8.x display: diff --git a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_revision_table.yml b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_revision_table.yml index 1cb6b6d..382bdf4 100644 --- a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_revision_table.yml +++ b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_revision_table.yml @@ -9,7 +9,7 @@ label: test_content_moderation_state_filter_revision_table module: views description: '' tag: '' -base_table: node_field_revision +baseTable: node_field_revision base_field: vid core: 8.x display: diff --git a/core/modules/content_moderation/tests/src/Functional/ViewsModerationStateFilterTest.php b/core/modules/content_moderation/tests/src/Functional/ViewsModerationStateFilterTest.php index e5b296d..83dce93 100644 --- a/core/modules/content_moderation/tests/src/Functional/ViewsModerationStateFilterTest.php +++ b/core/modules/content_moderation/tests/src/Functional/ViewsModerationStateFilterTest.php @@ -65,7 +65,7 @@ protected function setUp($import_test_views = TRUE) { public function testModerationStateFilterDependencyHandling() { // First, check that the view doesn't have any config dependency when there // are no states configured in the filter. - $view_id = 'test_content_moderation_state_filter_base_table'; + $view_id = 'testContentModerationStateFilterBaseTable'; $view = Views::getView($view_id); $this->assertWorkflowDependencies([], $view); @@ -200,11 +200,11 @@ public function testWorkflowChanges($view_id, $filter_name) { public function providerTestWorkflowChanges() { return [ 'view on base table, filter on base table' => [ - 'test_content_moderation_state_filter_base_table', + 'testContentModerationStateFilterBaseTable', 'Content: Moderation state' ], 'view on base table, filter on revision table' => [ - 'test_content_moderation_state_filter_base_table_filter_on_revision', + 'testContentModerationStateFilterBaseTable_filter_on_revision', 'Content revision: Moderation state' ], ]; @@ -246,7 +246,7 @@ public function testFilterRenderCache() { 'id' => 'foo3', ], 'Save'); - $view_id = 'test_content_moderation_state_filter_base_table'; + $view_id = 'testContentModerationStateFilterBaseTable'; $edit['options[expose][multiple]'] = TRUE; $this->drupalPostForm("admin/structure/views/nojs/handler/$view_id/default/filter/moderation_state", $edit, 'Apply'); $this->drupalPostForm("admin/structure/views/view/$view_id", [], 'Save'); diff --git a/core/modules/content_moderation/tests/src/Kernel/ViewsDataIntegrationTest.php b/core/modules/content_moderation/tests/src/Kernel/ViewsDataIntegrationTest.php index a1b396f..ad55153 100644 --- a/core/modules/content_moderation/tests/src/Kernel/ViewsDataIntegrationTest.php +++ b/core/modules/content_moderation/tests/src/Kernel/ViewsDataIntegrationTest.php @@ -102,7 +102,7 @@ public function testContentModerationStateBaseJoin() { $revision->moderation_state->value = 'draft'; $revision->save(); - $view = Views::getView('test_content_moderation_base_table_test'); + $view = Views::getView('testContentModerationBaseTable_test'); $view->execute(); $expected_result = [ diff --git a/core/modules/content_moderation/tests/src/Kernel/ViewsModerationStateFilterTest.php b/core/modules/content_moderation/tests/src/Kernel/ViewsModerationStateFilterTest.php index 637e70a..deb9662 100644 --- a/core/modules/content_moderation/tests/src/Kernel/ViewsModerationStateFilterTest.php +++ b/core/modules/content_moderation/tests/src/Kernel/ViewsModerationStateFilterTest.php @@ -256,7 +256,7 @@ public function testStateFilterStatesList() { */ protected function assertPluginStates($states) { $plugin = Views::pluginManager('filter')->createInstance('moderation_state_filter', []); - $view = Views::getView('test_content_moderation_state_filter_base_table'); + $view = Views::getView('testContentModerationStateFilterBaseTable'); $plugin->init($view, $view->getDisplay()); $this->assertEquals($states, $plugin->getValueOptions()); } @@ -271,7 +271,7 @@ protected function assertPluginStates($states) { * @param string $view_id * The view to execute for the results. */ - protected function assertNodesWithFilters(array $nodes, array $filters, $view_id = 'test_content_moderation_state_filter_base_table') { + protected function assertNodesWithFilters(array $nodes, array $filters, $view_id = 'testContentModerationStateFilterBaseTable') { $view = Views::getView($view_id); $view->setExposedInput($filters); $view->execute(); diff --git a/core/modules/content_translation/content_translation.module b/core/modules/content_translation/content_translation.module index 6a0c229..cec1c58 100644 --- a/core/modules/content_translation/content_translation.module +++ b/core/modules/content_translation/content_translation.module @@ -245,10 +245,10 @@ function content_translation_views_data_alter(array &$data) { /** @var \Drupal\content_translation\ContentTranslationManagerInterface $manager */ $manager = \Drupal::service('content_translation.manager'); foreach ($entity_types as $entity_type_id => $entity_type) { - $base_table = $entity_type->getBaseTable(); - if (isset($data[$base_table]) && $entity_type->hasLinkTemplate('drupal:content-translation-overview') && $manager->isEnabled($entity_type_id)) { + $baseTable = $entity_type->getBaseTable(); + if (isset($data[$baseTable]) && $entity_type->hasLinkTemplate('drupal:content-translation-overview') && $manager->isEnabled($entity_type_id)) { $t_arguments = ['@entity_type_label' => $entity_type->getLabel()]; - $data[$base_table]['translation_link'] = [ + $data[$baseTable]['translation_link'] = [ 'field' => [ 'title' => t('Link to translate @entity_type_label', $t_arguments), 'help' => t('Provide a translation link to the @entity_type_label.', $t_arguments), diff --git a/core/modules/content_translation/tests/modules/content_translation_test/src/Entity/EntityTestTranslatableNoUISkip.php b/core/modules/content_translation/tests/modules/content_translation_test/src/Entity/EntityTestTranslatableNoUISkip.php index d84257a..b5a5912 100644 --- a/core/modules/content_translation/tests/modules/content_translation_test/src/Entity/EntityTestTranslatableNoUISkip.php +++ b/core/modules/content_translation/tests/modules/content_translation_test/src/Entity/EntityTestTranslatableNoUISkip.php @@ -18,7 +18,7 @@ * "html" = "Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider", * }, * }, - * base_table = "entity_test_mul", + * baseTable = "entity_test_mul", * data_table = "entity_test_mul_property_data", * entity_keys = { * "id" = "id", diff --git a/core/modules/content_translation/tests/modules/content_translation_test/src/Entity/EntityTestTranslatableUISkip.php b/core/modules/content_translation/tests/modules/content_translation_test/src/Entity/EntityTestTranslatableUISkip.php index 1956aed..5eddbf4 100644 --- a/core/modules/content_translation/tests/modules/content_translation_test/src/Entity/EntityTestTranslatableUISkip.php +++ b/core/modules/content_translation/tests/modules/content_translation_test/src/Entity/EntityTestTranslatableUISkip.php @@ -10,7 +10,7 @@ * @ContentEntityType( * id = "entity_test_translatable_UI_skip", * label = @Translation("Test entity - Translatable skip UI check"), - * base_table = "entity_test_mul", + * baseTable = "entity_test_mul", * data_table = "entity_test_mul_property_data", * entity_keys = { * "id" = "id", diff --git a/core/modules/content_translation/tests/modules/content_translation_test_views/test_views/views.view.test_entity_translations_link.yml b/core/modules/content_translation/tests/modules/content_translation_test_views/test_views/views.view.test_entity_translations_link.yml index d7a21c3..67a74bd 100644 --- a/core/modules/content_translation/tests/modules/content_translation_test_views/test_views/views.view.test_entity_translations_link.yml +++ b/core/modules/content_translation/tests/modules/content_translation_test_views/test_views/views.view.test_entity_translations_link.yml @@ -9,7 +9,7 @@ label: People module: views description: '' tag: '' -base_table: users_field_data +baseTable: users_field_data base_field: uid core: 8.x display: diff --git a/core/modules/datetime/src/Tests/Views/DateTimeHandlerTestBase.php b/core/modules/datetime/src/Tests/Views/DateTimeHandlerTestBase.php index 854352e..1d5726f 100644 --- a/core/modules/datetime/src/Tests/Views/DateTimeHandlerTestBase.php +++ b/core/modules/datetime/src/Tests/Views/DateTimeHandlerTestBase.php @@ -31,7 +31,7 @@ * * @var string */ - protected static $field_name = 'field_date'; + protected static $fieldName = 'field_date'; /** * Nodes to test. diff --git a/core/modules/datetime/tests/modules/datetime_test/test_views/views.view.test_argument_datetime.yml b/core/modules/datetime/tests/modules/datetime_test/test_views/views.view.test_argument_datetime.yml index 24900e6..5afe53a 100644 --- a/core/modules/datetime/tests/modules/datetime_test/test_views/views.view.test_argument_datetime.yml +++ b/core/modules/datetime/tests/modules/datetime_test/test_views/views.view.test_argument_datetime.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/datetime/tests/modules/datetime_test/test_views/views.view.test_filter_datetime.yml b/core/modules/datetime/tests/modules/datetime_test/test_views/views.view.test_filter_datetime.yml index abd0e4f..f902c2f 100644 --- a/core/modules/datetime/tests/modules/datetime_test/test_views/views.view.test_filter_datetime.yml +++ b/core/modules/datetime/tests/modules/datetime_test/test_views/views.view.test_filter_datetime.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/datetime/tests/modules/datetime_test/test_views/views.view.test_sort_datetime.yml b/core/modules/datetime/tests/modules/datetime_test/test_views/views.view.test_sort_datetime.yml index 59bcbd9..0739454 100644 --- a/core/modules/datetime/tests/modules/datetime_test/test_views/views.view.test_sort_datetime.yml +++ b/core/modules/datetime/tests/modules/datetime_test/test_views/views.view.test_sort_datetime.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/datetime/tests/src/Kernel/Views/DateTimeHandlerTestBase.php b/core/modules/datetime/tests/src/Kernel/Views/DateTimeHandlerTestBase.php index 20a3542..6d77781 100644 --- a/core/modules/datetime/tests/src/Kernel/Views/DateTimeHandlerTestBase.php +++ b/core/modules/datetime/tests/src/Kernel/Views/DateTimeHandlerTestBase.php @@ -26,7 +26,7 @@ * * @var string */ - protected static $field_name = 'field_date'; + protected static $fieldName = 'field_date'; /** * Nodes to test. diff --git a/core/modules/dblog/config/optional/views.view.watchdog.yml b/core/modules/dblog/config/optional/views.view.watchdog.yml index a805ca5..e8bfde3 100644 --- a/core/modules/dblog/config/optional/views.view.watchdog.yml +++ b/core/modules/dblog/config/optional/views.view.watchdog.yml @@ -9,7 +9,7 @@ label: Watchdog module: views description: 'Recent log messages' tag: '' -base_table: watchdog +baseTable: watchdog base_field: wid core: 8.x display: diff --git a/core/modules/dblog/dblog.install b/core/modules/dblog/dblog.install index 8da830b..f2d139f 100644 --- a/core/modules/dblog/dblog.install +++ b/core/modules/dblog/dblog.install @@ -99,7 +99,7 @@ function dblog_update_8400() { foreach ($config_factory->listAll('views.view.') as $view_config_name) { $view = $config_factory->getEditable($view_config_name); - if ($view->get('base_table') != 'watchdog') { + if ($view->get('baseTable') != 'watchdog') { continue; } diff --git a/core/modules/dblog/dblog.module b/core/modules/dblog/dblog.module index 700ceea..27d858f 100644 --- a/core/modules/dblog/dblog.module +++ b/core/modules/dblog/dblog.module @@ -130,7 +130,7 @@ function dblog_logging_settings_submit($form, FormStateInterface $form_state) { */ function dblog_view_presave(ViewEntityInterface $view) { // Only interested in watchdog based views. - if ($view->get('base_table') != 'watchdog') { + if ($view->get('baseTable') != 'watchdog') { return; } @@ -193,7 +193,7 @@ function dblog_view_presave(ViewEntityInterface $view) { * Implements hook_views_pre_render(). */ function dblog_views_pre_render(ViewExecutable $view) { - if (isset($view) && ($view->storage->get('base_table') == 'watchdog')) { + if (isset($view) && ($view->storage->get('baseTable') == 'watchdog')) { $view->element['#attached']['library'][] = 'dblog/drupal.dblog'; } } diff --git a/core/modules/dblog/src/Plugin/views/wizard/Watchdog.php b/core/modules/dblog/src/Plugin/views/wizard/Watchdog.php index 3a0dad5..f9c6360 100644 --- a/core/modules/dblog/src/Plugin/views/wizard/Watchdog.php +++ b/core/modules/dblog/src/Plugin/views/wizard/Watchdog.php @@ -10,7 +10,7 @@ * @ViewsWizard( * id = "watchdog", * module = "dblog", - * base_table = "watchdog", + * baseTable = "watchdog", * title = @Translation("Log entries") * ) */ diff --git a/core/modules/dblog/tests/modules/dblog_test_views/test_views/views.view.dblog_2851293.yml b/core/modules/dblog/tests/modules/dblog_test_views/test_views/views.view.dblog_2851293.yml index 470a1f0..51c202a 100644 --- a/core/modules/dblog/tests/modules/dblog_test_views/test_views/views.view.dblog_2851293.yml +++ b/core/modules/dblog/tests/modules/dblog_test_views/test_views/views.view.dblog_2851293.yml @@ -8,7 +8,7 @@ label: dblog_2851293 module: views description: 'Base view to test upgrade from issue #2851293' tag: '' -base_table: watchdog +baseTable: watchdog base_field: wid core: 8.x display: diff --git a/core/modules/dblog/tests/modules/dblog_test_views/test_views/views.view.dblog_integration_test.yml b/core/modules/dblog/tests/modules/dblog_test_views/test_views/views.view.dblog_integration_test.yml index 5e701ab..e92b1d7 100644 --- a/core/modules/dblog/tests/modules/dblog_test_views/test_views/views.view.dblog_integration_test.yml +++ b/core/modules/dblog/tests/modules/dblog_test_views/test_views/views.view.dblog_integration_test.yml @@ -9,7 +9,7 @@ label: dblog_integration_test module: views description: '' tag: '' -base_table: watchdog +baseTable: watchdog base_field: wid core: 8.x display: diff --git a/core/modules/dblog/tests/modules/dblog_test_views/test_views/views.view.test_dblog.yml b/core/modules/dblog/tests/modules/dblog_test_views/test_views/views.view.test_dblog.yml index d3ebfc8..b3e41d9 100644 --- a/core/modules/dblog/tests/modules/dblog_test_views/test_views/views.view.test_dblog.yml +++ b/core/modules/dblog/tests/modules/dblog_test_views/test_views/views.view.test_dblog.yml @@ -8,7 +8,7 @@ label: test_dblog module: views description: '' tag: '' -base_table: watchdog +baseTable: watchdog base_field: wid core: 8.x display: diff --git a/core/modules/editor/src/Annotation/Editor.php b/core/modules/editor/src/Annotation/Editor.php index 83405d6..46b3cc1 100644 --- a/core/modules/editor/src/Annotation/Editor.php +++ b/core/modules/editor/src/Annotation/Editor.php @@ -73,27 +73,27 @@ class Editor extends Plugin { * * @var bool */ - public $supports_content_filtering; + public $supportContentFiltering; /** * Whether the editor supports the inline editing provided by the Edit module. * * @var bool */ - public $supports_inline_editing; + public $supportsInlineEditing; /** * Whether this text editor is not vulnerable to XSS attacks. * * @var bool */ - public $is_xss_safe; + public $isXssSafe; /** * A list of element types this text editor supports. * * @var string[] */ - public $supported_element_types; + public $supportedElementTypes; } diff --git a/core/modules/field/tests/fixtures/update/views.view.entity_reference_plugins_2429191.yml b/core/modules/field/tests/fixtures/update/views.view.entity_reference_plugins_2429191.yml index 9c49011..ee3f22a 100644 --- a/core/modules/field/tests/fixtures/update/views.view.entity_reference_plugins_2429191.yml +++ b/core/modules/field/tests/fixtures/update/views.view.entity_reference_plugins_2429191.yml @@ -11,7 +11,7 @@ label: test module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/HiddenTestItem.php b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/HiddenTestItem.php index 3f90cc3..a971593 100644 --- a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/HiddenTestItem.php +++ b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/HiddenTestItem.php @@ -9,7 +9,7 @@ * id = "hidden_test_field", * label = @Translation("Hidden from UI test field"), * description = @Translation("Dummy hidden field type used for tests."), - * no_ui = TRUE, + * noUi = TRUE, * default_widget = "test_field_widget", * default_formatter = "field_test_default" * ) diff --git a/core/modules/field/tests/modules/field_test_views/test_views/views.view.test_view_field_delete.yml b/core/modules/field/tests/modules/field_test_views/test_views/views.view.test_view_field_delete.yml index 16e9cb1..caac87e 100644 --- a/core/modules/field/tests/modules/field_test_views/test_views/views.view.test_view_field_delete.yml +++ b/core/modules/field/tests/modules/field_test_views/test_views/views.view.test_view_field_delete.yml @@ -11,7 +11,7 @@ label: test_view_field_delete module: views description: '' tag: default -base_table: node +baseTable: node base_field: nid core: '8' display: diff --git a/core/modules/field/tests/modules/field_test_views/test_views/views.view.test_view_fieldapi.yml b/core/modules/field/tests/modules/field_test_views/test_views/views.view.test_view_fieldapi.yml index ab39c27..0303746 100644 --- a/core/modules/field/tests/modules/field_test_views/test_views/views.view.test_view_fieldapi.yml +++ b/core/modules/field/tests/modules/field_test_views/test_views/views.view.test_view_fieldapi.yml @@ -9,7 +9,7 @@ label: test_view_fieldapi module: views description: '' tag: default -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/field_ui/src/Form/FieldStorageAddForm.php b/core/modules/field_ui/src/Form/FieldStorageAddForm.php index 584cc96..9d2fc0b 100644 --- a/core/modules/field_ui/src/Form/FieldStorageAddForm.php +++ b/core/modules/field_ui/src/Form/FieldStorageAddForm.php @@ -486,7 +486,7 @@ protected function getExistingFieldStorageOptions() { $field_type = $field_storage->getType(); if ($field_storage instanceof FieldStorageConfigInterface && !$field_storage->isLocked() - && empty($field_types[$field_type]['no_ui']) + && empty($field_types[$field_type]['noUi']) && !in_array($this->bundle, $field_storage->getBundles(), TRUE)) { $options[$field_name] = $this->t('@type: @field', [ '@type' => $field_types[$field_type]['label'], diff --git a/core/modules/field_ui/src/Tests/ManageFieldsTest.php b/core/modules/field_ui/src/Tests/ManageFieldsTest.php index 112e392..660c3a8 100644 --- a/core/modules/field_ui/src/Tests/ManageFieldsTest.php +++ b/core/modules/field_ui/src/Tests/ManageFieldsTest.php @@ -574,12 +574,12 @@ public function testLockedField() { } /** - * Tests that Field UI respects the 'no_ui' flag in the field type definition. + * Tests that Field UI respects the 'noUi' flag in the field type definition. */ public function testHiddenFields() { // Check that the field type is not available in the 'add new field' row. $this->drupalGet('admin/structure/types/manage/' . $this->contentType . '/fields/add-field'); - $this->assertFalse($this->xpath('//select[@id="edit-new-storage-type"]//option[@value="hidden_test_field"]'), "The 'add new field' select respects field types 'no_ui' property."); + $this->assertFalse($this->xpath('//select[@id="edit-new-storage-type"]//option[@value="hidden_test_field"]'), "The 'add new field' select respects field types 'noUi' property."); $this->assertTrue($this->xpath('//select[@id="edit-new-storage-type"]//option[@value="shape"]'), "The 'add new field' select shows a valid option."); // Create a field storage and a field programmatically. @@ -609,13 +609,13 @@ public function testHiddenFields() { // Check that the field does not appear in the 're-use existing field' row // on other bundles. $this->drupalGet('admin/structure/types/manage/page/fields/add-field'); - $this->assertFalse($this->xpath('//select[@id="edit-existing-storage-name"]//option[@value=:field_name]', [':field_name' => $field_name]), "The 're-use existing field' select respects field types 'no_ui' property."); + $this->assertFalse($this->xpath('//select[@id="edit-existing-storage-name"]//option[@value=:field_name]', [':field_name' => $field_name]), "The 're-use existing field' select respects field types 'noUi' property."); $this->assertTrue($this->xpath('//select[@id="edit-existing-storage-name"]//option[@value=:field_name]', [':field_name' => 'field_tags']), "The 're-use existing field' select shows a valid option."); // Check that non-configurable fields are not available. $field_types = \Drupal::service('plugin.manager.field.field_type')->getDefinitions(); foreach ($field_types as $field_type => $definition) { - if (empty($definition['no_ui'])) { + if (empty($definition['noUi'])) { $this->assertTrue($this->xpath('//select[@id="edit-new-storage-type"]//option[@value=:field_type]', [':field_type' => $field_type]), SafeMarkup::format('Configurable field type @field_type is available.', ['@field_type' => $field_type])); } else { diff --git a/core/modules/file/config/optional/views.view.files.yml b/core/modules/file/config/optional/views.view.files.yml index 053b72d..2c31053 100644 --- a/core/modules/file/config/optional/views.view.files.yml +++ b/core/modules/file/config/optional/views.view.files.yml @@ -9,7 +9,7 @@ label: Files module: file description: 'Find and manage files.' tag: default -base_table: file_managed +baseTable: file_managed base_field: fid core: 8.x display: diff --git a/core/modules/file/src/Entity/File.php b/core/modules/file/src/Entity/File.php index 4060b77..fd19d4e 100644 --- a/core/modules/file/src/Entity/File.php +++ b/core/modules/file/src/Entity/File.php @@ -24,7 +24,7 @@ * "access" = "Drupal\file\FileAccessControlHandler", * "views_data" = "Drupal\file\FileViewsData", * }, - * base_table = "file_managed", + * baseTable = "file_managed", * entity_keys = { * "id" = "fid", * "label" = "filename", diff --git a/core/modules/file/src/Plugin/Field/FieldType/FileUriItem.php b/core/modules/file/src/Plugin/Field/FieldType/FileUriItem.php index 33bc15e..691367a 100644 --- a/core/modules/file/src/Plugin/Field/FieldType/FileUriItem.php +++ b/core/modules/file/src/Plugin/Field/FieldType/FileUriItem.php @@ -14,7 +14,7 @@ * id = "file_uri", * label = @Translation("File URI"), * description = @Translation("An entity field containing a file URI, and a computed root-relative file URL."), - * no_ui = TRUE, + * noUi = TRUE, * default_formatter = "file_uri", * default_widget = "uri", * ) diff --git a/core/modules/file/src/Plugin/views/wizard/File.php b/core/modules/file/src/Plugin/views/wizard/File.php index f870f65..fb76fa6 100644 --- a/core/modules/file/src/Plugin/views/wizard/File.php +++ b/core/modules/file/src/Plugin/views/wizard/File.php @@ -9,7 +9,7 @@ * * @ViewsWizard( * id = "file_managed", - * base_table = "file_managed", + * baseTable = "file_managed", * title = @Translation("Files") * ) */ diff --git a/core/modules/file/tests/modules/file_test_views/test_views/views.view.file_extension_view.yml b/core/modules/file/tests/modules/file_test_views/test_views/views.view.file_extension_view.yml index f870fb3..de65594 100644 --- a/core/modules/file/tests/modules/file_test_views/test_views/views.view.file_extension_view.yml +++ b/core/modules/file/tests/modules/file_test_views/test_views/views.view.file_extension_view.yml @@ -6,7 +6,7 @@ label: 'Test view for file extension views field handler' module: views description: '' tag: '' -base_table: file_managed +baseTable: file_managed base_field: fid core: '8' display: diff --git a/core/modules/file/tests/modules/file_test_views/test_views/views.view.test_file_user_file_data.yml b/core/modules/file/tests/modules/file_test_views/test_views/views.view.test_file_user_file_data.yml index 1b630e4..4398b22 100644 --- a/core/modules/file/tests/modules/file_test_views/test_views/views.view.test_file_user_file_data.yml +++ b/core/modules/file/tests/modules/file_test_views/test_views/views.view.test_file_user_file_data.yml @@ -9,7 +9,7 @@ label: test_file_user_file_data module: views description: '' tag: '' -base_table: users_field_data +baseTable: users_field_data base_field: uid core: 8.x display: diff --git a/core/modules/filter/tests/src/Kernel/FilterSettingsTest.php b/core/modules/filter/tests/src/Kernel/FilterSettingsTest.php index f77efac..ed4aff1 100644 --- a/core/modules/filter/tests/src/Kernel/FilterSettingsTest.php +++ b/core/modules/filter/tests/src/Kernel/FilterSettingsTest.php @@ -26,15 +26,15 @@ public function testFilterDefaults() { $filter_info = $this->container->get('plugin.manager.filter')->getDefinitions(); // Create text format using filter default settings. - $filter_defaults_format = FilterFormat::create([ - 'format' => 'filter_defaults', + $filterDefaults_format = FilterFormat::create([ + 'format' => 'filterDefaults', 'name' => 'Filter defaults', ]); - $filter_defaults_format->save(); + $filterDefaultsFormat->save(); // Verify that default weights defined in hook_filter_info() were applied. $saved_settings = []; - foreach ($filter_defaults_format->filters() as $name => $filter) { + foreach ($filterDefaultsFormat->filters() as $name => $filter) { $expected_weight = $filter_info[$name]['weight']; $this->assertEqual($filter->weight, $expected_weight, format_string('@name filter weight %saved equals %default', [ '@name' => $name, @@ -45,12 +45,12 @@ public function testFilterDefaults() { } // Re-save the text format. - $filter_defaults_format->save(); + $filterDefaultsFormat->save(); // Reload it from scratch. filter_formats_reset(); // Verify that saved filter settings have not been changed. - foreach ($filter_defaults_format->filters() as $name => $filter) { + foreach ($filterDefaultsFormat->filters() as $name => $filter) { $this->assertEqual($filter->weight, $saved_settings[$name]['weight'], format_string('@name filter weight %saved equals %previous', [ '@name' => $name, '%saved' => $filter->weight, diff --git a/core/modules/forum/src/ForumManager.php b/core/modules/forum/src/ForumManager.php index 05cd860..68b9775 100644 --- a/core/modules/forum/src/ForumManager.php +++ b/core/modules/forum/src/ForumManager.php @@ -155,7 +155,7 @@ public function getTopics($tid, AccountInterface $account) { $query ->condition('f.tid', $tid) ->addTag('node_access') - ->addMetaData('base_table', 'forum_index') + ->addMetaData('baseTable', 'forum_index') ->orderBy('f.sticky', 'DESC') ->orderByHeader($header) ->limit($forum_per_page); @@ -164,7 +164,7 @@ public function getTopics($tid, AccountInterface $account) { $count_query->condition('f.tid', $tid); $count_query->addExpression('COUNT(*)'); $count_query->addTag('node_access'); - $count_query->addMetaData('base_table', 'forum_index'); + $count_query->addMetaData('baseTable', 'forum_index'); $query->setCountQuery($count_query); $result = $query->execute(); diff --git a/core/modules/forum/src/Plugin/Block/ActiveTopicsBlock.php b/core/modules/forum/src/Plugin/Block/ActiveTopicsBlock.php index ac8d828..0dedfaf 100644 --- a/core/modules/forum/src/Plugin/Block/ActiveTopicsBlock.php +++ b/core/modules/forum/src/Plugin/Block/ActiveTopicsBlock.php @@ -20,7 +20,7 @@ protected function buildForumQuery() { return db_select('forum_index', 'f') ->fields('f') ->addTag('node_access') - ->addMetaData('base_table', 'forum_index') + ->addMetaData('baseTable', 'forum_index') ->orderBy('f.last_comment_timestamp', 'DESC') ->range(0, $this->configuration['block_count']); } diff --git a/core/modules/forum/src/Plugin/Block/NewTopicsBlock.php b/core/modules/forum/src/Plugin/Block/NewTopicsBlock.php index d57628f..3df819a 100644 --- a/core/modules/forum/src/Plugin/Block/NewTopicsBlock.php +++ b/core/modules/forum/src/Plugin/Block/NewTopicsBlock.php @@ -20,7 +20,7 @@ protected function buildForumQuery() { return db_select('forum_index', 'f') ->fields('f') ->addTag('node_access') - ->addMetaData('base_table', 'forum_index') + ->addMetaData('baseTable', 'forum_index') ->orderBy('f.created', 'DESC') ->range(0, $this->configuration['block_count']); } diff --git a/core/modules/forum/tests/modules/forum_test_views/test_views/views.view.test_forum_index.yml b/core/modules/forum/tests/modules/forum_test_views/test_views/views.view.test_forum_index.yml index a874401..6ffe286 100644 --- a/core/modules/forum/tests/modules/forum_test_views/test_views/views.view.test_forum_index.yml +++ b/core/modules/forum/tests/modules/forum_test_views/test_views/views.view.test_forum_index.yml @@ -6,7 +6,7 @@ label: test_forum_index module: views description: '' tag: '' -base_table: forum_index +baseTable: forum_index base_field: nid core: 8.x display: diff --git a/core/modules/hal/tests/fixtures/update/drupal-8.rest-hal_update_8301.php b/core/modules/hal/tests/fixtures/update/drupal-8.rest-hal_update_8301.php index 842e52a..fe59155 100644 Binary files a/core/modules/hal/tests/fixtures/update/drupal-8.rest-hal_update_8301.php and b/core/modules/hal/tests/fixtures/update/drupal-8.rest-hal_update_8301.php differ diff --git a/core/modules/image/tests/modules/image_test_views/test_views/views.view.test_image_user_image_data.yml b/core/modules/image/tests/modules/image_test_views/test_views/views.view.test_image_user_image_data.yml index 8ea166b..93902ff 100644 --- a/core/modules/image/tests/modules/image_test_views/test_views/views.view.test_image_user_image_data.yml +++ b/core/modules/image/tests/modules/image_test_views/test_views/views.view.test_image_user_image_data.yml @@ -9,7 +9,7 @@ label: test_image_user_image_data module: views description: '' tag: '' -base_table: users_field_data +baseTable: users_field_data base_field: uid core: 8.x display: diff --git a/core/modules/language/tests/language_test/config/optional/views.view.no_entity_translation_view.yml b/core/modules/language/tests/language_test/config/optional/views.view.no_entity_translation_view.yml index 8e7ef45..440c835 100644 --- a/core/modules/language/tests/language_test/config/optional/views.view.no_entity_translation_view.yml +++ b/core/modules/language/tests/language_test/config/optional/views.view.no_entity_translation_view.yml @@ -8,7 +8,7 @@ label: 'No Entity Translation View' module: views description: '' tag: '' -base_table: no_language_entity_test +baseTable: no_language_entity_test base_field: id core: 8.x display: diff --git a/core/modules/language/tests/language_test/src/Entity/NoLanguageEntityTest.php b/core/modules/language/tests/language_test/src/Entity/NoLanguageEntityTest.php index 2a25f7c..9a7b48e 100644 --- a/core/modules/language/tests/language_test/src/Entity/NoLanguageEntityTest.php +++ b/core/modules/language/tests/language_test/src/Entity/NoLanguageEntityTest.php @@ -15,7 +15,7 @@ * handlers = { * "views_data" = "Drupal\entity_test\EntityTestViewsData" * }, - * base_table = "no_language_entity_test", + * baseTable = "no_language_entity_test", * persistent_cache = FALSE, * entity_keys = { * "id" = "id", diff --git a/core/modules/layout_builder/src/Plugin/Field/FieldType/LayoutSectionItem.php b/core/modules/layout_builder/src/Plugin/Field/FieldType/LayoutSectionItem.php index a8d5c70..d1f8157 100644 --- a/core/modules/layout_builder/src/Plugin/Field/FieldType/LayoutSectionItem.php +++ b/core/modules/layout_builder/src/Plugin/Field/FieldType/LayoutSectionItem.php @@ -19,7 +19,7 @@ * label = @Translation("Layout Section"), * description = @Translation("Layout Section"), * list_class = "\Drupal\layout_builder\Field\LayoutSectionItemList", - * no_ui = TRUE, + * noUi = TRUE, * cardinality = \Drupal\Core\Field\FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED * ) * diff --git a/core/modules/link/tests/modules/link_test_views/test_views/views.view.test_link_tokens.yml b/core/modules/link/tests/modules/link_test_views/test_views/views.view.test_link_tokens.yml index 8f3ee26..fe15a8a 100644 --- a/core/modules/link/tests/modules/link_test_views/test_views/views.view.test_link_tokens.yml +++ b/core/modules/link/tests/modules/link_test_views/test_views/views.view.test_link_tokens.yml @@ -12,7 +12,7 @@ label: link module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/media/config/optional/views.view.media.yml b/core/modules/media/config/optional/views.view.media.yml index 88b7674..7c9adcd 100644 --- a/core/modules/media/config/optional/views.view.media.yml +++ b/core/modules/media/config/optional/views.view.media.yml @@ -10,7 +10,7 @@ label: Media module: views description: '' tag: '' -base_table: media_field_data +baseTable: media_field_data base_field: mid core: 8.x display: diff --git a/core/modules/media/src/Annotation/MediaSource.php b/core/modules/media/src/Annotation/MediaSource.php index fe1735d..db32c6c 100644 --- a/core/modules/media/src/Annotation/MediaSource.php +++ b/core/modules/media/src/Annotation/MediaSource.php @@ -55,7 +55,7 @@ class MediaSource extends Plugin { * * @var string[] */ - public $allowed_field_types = []; + public $allowedFieldTypes = []; /** * A filename for the default thumbnail. @@ -70,14 +70,14 @@ class MediaSource extends Plugin { * * @see media_install() */ - public $default_thumbnail_filename = 'generic.png'; + public $defaultThumbnailFilename = 'generic.png'; /** * The metadata attribute name to provide the thumbnail URI. * * @var string */ - public $thumbnail_uri_metadata_attribute = 'thumbnail_uri'; + public $thumbnailUriMetadataAttribute = 'thumbnail_uri'; /** * (optional) The metadata attribute name to provide the thumbnail alt. @@ -86,7 +86,7 @@ class MediaSource extends Plugin { * * @var string|null */ - public $thumbnail_alt_metadata_attribute; + public $thumbnailAltMetadataAttribute; /** * (optional) The metadata attribute name to provide the thumbnail title. @@ -96,13 +96,13 @@ class MediaSource extends Plugin { * * @var string|null */ - public $thumbnail_title_metadata_attribute; + public $thumbnailTitleMetadataAttribute; /** * The metadata attribute name to provide the default name. * * @var string */ - public $default_name_metadata_attribute = 'default_name'; + public $defaultNameMetadataAttribute = 'default_name'; } diff --git a/core/modules/media/src/Entity/Media.php b/core/modules/media/src/Entity/Media.php index 6e58771..0a48b73 100644 --- a/core/modules/media/src/Entity/Media.php +++ b/core/modules/media/src/Entity/Media.php @@ -45,7 +45,7 @@ * "html" = "Drupal\Core\Entity\Routing\AdminHtmlRouteProvider", * } * }, - * base_table = "media", + * baseTable = "media", * data_table = "media_field_data", * revision_table = "media_revision", * revision_data_table = "media_field_revision", diff --git a/core/modules/media/src/Plugin/views/wizard/Media.php b/core/modules/media/src/Plugin/views/wizard/Media.php index 30a7ad6..ed97dc0 100644 --- a/core/modules/media/src/Plugin/views/wizard/Media.php +++ b/core/modules/media/src/Plugin/views/wizard/Media.php @@ -9,7 +9,7 @@ * * @ViewsWizard( * id = "media", - * base_table = "media_field_data", + * baseTable = "media_field_data", * title = @Translation("Media") * ) */ diff --git a/core/modules/media/src/Plugin/views/wizard/MediaRevision.php b/core/modules/media/src/Plugin/views/wizard/MediaRevision.php index 10b5154..cc5aed8 100644 --- a/core/modules/media/src/Plugin/views/wizard/MediaRevision.php +++ b/core/modules/media/src/Plugin/views/wizard/MediaRevision.php @@ -9,7 +9,7 @@ * * @ViewsWizard( * id = "media_revision", - * base_table = "media_field_revision", + * baseTable = "media_field_revision", * title = @Translation("Media revisions") * ) */ diff --git a/core/modules/media/tests/fixtures/update/drupal-8.media-enabled.php b/core/modules/media/tests/fixtures/update/drupal-8.media-enabled.php index 7c05d32..feaa5f7 100644 --- a/core/modules/media/tests/fixtures/update/drupal-8.media-enabled.php +++ b/core/modules/media/tests/fixtures/update/drupal-8.media-enabled.php @@ -729,7 +729,7 @@ ->condition('collection', 'entity.definitions.installed') ->condition('name', 'media.entity_type') ->fields([ - 'value' => 'O:36:"Drupal\Core\Entity\ContentEntityType":38:{s:25:"*revision_metadata_keys";a:3:{s:13:"revision_user";s:13:"revision_user";s:16:"revision_created";s:16:"revision_created";s:20:"revision_log_message";s:20:"revision_log_message";}s:15:"*static_cache";b:1;s:15:"*render_cache";b:1;s:19:"*persistent_cache";b:1;s:14:"*entity_keys";a:9:{s:2:"id";s:3:"mid";s:8:"revision";s:3:"vid";s:6:"bundle";s:6:"bundle";s:5:"label";s:4:"name";s:8:"langcode";s:8:"langcode";s:4:"uuid";s:4:"uuid";s:9:"published";s:6:"status";s:16:"default_langcode";s:16:"default_langcode";s:29:"revision_translation_affected";s:29:"revision_translation_affected";}s:5:"*id";s:5:"media";s:16:"*originalClass";s:25:"Drupal\media\Entity\Media";s:11:"*handlers";a:8:{s:7:"storage";s:46:"Drupal\Core\Entity\Sql\SqlContentEntityStorage";s:12:"view_builder";s:36:"Drupal\Core\Entity\EntityViewBuilder";s:12:"list_builder";s:36:"Drupal\Core\Entity\EntityListBuilder";s:6:"access";s:38:"Drupal\media\MediaAccessControlHandler";s:4:"form";a:4:{s:7:"default";s:22:"Drupal\media\MediaForm";s:3:"add";s:22:"Drupal\media\MediaForm";s:4:"edit";s:22:"Drupal\media\MediaForm";s:6:"delete";s:42:"Drupal\Core\Entity\ContentEntityDeleteForm";}s:11:"translation";s:52:"Drupal\content_translation\ContentTranslationHandler";s:10:"views_data";s:27:"Drupal\media\MediaViewsData";s:14:"route_provider";a:1:{s:4:"html";s:49:"Drupal\Core\Entity\Routing\AdminHtmlRouteProvider";}}s:19:"*admin_permission";s:16:"administer media";s:25:"*permission_granularity";s:11:"entity_type";s:8:"*links";a:6:{s:8:"add-page";s:10:"/media/add";s:8:"add-form";s:23:"/media/add/{media_type}";s:9:"canonical";s:14:"/media/{media}";s:11:"delete-form";s:21:"/media/{media}/delete";s:9:"edit-form";s:19:"/media/{media}/edit";s:8:"revision";s:46:"/media/{media}/revisions/{media_revision}/view";}s:17:"*label_callback";N;s:21:"*bundle_entity_type";s:10:"media_type";s:12:"*bundle_of";N;s:15:"*bundle_label";O:48:"Drupal\Core\StringTranslation\TranslatableMarkup":3:{s:9:"*string";s:10:"Media type";s:12:"*arguments";a:0:{}s:10:"*options";a:0:{}}s:13:"*base_table";s:5:"media";s:22:"*revision_data_table";s:20:"media_field_revision";s:17:"*revision_table";s:14:"media_revision";s:13:"*data_table";s:16:"media_field_data";s:15:"*translatable";b:1;s:19:"*show_revision_ui";b:1;s:8:"*label";O:48:"Drupal\Core\StringTranslation\TranslatableMarkup":3:{s:9:"*string";s:5:"Media";s:12:"*arguments";a:0:{}s:10:"*options";a:0:{}}s:19:"*label_collection";s:0:"";s:17:"*label_singular";O:48:"Drupal\Core\StringTranslation\TranslatableMarkup":3:{s:9:"*string";s:10:"media item";s:12:"*arguments";a:0:{}s:10:"*options";a:0:{}}s:15:"*label_plural";O:48:"Drupal\Core\StringTranslation\TranslatableMarkup":3:{s:9:"*string";s:11:"media items";s:12:"*arguments";a:0:{}s:10:"*options";a:0:{}}s:14:"*label_count";a:3:{s:8:"singular";s:17:"@count media item";s:6:"plural";s:18:"@count media items";s:7:"context";N;}s:15:"*uri_callback";N;s:8:"*group";s:7:"content";s:14:"*group_label";O:48:"Drupal\Core\StringTranslation\TranslatableMarkup":3:{s:9:"*string";s:7:"Content";s:12:"*arguments";a:0:{}s:10:"*options";a:1:{s:7:"context";s:17:"Entity type group";}}s:22:"*field_ui_base_route";s:27:"entity.media_type.edit_form";s:26:"*common_reference_target";b:1;s:22:"*list_cache_contexts";a:0:{}s:18:"*list_cache_tags";a:1:{i:0;s:10:"media_list";}s:14:"*constraints";a:1:{s:13:"EntityChanged";N;}s:13:"*additional";a:0:{}s:8:"*class";s:25:"Drupal\media\Entity\Media";s:11:"*provider";s:5:"media";s:20:"*stringTranslation";N;}', + 'value' => 'O:36:"Drupal\Core\Entity\ContentEntityType":38:{s:25:"*revision_metadata_keys";a:3:{s:13:"revision_user";s:13:"revision_user";s:16:"revision_created";s:16:"revision_created";s:20:"revision_log_message";s:20:"revision_log_message";}s:15:"*static_cache";b:1;s:15:"*render_cache";b:1;s:19:"*persistent_cache";b:1;s:14:"*entity_keys";a:9:{s:2:"id";s:3:"mid";s:8:"revision";s:3:"vid";s:6:"bundle";s:6:"bundle";s:5:"label";s:4:"name";s:8:"langcode";s:8:"langcode";s:4:"uuid";s:4:"uuid";s:9:"published";s:6:"status";s:16:"default_langcode";s:16:"default_langcode";s:29:"revision_translation_affected";s:29:"revision_translation_affected";}s:5:"*id";s:5:"media";s:16:"*originalClass";s:25:"Drupal\media\Entity\Media";s:11:"*handlers";a:8:{s:7:"storage";s:46:"Drupal\Core\Entity\Sql\SqlContentEntityStorage";s:12:"view_builder";s:36:"Drupal\Core\Entity\EntityViewBuilder";s:12:"list_builder";s:36:"Drupal\Core\Entity\EntityListBuilder";s:6:"access";s:38:"Drupal\media\MediaAccessControlHandler";s:4:"form";a:4:{s:7:"default";s:22:"Drupal\media\MediaForm";s:3:"add";s:22:"Drupal\media\MediaForm";s:4:"edit";s:22:"Drupal\media\MediaForm";s:6:"delete";s:42:"Drupal\Core\Entity\ContentEntityDeleteForm";}s:11:"translation";s:52:"Drupal\content_translation\ContentTranslationHandler";s:10:"views_data";s:27:"Drupal\media\MediaViewsData";s:14:"route_provider";a:1:{s:4:"html";s:49:"Drupal\Core\Entity\Routing\AdminHtmlRouteProvider";}}s:19:"*admin_permission";s:16:"administer media";s:25:"*permission_granularity";s:11:"entity_type";s:8:"*links";a:6:{s:8:"add-page";s:10:"/media/add";s:8:"add-form";s:23:"/media/add/{media_type}";s:9:"canonical";s:14:"/media/{media}";s:11:"delete-form";s:21:"/media/{media}/delete";s:9:"edit-form";s:19:"/media/{media}/edit";s:8:"revision";s:46:"/media/{media}/revisions/{media_revision}/view";}s:17:"*label_callback";N;s:21:"*bundle_entity_type";s:10:"media_type";s:12:"*bundle_of";N;s:15:"*bundle_label";O:48:"Drupal\Core\StringTranslation\TranslatableMarkup":3:{s:9:"*string";s:10:"Media type";s:12:"*arguments";a:0:{}s:10:"*options";a:0:{}}s:13:"*baseTable";s:5:"media";s:22:"*revision_data_table";s:20:"media_field_revision";s:17:"*revision_table";s:14:"media_revision";s:13:"*data_table";s:16:"media_field_data";s:15:"*translatable";b:1;s:19:"*show_revision_ui";b:1;s:8:"*label";O:48:"Drupal\Core\StringTranslation\TranslatableMarkup":3:{s:9:"*string";s:5:"Media";s:12:"*arguments";a:0:{}s:10:"*options";a:0:{}}s:19:"*label_collection";s:0:"";s:17:"*label_singular";O:48:"Drupal\Core\StringTranslation\TranslatableMarkup":3:{s:9:"*string";s:10:"media item";s:12:"*arguments";a:0:{}s:10:"*options";a:0:{}}s:15:"*label_plural";O:48:"Drupal\Core\StringTranslation\TranslatableMarkup":3:{s:9:"*string";s:11:"media items";s:12:"*arguments";a:0:{}s:10:"*options";a:0:{}}s:14:"*label_count";a:3:{s:8:"singular";s:17:"@count media item";s:6:"plural";s:18:"@count media items";s:7:"context";N;}s:15:"*uri_callback";N;s:8:"*group";s:7:"content";s:14:"*group_label";O:48:"Drupal\Core\StringTranslation\TranslatableMarkup":3:{s:9:"*string";s:7:"Content";s:12:"*arguments";a:0:{}s:10:"*options";a:1:{s:7:"context";s:17:"Entity type group";}}s:22:"*field_ui_base_route";s:27:"entity.media_type.edit_form";s:26:"*common_reference_target";b:1;s:22:"*list_cache_contexts";a:0:{}s:18:"*list_cache_tags";a:1:{i:0;s:10:"media_list";}s:14:"*constraints";a:1:{s:13:"EntityChanged";N;}s:13:"*additional";a:0:{}s:8:"*class";s:25:"Drupal\media\Entity\Media";s:11:"*provider";s:5:"media";s:20:"*stringTranslation";N;}', 'name' => 'media.entity_type', 'collection' => 'entity.definitions.installed', ]) @@ -749,7 +749,7 @@ ->condition('collection', 'entity.definitions.installed') ->condition('name', 'media_type.entity_type') ->fields([ - 'value' => 'O:42:"Drupal\Core\Config\Entity\ConfigEntityType":41:{s:16:"*config_prefix";s:4:"type";s:15:"*static_cache";b:0;s:14:"*lookup_keys";a:1:{i:0;s:4:"uuid";}s:16:"*config_export";a:9:{i:0;s:2:"id";i:1;s:5:"label";i:2;s:11:"description";i:3;s:6:"source";i:4;s:25:"queue_thumbnail_downloads";i:5;s:12:"new_revision";i:6;s:20:"source_configuration";i:7;s:9:"field_map";i:8;s:6:"status";}s:21:"*mergedConfigExport";a:0:{}s:15:"*render_cache";b:1;s:19:"*persistent_cache";b:1;s:14:"*entity_keys";a:9:{s:2:"id";s:2:"id";s:5:"label";s:5:"label";s:6:"status";s:6:"status";s:8:"revision";s:0:"";s:6:"bundle";s:0:"";s:8:"langcode";s:8:"langcode";s:16:"default_langcode";s:16:"default_langcode";s:29:"revision_translation_affected";s:29:"revision_translation_affected";s:4:"uuid";s:4:"uuid";}s:5:"*id";s:10:"media_type";s:16:"*originalClass";s:29:"Drupal\media\Entity\MediaType";s:11:"*handlers";a:5:{s:4:"form";a:3:{s:3:"add";s:26:"Drupal\media\MediaTypeForm";s:4:"edit";s:26:"Drupal\media\MediaTypeForm";s:6:"delete";s:44:"Drupal\media\Form\MediaTypeDeleteConfirmForm";}s:12:"list_builder";s:33:"Drupal\media\MediaTypeListBuilder";s:14:"route_provider";a:1:{s:4:"html";s:51:"Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider";}s:6:"access";s:45:"Drupal\Core\Entity\EntityAccessControlHandler";s:7:"storage";s:45:"Drupal\Core\Config\Entity\ConfigEntityStorage";}s:19:"*admin_permission";s:22:"administer media types";s:25:"*permission_granularity";s:11:"entity_type";s:8:"*links";a:4:{s:8:"add-form";s:26:"/admin/structure/media/add";s:9:"edit-form";s:42:"/admin/structure/media/manage/{media_type}";s:11:"delete-form";s:49:"/admin/structure/media/manage/{media_type}/delete";s:10:"collection";s:22:"/admin/structure/media";}s:17:"*label_callback";N;s:21:"*bundle_entity_type";N;s:12:"*bundle_of";s:5:"media";s:15:"*bundle_label";N;s:13:"*base_table";N;s:22:"*revision_data_table";N;s:17:"*revision_table";N;s:13:"*data_table";N;s:15:"*translatable";b:0;s:19:"*show_revision_ui";b:0;s:8:"*label";O:48:"Drupal\Core\StringTranslation\TranslatableMarkup":3:{s:9:"*string";s:10:"Media type";s:12:"*arguments";a:0:{}s:10:"*options";a:0:{}}s:19:"*label_collection";O:48:"Drupal\Core\StringTranslation\TranslatableMarkup":3:{s:9:"*string";s:11:"Media types";s:12:"*arguments";a:0:{}s:10:"*options";a:0:{}}s:17:"*label_singular";O:48:"Drupal\Core\StringTranslation\TranslatableMarkup":3:{s:9:"*string";s:10:"media type";s:12:"*arguments";a:0:{}s:10:"*options";a:0:{}}s:15:"*label_plural";O:48:"Drupal\Core\StringTranslation\TranslatableMarkup":3:{s:9:"*string";s:11:"media types";s:12:"*arguments";a:0:{}s:10:"*options";a:0:{}}s:14:"*label_count";a:3:{s:8:"singular";s:17:"@count media type";s:6:"plural";s:18:"@count media types";s:7:"context";N;}s:15:"*uri_callback";N;s:8:"*group";s:13:"configuration";s:14:"*group_label";O:48:"Drupal\Core\StringTranslation\TranslatableMarkup":3:{s:9:"*string";s:13:"Configuration";s:12:"*arguments";a:0:{}s:10:"*options";a:1:{s:7:"context";s:17:"Entity type group";}}s:22:"*field_ui_base_route";N;s:26:"*common_reference_target";b:0;s:22:"*list_cache_contexts";a:0:{}s:18:"*list_cache_tags";a:1:{i:0;s:22:"config:media_type_list";}s:14:"*constraints";a:0:{}s:13:"*additional";a:0:{}s:8:"*class";s:29:"Drupal\media\Entity\MediaType";s:11:"*provider";s:5:"media";s:20:"*stringTranslation";N;}', + 'value' => 'O:42:"Drupal\Core\Config\Entity\ConfigEntityType":41:{s:16:"*config_prefix";s:4:"type";s:15:"*static_cache";b:0;s:14:"*lookup_keys";a:1:{i:0;s:4:"uuid";}s:16:"*config_export";a:9:{i:0;s:2:"id";i:1;s:5:"label";i:2;s:11:"description";i:3;s:6:"source";i:4;s:25:"queue_thumbnail_downloads";i:5;s:12:"new_revision";i:6;s:20:"source_configuration";i:7;s:9:"field_map";i:8;s:6:"status";}s:21:"*mergedConfigExport";a:0:{}s:15:"*render_cache";b:1;s:19:"*persistent_cache";b:1;s:14:"*entity_keys";a:9:{s:2:"id";s:2:"id";s:5:"label";s:5:"label";s:6:"status";s:6:"status";s:8:"revision";s:0:"";s:6:"bundle";s:0:"";s:8:"langcode";s:8:"langcode";s:16:"default_langcode";s:16:"default_langcode";s:29:"revision_translation_affected";s:29:"revision_translation_affected";s:4:"uuid";s:4:"uuid";}s:5:"*id";s:10:"media_type";s:16:"*originalClass";s:29:"Drupal\media\Entity\MediaType";s:11:"*handlers";a:5:{s:4:"form";a:3:{s:3:"add";s:26:"Drupal\media\MediaTypeForm";s:4:"edit";s:26:"Drupal\media\MediaTypeForm";s:6:"delete";s:44:"Drupal\media\Form\MediaTypeDeleteConfirmForm";}s:12:"list_builder";s:33:"Drupal\media\MediaTypeListBuilder";s:14:"route_provider";a:1:{s:4:"html";s:51:"Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider";}s:6:"access";s:45:"Drupal\Core\Entity\EntityAccessControlHandler";s:7:"storage";s:45:"Drupal\Core\Config\Entity\ConfigEntityStorage";}s:19:"*admin_permission";s:22:"administer media types";s:25:"*permission_granularity";s:11:"entity_type";s:8:"*links";a:4:{s:8:"add-form";s:26:"/admin/structure/media/add";s:9:"edit-form";s:42:"/admin/structure/media/manage/{media_type}";s:11:"delete-form";s:49:"/admin/structure/media/manage/{media_type}/delete";s:10:"collection";s:22:"/admin/structure/media";}s:17:"*label_callback";N;s:21:"*bundle_entity_type";N;s:12:"*bundle_of";s:5:"media";s:15:"*bundle_label";N;s:13:"*baseTable";N;s:22:"*revision_data_table";N;s:17:"*revision_table";N;s:13:"*data_table";N;s:15:"*translatable";b:0;s:19:"*show_revision_ui";b:0;s:8:"*label";O:48:"Drupal\Core\StringTranslation\TranslatableMarkup":3:{s:9:"*string";s:10:"Media type";s:12:"*arguments";a:0:{}s:10:"*options";a:0:{}}s:19:"*label_collection";O:48:"Drupal\Core\StringTranslation\TranslatableMarkup":3:{s:9:"*string";s:11:"Media types";s:12:"*arguments";a:0:{}s:10:"*options";a:0:{}}s:17:"*label_singular";O:48:"Drupal\Core\StringTranslation\TranslatableMarkup":3:{s:9:"*string";s:10:"media type";s:12:"*arguments";a:0:{}s:10:"*options";a:0:{}}s:15:"*label_plural";O:48:"Drupal\Core\StringTranslation\TranslatableMarkup":3:{s:9:"*string";s:11:"media types";s:12:"*arguments";a:0:{}s:10:"*options";a:0:{}}s:14:"*label_count";a:3:{s:8:"singular";s:17:"@count media type";s:6:"plural";s:18:"@count media types";s:7:"context";N;}s:15:"*uri_callback";N;s:8:"*group";s:13:"configuration";s:14:"*group_label";O:48:"Drupal\Core\StringTranslation\TranslatableMarkup":3:{s:9:"*string";s:13:"Configuration";s:12:"*arguments";a:0:{}s:10:"*options";a:1:{s:7:"context";s:17:"Entity type group";}}s:22:"*field_ui_base_route";N;s:26:"*common_reference_target";b:0;s:22:"*list_cache_contexts";a:0:{}s:18:"*list_cache_tags";a:1:{i:0;s:22:"config:media_type_list";}s:14:"*constraints";a:0:{}s:13:"*additional";a:0:{}s:8:"*class";s:29:"Drupal\media\Entity\MediaType";s:11:"*provider";s:5:"media";s:20:"*stringTranslation";N;}', 'name' => 'media_type.entity_type', 'collection' => 'entity.definitions.installed', ]) diff --git a/core/modules/menu_link_content/src/Entity/MenuLinkContent.php b/core/modules/menu_link_content/src/Entity/MenuLinkContent.php index 460c0df..82851dd 100644 --- a/core/modules/menu_link_content/src/Entity/MenuLinkContent.php +++ b/core/modules/menu_link_content/src/Entity/MenuLinkContent.php @@ -29,7 +29,7 @@ * } * }, * admin_permission = "administer menu", - * base_table = "menu_link_content", + * baseTable = "menu_link_content", * data_table = "menu_link_content_data", * translatable = TRUE, * entity_keys = { diff --git a/core/modules/migrate/tests/modules/migrate_entity_test/src/Entity/StringIdEntityTest.php b/core/modules/migrate/tests/modules/migrate_entity_test/src/Entity/StringIdEntityTest.php index 060e355..f4a7416 100644 --- a/core/modules/migrate/tests/modules/migrate_entity_test/src/Entity/StringIdEntityTest.php +++ b/core/modules/migrate/tests/modules/migrate_entity_test/src/Entity/StringIdEntityTest.php @@ -12,7 +12,7 @@ * @ContentEntityType( * id = "migrate_string_id_entity_test", * label = @Translation("String id entity test"), - * base_table = "migrate_entity_test_string_id", + * baseTable = "migrate_entity_test_string_id", * entity_keys = { * "id" = "id", * } diff --git a/core/modules/migrate_drupal/src/Annotation/MigrateField.php b/core/modules/migrate_drupal/src/Annotation/MigrateField.php index 8225b71..5c4dfba 100644 --- a/core/modules/migrate_drupal/src/Annotation/MigrateField.php +++ b/core/modules/migrate_drupal/src/Annotation/MigrateField.php @@ -42,7 +42,7 @@ public function __construct($values) { * * @var string[] */ - public $type_map = []; + public $typeMap = []; /** * The Drupal core version(s) this plugin applies to. @@ -59,7 +59,7 @@ public function __construct($values) { * * @var string */ - public $source_module; + public $sourceModule; /** * Identifies the system handling the data the destination plugin will write. @@ -69,6 +69,6 @@ public function __construct($values) { * * @var string */ - public $destination_module; + public $destinationModule; } diff --git a/core/modules/node/config/optional/views.view.archive.yml b/core/modules/node/config/optional/views.view.archive.yml index 73e0477..048939f 100644 --- a/core/modules/node/config/optional/views.view.archive.yml +++ b/core/modules/node/config/optional/views.view.archive.yml @@ -11,7 +11,7 @@ label: Archive module: node description: 'All content, by month.' tag: default -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/node/config/optional/views.view.content.yml b/core/modules/node/config/optional/views.view.content.yml index cef43c7..7cc6517 100644 --- a/core/modules/node/config/optional/views.view.content.yml +++ b/core/modules/node/config/optional/views.view.content.yml @@ -9,7 +9,7 @@ label: Content module: node description: 'Find and manage content.' tag: default -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/node/config/optional/views.view.content_recent.yml b/core/modules/node/config/optional/views.view.content_recent.yml index 1db249e..bdae618 100644 --- a/core/modules/node/config/optional/views.view.content_recent.yml +++ b/core/modules/node/config/optional/views.view.content_recent.yml @@ -9,7 +9,7 @@ label: 'Recent content' module: node description: 'Recent content.' tag: default -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/node/config/optional/views.view.frontpage.yml b/core/modules/node/config/optional/views.view.frontpage.yml index 49d6f95..5b33637 100644 --- a/core/modules/node/config/optional/views.view.frontpage.yml +++ b/core/modules/node/config/optional/views.view.frontpage.yml @@ -12,7 +12,7 @@ label: Frontpage module: node description: 'All content promoted to the front page.' tag: default -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/node/config/optional/views.view.glossary.yml b/core/modules/node/config/optional/views.view.glossary.yml index 10f6d55..eec091f 100644 --- a/core/modules/node/config/optional/views.view.glossary.yml +++ b/core/modules/node/config/optional/views.view.glossary.yml @@ -11,7 +11,7 @@ label: Glossary module: node description: 'All content, by letter.' tag: default -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/node/node.module b/core/modules/node/node.module index 208deb5..ce4fec8 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -1,4 +1,4 @@ -addTag('node_access') - * ->addMetaData('base_table', 'taxonomy_index'); + * ->addMetaData('baseTable', 'taxonomy_index'); * @endcode */ function node_query_node_access_alter(AlterableInterface $query) { @@ -1074,12 +1074,12 @@ function node_query_node_access_alter(AlterableInterface $query) { } $tables = $query->getTables(); - $base_table = $query->getMetaData('base_table'); + $baseTable = $query->getMetaData('baseTable'); // If the base table is not given, default to one of the node base tables. - if (!$base_table) { + if (!$baseTable) { /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */ $table_mapping = \Drupal::entityTypeManager()->getStorage('node')->getTableMapping(); - $node_base_tables = $table_mapping->getTableNames(); + $nodeBaseTables = $table_mapping->getTableNames(); foreach ($tables as $table_info) { if (!($table_info instanceof SelectInterface)) { @@ -1087,25 +1087,25 @@ function node_query_node_access_alter(AlterableInterface $query) { // Ensure that 'node' and 'node_field_data' are always preferred over // 'node_revision' and 'node_field_revision'. if ($table == 'node' || $table == 'node_field_data') { - $base_table = $table; + $baseTable = $table; break; } // If one of the node base tables are in the query, add it to the list // of possible base tables to join against. - if (in_array($table, $node_base_tables)) { - $base_table = $table; + if (in_array($table, $nodeBaseTables)) { + $baseTable = $table; } } } // Bail out if the base table is missing. - if (!$base_table) { - throw new Exception(t('Query tagged for node access but there is no node table, specify the base_table using meta data.')); + if (!$baseTable) { + throw new Exception(t('Query tagged for node access but there is no node table, specify the baseTable using meta data.')); } } // Update the query for the given storage method. - \Drupal::service('node.grant_storage')->alterQuery($query, $tables, $op, $account, $base_table); + \Drupal::service('node.grant_storage')->alterQuery($query, $tables, $op, $account, $baseTable); // Bubble the 'user.node_grants:$op' cache context to the current render // context. diff --git a/core/modules/node/node.views_execution.inc b/core/modules/node/node.views_execution.inc index 4d834a1..3ef563a 100644 --- a/core/modules/node/node.views_execution.inc +++ b/core/modules/node/node.views_execution.inc @@ -27,7 +27,7 @@ function node_views_query_substitutions(ViewExecutable $view) { function node_views_analyze(ViewExecutable $view) { $ret = []; // Check for something other than the default display: - if ($view->storage->get('base_table') == 'node') { + if ($view->storage->get('baseTable') == 'node') { foreach ($view->displayHandlers as $display) { if (!$display->isDefaulted('access') || !$display->isDefaulted('filters')) { // check for no access control diff --git a/core/modules/node/src/Entity/Node.php b/core/modules/node/src/Entity/Node.php index 368ce1b..eb28035 100644 --- a/core/modules/node/src/Entity/Node.php +++ b/core/modules/node/src/Entity/Node.php @@ -41,7 +41,7 @@ * "list_builder" = "Drupal\node\NodeListBuilder", * "translation" = "Drupal\node\NodeTranslationHandler" * }, - * base_table = "node", + * baseTable = "node", * data_table = "node_field_data", * revision_table = "node_revision", * revision_data_table = "node_field_revision", diff --git a/core/modules/node/src/NodeGrantDatabaseStorage.php b/core/modules/node/src/NodeGrantDatabaseStorage.php index f6ae1f6..ae43063 100644 --- a/core/modules/node/src/NodeGrantDatabaseStorage.php +++ b/core/modules/node/src/NodeGrantDatabaseStorage.php @@ -147,7 +147,7 @@ public function checkAll(AccountInterface $account) { /** * {@inheritdoc} */ - public function alterQuery($query, array $tables, $op, AccountInterface $account, $base_table) { + public function alterQuery($query, array $tables, $op, AccountInterface $account, $baseTable) { if (!$langcode = $query->getMetaData('langcode')) { $langcode = FALSE; } @@ -158,7 +158,7 @@ public function alterQuery($query, array $tables, $op, AccountInterface $account $grants = node_access_grants($op, $account); foreach ($tables as $nalias => $tableinfo) { $table = $tableinfo['table']; - if (!($table instanceof SelectInterface) && $table == $base_table) { + if (!($table instanceof SelectInterface) && $table == $baseTable) { // Set the subquery. $subquery = $this->database->select('node_access', 'na') ->fields('na', ['nid']); diff --git a/core/modules/node/src/NodeGrantDatabaseStorageInterface.php b/core/modules/node/src/NodeGrantDatabaseStorageInterface.php index 329d9a1..583708a 100644 --- a/core/modules/node/src/NodeGrantDatabaseStorageInterface.php +++ b/core/modules/node/src/NodeGrantDatabaseStorageInterface.php @@ -39,13 +39,13 @@ public function checkAll(AccountInterface $account); * @param \Drupal\Core\Session\AccountInterface $account * A user object representing the user for whom the operation is to be * performed. - * @param string $base_table + * @param string $baseTable * The base table of the query. * * @return int * Status of the access check. */ - public function alterQuery($query, array $tables, $op, AccountInterface $account, $base_table); + public function alterQuery($query, array $tables, $op, AccountInterface $account, $baseTable); /** * Writes a list of grants to the database, deleting previously saved ones. diff --git a/core/modules/node/src/Plugin/views/row/Rss.php b/core/modules/node/src/Plugin/views/row/Rss.php index 9683879..faa600b 100644 --- a/core/modules/node/src/Plugin/views/row/Rss.php +++ b/core/modules/node/src/Plugin/views/row/Rss.php @@ -16,13 +16,13 @@ * theme = "views_view_row_rss", * register_theme = FALSE, * base = {"node_field_data"}, - * display_types = {"feed"} + * displayTypes = {"feed"} * ) */ class Rss extends RssPluginBase { // Basic properties that let the row style follow relationships. - public $base_table = 'node_field_data'; + public $baseTable = 'node_field_data'; public $base_field = 'nid'; diff --git a/core/modules/node/src/Plugin/views/wizard/Node.php b/core/modules/node/src/Plugin/views/wizard/Node.php index c9929c5..87180fe 100644 --- a/core/modules/node/src/Plugin/views/wizard/Node.php +++ b/core/modules/node/src/Plugin/views/wizard/Node.php @@ -14,7 +14,7 @@ * * @ViewsWizard( * id = "node", - * base_table = "node_field_data", + * baseTable = "node_field_data", * title = @Translation("Content") * ) */ diff --git a/core/modules/node/src/Plugin/views/wizard/NodeRevision.php b/core/modules/node/src/Plugin/views/wizard/NodeRevision.php index d7088eb..a170ab2 100644 --- a/core/modules/node/src/Plugin/views/wizard/NodeRevision.php +++ b/core/modules/node/src/Plugin/views/wizard/NodeRevision.php @@ -13,7 +13,7 @@ * * @ViewsWizard( * id = "node_revision", - * base_table = "node_field_revision", + * baseTable = "node_field_revision", * title = @Translation("Content revisions") * ) */ diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_argument_node_uid_revision.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_argument_node_uid_revision.yml index 00ee678..8bd7942 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_argument_node_uid_revision.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_argument_node_uid_revision.yml @@ -9,7 +9,7 @@ label: test_argument_node_uid_revision module: views description: '' tag: default -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.0-dev display: diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_contextual_links.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_contextual_links.yml index 37b3f8d..020c06c 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_contextual_links.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_contextual_links.yml @@ -9,7 +9,7 @@ label: 'Contextual links' module: node description: '' tag: default -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_filters.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_filters.yml index fcfc4f0..83ef13a 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_filters.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_filters.yml @@ -9,7 +9,7 @@ label: 'Test field filters' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_filter_node_access.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_filter_node_access.yml index 6663fa8..51796ff 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_filter_node_access.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_filter_node_access.yml @@ -9,7 +9,7 @@ label: test_filter_node_access module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_filter_node_uid_revision.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_filter_node_uid_revision.yml index 4f8ba50..8f283b9 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_filter_node_uid_revision.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_filter_node_uid_revision.yml @@ -9,7 +9,7 @@ label: test_filter_node_uid_revision module: views description: '' tag: default -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.0-dev display: diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_language.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_language.yml index d95efc0..5f4c850 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_language.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_language.yml @@ -9,7 +9,7 @@ label: 'Test language' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_nid_argument.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_nid_argument.yml index f521093..a6e99c2 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_nid_argument.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_nid_argument.yml @@ -9,7 +9,7 @@ label: test_nid_argument module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_bulk_form.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_bulk_form.yml index 7469b7c..bb9233d 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_bulk_form.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_bulk_form.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_path_plugin.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_path_plugin.yml index 747de35..8cf7e41 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_path_plugin.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_path_plugin.yml @@ -9,7 +9,7 @@ label: test_node_path_plugin module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_links.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_links.yml index 1313f01..9042a93 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_links.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_links.yml @@ -8,7 +8,7 @@ label: test_node_revision_links module: views description: '' tag: '' -base_table: node_field_revision +baseTable: node_field_revision base_field: vid core: '8' display: diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_nid.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_nid.yml index 179e140..afd79a0 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_nid.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_nid.yml @@ -8,7 +8,7 @@ label: null module: views description: '' tag: '' -base_table: node_field_revision +baseTable: node_field_revision base_field: nid core: '8' display: diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_timestamp.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_timestamp.yml index a0ba6eb..137724a 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_timestamp.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_timestamp.yml @@ -8,7 +8,7 @@ label: null module: views description: '' tag: '' -base_table: node_field_revision +baseTable: node_field_revision base_field: vid core: '8' display: diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_vid.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_vid.yml index a2783a5..f7816a1 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_vid.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_vid.yml @@ -8,7 +8,7 @@ label: null module: views description: '' tag: '' -base_table: node_field_revision +baseTable: node_field_revision base_field: nid core: '8' display: diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_row_plugin.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_row_plugin.yml index ea4bd50..f0e63ad 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_row_plugin.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_row_plugin.yml @@ -9,7 +9,7 @@ label: test_node_row_plugin module: views description: '' tag: default -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_tokens.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_tokens.yml index 26517fc..e415a4b 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_tokens.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_tokens.yml @@ -12,7 +12,7 @@ label: test_node_tokens module: views description: 'Verifies tokens provided by the Node module are replaced correctly.' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_view.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_view.yml index 2fa9717..19571e2 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_view.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_view.yml @@ -9,7 +9,7 @@ label: test_node_view module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_status_extra.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_status_extra.yml index 8c6f7cf..4b11ea6 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_status_extra.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_status_extra.yml @@ -9,7 +9,7 @@ label: test_status_extra module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/node/tests/src/Unit/Plugin/views/field/NodeBulkFormTest.php b/core/modules/node/tests/src/Unit/Plugin/views/field/NodeBulkFormTest.php index eb92f8c..f08af46 100644 --- a/core/modules/node/tests/src/Unit/Plugin/views/field/NodeBulkFormTest.php +++ b/core/modules/node/tests/src/Unit/Plugin/views/field/NodeBulkFormTest.php @@ -69,7 +69,7 @@ public function testConstructor() { $storage = $this->getMock('Drupal\views\ViewEntityInterface'); $storage->expects($this->any()) ->method('get') - ->with('base_table') + ->with('baseTable') ->will($this->returnValue('node')); $executable = $this->getMockBuilder('Drupal\views\ViewExecutable') diff --git a/core/modules/options/tests/options_test_views/test_views/views.view.test_options_list_argument_numeric.yml b/core/modules/options/tests/options_test_views/test_views/views.view.test_options_list_argument_numeric.yml index bff9b59..8b2ccd1 100644 --- a/core/modules/options/tests/options_test_views/test_views/views.view.test_options_list_argument_numeric.yml +++ b/core/modules/options/tests/options_test_views/test_views/views.view.test_options_list_argument_numeric.yml @@ -11,7 +11,7 @@ label: 'test options list argument (numeric)' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/options/tests/options_test_views/test_views/views.view.test_options_list_argument_string.yml b/core/modules/options/tests/options_test_views/test_views/views.view.test_options_list_argument_string.yml index 1576619..086cd6b 100644 --- a/core/modules/options/tests/options_test_views/test_views/views.view.test_options_list_argument_string.yml +++ b/core/modules/options/tests/options_test_views/test_views/views.view.test_options_list_argument_string.yml @@ -11,7 +11,7 @@ label: 'test options list argument (string)' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/options/tests/options_test_views/test_views/views.view.test_options_list_filter.yml b/core/modules/options/tests/options_test_views/test_views/views.view.test_options_list_filter.yml index 7dd2602..23994bc 100644 --- a/core/modules/options/tests/options_test_views/test_views/views.view.test_options_list_filter.yml +++ b/core/modules/options/tests/options_test_views/test_views/views.view.test_options_list_filter.yml @@ -11,7 +11,7 @@ label: test_options_list_filter module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/path/src/Plugin/Field/FieldType/PathItem.php b/core/modules/path/src/Plugin/Field/FieldType/PathItem.php index 65cb14b..3d68ce1 100644 --- a/core/modules/path/src/Plugin/Field/FieldType/PathItem.php +++ b/core/modules/path/src/Plugin/Field/FieldType/PathItem.php @@ -15,7 +15,7 @@ * id = "path", * label = @Translation("Path"), * description = @Translation("An entity field containing a path alias and related data."), - * no_ui = TRUE, + * noUi = TRUE, * default_widget = "path", * list_class = "\Drupal\path\Plugin\Field\FieldType\PathFieldItemList", * constraints = {"PathAlias" = {}}, diff --git a/core/modules/quickedit/src/Ajax/FieldFormSavedCommand.php b/core/modules/quickedit/src/Ajax/FieldFormSavedCommand.php index 1e84b0e..f023ca2 100644 --- a/core/modules/quickedit/src/Ajax/FieldFormSavedCommand.php +++ b/core/modules/quickedit/src/Ajax/FieldFormSavedCommand.php @@ -16,7 +16,7 @@ class FieldFormSavedCommand extends BaseCommand { * * @var array */ - protected $other_view_modes; + protected $otherViewModes; /** * Constructs a FieldFormSavedCommand object. diff --git a/core/modules/rest/src/Annotation/RestResource.php b/core/modules/rest/src/Annotation/RestResource.php index f525ff1..967db02 100644 --- a/core/modules/rest/src/Annotation/RestResource.php +++ b/core/modules/rest/src/Annotation/RestResource.php @@ -45,7 +45,7 @@ class RestResource extends Plugin { * * @var string (optional) */ - public $serialization_class; + public $serializationClass; /** * The URI paths that this REST resource plugin provides. @@ -57,6 +57,6 @@ class RestResource extends Plugin { * * @var string[] */ - public $uri_paths = []; + public $uriPaths = []; } diff --git a/core/modules/rest/src/Plugin/views/display/RestExport.php b/core/modules/rest/src/Plugin/views/display/RestExport.php index 52daee0..b19bac8 100644 --- a/core/modules/rest/src/Plugin/views/display/RestExport.php +++ b/core/modules/rest/src/Plugin/views/display/RestExport.php @@ -28,7 +28,7 @@ * help = @Translation("Create a REST export resource."), * uses_route = TRUE, * admin = @Translation("REST export"), - * returns_response = TRUE + * returnsResponse = TRUE * ) */ class RestExport extends PathPluginBase implements ResponseDisplayPluginInterface { diff --git a/core/modules/rest/src/Plugin/views/row/DataEntityRow.php b/core/modules/rest/src/Plugin/views/row/DataEntityRow.php index c857676..904c105 100644 --- a/core/modules/rest/src/Plugin/views/row/DataEntityRow.php +++ b/core/modules/rest/src/Plugin/views/row/DataEntityRow.php @@ -17,7 +17,7 @@ * id = "data_entity", * title = @Translation("Entity"), * help = @Translation("Use entities as row data."), - * display_types = {"data"} + * displayTypes = {"data"} * ) */ class DataEntityRow extends RowPluginBase { diff --git a/core/modules/rest/src/Plugin/views/row/DataFieldRow.php b/core/modules/rest/src/Plugin/views/row/DataFieldRow.php index c511877..e1e6bea 100644 --- a/core/modules/rest/src/Plugin/views/row/DataFieldRow.php +++ b/core/modules/rest/src/Plugin/views/row/DataFieldRow.php @@ -16,7 +16,7 @@ * id = "data_field", * title = @Translation("Fields"), * help = @Translation("Use fields as row data."), - * display_types = {"data"} + * displayTypes = {"data"} * ) */ class DataFieldRow extends RowPluginBase { diff --git a/core/modules/rest/src/Plugin/views/style/Serializer.php b/core/modules/rest/src/Plugin/views/style/Serializer.php index 895b9fe..7345c3e 100644 --- a/core/modules/rest/src/Plugin/views/style/Serializer.php +++ b/core/modules/rest/src/Plugin/views/style/Serializer.php @@ -18,7 +18,7 @@ * id = "serializer", * title = @Translation("Serializer"), * help = @Translation("Serializes views row data using the Serializer component."), - * display_types = {"data"} + * displayTypes = {"data"} * ) */ class Serializer extends StylePluginBase implements CacheableDependencyInterface { diff --git a/core/modules/rest/tests/fixtures/update/drupal-8.rest-rest_post_update_resource_granularity.php b/core/modules/rest/tests/fixtures/update/drupal-8.rest-rest_post_update_resource_granularity.php index aa94c63..e11813c 100644 Binary files a/core/modules/rest/tests/fixtures/update/drupal-8.rest-rest_post_update_resource_granularity.php and b/core/modules/rest/tests/fixtures/update/drupal-8.rest-rest_post_update_resource_granularity.php differ diff --git a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_excluded_field_token_display.yml b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_excluded_field_token_display.yml index e95f953..bfe7318 100644 --- a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_excluded_field_token_display.yml +++ b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_excluded_field_token_display.yml @@ -12,7 +12,7 @@ label: 'Test Excluded Field Token Display' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_entity.yml b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_entity.yml index 2a5818e..f098026 100644 --- a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_entity.yml +++ b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_entity.yml @@ -9,7 +9,7 @@ label: 'Test serialize display entity rows' module: rest description: '' tag: '' -base_table: entity_test +baseTable: entity_test base_field: id core: 8.x display: diff --git a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_entity_translated.yml b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_entity_translated.yml index 55cc7bb..50de996 100644 --- a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_entity_translated.yml +++ b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_entity_translated.yml @@ -9,7 +9,7 @@ label: 'Test serialize translated entity rows' module: rest description: '' tag: '' -base_table: entity_test_mul_property_data +baseTable: entity_test_mul_property_data base_field: id core: 8.x display: diff --git a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_field.yml b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_field.yml index 2b981f0..b016dc5 100644 --- a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_field.yml +++ b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_field.yml @@ -9,7 +9,7 @@ label: 'Test serializer display field rows' module: rest description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: id core: 8.x display: diff --git a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_node_display_field.yml b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_node_display_field.yml index 4a09bbd..85795bc 100644 --- a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_node_display_field.yml +++ b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_node_display_field.yml @@ -14,7 +14,7 @@ label: 'Test serializer display field rows for entity fields' module: rest_test_views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_node_exposed_filter.yml b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_node_exposed_filter.yml index 6165641..261c27c 100644 --- a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_node_exposed_filter.yml +++ b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_node_exposed_filter.yml @@ -14,7 +14,7 @@ label: 'Test serializer display for exposed filters' module: rest_test_views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_shared_path.yml b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_shared_path.yml index bc4f6ef..9225ded 100644 --- a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_shared_path.yml +++ b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_shared_path.yml @@ -9,7 +9,7 @@ label: 'Test serializer shared path' module: rest description: '' tag: '' -base_table: entity_test +baseTable: entity_test base_field: id core: 8.x display: diff --git a/core/modules/rest/tests/src/Functional/EntityResource/View/ViewResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/View/ViewResourceTestBase.php index 26ec7bb..b4a651f 100644 --- a/core/modules/rest/tests/src/Functional/EntityResource/View/ViewResourceTestBase.php +++ b/core/modules/rest/tests/src/Functional/EntityResource/View/ViewResourceTestBase.php @@ -47,7 +47,7 @@ protected function createEntity() { protected function getExpectedNormalizedEntity() { return [ 'base_field' => 'nid', - 'base_table' => 'node', + 'baseTable' => 'node', 'core' => '8.x', 'dependencies' => [], 'description' => '', diff --git a/core/modules/search/src/SearchQuery.php b/core/modules/search/src/SearchQuery.php index fca2b23..aa86bc0 100644 --- a/core/modules/search/src/SearchQuery.php +++ b/core/modules/search/src/SearchQuery.php @@ -179,7 +179,7 @@ class SearchQuery extends SelectExtender { * * @var int */ - protected $relevance_count = 0; + protected $relevanceCount = 0; /** * Multipliers for score expressions. diff --git a/core/modules/shortcut/src/Entity/Shortcut.php b/core/modules/shortcut/src/Entity/Shortcut.php index bba393a..49d3756 100644 --- a/core/modules/shortcut/src/Entity/Shortcut.php +++ b/core/modules/shortcut/src/Entity/Shortcut.php @@ -29,7 +29,7 @@ * }, * "translation" = "Drupal\content_translation\ContentTranslationHandler" * }, - * base_table = "shortcut", + * baseTable = "shortcut", * data_table = "shortcut_field_data", * translatable = TRUE, * entity_keys = { diff --git a/core/modules/statistics/tests/modules/statistics_test_views/test_views/views.view.test_statistics_integration.yml b/core/modules/statistics/tests/modules/statistics_test_views/test_views/views.view.test_statistics_integration.yml index 4d2d90f..b73ca8f 100644 --- a/core/modules/statistics/tests/modules/statistics_test_views/test_views/views.view.test_statistics_integration.yml +++ b/core/modules/statistics/tests/modules/statistics_test_views/test_views/views.view.test_statistics_integration.yml @@ -9,7 +9,7 @@ label: 'Test statistics integration' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/system/src/Tests/Entity/EntityDefinitionTestTrait.php b/core/modules/system/src/Tests/Entity/EntityDefinitionTestTrait.php index 380c1e6..24aab23 100644 --- a/core/modules/system/src/Tests/Entity/EntityDefinitionTestTrait.php +++ b/core/modules/system/src/Tests/Entity/EntityDefinitionTestTrait.php @@ -251,7 +251,7 @@ protected function removeEntityIndex() { protected function renameBaseTable() { $entity_type = clone $this->entityManager->getDefinition('entity_test_update'); - $entity_type->set('base_table', 'entity_test_update_new'); + $entity_type->set('baseTable', 'entity_test_update_new'); $this->state->set('entity_test_update.entity_type', $entity_type); } diff --git a/core/modules/system/src/Tests/Module/ModuleTestBase.php b/core/modules/system/src/Tests/Module/ModuleTestBase.php index cc5a7ef..3988990 100644 --- a/core/modules/system/src/Tests/Module/ModuleTestBase.php +++ b/core/modules/system/src/Tests/Module/ModuleTestBase.php @@ -35,19 +35,19 @@ protected function setUp() { /** * Assert there are tables that begin with the specified base table name. * - * @param $base_table + * @param $baseTable * Beginning of table name to look for. * @param $count * (optional) Whether or not to assert that there are tables that match the * specified base table. Defaults to TRUE. */ - public function assertTableCount($base_table, $count = TRUE) { - $tables = db_find_tables(Database::getConnection()->prefixTables('{' . $base_table . '}') . '%'); + public function assertTableCount($baseTable, $count = TRUE) { + $tables = db_find_tables(Database::getConnection()->prefixTables('{' . $baseTable . '}') . '%'); if ($count) { - return $this->assertTrue($tables, format_string('Tables matching "@base_table" found.', ['@base_table' => $base_table])); + return $this->assertTrue($tables, format_string('Tables matching "@baseTable" found.', ['@baseTable' => $baseTable])); } - return $this->assertFalse($tables, format_string('Tables matching "@base_table" not found.', ['@base_table' => $base_table])); + return $this->assertFalse($tables, format_string('Tables matching "@baseTable" not found.', ['@baseTable' => $baseTable])); } /** diff --git a/core/modules/system/system.install b/core/modules/system/system.install index 0fd4b26..3b7b813 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -1895,7 +1895,7 @@ function system_update_8400(&$sandbox) { if (!empty($fields_to_update)) { // Initialize the entity table names. // @see \Drupal\Core\Entity\Sql\SqlContentEntityStorage::initTableLayout() - $base_table = $entity_type->getBaseTable() ?: $entity_type_id; + $baseTable = $entity_type->getBaseTable() ?: $entity_type_id; $data_table = $entity_type->getDataTable() ?: $entity_type_id . '_field_data'; $revision_table = $entity_type->getRevisionTable() ?: $entity_type_id . '_revision'; $revision_data_table = $entity_type->getRevisionDataTable() ?: $entity_type_id . '_field_revision'; @@ -1972,11 +1972,11 @@ function system_update_8400(&$sandbox) { } else { foreach ($fields_to_update as $revision_metadata_field_name => $definition) { - if ($database_schema->fieldExists($base_table, $revision_metadata_field_name)) { + if ($database_schema->fieldExists($baseTable, $revision_metadata_field_name)) { // Install the field in the revision table. $entity_definition_update_manager->installFieldStorageDefinition($revision_metadata_field_name, $entity_type_id, $entity_type->getProvider(), $definition); // Drop the field from the base table. - $database_schema->dropField($base_table, $revision_metadata_field_name); + $database_schema->dropField($baseTable, $revision_metadata_field_name); } } $sandbox['current']++; diff --git a/core/modules/system/tests/fixtures/update/drupal-8.language-enabled.php b/core/modules/system/tests/fixtures/update/drupal-8.language-enabled.php index 05bcf8e..3eb7e9f 100644 Binary files a/core/modules/system/tests/fixtures/update/drupal-8.language-enabled.php and b/core/modules/system/tests/fixtures/update/drupal-8.language-enabled.php differ diff --git a/core/modules/system/tests/fixtures/update/drupal-8.views-entity-views-data-2455125.yml b/core/modules/system/tests/fixtures/update/drupal-8.views-entity-views-data-2455125.yml index e3c1b63..0169f91 100644 --- a/core/modules/system/tests/fixtures/update/drupal-8.views-entity-views-data-2455125.yml +++ b/core/modules/system/tests/fixtures/update/drupal-8.views-entity-views-data-2455125.yml @@ -9,7 +9,7 @@ label: 'Update Test' module: views description: '' tag: '' -base_table: users_field_data +baseTable: users_field_data base_field: uid core: 8.x display: diff --git a/core/modules/system/tests/fixtures/update/drupal-8.views-entity-views-data-2846614.yml b/core/modules/system/tests/fixtures/update/drupal-8.views-entity-views-data-2846614.yml index 2d68cbe..e5ab62b 100644 --- a/core/modules/system/tests/fixtures/update/drupal-8.views-entity-views-data-2846614.yml +++ b/core/modules/system/tests/fixtures/update/drupal-8.views-entity-views-data-2846614.yml @@ -9,7 +9,7 @@ label: test_user_multi_value module: views description: '' tag: '' -base_table: users_field_data +baseTable: users_field_data base_field: uid core: 8.x display: diff --git a/core/modules/system/tests/fixtures/update/drupal-8.views-taxonomy-parent-2543726.yml b/core/modules/system/tests/fixtures/update/drupal-8.views-taxonomy-parent-2543726.yml index de8f63d..23c1294 100644 --- a/core/modules/system/tests/fixtures/update/drupal-8.views-taxonomy-parent-2543726.yml +++ b/core/modules/system/tests/fixtures/update/drupal-8.views-taxonomy-parent-2543726.yml @@ -9,7 +9,7 @@ label: test_taxonomy_parent module: views description: '' tag: '' -base_table: taxonomy_term_data +baseTable: taxonomy_term_data base_field: tid core: 8.x display: diff --git a/core/modules/system/tests/fixtures/update/drupal8.views-image-style-dependency-2649914.yml b/core/modules/system/tests/fixtures/update/drupal8.views-image-style-dependency-2649914.yml index 585da34..a59c6c6 100644 --- a/core/modules/system/tests/fixtures/update/drupal8.views-image-style-dependency-2649914.yml +++ b/core/modules/system/tests/fixtures/update/drupal8.views-image-style-dependency-2649914.yml @@ -11,7 +11,7 @@ label: Foo module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/system/tests/fixtures/update/views.view.entity_test_mul_revlog_for_2248983.yml b/core/modules/system/tests/fixtures/update/views.view.entity_test_mul_revlog_for_2248983.yml index d9eba9a..dd4c251 100644 --- a/core/modules/system/tests/fixtures/update/views.view.entity_test_mul_revlog_for_2248983.yml +++ b/core/modules/system/tests/fixtures/update/views.view.entity_test_mul_revlog_for_2248983.yml @@ -9,7 +9,7 @@ label: entity_test_mul_revlog module: views description: '' tag: '' -base_table: entity_test_mul_revlog_property_data +baseTable: entity_test_mul_revlog_property_data base_field: id core: 8.x display: diff --git a/core/modules/system/tests/fixtures/update/views.view.entity_test_revlog_for_2248983.yml b/core/modules/system/tests/fixtures/update/views.view.entity_test_revlog_for_2248983.yml index 412972c..3a7c750 100644 --- a/core/modules/system/tests/fixtures/update/views.view.entity_test_revlog_for_2248983.yml +++ b/core/modules/system/tests/fixtures/update/views.view.entity_test_revlog_for_2248983.yml @@ -9,7 +9,7 @@ label: entity_test_revlog module: views description: '' tag: '' -base_table: entity_test_revlog +baseTable: entity_test_revlog base_field: id core: 8.x display: diff --git a/core/modules/system/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference.yml b/core/modules/system/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference.yml index 3e78c51..0e87afd 100644 --- a/core/modules/system/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference.yml +++ b/core/modules/system/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference.yml @@ -10,7 +10,7 @@ label: 'Entity reference' module: entity_reference_test description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/system/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference_entity_test.yml b/core/modules/system/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference_entity_test.yml index 752e528..f83eacc 100644 --- a/core/modules/system/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference_entity_test.yml +++ b/core/modules/system/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference_entity_test.yml @@ -9,7 +9,7 @@ label: 'Entity reference' module: views description: '' tag: '' -base_table: entity_test +baseTable: entity_test base_field: id core: 8.x display: diff --git a/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_entity_test_mul_view.yml b/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_entity_test_mul_view.yml index 0d06377..ae00491 100644 --- a/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_entity_test_mul_view.yml +++ b/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_entity_test_mul_view.yml @@ -8,7 +8,7 @@ label: test_entity_reference_entity_test_mul_view module: views description: '' tag: '' -base_table: entity_test_mul_property_data +baseTable: entity_test_mul_property_data base_field: id core: 8.x display: diff --git a/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_entity_test_view.yml b/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_entity_test_view.yml index 5c9bc5f..d69ebfa 100644 --- a/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_entity_test_view.yml +++ b/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_entity_test_view.yml @@ -8,7 +8,7 @@ label: test_entity_reference_entity_test_view module: views description: '' tag: '' -base_table: entity_test +baseTable: entity_test base_field: id core: 8.x display: diff --git a/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_entity_test_view_long.yml b/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_entity_test_view_long.yml index 9978205..344fc3b 100644 --- a/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_entity_test_view_long.yml +++ b/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_entity_test_view_long.yml @@ -8,7 +8,7 @@ label: test_entity_reference_entity_test_view_long module: views description: '' tag: '' -base_table: entity_test_mul_changed_property +baseTable: entity_test_mul_changed_property base_field: id core: 8.x display: diff --git a/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_group_by_empty_relationships.yml b/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_group_by_empty_relationships.yml index 5c93524..f387106 100644 --- a/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_group_by_empty_relationships.yml +++ b/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_group_by_empty_relationships.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: entity_test +baseTable: entity_test base_field: id core: '8' display: diff --git a/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_reverse_entity_test_mul_view.yml b/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_reverse_entity_test_mul_view.yml index a1153b6..89b6b6e 100644 --- a/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_reverse_entity_test_mul_view.yml +++ b/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_reverse_entity_test_mul_view.yml @@ -8,7 +8,7 @@ label: test_entity_reference_reverse_entity_test_mul_view module: views description: '' tag: '' -base_table: entity_test +baseTable: entity_test base_field: id core: 8.x display: diff --git a/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_reverse_entity_test_view.yml b/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_reverse_entity_test_view.yml index 1412b71..7dead74 100644 --- a/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_reverse_entity_test_view.yml +++ b/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_reverse_entity_test_view.yml @@ -8,7 +8,7 @@ label: test_entity_reference_reverse_entity_test_view module: views description: '' tag: '' -base_table: entity_test_mul_property_data +baseTable: entity_test_mul_property_data base_field: id core: 8.x display: diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTest.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTest.php index 9f8c5b0..7ceadc1 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTest.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTest.php @@ -29,7 +29,7 @@ * "translation" = "Drupal\content_translation\ContentTranslationHandler", * "views_data" = "Drupal\entity_test\EntityTestViewsData" * }, - * base_table = "entity_test", + * baseTable = "entity_test", * admin_permission = "administer entity_test content", * persistent_cache = FALSE, * list_cache_contexts = { "entity_test_view_grants" }, diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestAdminRoutes.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestAdminRoutes.php index eda9c98..676b395 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestAdminRoutes.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestAdminRoutes.php @@ -21,7 +21,7 @@ * "html" = "Drupal\Core\Entity\Routing\AdminHtmlRouteProvider", * }, * }, - * base_table = "entity_test_admin_routes", + * baseTable = "entity_test_admin_routes", * data_table = "entity_test_admin_routes_property_data", * admin_permission = "administer entity_test content", * translatable = TRUE, diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestBaseFieldDisplay.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestBaseFieldDisplay.php index 7fe9ce2..6af7187 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestBaseFieldDisplay.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestBaseFieldDisplay.php @@ -22,7 +22,7 @@ * "html" = "Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider", * }, * }, - * base_table = "entity_test_base_field_display", + * baseTable = "entity_test_base_field_display", * admin_permission = "administer entity_test content", * entity_keys = { * "id" = "id", diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestCache.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestCache.php index dfbb9f0..c515801 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestCache.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestCache.php @@ -15,7 +15,7 @@ * }, * "translation" = "Drupal\content_translation\ContentTranslationHandler" * }, - * base_table = "entity_test_cache", + * baseTable = "entity_test_cache", * entity_keys = { * "id" = "id", * "uuid" = "uuid", diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestCompositeConstraint.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestCompositeConstraint.php index 3ace146..b0e26f9 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestCompositeConstraint.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestCompositeConstraint.php @@ -21,7 +21,7 @@ * "default" = "Drupal\entity_test\EntityTestForm" * } * }, - * base_table = "entity_test_composite_constraint", + * baseTable = "entity_test_composite_constraint", * persistent_cache = FALSE, * constraints = { * "EntityTestComposite" = {}, diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestComputedField.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestComputedField.php index c873ccc..ed23547 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestComputedField.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestComputedField.php @@ -12,7 +12,7 @@ * @ContentEntityType( * id = "entity_test_computed_field", * label = @Translation("Entity Test computed field"), - * base_table = "entity_test_computed_field", + * baseTable = "entity_test_computed_field", * handlers = { * "views_data" = "Drupal\entity_test\EntityTestViewsData" * }, diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestConstraintViolation.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestConstraintViolation.php index e12c74a..12f538b 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestConstraintViolation.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestConstraintViolation.php @@ -15,7 +15,7 @@ * "default" = "Drupal\entity_test\EntityTestForm" * } * }, - * base_table = "entity_test_constraint_violation", + * baseTable = "entity_test_constraint_violation", * persistent_cache = FALSE, * entity_keys = { * "id" = "id", diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestConstraints.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestConstraints.php index a91e2cb..bf932be 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestConstraints.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestConstraints.php @@ -19,7 +19,7 @@ * "bundle" = "type", * "label" = "name" * }, - * base_table = "entity_test_constraints", + * baseTable = "entity_test_constraints", * persistent_cache = FALSE, * constraints = { * "NotNull" = {} diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestDefaultAccess.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestDefaultAccess.php index 71c806b..18d8d3e 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestDefaultAccess.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestDefaultAccess.php @@ -8,7 +8,7 @@ * @ContentEntityType( * id = "entity_test_default_access", * label = @Translation("Test entity with default access"), - * base_table = "entity_test_default_access", + * baseTable = "entity_test_default_access", * entity_keys = { * "id" = "id", * "bundle" = "type" diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestDefaultValue.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestDefaultValue.php index 2639d3e..a4f1740 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestDefaultValue.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestDefaultValue.php @@ -11,7 +11,7 @@ * @ContentEntityType( * id = "entity_test_default_value", * label = @Translation("Test entity for default values"), - * base_table = "entity_test_default_value", + * baseTable = "entity_test_default_value", * entity_keys = { * "id" = "id", * "uuid" = "uuid", diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestFieldMethods.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestFieldMethods.php index 9160c1f..79236c8 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestFieldMethods.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestFieldMethods.php @@ -24,7 +24,7 @@ * "html" = "Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider", * }, * }, - * base_table = "entity_test_field_methods", + * baseTable = "entity_test_field_methods", * data_table = "entity_test_field_methods_property", * admin_permission = "administer entity_test content", * translatable = TRUE, diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestFieldOverride.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestFieldOverride.php index aaca0ae..a7e9622 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestFieldOverride.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestFieldOverride.php @@ -10,7 +10,7 @@ * @ContentEntityType( * id = "entity_test_field_override", * label = @Translation("Test entity field overrides"), - * base_table = "entity_test_field_override", + * baseTable = "entity_test_field_override", * entity_keys = { * "id" = "id", * "uuid" = "uuid", diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestLabel.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestLabel.php index 1b4597f..19eb21c 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestLabel.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestLabel.php @@ -12,7 +12,7 @@ * "access" = "Drupal\entity_test\EntityTestAccessControlHandler", * "view_builder" = "Drupal\entity_test\EntityTestViewBuilder" * }, - * base_table = "entity_test_label", + * baseTable = "entity_test_label", * render_cache = FALSE, * entity_keys = { * "uuid" = "uuid", diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestLabelCallback.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestLabelCallback.php index e3fd77e..4d3de8a 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestLabelCallback.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestLabelCallback.php @@ -9,7 +9,7 @@ * id = "entity_test_label_callback", * label = @Translation("Entity test label callback"), * persistent_cache = FALSE, - * base_table = "entity_test_label_callback", + * baseTable = "entity_test_label_callback", * label_callback = "entity_test_label_callback", * entity_keys = { * "id" = "id", diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMul.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMul.php index 50ae377..0b1cf4e 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMul.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMul.php @@ -23,7 +23,7 @@ * "html" = "Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider", * }, * }, - * base_table = "entity_test_mul", + * baseTable = "entity_test_mul", * data_table = "entity_test_mul_property_data", * admin_permission = "administer entity_test content", * translatable = TRUE, diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulChanged.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulChanged.php index dd3da09..eac341a 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulChanged.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulChanged.php @@ -26,7 +26,7 @@ * "translation" = "Drupal\content_translation\ContentTranslationHandler", * "views_data" = "Drupal\views\EntityViewsData" * }, - * base_table = "entity_test_mul_changed", + * baseTable = "entity_test_mul_changed", * data_table = "entity_test_mul_changed_property", * translatable = TRUE, * entity_keys = { diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulDefaultValue.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulDefaultValue.php index bcbb541..c251211 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulDefaultValue.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulDefaultValue.php @@ -21,7 +21,7 @@ * "translation" = "Drupal\content_translation\ContentTranslationHandler", * "views_data" = "Drupal\views\EntityViewsData" * }, - * base_table = "entity_test_mul_default_value", + * baseTable = "entity_test_mul_default_value", * data_table = "entity_test_mul_default_value_property_data", * translatable = TRUE, * entity_keys = { diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulLangcodeKey.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulLangcodeKey.php index 94948a3..6d78073 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulLangcodeKey.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulLangcodeKey.php @@ -21,7 +21,7 @@ * "html" = "Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider", * }, * }, - * base_table = "entity_test_mul_langcode_key", + * baseTable = "entity_test_mul_langcode_key", * data_table = "entity_test_mul_langcode_key_field_data", * admin_permission = "administer entity_test content", * translatable = TRUE, diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRev.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRev.php index 724385f..042d04e 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRev.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRev.php @@ -24,7 +24,7 @@ * "html" = "Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider", * }, * }, - * base_table = "entity_test_mulrev", + * baseTable = "entity_test_mulrev", * data_table = "entity_test_mulrev_property_data", * revision_table = "entity_test_mulrev_revision", * revision_data_table = "entity_test_mulrev_property_revision", diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRevChanged.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRevChanged.php index 3913075..4f41eb8 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRevChanged.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRevChanged.php @@ -24,7 +24,7 @@ * "translation" = "Drupal\content_translation\ContentTranslationHandler", * "views_data" = "Drupal\views\EntityViewsData" * }, - * base_table = "entity_test_mulrev_changed", + * baseTable = "entity_test_mulrev_changed", * data_table = "entity_test_mulrev_changed_property", * revision_table = "entity_test_mulrev_changed_revision", * revision_data_table = "entity_test_mulrev_changed_property_revision", diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRevChangedWithRevisionLog.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRevChangedWithRevisionLog.php index a22954b..e926ff9 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRevChangedWithRevisionLog.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRevChangedWithRevisionLog.php @@ -12,7 +12,7 @@ * @ContentEntityType( * id = "entity_test_mulrev_chnged_revlog", * label = @Translation("Test entity - revisions log and data table"), - * base_table = "entity_test_mulrev_changed_revlog", + * baseTable = "entity_test_mulrev_changed_revlog", * revision_table = "entity_test_mulrev_changed_revlog_revision", * entity_keys = { * "id" = "id", diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRevPub.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRevPub.php index 862958e..0f825fd 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRevPub.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRevPub.php @@ -25,7 +25,7 @@ * "html" = "Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider", * }, * }, - * base_table = "entity_test_mulrevpub", + * baseTable = "entity_test_mulrevpub", * data_table = "entity_test_mulrevpub_property_data", * revision_table = "entity_test_mulrevpub_revision", * revision_data_table = "entity_test_mulrevpub_property_revision", diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMultiValueBasefield.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMultiValueBasefield.php index b5bf2c2..aafe33b 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMultiValueBasefield.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMultiValueBasefield.php @@ -10,7 +10,7 @@ * @ContentEntityType( * id = "entity_test_multivalue_basefield", * label = @Translation("Entity Test with a multivalue base field"), - * base_table = "entity_test_multivalue_basefield", + * baseTable = "entity_test_multivalue_basefield", * data_table = "entity_test_multivalue_basefield_field_data", * handlers = { * "views_data" = "Drupal\views\EntityViewsData", diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNew.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNew.php index c3845c6..7e967de 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNew.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNew.php @@ -11,7 +11,7 @@ * @ContentEntityType( * id = "entity_test_new", * label = @Translation("New test entity"), - * base_table = "entity_test_new", + * baseTable = "entity_test_new", * entity_keys = { * "id" = "id", * "uuid" = "uuid", diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoBundle.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoBundle.php index 0369a64..eb4230b 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoBundle.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoBundle.php @@ -8,7 +8,7 @@ * @ContentEntityType( * id = "entity_test_no_bundle", * label = @Translation("Entity Test without bundle"), - * base_table = "entity_test_no_bundle", + * baseTable = "entity_test_no_bundle", * handlers = { * "views_data" = "Drupal\views\EntityViewsData" * }, diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoLabel.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoLabel.php index fb69ccb..470b36c 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoLabel.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoLabel.php @@ -9,7 +9,7 @@ * id = "entity_test_no_label", * label = @Translation("Entity Test without label"), * persistent_cache = FALSE, - * base_table = "entity_test_no_label", + * baseTable = "entity_test_no_label", * entity_keys = { * "id" = "id", * "bundle" = "type" diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoUuid.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoUuid.php index 8d0ddac..6b91541 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoUuid.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoUuid.php @@ -11,7 +11,7 @@ * handlers = { * "access" = "Drupal\entity_test\EntityTestAccessControlHandler", * }, - * base_table = "entity_test_no_uuid", + * baseTable = "entity_test_no_uuid", * revision_table = "entity_test_no_uuid_revision", * admin_permission = "administer entity_test content", * persistent_cache = FALSE, diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestRev.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestRev.php index 5aa3ae1..c1da370 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestRev.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestRev.php @@ -25,7 +25,7 @@ * "html" = "Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider", * }, * }, - * base_table = "entity_test_rev", + * baseTable = "entity_test_rev", * revision_table = "entity_test_rev_revision", * admin_permission = "administer entity_test content", * show_revision_ui = TRUE, diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestStringId.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestStringId.php index 85a5e66..28c60fb 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestStringId.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestStringId.php @@ -21,7 +21,7 @@ * "html" = "Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider", * }, * }, - * base_table = "entity_test_string", + * baseTable = "entity_test_string", * admin_permission = "administer entity_test content", * entity_keys = { * "id" = "id", diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestViewBuilder.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestViewBuilder.php index 6cf9050..fa024f0 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestViewBuilder.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestViewBuilder.php @@ -12,7 +12,7 @@ * "access" = "Drupal\entity_test\EntityTestAccessControlHandler", * "view_builder" = "Drupal\entity_test\EntityTestViewBuilderOverriddenView", * }, - * base_table = "entity_test_view_builder", + * baseTable = "entity_test_view_builder", * render_cache = FALSE, * entity_keys = { * "id" = "id", diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestWithBundle.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestWithBundle.php index e6cb542..ab9f727 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestWithBundle.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestWithBundle.php @@ -24,7 +24,7 @@ * "html" = "Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider", * }, * }, - * base_table = "entity_test_with_bundle", + * baseTable = "entity_test_with_bundle", * admin_permission = "administer entity_test_with_bundle content", * persistent_cache = FALSE, * entity_keys = { diff --git a/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldType/AutoIncrementingTestItem.php b/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldType/AutoIncrementingTestItem.php index baa175e..66c7aca 100644 --- a/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldType/AutoIncrementingTestItem.php +++ b/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldType/AutoIncrementingTestItem.php @@ -12,7 +12,7 @@ * label = @Translation("Auto incrementing test field item"), * description = @Translation("An entity field designed to test the field method invocation order."), * category = @Translation("Number"), - * no_ui = TRUE, + * noUi = TRUE, * ) */ class AutoIncrementingTestItem extends IntegerItem { diff --git a/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldType/ChangedTestItem.php b/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldType/ChangedTestItem.php index 0e0a46c..0cd7155 100644 --- a/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldType/ChangedTestItem.php +++ b/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldType/ChangedTestItem.php @@ -13,7 +13,7 @@ * id = "changed_test", * label = @Translation("Last changed"), * description = @Translation("An entity field containing a UNIX timestamp of when the entity has been last updated."), - * no_ui = TRUE, + * noUi = TRUE, * list_class = "\Drupal\Core\Field\ChangedFieldItemList" * ) * diff --git a/core/modules/system/tests/modules/entity_test_revlog/src/Entity/EntityTestMulWithRevisionLog.php b/core/modules/system/tests/modules/entity_test_revlog/src/Entity/EntityTestMulWithRevisionLog.php index 5a17b85..3b23cfc 100644 --- a/core/modules/system/tests/modules/entity_test_revlog/src/Entity/EntityTestMulWithRevisionLog.php +++ b/core/modules/system/tests/modules/entity_test_revlog/src/Entity/EntityTestMulWithRevisionLog.php @@ -8,7 +8,7 @@ * @ContentEntityType( * id = "entity_test_mul_revlog", * label = @Translation("Test entity - data table, revisions log"), - * base_table = "entity_test_mul_revlog", + * baseTable = "entity_test_mul_revlog", * data_table = "entity_test_mul_revlog_field_data", * revision_table = "entity_test_mul_revlog_revision", * revision_data_table = "entity_test_mul_revlog_field_revision", diff --git a/core/modules/system/tests/modules/entity_test_revlog/src/Entity/EntityTestWithRevisionLog.php b/core/modules/system/tests/modules/entity_test_revlog/src/Entity/EntityTestWithRevisionLog.php index b03415f..eb32d70 100644 --- a/core/modules/system/tests/modules/entity_test_revlog/src/Entity/EntityTestWithRevisionLog.php +++ b/core/modules/system/tests/modules/entity_test_revlog/src/Entity/EntityTestWithRevisionLog.php @@ -12,7 +12,7 @@ * @ContentEntityType( * id = "entity_test_revlog", * label = @Translation("Test entity - revisions log"), - * base_table = "entity_test_revlog", + * baseTable = "entity_test_revlog", * revision_table = "entity_test_revlog_revision", * entity_keys = { * "id" = "id", diff --git a/core/modules/system/tests/modules/entity_test_update/src/Entity/EntityTestUpdate.php b/core/modules/system/tests/modules/entity_test_update/src/Entity/EntityTestUpdate.php index 286e8e6..facc210 100644 --- a/core/modules/system/tests/modules/entity_test_update/src/Entity/EntityTestUpdate.php +++ b/core/modules/system/tests/modules/entity_test_update/src/Entity/EntityTestUpdate.php @@ -21,7 +21,7 @@ * handlers = { * "storage_schema" = "Drupal\entity_test_update\EntityTestUpdateStorageSchema", * }, - * base_table = "entity_test_update", + * baseTable = "entity_test_update", * persistent_cache = FALSE, * entity_keys = { * "id" = "id", diff --git a/core/modules/system/tests/src/Functional/Entity/Update/SqlContentEntityStorageSchemaConverterTest.php b/core/modules/system/tests/src/Functional/Entity/Update/SqlContentEntityStorageSchemaConverterTest.php index 625ee19..ebff80b 100644 --- a/core/modules/system/tests/src/Functional/Entity/Update/SqlContentEntityStorageSchemaConverterTest.php +++ b/core/modules/system/tests/src/Functional/Entity/Update/SqlContentEntityStorageSchemaConverterTest.php @@ -232,11 +232,11 @@ public function testMakeRevisionableErrorHandling() { $this->assertTrue($schema->tableExists('entity_test_update')); $this->assertTrue($schema->tableExists('entity_test_update_data')); - $base_table_count = \Drupal::database()->select('entity_test_update') + $baseTable_count = \Drupal::database()->select('entity_test_update') ->countQuery() ->execute() ->fetchField(); - $this->assertEqual($base_table_count, 102); + $this->assertEqual($baseTable_count, 102); $data_table_count = \Drupal::database()->select('entity_test_update_data') ->countQuery() @@ -246,13 +246,13 @@ public function testMakeRevisionableErrorHandling() { // Romanian. $this->assertEqual($data_table_count, 204); - $base_table_row = \Drupal::database()->select('entity_test_update') + $baseTable_row = \Drupal::database()->select('entity_test_update') ->fields('entity_test_update') ->condition('id', 1, '=') ->condition('langcode', 'en', '=') ->execute() ->fetchAllAssoc('id'); - $this->assertEqual('843e9ac7-3351-4cc1-a202-2dbffffae21c', $base_table_row[1]->uuid); + $this->assertEqual('843e9ac7-3351-4cc1-a202-2dbffffae21c', $baseTable_row[1]->uuid); $data_table_row = \Drupal::database()->select('entity_test_update_data') ->fields('entity_test_update_data') diff --git a/core/modules/system/tests/src/Functional/Module/ModuleTestBase.php b/core/modules/system/tests/src/Functional/Module/ModuleTestBase.php index abdbe03..c1d785f 100644 --- a/core/modules/system/tests/src/Functional/Module/ModuleTestBase.php +++ b/core/modules/system/tests/src/Functional/Module/ModuleTestBase.php @@ -32,19 +32,19 @@ protected function setUp() { /** * Assert there are tables that begin with the specified base table name. * - * @param $base_table + * @param $baseTable * Beginning of table name to look for. * @param $count * (optional) Whether or not to assert that there are tables that match the * specified base table. Defaults to TRUE. */ - public function assertTableCount($base_table, $count = TRUE) { - $tables = db_find_tables(Database::getConnection()->prefixTables('{' . $base_table . '}') . '%'); + public function assertTableCount($baseTable, $count = TRUE) { + $tables = db_find_tables(Database::getConnection()->prefixTables('{' . $baseTable . '}') . '%'); if ($count) { - return $this->assertTrue($tables, format_string('Tables matching "@base_table" found.', ['@base_table' => $base_table])); + return $this->assertTrue($tables, format_string('Tables matching "@baseTable" found.', ['@baseTable' => $baseTable])); } - return $this->assertFalse($tables, format_string('Tables matching "@base_table" not found.', ['@base_table' => $base_table])); + return $this->assertFalse($tables, format_string('Tables matching "@baseTable" not found.', ['@baseTable' => $baseTable])); } /** diff --git a/core/modules/taxonomy/config/optional/views.view.taxonomy_term.yml b/core/modules/taxonomy/config/optional/views.view.taxonomy_term.yml index 95b54a8..32e83d6 100644 --- a/core/modules/taxonomy/config/optional/views.view.taxonomy_term.yml +++ b/core/modules/taxonomy/config/optional/views.view.taxonomy_term.yml @@ -12,7 +12,7 @@ label: 'Taxonomy term' module: taxonomy description: 'Content belonging to a certain taxonomy term.' tag: default -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/taxonomy/src/Entity/Term.php b/core/modules/taxonomy/src/Entity/Term.php index 3a14073..148103f 100644 --- a/core/modules/taxonomy/src/Entity/Term.php +++ b/core/modules/taxonomy/src/Entity/Term.php @@ -29,7 +29,7 @@ * }, * "translation" = "Drupal\taxonomy\TermTranslationHandler" * }, - * base_table = "taxonomy_term_data", + * baseTable = "taxonomy_term_data", * data_table = "taxonomy_term_field_data", * uri_callback = "taxonomy_term_uri", * translatable = TRUE, diff --git a/core/modules/taxonomy/src/Plugin/views/field/TaxonomyIndexTid.php b/core/modules/taxonomy/src/Plugin/views/field/TaxonomyIndexTid.php index 367565c..77ea288 100644 --- a/core/modules/taxonomy/src/Plugin/views/field/TaxonomyIndexTid.php +++ b/core/modules/taxonomy/src/Plugin/views/field/TaxonomyIndexTid.php @@ -60,8 +60,8 @@ public static function create(ContainerInterface $container, array $configuratio public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) { parent::init($view, $display, $options); - // @todo: Wouldn't it be possible to use $this->base_table and no if here? - if ($view->storage->get('base_table') == 'node_field_revision') { + // @todo: Wouldn't it be possible to use $this->baseTable and no if here? + if ($view->storage->get('baseTable') == 'node_field_revision') { $this->additional_fields['nid'] = ['table' => 'node_field_revision', 'field' => 'nid']; } else { diff --git a/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php b/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php index efadf83..99fd7f5 100644 --- a/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php +++ b/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php @@ -22,7 +22,7 @@ class TaxonomyIndexTid extends ManyToOne { // Stores the exposed input for this filter. - public $validated_exposed_input = NULL; + public $validatedExposedInput = NULL; /** * The vocabulary storage. diff --git a/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTidDepth.php b/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTidDepth.php index ebb5b51..451f55f 100644 --- a/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTidDepth.php +++ b/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTidDepth.php @@ -67,7 +67,7 @@ public function query() { } // If no relationship, then use the alias of the base table. else { - $this->tableAlias = $this->query->ensureTable($this->view->storage->get('base_table')); + $this->tableAlias = $this->query->ensureTable($this->view->storage->get('baseTable')); } // Now build the subqueries. diff --git a/core/modules/taxonomy/src/Plugin/views/wizard/TaxonomyTerm.php b/core/modules/taxonomy/src/Plugin/views/wizard/TaxonomyTerm.php index cc79681..637a441 100644 --- a/core/modules/taxonomy/src/Plugin/views/wizard/TaxonomyTerm.php +++ b/core/modules/taxonomy/src/Plugin/views/wizard/TaxonomyTerm.php @@ -9,7 +9,7 @@ * * @ViewsWizard( * id = "taxonomy_term", - * base_table = "taxonomy_term_field_data", + * baseTable = "taxonomy_term_field_data", * title = @Translation("Taxonomy terms") * ) */ diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.taxonomy_all_terms_test.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.taxonomy_all_terms_test.yml index 4f1467b..9dee6eb 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.taxonomy_all_terms_test.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.taxonomy_all_terms_test.yml @@ -10,7 +10,7 @@ label: taxonomy_all_terms_test module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.taxonomy_default_argument_test.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.taxonomy_default_argument_test.yml index d19e395..22564cd 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.taxonomy_default_argument_test.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.taxonomy_default_argument_test.yml @@ -9,7 +9,7 @@ label: taxonomy_default_argument_test module: views description: '' tag: '' -base_table: taxonomy_term_field_data +baseTable: taxonomy_term_field_data base_field: tid core: 8.x display: diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_argument_taxonomy_index_tid_depth.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_argument_taxonomy_index_tid_depth.yml index e6fd1a5..ad36bd3 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_argument_taxonomy_index_tid_depth.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_argument_taxonomy_index_tid_depth.yml @@ -10,7 +10,7 @@ label: test_argument_taxonomy_index_tid_depth module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_argument_taxonomy_vocabulary.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_argument_taxonomy_vocabulary.yml index a90e618..18e663b 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_argument_taxonomy_vocabulary.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_argument_taxonomy_vocabulary.yml @@ -9,7 +9,7 @@ label: test_argument_taxonomy_vocabulary module: views description: '' tag: '' -base_table: taxonomy_term_field_data +baseTable: taxonomy_term_field_data base_field: tid core: 8.x display: diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_field_filters.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_field_filters.yml index b2a7c9e..0a2b58c 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_field_filters.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_field_filters.yml @@ -9,7 +9,7 @@ label: 'Test field filters' module: views description: '' tag: '' -base_table: taxonomy_term_field_data +baseTable: taxonomy_term_field_data base_field: tid core: 8.x display: diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid.yml index ab5e1d8..66a36f4 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid.yml @@ -10,7 +10,7 @@ label: test_filter_taxonomy_index_tid module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid__non_existing_dependency.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid__non_existing_dependency.yml index a5c5828..bb1e7e0 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid__non_existing_dependency.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid__non_existing_dependency.yml @@ -10,7 +10,7 @@ label: test_filter_taxonomy_index_tid__non_existing_dependency module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid_depth.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid_depth.yml index 856543a..d2a763a 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid_depth.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid_depth.yml @@ -10,7 +10,7 @@ label: test_filter_taxonomy_index_tid_depth module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_groupwise_term.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_groupwise_term.yml index 5ba97e0..a0bdad1 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_groupwise_term.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_groupwise_term.yml @@ -10,7 +10,7 @@ label: test_groupwise module: views description: '' tag: default -base_table: taxonomy_term_field_data +baseTable: taxonomy_term_field_data base_field: tid core: 8.0-dev display: diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_node_term_data.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_node_term_data.yml index beb3c63..7adb42d 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_node_term_data.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_node_term_data.yml @@ -10,7 +10,7 @@ label: test_taxonomy_node_term_data module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_parent.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_parent.yml index 65df6a8..14b4bf8 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_parent.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_parent.yml @@ -9,7 +9,7 @@ label: test_taxonomy_parent module: views description: '' tag: '' -base_table: taxonomy_term_data +baseTable: taxonomy_term_data base_field: tid core: 8.x display: diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_term_name.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_term_name.yml index fbb9142..9586ef2 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_term_name.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_term_name.yml @@ -9,7 +9,7 @@ label: test_taxonomy_term_name module: views description: '' tag: '' -base_table: taxonomy_term_field_data +baseTable: taxonomy_term_field_data base_field: tid core: 8.x display: diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_term_relationship.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_term_relationship.yml index 664ae27..da4cdec 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_term_relationship.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_term_relationship.yml @@ -10,7 +10,7 @@ label: test_taxonomy_term_relationship module: views description: '' tag: '' -base_table: taxonomy_term_field_data +baseTable: taxonomy_term_field_data base_field: tid core: 8.x display: diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_tid_field.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_tid_field.yml index d54e4b4..9b70143 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_tid_field.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_tid_field.yml @@ -9,7 +9,7 @@ label: test_taxonomy_tid_field module: views description: '' tag: '' -base_table: taxonomy_term_field_data +baseTable: taxonomy_term_field_data base_field: tid core: 8.x display: diff --git a/core/modules/tracker/tests/modules/tracker_test_views/test_views/views.view.test_tracker_user_uid.yml b/core/modules/tracker/tests/modules/tracker_test_views/test_views/views.view.test_tracker_user_uid.yml index 04bdd4d..d8d39d9 100644 --- a/core/modules/tracker/tests/modules/tracker_test_views/test_views/views.view.test_tracker_user_uid.yml +++ b/core/modules/tracker/tests/modules/tracker_test_views/test_views/views.view.test_tracker_user_uid.yml @@ -10,7 +10,7 @@ label: 'tracker test' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/tracker/tracker.pages.inc b/core/modules/tracker/tracker.pages.inc index de08c63..6a91b34 100644 --- a/core/modules/tracker/tracker.pages.inc +++ b/core/modules/tracker/tracker.pages.inc @@ -24,13 +24,13 @@ function tracker_page($account = NULL) { if ($account) { $query = db_select('tracker_user', 't') ->extend('Drupal\Core\Database\Query\PagerSelectExtender') - ->addMetaData('base_table', 'tracker_user') + ->addMetaData('baseTable', 'tracker_user') ->condition('t.uid', $account->id()); } else { $query = db_select('tracker_node', 't', ['target' => 'replica']) ->extend('Drupal\Core\Database\Query\PagerSelectExtender') - ->addMetaData('base_table', 'tracker_node'); + ->addMetaData('baseTable', 'tracker_node'); } // This array acts as a placeholder for the data selected later diff --git a/core/modules/user/config/optional/views.view.user_admin_people.yml b/core/modules/user/config/optional/views.view.user_admin_people.yml index e829a20..024341e 100644 --- a/core/modules/user/config/optional/views.view.user_admin_people.yml +++ b/core/modules/user/config/optional/views.view.user_admin_people.yml @@ -8,7 +8,7 @@ label: People module: user description: 'Find and manage people interacting with your site.' tag: default -base_table: users_field_data +baseTable: users_field_data base_field: uid core: 8.x display: diff --git a/core/modules/user/config/optional/views.view.who_s_new.yml b/core/modules/user/config/optional/views.view.who_s_new.yml index 7d4ed34..da7b9b2 100644 --- a/core/modules/user/config/optional/views.view.who_s_new.yml +++ b/core/modules/user/config/optional/views.view.who_s_new.yml @@ -8,7 +8,7 @@ label: 'Who''s new' module: user description: 'Shows a list of the newest user accounts on the site.' tag: default -base_table: users_field_data +baseTable: users_field_data base_field: uid core: 8.x display: diff --git a/core/modules/user/config/optional/views.view.who_s_online.yml b/core/modules/user/config/optional/views.view.who_s_online.yml index 3116036..61c47f9 100644 --- a/core/modules/user/config/optional/views.view.who_s_online.yml +++ b/core/modules/user/config/optional/views.view.who_s_online.yml @@ -8,7 +8,7 @@ label: 'Who''s online block' module: user description: 'Shows the user names of the most recently active users, and the total number of active users.' tag: default -base_table: users_field_data +baseTable: users_field_data base_field: uid core: 8.x display: diff --git a/core/modules/user/src/Entity/User.php b/core/modules/user/src/Entity/User.php index 54439cf..7d1078d 100644 --- a/core/modules/user/src/Entity/User.php +++ b/core/modules/user/src/Entity/User.php @@ -39,7 +39,7 @@ * "translation" = "Drupal\user\ProfileTranslationHandler" * }, * admin_permission = "administer users", - * base_table = "users", + * baseTable = "users", * data_table = "users_field_data", * label_callback = "user_format_name", * translatable = TRUE, diff --git a/core/modules/user/src/Plugin/EntityReferenceSelection/UserSelection.php b/core/modules/user/src/Plugin/EntityReferenceSelection/UserSelection.php index d06a81c..ed512dc 100644 --- a/core/modules/user/src/Plugin/EntityReferenceSelection/UserSelection.php +++ b/core/modules/user/src/Plugin/EntityReferenceSelection/UserSelection.php @@ -243,7 +243,7 @@ public function entityQueryAlter(SelectInterface $query) { $value_part->compile($this->connection, $query); $or->condition((new Condition('AND')) ->where(str_replace('anonymous_name', ':anonymous_name', (string) $value_part), $value_part->arguments() + [':anonymous_name' => \Drupal::config('user.settings')->get('anonymous')]) - ->condition('base_table.uid', 0) + ->condition('baseTable.uid', 0) ); $query->condition($or); } diff --git a/core/modules/user/src/Plugin/views/wizard/Users.php b/core/modules/user/src/Plugin/views/wizard/Users.php index 00b6863..7bd0731 100644 --- a/core/modules/user/src/Plugin/views/wizard/Users.php +++ b/core/modules/user/src/Plugin/views/wizard/Users.php @@ -13,7 +13,7 @@ * * @ViewsWizard( * id = "users", - * base_table = "users_field_data", + * baseTable = "users_field_data", * title = @Translation("Users") * ) */ diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_perm.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_perm.yml index 7862066..032b3cf 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_perm.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_perm.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_role.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_role.yml index f07b429..472abf4 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_role.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_role.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_field_permission.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_field_permission.yml index 04948cd..b490a27 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_field_permission.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_field_permission.yml @@ -8,7 +8,7 @@ label: null module: views description: '' tag: '' -base_table: users_field_data +baseTable: users_field_data base_field: uid core: 8.x display: diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_filter_current_user.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_filter_current_user.yml index 1e3e5bb..8805567 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_filter_current_user.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_filter_current_user.yml @@ -8,7 +8,7 @@ label: Users module: views description: '' tag: '' -base_table: users_field_data +baseTable: users_field_data base_field: uid core: 8.x display: diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_filter_permission.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_filter_permission.yml index a389464..2ec70d9 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_filter_permission.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_filter_permission.yml @@ -8,7 +8,7 @@ label: null module: views description: '' tag: '' -base_table: users_field_data +baseTable: users_field_data base_field: uid core: 8.x display: diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_groupwise_user.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_groupwise_user.yml index 7487fc4..142164a 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_groupwise_user.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_groupwise_user.yml @@ -9,7 +9,7 @@ label: test_groupwise_user module: views description: '' tag: default -base_table: users_field_data +baseTable: users_field_data base_field: uid core: 8.0-dev display: diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml index a080e26..fe36523 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_bulk_form.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_bulk_form.yml index 1fbbb74..dfc63be 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_bulk_form.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_bulk_form.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: users_field_data +baseTable: users_field_data base_field: uid core: 8.x display: diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_bulk_form_combine_filter.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_bulk_form_combine_filter.yml index 075b4f6..9e9ce78 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_bulk_form_combine_filter.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_bulk_form_combine_filter.yml @@ -8,7 +8,7 @@ label: test_user_bulk_form_combine_filter module: views description: '' tag: '' -base_table: users_field_data +baseTable: users_field_data base_field: uid core: 8.x display: diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_changed.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_changed.yml index 5df2ab4..d6c1020 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_changed.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_changed.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: users_field_data +baseTable: users_field_data base_field: nid core: '8' display: diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_data.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_data.yml index c33be6f..929e3b1 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_data.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_data.yml @@ -8,7 +8,7 @@ label: test_user_data module: views description: '' tag: '' -base_table: users_field_data +baseTable: users_field_data base_field: uid core: 8.x display: diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_name.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_name.yml index 55b5d1a..53553ac 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_name.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_name.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: users_field_data +baseTable: users_field_data base_field: nid core: '8' display: diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_relationship.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_relationship.yml index 6926bb1..baf07e8 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_relationship.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_relationship.yml @@ -9,7 +9,7 @@ label: test_user_relationship module: views description: '' tag: default -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_roles_rid.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_roles_rid.yml index ac67048..bc74efb 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_roles_rid.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_roles_rid.yml @@ -8,7 +8,7 @@ label: test_user_roles_rid module: views description: '' tag: '' -base_table: users_field_data +baseTable: users_field_data base_field: uid core: 8.x display: diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_uid_argument.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_uid_argument.yml index 4ff201c..08057a9 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_uid_argument.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_uid_argument.yml @@ -8,7 +8,7 @@ label: null module: views description: '' tag: '' -base_table: users_field_data +baseTable: users_field_data base_field: nid core: '8' display: diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_user.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_user.yml index 60f9bf8..1c52030 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_user.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_user.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_username.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_username.yml index d7fc245..b9a81c3 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_username.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_username.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_role.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_role.yml index eefc1af..69efc93 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_role.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_role.yml @@ -8,7 +8,7 @@ label: test_views_handler_field_role module: views description: '' tag: '' -base_table: users_field_data +baseTable: users_field_data base_field: uid core: 8.x display: diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml index fe96f4e..d730d05 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml @@ -8,7 +8,7 @@ label: test_views_handler_field_user_name module: views description: '' tag: default -base_table: users_field_data +baseTable: users_field_data base_field: nid core: '8' display: diff --git a/core/modules/user/tests/src/Unit/Plugin/views/field/UserBulkFormTest.php b/core/modules/user/tests/src/Unit/Plugin/views/field/UserBulkFormTest.php index 11a970a..19ba7cf 100644 --- a/core/modules/user/tests/src/Unit/Plugin/views/field/UserBulkFormTest.php +++ b/core/modules/user/tests/src/Unit/Plugin/views/field/UserBulkFormTest.php @@ -69,7 +69,7 @@ public function testConstructor() { $storage = $this->getMock('Drupal\views\ViewEntityInterface'); $storage->expects($this->any()) ->method('get') - ->with('base_table') + ->with('baseTable') ->will($this->returnValue('users')); $executable = $this->getMockBuilder('Drupal\views\ViewExecutable') diff --git a/core/modules/views/config/schema/views.schema.yml b/core/modules/views/config/schema/views.schema.yml index 6a6c321..575c209 100644 --- a/core/modules/views/config/schema/views.schema.yml +++ b/core/modules/views/config/schema/views.schema.yml @@ -84,7 +84,7 @@ views.view.*: tag: type: string label: 'Tag' - base_table: + baseTable: type: string label: 'Base table' base_field: diff --git a/core/modules/views/src/Annotation/ViewsAccess.php b/core/modules/views/src/Annotation/ViewsAccess.php index 9cfcb24..3f405ed 100644 --- a/core/modules/views/src/Annotation/ViewsAccess.php +++ b/core/modules/views/src/Annotation/ViewsAccess.php @@ -36,7 +36,7 @@ class ViewsAccess extends ViewsPluginAnnotationBase { * * @ingroup plugin_translatable */ - public $short_title = ''; + public $shortTitle = ''; /** * A short help string; this is displayed in the views UI. @@ -55,7 +55,7 @@ class ViewsAccess extends ViewsPluginAnnotationBase { * * @var array */ - public $display_types; + public $displayTypes; /** * The base tables on which this access plugin can be used. @@ -73,6 +73,6 @@ class ViewsAccess extends ViewsPluginAnnotationBase { * * @var bool */ - public $no_ui; + public $noUi; } diff --git a/core/modules/views/src/Annotation/ViewsArgumentDefault.php b/core/modules/views/src/Annotation/ViewsArgumentDefault.php index 96bf8ab..84e7c7b 100644 --- a/core/modules/views/src/Annotation/ViewsArgumentDefault.php +++ b/core/modules/views/src/Annotation/ViewsArgumentDefault.php @@ -36,7 +36,7 @@ class ViewsArgumentDefault extends ViewsPluginAnnotationBase { * * @ingroup plugin_translatable */ - public $short_title = ''; + public $shortTitle = ''; /** * Whether the plugin should be not selectable in the UI. @@ -45,6 +45,6 @@ class ViewsArgumentDefault extends ViewsPluginAnnotationBase { * * @var bool */ - public $no_ui; + public $noUi; } diff --git a/core/modules/views/src/Annotation/ViewsArgumentValidator.php b/core/modules/views/src/Annotation/ViewsArgumentValidator.php index f8edde4..ae4bb78 100644 --- a/core/modules/views/src/Annotation/ViewsArgumentValidator.php +++ b/core/modules/views/src/Annotation/ViewsArgumentValidator.php @@ -36,7 +36,7 @@ class ViewsArgumentValidator extends ViewsPluginAnnotationBase { * * @ingroup plugin_translatable */ - public $short_title = ''; + public $shortTitle = ''; /** * Whether the plugin should be not selectable in the UI. @@ -45,6 +45,6 @@ class ViewsArgumentValidator extends ViewsPluginAnnotationBase { * * @var bool */ - public $no_ui; + public $noUi; } diff --git a/core/modules/views/src/Annotation/ViewsCache.php b/core/modules/views/src/Annotation/ViewsCache.php index a401241..f3987d1 100644 --- a/core/modules/views/src/Annotation/ViewsCache.php +++ b/core/modules/views/src/Annotation/ViewsCache.php @@ -36,7 +36,7 @@ class ViewsCache extends ViewsPluginAnnotationBase { * * @ingroup plugin_translatable */ - public $short_title = ''; + public $shortTitle = ''; /** * A short help string; this is displayed in the views UI. @@ -55,7 +55,7 @@ class ViewsCache extends ViewsPluginAnnotationBase { * * @var array */ - public $display_types; + public $displayTypes; /** * The base tables on which this cache plugin can be used. @@ -73,6 +73,6 @@ class ViewsCache extends ViewsPluginAnnotationBase { * * @var bool */ - public $no_ui; + public $noUi; } diff --git a/core/modules/views/src/Annotation/ViewsDisplay.php b/core/modules/views/src/Annotation/ViewsDisplay.php index 5821026..ad5fce9 100644 --- a/core/modules/views/src/Annotation/ViewsDisplay.php +++ b/core/modules/views/src/Annotation/ViewsDisplay.php @@ -36,7 +36,7 @@ class ViewsDisplay extends ViewsPluginAnnotationBase { * * @ingroup plugin_translatable */ - public $short_title = ''; + public $shortTitle = ''; /** * The administrative name of the display. @@ -64,21 +64,21 @@ class ViewsDisplay extends ViewsPluginAnnotationBase { * * @var bool */ - public $uses_menu_links; + public $usesMenuLinks; /** * Does the display plugin registers routes to the route. * * @var bool */ - public $uses_route; + public $usesRoute; /** * Does the display plugin provide blocks. * * @var bool */ - public $uses_hook_block; + public $usesHookBlock; /** * A list of places where contextual links should be added. @@ -97,7 +97,7 @@ class ViewsDisplay extends ViewsPluginAnnotationBase { * * @var array */ - public $contextual_links_locations; + public $contextualLinksLocations; /** * The base tables on which this display plugin can be used. @@ -122,13 +122,13 @@ class ViewsDisplay extends ViewsPluginAnnotationBase { * * @var bool */ - public $no_ui; + public $noUi; /** * Whether the display returns a response object. * * @var bool */ - public $returns_response; + public $returnsResponse; } diff --git a/core/modules/views/src/Annotation/ViewsDisplayExtender.php b/core/modules/views/src/Annotation/ViewsDisplayExtender.php index f28a175..1f04f5f 100644 --- a/core/modules/views/src/Annotation/ViewsDisplayExtender.php +++ b/core/modules/views/src/Annotation/ViewsDisplayExtender.php @@ -36,7 +36,7 @@ class ViewsDisplayExtender extends ViewsPluginAnnotationBase { * * @ingroup plugin_translatable */ - public $short_title = ''; + public $shortTitle = ''; /** * A short help string; this is displayed in the views UI. @@ -54,6 +54,6 @@ class ViewsDisplayExtender extends ViewsPluginAnnotationBase { * * @var bool */ - public $no_ui; + public $noUi; } diff --git a/core/modules/views/src/Annotation/ViewsExposedForm.php b/core/modules/views/src/Annotation/ViewsExposedForm.php index a6f0fce..34dc08b 100644 --- a/core/modules/views/src/Annotation/ViewsExposedForm.php +++ b/core/modules/views/src/Annotation/ViewsExposedForm.php @@ -37,7 +37,7 @@ class ViewsExposedForm extends ViewsPluginAnnotationBase { * * @ingroup plugin_translatable */ - public $short_title = ''; + public $shortTitle = ''; /** * A short help string; this is displayed in the views UI. @@ -56,7 +56,7 @@ class ViewsExposedForm extends ViewsPluginAnnotationBase { * * @var array */ - public $display_types; + public $displayTypes; /** * The base tables on which this exposed form plugin can be used. @@ -74,6 +74,6 @@ class ViewsExposedForm extends ViewsPluginAnnotationBase { * * @var bool */ - public $no_ui; + public $noUi; } diff --git a/core/modules/views/src/Annotation/ViewsPager.php b/core/modules/views/src/Annotation/ViewsPager.php index 6591d8b..a56ca42 100644 --- a/core/modules/views/src/Annotation/ViewsPager.php +++ b/core/modules/views/src/Annotation/ViewsPager.php @@ -36,7 +36,7 @@ class ViewsPager extends ViewsPluginAnnotationBase { * * @ingroup plugin_translatable */ - public $short_title = ''; + public $shortTitle = ''; /** * A short help string; this is displayed in the views UI. @@ -62,7 +62,7 @@ class ViewsPager extends ViewsPluginAnnotationBase { * * @var array */ - public $display_types; + public $displayTypes; /** * The base tables on which this pager plugin can be used. @@ -80,6 +80,6 @@ class ViewsPager extends ViewsPluginAnnotationBase { * * @var bool */ - public $no_ui; + public $noUi; } diff --git a/core/modules/views/src/Annotation/ViewsPluginAnnotationBase.php b/core/modules/views/src/Annotation/ViewsPluginAnnotationBase.php index f0569ec..5c997d4 100644 --- a/core/modules/views/src/Annotation/ViewsPluginAnnotationBase.php +++ b/core/modules/views/src/Annotation/ViewsPluginAnnotationBase.php @@ -15,6 +15,6 @@ * * @var bool (optional) */ - public $register_theme = TRUE; + public $registerTheme = TRUE; } diff --git a/core/modules/views/src/Annotation/ViewsQuery.php b/core/modules/views/src/Annotation/ViewsQuery.php index efe5230..770ba08 100644 --- a/core/modules/views/src/Annotation/ViewsQuery.php +++ b/core/modules/views/src/Annotation/ViewsQuery.php @@ -36,7 +36,7 @@ class ViewsQuery extends ViewsPluginAnnotationBase { * * @ingroup plugin_translatable */ - public $short_title = ''; + public $shortTitle = ''; /** * A short help string; this is displayed in the views UI. @@ -54,6 +54,6 @@ class ViewsQuery extends ViewsPluginAnnotationBase { * * @var bool */ - public $no_ui; + public $noUi; } diff --git a/core/modules/views/src/Annotation/ViewsRow.php b/core/modules/views/src/Annotation/ViewsRow.php index c4d5662..449a2fa 100644 --- a/core/modules/views/src/Annotation/ViewsRow.php +++ b/core/modules/views/src/Annotation/ViewsRow.php @@ -36,7 +36,7 @@ class ViewsRow extends ViewsPluginAnnotationBase { * * @ingroup plugin_translatable */ - public $short_title = ''; + public $shortTitle = ''; /** * A short help string; this is displayed in the views UI. @@ -69,7 +69,7 @@ class ViewsRow extends ViewsPluginAnnotationBase { * * @var array */ - public $display_types; + public $displayTypes; /** * Whether the plugin should be not selectable in the UI. @@ -78,6 +78,6 @@ class ViewsRow extends ViewsPluginAnnotationBase { * * @var bool */ - public $no_ui; + public $noUi; } diff --git a/core/modules/views/src/Annotation/ViewsStyle.php b/core/modules/views/src/Annotation/ViewsStyle.php index 31c05fb..3abf329 100644 --- a/core/modules/views/src/Annotation/ViewsStyle.php +++ b/core/modules/views/src/Annotation/ViewsStyle.php @@ -36,7 +36,7 @@ class ViewsStyle extends ViewsPluginAnnotationBase { * * @ingroup plugin_translatable */ - public $short_title = ''; + public $shortTitle = ''; /** * A short help string; this is displayed in the views UI. @@ -62,7 +62,7 @@ class ViewsStyle extends ViewsPluginAnnotationBase { * * @var array */ - public $display_types; + public $displayTypes; /** * The base tables on which this style plugin can be used. @@ -80,6 +80,6 @@ class ViewsStyle extends ViewsPluginAnnotationBase { * * @var bool */ - public $no_ui; + public $noUi; } diff --git a/core/modules/views/src/Annotation/ViewsWizard.php b/core/modules/views/src/Annotation/ViewsWizard.php index b3f363f..defd2a4 100644 --- a/core/modules/views/src/Annotation/ViewsWizard.php +++ b/core/modules/views/src/Annotation/ViewsWizard.php @@ -37,13 +37,13 @@ class ViewsWizard extends ViewsPluginAnnotationBase { * * @ingroup plugin_translatable */ - public $short_title = ''; + public $shortTitle = ''; /** * The base tables on which this wizard is used. * * @var array */ - public $base_table; + public $baseTable; } diff --git a/core/modules/views/src/Element/View.php b/core/modules/views/src/Element/View.php index 6cc87e5..760540d 100644 --- a/core/modules/views/src/Element/View.php +++ b/core/modules/views/src/Element/View.php @@ -80,7 +80,7 @@ public static function preRenderViewElement($element) { $element['#title'] = &$element['view_build']['#title']; } - if (empty($view->display_handler->getPluginDefinition()['returns_response'])) { + if (empty($view->display_handler->getPluginDefinition()['returnsResponse'])) { // views_add_contextual_links() needs the following information in // order to be attached to the view. $element['#view_id'] = $view->storage->id(); @@ -89,7 +89,7 @@ public static function preRenderViewElement($element) { views_add_contextual_links($element, 'view', $view->current_display); } } - if (empty($view->display_handler->getPluginDefinition()['returns_response'])) { + if (empty($view->display_handler->getPluginDefinition()['returnsResponse'])) { $element['#attributes']['class'][] = 'views-element-container'; $element['#theme_wrappers'] = ['container']; } diff --git a/core/modules/views/src/Entity/Render/TranslationLanguageRenderer.php b/core/modules/views/src/Entity/Render/TranslationLanguageRenderer.php index 5b4b356..7e45b32 100644 --- a/core/modules/views/src/Entity/Render/TranslationLanguageRenderer.php +++ b/core/modules/views/src/Entity/Render/TranslationLanguageRenderer.php @@ -60,15 +60,15 @@ protected function getLangcodeTable(QueryPluginBase $query, $relationship) { // use the revision table or the revision data table, depending on which one // is being used as query base table. if ($this->entityType->isRevisionable()) { - $query_base_table = isset($query->relationships[$relationship]['base']) ? + $queryBaseTable = isset($query->relationships[$relationship]['base']) ? $query->relationships[$relationship]['base'] : - $this->view->storage->get('base_table'); + $this->view->storage->get('baseTable'); $revision_table = $storage->getRevisionTable(); $revision_data_table = $storage->getRevisionDataTable(); - if ($query_base_table === $revision_table) { + if ($queryBaseTable === $revision_table) { $langcode_table = $revision_table; } - elseif ($query_base_table === $revision_data_table) { + elseif ($queryBaseTable === $revision_data_table) { $langcode_table = $revision_data_table; } } diff --git a/core/modules/views/src/Entity/View.php b/core/modules/views/src/Entity/View.php index c82d64c..9f38797 100644 --- a/core/modules/views/src/Entity/View.php +++ b/core/modules/views/src/Entity/View.php @@ -31,7 +31,7 @@ * "module", * "description", * "tag", - * "base_table", + * "baseTable", * "base_field", * "core", * "display", @@ -45,7 +45,7 @@ class View extends ConfigEntityBase implements ViewEntityInterface { * * @var string */ - protected $base_table = 'node'; + protected $baseTable = 'node'; /** * The unique ID of the view. @@ -485,7 +485,7 @@ public function mergeDefaultDisplaysOptions() { * {@inheritdoc} */ public function isInstallable() { - $table_definition = \Drupal::service('views.views_data')->get($this->base_table); + $table_definition = \Drupal::service('views.views_data')->get($this->baseTable); // Check whether the base table definition exists and contains a base table // definition. For example, taxonomy_views_data_alter() defines // node_field_data even if it doesn't exist as a base table. @@ -524,9 +524,9 @@ public function onDependencyRemoval(array $dependencies) { // If the base table for the View is provided by a module being removed, we // delete the View because this is not something that can be fixed manually. $views_data = Views::viewsData(); - $base_table = $this->get('base_table'); - $base_table_data = $views_data->get($base_table); - if (!empty($base_table_data['table']['provider']) && in_array($base_table_data['table']['provider'], $dependencies['module'])) { + $baseTable = $this->get('baseTable'); + $baseTable_data = $views_data->get($baseTable); + if (!empty($baseTable_data['table']['provider']) && in_array($baseTable_data['table']['provider'], $dependencies['module'])) { return FALSE; } diff --git a/core/modules/views/src/EntityViewsData.php b/core/modules/views/src/EntityViewsData.php index a12bd55..d51cb12 100644 --- a/core/modules/views/src/EntityViewsData.php +++ b/core/modules/views/src/EntityViewsData.php @@ -118,8 +118,8 @@ protected function getFieldStorageDefinitions() { public function getViewsData() { $data = []; - $base_table = $this->entityType->getBaseTable() ?: $this->entityType->id(); - $views_revision_base_table = NULL; + $baseTable = $this->entityType->getBaseTable() ?: $this->entityType->id(); + $viewsRevisionBaseTable = NULL; $revisionable = $this->entityType->isRevisionable(); $base_field = $this->entityType->getKey('id'); @@ -145,29 +145,29 @@ public function getViewsData() { $revision_field = $this->entityType->getKey('revision'); // Setup base information of the views data. - $data[$base_table]['table']['group'] = $this->entityType->getLabel(); - $data[$base_table]['table']['provider'] = $this->entityType->getProvider(); + $data[$baseTable]['table']['group'] = $this->entityType->getLabel(); + $data[$baseTable]['table']['provider'] = $this->entityType->getProvider(); - $views_base_table = $base_table; + $viewsBaseTable = $baseTable; if ($data_table) { - $views_base_table = $data_table; + $viewsBaseTable = $data_table; } - $data[$views_base_table]['table']['base'] = [ + $data[$viewsBaseTable]['table']['base'] = [ 'field' => $base_field, 'title' => $this->entityType->getLabel(), 'cache_contexts' => $this->entityType->getListCacheContexts(), ]; - $data[$base_table]['table']['entity revision'] = FALSE; + $data[$baseTable]['table']['entity revision'] = FALSE; if ($label_key = $this->entityType->getKey('label')) { if ($data_table) { - $data[$views_base_table]['table']['base']['defaults'] = [ + $data[$viewsBaseTable]['table']['base']['defaults'] = [ 'field' => $label_key, 'table' => $data_table, ]; } else { - $data[$views_base_table]['table']['base']['defaults'] = [ + $data[$viewsBaseTable]['table']['base']['defaults'] = [ 'field' => $label_key, ]; } @@ -176,7 +176,7 @@ public function getViewsData() { // Entity types must implement a list_builder in order to use Views' // entity operations field. if ($this->entityType->hasListBuilderClass()) { - $data[$base_table]['operations'] = [ + $data[$baseTable]['operations'] = [ 'field' => [ 'title' => $this->t('Operations links'), 'help' => $this->t('Provides links to perform entity operations.'), @@ -193,7 +193,7 @@ public function getViewsData() { } if ($this->entityType->hasViewBuilderClass()) { - $data[$base_table]['rendered_entity'] = [ + $data[$baseTable]['rendered_entity'] = [ 'field' => [ 'title' => $this->t('Rendered entity'), 'help' => $this->t('Renders an entity in a view mode.'), @@ -204,7 +204,7 @@ public function getViewsData() { // Setup relations to the revisions/property data. if ($data_table) { - $data[$base_table]['table']['join'][$data_table] = [ + $data[$baseTable]['table']['join'][$data_table] = [ 'left_field' => $base_field, 'field' => $base_field, 'type' => 'INNER' @@ -217,17 +217,17 @@ public function getViewsData() { $data[$revision_table]['table']['group'] = $this->t('@entity_type revision', ['@entity_type' => $this->entityType->getLabel()]); $data[$revision_table]['table']['provider'] = $this->entityType->getProvider(); - $views_revision_base_table = $revision_table; + $viewsRevisionBaseTable = $revision_table; if ($revision_data_table) { - $views_revision_base_table = $revision_data_table; + $viewsRevisionBaseTable = $revision_data_table; } - $data[$views_revision_base_table]['table']['entity revision'] = TRUE; - $data[$views_revision_base_table]['table']['base'] = [ + $data[$viewsRevisionBaseTable]['table']['entity revision'] = TRUE; + $data[$viewsRevisionBaseTable]['table']['base'] = [ 'field' => $revision_field, 'title' => $this->t('@entity_type revisions', ['@entity_type' => $this->entityType->getLabel()]), ]; // Join the revision table to the base table. - $data[$views_revision_base_table]['table']['join'][$views_base_table] = [ + $data[$viewsRevisionBaseTable]['table']['join'][$viewsBaseTable] = [ 'left_field' => $revision_field, 'field' => $revision_field, 'type' => 'INNER', @@ -252,7 +252,7 @@ public function getViewsData() { ]; } - $this->addEntityLinks($data[$base_table]); + $this->addEntityLinks($data[$baseTable]); // Load all typed data definitions of all fields. This should cover each of // the entity base, revision, data tables. @@ -274,7 +274,7 @@ public function getViewsData() { // To avoid confusing duplication in the user interface, for fields // that are on both base and data tables, only add them on the data // table (same for revision vs. revision data). - if ($data_table && ($table === $base_table || $table === $revision_table) && in_array($field_name, $duplicate_fields)) { + if ($data_table && ($table === $baseTable || $table === $revision_table) && in_array($field_name, $duplicate_fields)) { continue; } $this->mapFieldDefinition($table, $field_name, $field_definitions[$field_name], $table_mapping, $data[$table]); @@ -287,7 +287,7 @@ public function getViewsData() { $data[$table]['table']['group'] = $this->entityType->getLabel(); $data[$table]['table']['provider'] = $this->entityType->getProvider(); - $data[$table]['table']['join'][$views_base_table] = [ + $data[$table]['table']['join'][$viewsBaseTable] = [ 'left_field' => $base_field, 'field' => 'entity_id', 'extra' => [ @@ -300,7 +300,7 @@ public function getViewsData() { $data[$revision_table]['table']['group'] = $this->t('@entity_type revision', ['@entity_type' => $this->entityType->getLabel()]); $data[$revision_table]['table']['provider'] = $this->entityType->getProvider(); - $data[$revision_table]['table']['join'][$views_revision_base_table] = [ + $data[$revision_table]['table']['join'][$viewsRevisionBaseTable] = [ 'left_field' => $revision_field, 'field' => 'entity_id', 'extra' => [ diff --git a/core/modules/views/src/EventSubscriber/ViewsEntitySchemaSubscriber.php b/core/modules/views/src/EventSubscriber/ViewsEntitySchemaSubscriber.php index 6060ae4..2e1399b 100644 --- a/core/modules/views/src/EventSubscriber/ViewsEntitySchemaSubscriber.php +++ b/core/modules/views/src/EventSubscriber/ViewsEntitySchemaSubscriber.php @@ -212,7 +212,7 @@ public function onEntityTypeDelete(EntityTypeInterface $entity_type) { foreach ($all_views as $id => $view) { // First check just the base table. - if (in_array($view->get('base_table'), $tables)) { + if (in_array($view->get('baseTable'), $tables)) { $view->disable(); $view->save(); } @@ -254,21 +254,21 @@ protected function processHandlers(array $all_views, callable $process) { * All views. * @param string $entity_type_id * The entity type ID. - * @param string $old_base_table + * @param string $oldBaseTable * The old base table name. - * @param string $new_base_table + * @param string $newBaseTable * The new base table name. */ - protected function baseTableRename($all_views, $entity_type_id, $old_base_table, $new_base_table) { + protected function baseTableRename($all_views, $entity_type_id, $oldBaseTable, $newBaseTable) { foreach ($all_views as $view) { - if ($view->get('base_table') == $old_base_table) { - $view->set('base_table', $new_base_table); + if ($view->get('baseTable') == $oldBaseTable) { + $view->set('baseTable', $newBaseTable); } } - $this->processHandlers($all_views, function (array &$handler_config) use ($entity_type_id, $old_base_table, $new_base_table) { - if (isset($handler_config['entity_type']) && $handler_config['entity_type'] == $entity_type_id && $handler_config['table'] == $old_base_table) { - $handler_config['table'] = $new_base_table; + $this->processHandlers($all_views, function (array &$handler_config) use ($entity_type_id, $oldBaseTable, $newBaseTable) { + if (isset($handler_config['entity_type']) && $handler_config['entity_type'] == $entity_type_id && $handler_config['table'] == $oldBaseTable) { + $handler_config['table'] = $newBaseTable; } }); } @@ -287,8 +287,8 @@ protected function baseTableRename($all_views, $entity_type_id, $old_base_table, */ protected function dataTableRename($all_views, $entity_type_id, $old_data_table, $new_data_table) { foreach ($all_views as $view) { - if ($view->get('base_table') == $old_data_table) { - $view->set('base_table', $new_data_table); + if ($view->get('baseTable') == $old_data_table) { + $view->set('baseTable', $new_data_table); } } @@ -308,24 +308,24 @@ protected function dataTableRename($all_views, $entity_type_id, $old_data_table, * The entity type. * @param string $new_data_table * The new data table. - * @param string $base_table + * @param string $baseTable * The base table. */ - protected function dataTableAddition($all_views, EntityTypeInterface $entity_type, $new_data_table, $base_table) { + protected function dataTableAddition($all_views, EntityTypeInterface $entity_type, $new_data_table, $baseTable) { /** @var \Drupal\Core\Entity\Sql\SqlContentEntityStorage $storage */ $entity_type_id = $entity_type->id(); $storage = $this->entityManager->getStorage($entity_type_id); $storage->setEntityType($entity_type); $table_mapping = $storage->getTableMapping(); $data_table_fields = $table_mapping->getFieldNames($new_data_table); - $base_table_fields = $table_mapping->getFieldNames($base_table); + $baseTable_fields = $table_mapping->getFieldNames($baseTable); $data_table = $new_data_table; - $this->processHandlers($all_views, function (array &$handler_config) use ($entity_type_id, $base_table, $data_table, $base_table_fields, $data_table_fields) { + $this->processHandlers($all_views, function (array &$handler_config) use ($entity_type_id, $baseTable, $data_table, $baseTable_fields, $data_table_fields) { if (isset($handler_config['entity_type']) && isset($handler_config['entity_field']) && $handler_config['entity_type'] == $entity_type_id) { // Move all fields which just exists on the data table. - if ($handler_config['table'] == $base_table && in_array($handler_config['entity_field'], $data_table_fields) && !in_array($handler_config['entity_field'], $base_table_fields)) { + if ($handler_config['table'] == $baseTable && in_array($handler_config['entity_field'], $data_table_fields) && !in_array($handler_config['entity_field'], $baseTable_fields)) { $handler_config['table'] = $data_table; } } @@ -341,15 +341,15 @@ protected function dataTableAddition($all_views, EntityTypeInterface $entity_typ * The entity type ID. * @param string $old_data_table * The name of the previous existing data table. - * @param string $base_table + * @param string $baseTable * The name of the base table. */ - protected function dataTableRemoval($all_views, $entity_type_id, $old_data_table, $base_table) { + protected function dataTableRemoval($all_views, $entity_type_id, $old_data_table, $baseTable) { // We move back the data table back to the base table. - $this->processHandlers($all_views, function (array &$handler_config) use ($entity_type_id, $old_data_table, $base_table) { + $this->processHandlers($all_views, function (array &$handler_config) use ($entity_type_id, $old_data_table, $baseTable) { if (isset($handler_config['entity_type']) && $handler_config['entity_type'] == $entity_type_id) { if ($handler_config['table'] == $old_data_table) { - $handler_config['table'] = $base_table; + $handler_config['table'] = $baseTable; } } }); @@ -364,11 +364,11 @@ protected function dataTableRemoval($all_views, $entity_type_id, $old_data_table * The origin entity type. */ protected function revisionRemoval($all_views, EntityTypeInterface $original) { - $revision_base_table = $original->getRevisionTable(); + $revisionBaseTable = $original->getRevisionTable(); $revision_data_table = $original->getRevisionDataTable(); foreach ($all_views as $view) { - if (in_array($view->get('base_table'), [$revision_base_table, $revision_data_table])) { + if (in_array($view->get('baseTable'), [$revisionBaseTable, $revision_data_table])) { // Let's disable the views as we no longer support revisions. $view->setStatus(FALSE); } diff --git a/core/modules/views/src/ManyToOneHelper.php b/core/modules/views/src/ManyToOneHelper.php index cb2e575..ee8aeb3 100644 --- a/core/modules/views/src/ManyToOneHelper.php +++ b/core/modules/views/src/ManyToOneHelper.php @@ -75,17 +75,17 @@ public function addTable($join = NULL, $alias = NULL) { // Determine the primary table to seek if (empty($this->handler->query->relationships[$relationship])) { - $base_table = $this->handler->view->storage->get('base_table'); + $baseTable = $this->handler->view->storage->get('baseTable'); } else { - $base_table = $this->handler->query->relationships[$relationship]['base']; + $baseTable = $this->handler->query->relationships[$relationship]['base']; } // Cycle through the joins. This isn't as error-safe as the normal // ensurePath logic. Perhaps it should be. $r_join = clone $join; - while ($r_join->leftTable != $base_table) { - $r_join = HandlerBase::getTableJoin($r_join->leftTable, $base_table); + while ($r_join->leftTable != $baseTable) { + $r_join = HandlerBase::getTableJoin($r_join->leftTable, $baseTable); } // If we found that there are tables in between, add the relationship. if ($r_join->table != $join->table) { diff --git a/core/modules/views/src/Plugin/Derivative/DefaultWizardDeriver.php b/core/modules/views/src/Plugin/Derivative/DefaultWizardDeriver.php index f6a045c..a054ccc 100644 --- a/core/modules/views/src/Plugin/Derivative/DefaultWizardDeriver.php +++ b/core/modules/views/src/Plugin/Derivative/DefaultWizardDeriver.php @@ -16,14 +16,14 @@ class DefaultWizardDeriver extends DeriverBase { */ public function getDerivativeDefinitions($base_plugin_definition) { $views_data = Views::viewsData(); - $base_tables = array_keys($views_data->fetchBaseTables()); + $baseTables = array_keys($views_data->fetchBaseTables()); $this->derivatives = []; - foreach ($base_tables as $table) { + foreach ($baseTables as $table) { $views_info = $views_data->get($table); if (empty($views_info['table']['wizard_id'])) { $this->derivatives[$table] = [ 'id' => 'standard', - 'base_table' => $table, + 'baseTable' => $table, 'title' => $views_info['table']['base']['title'], 'class' => 'Drupal\views\Plugin\views\wizard\Standard' ]; diff --git a/core/modules/views/src/Plugin/Derivative/ViewsEntityRow.php b/core/modules/views/src/Plugin/Derivative/ViewsEntityRow.php index 67e7c33..fbe8d7a 100644 --- a/core/modules/views/src/Plugin/Derivative/ViewsEntityRow.php +++ b/core/modules/views/src/Plugin/Derivative/ViewsEntityRow.php @@ -88,7 +88,7 @@ public function getDerivativeDefinition($derivative_id, $base_plugin_definition) public function getDerivativeDefinitions($base_plugin_definition) { foreach ($this->entityManager->getDefinitions() as $entity_type_id => $entity_type) { // Just add support for entity types which have a views integration. - if (($base_table = $entity_type->getBaseTable()) && $this->viewsData->get($base_table) && $this->entityManager->hasHandler($entity_type_id, 'view_builder')) { + if (($baseTable = $entity_type->getBaseTable()) && $this->viewsData->get($baseTable) && $this->entityManager->hasHandler($entity_type_id, 'view_builder')) { $this->derivatives[$entity_type_id] = [ 'id' => 'entity:' . $entity_type_id, 'provider' => 'views', @@ -96,7 +96,7 @@ public function getDerivativeDefinitions($base_plugin_definition) { 'help' => t('Display the @label', ['@label' => $entity_type->getLabel()]), 'base' => [$entity_type->getDataTable() ?: $entity_type->getBaseTable()], 'entity_type' => $entity_type_id, - 'display_types' => ['normal'], + 'displayTypes' => ['normal'], 'class' => $base_plugin_definition['class'], ]; } diff --git a/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php b/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php index 9911f61..eab5266 100644 --- a/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php +++ b/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php @@ -60,7 +60,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta foreach ($displays as $data) { list($view_id, $display_id) = $data; $view = $view_storage->load($view_id); - if (in_array($view->get('base_table'), [$entity_type->getBaseTable(), $entity_type->getDataTable()])) { + if (in_array($view->get('baseTable'), [$entity_type->getBaseTable(), $entity_type->getDataTable()])) { $display = $view->get('display'); $options[$view_id . ':' . $display_id] = $view_id . ' - ' . $display[$display_id]['display_title']; } diff --git a/core/modules/views/src/Plugin/views/HandlerBase.php b/core/modules/views/src/Plugin/views/HandlerBase.php index 4cc4e4b..d57d0af 100644 --- a/core/modules/views/src/Plugin/views/HandlerBase.php +++ b/core/modules/views/src/Plugin/views/HandlerBase.php @@ -584,13 +584,13 @@ public function getJoin() { // get the join from this table that links back to the base table. // Determine the primary table to seek if (empty($this->query->relationships[$this->relationship])) { - $base_table = $this->view->storage->get('base_table'); + $baseTable = $this->view->storage->get('baseTable'); } else { - $base_table = $this->query->relationships[$this->relationship]['base']; + $baseTable = $this->query->relationships[$this->relationship]['base']; } - $join = $this->getTableJoin($this->table, $base_table); + $join = $this->getTableJoin($this->table, $baseTable); if ($join) { return clone $join; } @@ -656,10 +656,10 @@ public function setViewsData(ViewsData $views_data) { /** * {@inheritdoc} */ - public static function getTableJoin($table, $base_table) { + public static function getTableJoin($table, $baseTable) { $data = Views::viewsData()->get($table); - if (isset($data['table']['join'][$base_table])) { - $join_info = $data['table']['join'][$base_table]; + if (isset($data['table']['join'][$baseTable])) { + $join_info = $data['table']['join'][$baseTable]; if (!empty($join_info['join_id'])) { $id = $join_info['join_id']; } @@ -674,7 +674,7 @@ public static function getTableJoin($table, $base_table) { } // If this is empty, it's a direct link. if (empty($configuration['left_table'])) { - $configuration['left_table'] = $base_table; + $configuration['left_table'] = $baseTable; } if (isset($join_info['arguments'])) { @@ -701,7 +701,7 @@ public function getEntityType() { $views_data = $this->getViewsData()->get($table_data[$relationship['field']]['relationship']['base']); } else { - $views_data = $this->getViewsData()->get($this->view->storage->get('base_table')); + $views_data = $this->getViewsData()->get($this->view->storage->get('baseTable')); } if (isset($views_data['table']['entity type'])) { diff --git a/core/modules/views/src/Plugin/views/PluginBase.php b/core/modules/views/src/Plugin/views/PluginBase.php index 7c17d2b..540a7a4 100644 --- a/core/modules/views/src/Plugin/views/PluginBase.php +++ b/core/modules/views/src/Plugin/views/PluginBase.php @@ -311,8 +311,8 @@ public function summaryTitle() { */ public function pluginTitle() { // Short_title is optional so its defaults to an empty string. - if (!empty($this->definition['short_title'])) { - return $this->definition['short_title']; + if (!empty($this->definition['shortTitle'])) { + return $this->definition['shortTitle']; } return $this->definition['title']; } diff --git a/core/modules/views/src/Plugin/views/ViewsHandlerInterface.php b/core/modules/views/src/Plugin/views/ViewsHandlerInterface.php index d54ce38..d04c419 100644 --- a/core/modules/views/src/Plugin/views/ViewsHandlerInterface.php +++ b/core/modules/views/src/Plugin/views/ViewsHandlerInterface.php @@ -80,12 +80,12 @@ public function sanitizeValue($value, $type = NULL); * * @param string $table * The table to join from. - * @param string $base_table + * @param string $baseTable * The table to join to. * * @return \Drupal\views\Plugin\views\join\JoinPluginBase */ - public static function getTableJoin($table, $base_table); + public static function getTableJoin($table, $baseTable); /** * Shortcut to get a handler's raw field value. diff --git a/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php b/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php index 9bcd5ba..491bc57 100644 --- a/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php +++ b/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php @@ -295,7 +295,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { $plugins = Views::pluginManager('argument_validator')->getDefinitions(); foreach ($plugins as $id => $info) { - if (!empty($info['no_ui'])) { + if (!empty($info['noUi'])) { continue; } @@ -571,7 +571,7 @@ public function defaultArgumentForm(&$form, FormStateInterface $form_state) { ]; foreach ($plugins as $id => $info) { - if (!empty($info['no_ui'])) { + if (!empty($info['noUi'])) { continue; } $plugin = $this->getPlugin('argument_default', $id); @@ -612,7 +612,7 @@ public function defaultSummaryForm(&$form, FormStateInterface $form_state) { $summary_plugins = []; $format_options = []; foreach ($style_plugins as $key => $plugin) { - if (isset($plugin['display_types']) && in_array('summary', $plugin['display_types'])) { + if (isset($plugin['displayTypes']) && in_array('summary', $plugin['displayTypes'])) { $summary_plugins[$key] = $plugin; $format_options[$key] = $plugin['title']; } @@ -901,7 +901,7 @@ public function summaryBasics($count_field = TRUE) { // Add the number of nodes counter $distinct = ($this->view->display_handler->getOption('distinct') && empty($this->query->no_distinct)); - $count_alias = $this->query->addField($this->view->storage->get('base_table'), $this->view->storage->get('base_field'), 'num_records', ['count' => TRUE, 'distinct' => $distinct]); + $count_alias = $this->query->addField($this->view->storage->get('baseTable'), $this->view->storage->get('base_field'), 'num_records', ['count' => TRUE, 'distinct' => $distinct]); $this->query->addGroupBy($this->name_alias); if ($count_field) { diff --git a/core/modules/views/src/Plugin/views/display/DefaultDisplay.php b/core/modules/views/src/Plugin/views/display/DefaultDisplay.php index 2d14cfb..6975585 100644 --- a/core/modules/views/src/Plugin/views/display/DefaultDisplay.php +++ b/core/modules/views/src/Plugin/views/display/DefaultDisplay.php @@ -12,7 +12,7 @@ * title = @Translation("Master"), * help = @Translation("Default settings for this view."), * theme = "views_view", - * no_ui = TRUE + * noUi = TRUE * ) */ class DefaultDisplay extends DisplayPluginBase { diff --git a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php index 012dec4..7d7271b 100644 --- a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php +++ b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php @@ -805,7 +805,7 @@ public function getPlugin($type) { // Query plugins allow specifying a specific query class per base table. if ($type == 'query') { - $views_data = Views::viewsData()->get($this->view->storage->get('base_table')); + $views_data = Views::viewsData()->get($this->view->storage->get('baseTable')); $name = isset($views_data['table']['base']['query_id']) ? $views_data['table']['base']['query_id'] : 'views_query'; } else { @@ -1524,7 +1524,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { '#title' => $this->t('Access'), '#title_display' => 'invisible', '#type' => 'radios', - '#options' => Views::fetchPluginNames('access', $this->getType(), [$this->view->storage->get('base_table')]), + '#options' => Views::fetchPluginNames('access', $this->getType(), [$this->view->storage->get('baseTable')]), '#default_value' => $access['type'], ]; @@ -1561,7 +1561,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { '#title' => $this->t('Caching'), '#title_display' => 'invisible', '#type' => 'radios', - '#options' => Views::fetchPluginNames('cache', $this->getType(), [$this->view->storage->get('base_table')]), + '#options' => Views::fetchPluginNames('cache', $this->getType(), [$this->view->storage->get('baseTable')]), '#default_value' => $cache['type'], ]; @@ -1633,7 +1633,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { '#title' => $this->t('Style'), '#title_display' => 'invisible', '#type' => 'radios', - '#options' => Views::fetchPluginNames('style', $this->getType(), [$this->view->storage->get('base_table')]), + '#options' => Views::fetchPluginNames('style', $this->getType(), [$this->view->storage->get('baseTable')]), '#default_value' => $style_plugin->definition['id'], '#description' => $this->t('If the style you choose has settings, be sure to click the settings button that will appear next to it in the View summary.'), ]; @@ -1682,7 +1682,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { '#title' => $this->t('Row'), '#title_display' => 'invisible', '#type' => 'radios', - '#options' => Views::fetchPluginNames('row', $this->getType(), [$this->view->storage->get('base_table')]), + '#options' => Views::fetchPluginNames('row', $this->getType(), [$this->view->storage->get('baseTable')]), '#default_value' => $row_plugin_instance->definition['id'], ]; @@ -1782,7 +1782,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { '#title' => $this->t('Exposed form'), '#title_display' => 'invisible', '#type' => 'radios', - '#options' => Views::fetchPluginNames('exposed_form', $this->getType(), [$this->view->storage->get('base_table')]), + '#options' => Views::fetchPluginNames('exposed_form', $this->getType(), [$this->view->storage->get('baseTable')]), '#default_value' => $exposed_form['type'], ]; @@ -1818,7 +1818,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { '#title' => $this->t('Pager'), '#title_display' => 'invisible', '#type' => 'radios', - '#options' => Views::fetchPluginNames('pager', !$this->usesPager() ? 'basic' : NULL, [$this->view->storage->get('base_table')]), + '#options' => Views::fetchPluginNames('pager', !$this->usesPager() ? 'basic' : NULL, [$this->view->storage->get('baseTable')]), '#default_value' => $pager['type'], ]; diff --git a/core/modules/views/src/Plugin/views/display/Embed.php b/core/modules/views/src/Plugin/views/display/Embed.php index 6abf9d6..10de385 100644 --- a/core/modules/views/src/Plugin/views/display/Embed.php +++ b/core/modules/views/src/Plugin/views/display/Embed.php @@ -8,7 +8,7 @@ * @ingroup views_display_plugins * * @todo: Wait until annotations/plugins support access methods. - * no_ui => !\Drupal::config('views.settings')->get('ui.show.display_embed'), + * noUi => !\Drupal::config('views.settings')->get('ui.show.display_embed'), * * @ViewsDisplay( * id = "embed", diff --git a/core/modules/views/src/Plugin/views/display/EntityReference.php b/core/modules/views/src/Plugin/views/display/EntityReference.php index eb5f04c..4ef52f0 100644 --- a/core/modules/views/src/Plugin/views/display/EntityReference.php +++ b/core/modules/views/src/Plugin/views/display/EntityReference.php @@ -119,7 +119,7 @@ public function query() { // Make sure the id field is included in the results. $id_field = $this->view->storage->get('base_field'); - $id_table = $this->view->storage->get('base_table'); + $id_table = $this->view->storage->get('baseTable'); $this->id_field_alias = $this->view->query->addField($id_table, $id_field); $options = $this->getOption('entity_reference_options'); diff --git a/core/modules/views/src/Plugin/views/display/Feed.php b/core/modules/views/src/Plugin/views/display/Feed.php index c664c05..a41bde9 100644 --- a/core/modules/views/src/Plugin/views/display/Feed.php +++ b/core/modules/views/src/Plugin/views/display/Feed.php @@ -20,7 +20,7 @@ * help = @Translation("Display the view as a feed, such as an RSS feed."), * uses_route = TRUE, * admin = @Translation("Feed"), - * returns_response = TRUE + * returnsResponse = TRUE * ) */ class Feed extends PathPluginBase implements ResponseDisplayPluginInterface { @@ -160,7 +160,7 @@ public function newDisplay() { // definition, but in this case it's dependent on the view's base table, // which we don't know until init(). if (empty($this->options['row']['type']) || $this->options['row']['type'] === 'rss_fields') { - $row_plugins = Views::fetchPluginNames('row', $this->getType(), [$this->view->storage->get('base_table')]); + $row_plugins = Views::fetchPluginNames('row', $this->getType(), [$this->view->storage->get('baseTable')]); $default_row_plugin = key($row_plugins); $options = $this->getOption('row'); diff --git a/core/modules/views/src/Plugin/views/display/PathPluginBase.php b/core/modules/views/src/Plugin/views/display/PathPluginBase.php index 17d8663..c7932b0 100644 --- a/core/modules/views/src/Plugin/views/display/PathPluginBase.php +++ b/core/modules/views/src/Plugin/views/display/PathPluginBase.php @@ -205,7 +205,7 @@ protected function getRoute($view_id, $display_id) { $route->setOption('_view_display_show_admin_links', $this->getOption('show_admin_links')); // Store whether the view will return a response. - $route->setOption('returns_response', !empty($this->getPluginDefinition()['returns_response'])); + $route->setOption('returnsResponse', !empty($this->getPluginDefinition()['returns_response'])); return $route; } diff --git a/core/modules/views/src/Plugin/views/display_extender/DefaultDisplayExtender.php b/core/modules/views/src/Plugin/views/display_extender/DefaultDisplayExtender.php index 719e261..dc267a2 100644 --- a/core/modules/views/src/Plugin/views/display_extender/DefaultDisplayExtender.php +++ b/core/modules/views/src/Plugin/views/display_extender/DefaultDisplayExtender.php @@ -11,7 +11,7 @@ * id = "default", * title = @Translation("Empty display extender"), * help = @Translation("Default settings for this view."), - * no_ui = TRUE + * noUi = TRUE * ) */ class DefaultDisplayExtender extends DisplayExtenderPluginBase { diff --git a/core/modules/views/src/Plugin/views/field/EntityField.php b/core/modules/views/src/Plugin/views/field/EntityField.php index ee2882c..0765693 100644 --- a/core/modules/views/src/Plugin/views/field/EntityField.php +++ b/core/modules/views/src/Plugin/views/field/EntityField.php @@ -59,14 +59,14 @@ class EntityField extends FieldPluginBase implements CacheableDependencyInterfac * * @var bool */ - public $limit_values; + public $limitValues; /** - * A shortcut for $view->base_table. + * A shortcut for $view->baseTable. * * @var string */ - public $base_table; + public $baseTable; /** * An array of formatter options. @@ -176,7 +176,7 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o parent::init($view, $display, $options); $this->multiple = FALSE; - $this->limit_values = FALSE; + $this->limitValues = FALSE; $field_definition = $this->getFieldDefinition(); $cardinality = $field_definition->getFieldStorageDefinition()->getCardinality(); @@ -186,18 +186,18 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o // If "Display all values in the same row" is FALSE, then we always limit // in order to show a single unique value per row. if (!$this->options['group_rows']) { - $this->limit_values = TRUE; + $this->limitValues = TRUE; } // If "First and last only" is chosen, limit the values if (!empty($this->options['delta_first_last'])) { - $this->limit_values = TRUE; + $this->limitValues = TRUE; } // Otherwise, we only limit values if the user hasn't selected "all", 0, or // the value matching field cardinality. if ((($this->options['delta_limit'] > 0) && ($this->options['delta_limit'] != $cardinality)) || intval($this->options['delta_offset'])) { - $this->limit_values = TRUE; + $this->limitValues = TRUE; } } } @@ -719,7 +719,7 @@ protected function prepareItemsByDelta(array $all_values) { } // We are supposed to show only certain deltas. - if ($this->limit_values) { + if ($this->limitValues) { $row = $this->view->result[$this->view->row_index]; // Offset is calculated differently when row grouping for a field is not diff --git a/core/modules/views/src/Plugin/views/filter/LatestRevision.php b/core/modules/views/src/Plugin/views/filter/LatestRevision.php index 7930a7f..2007ffc 100644 --- a/core/modules/views/src/Plugin/views/filter/LatestRevision.php +++ b/core/modules/views/src/Plugin/views/filter/LatestRevision.php @@ -88,16 +88,16 @@ public function canExpose() { public function query() { /** @var \Drupal\views\Plugin\views\query\Sql $query */ $query = $this->query; - $query_base_table = $this->relationship ?: $this->view->storage->get('base_table'); + $queryBaseTable = $this->relationship ?: $this->view->storage->get('baseTable'); $entity_type = $this->entityTypeManager->getDefinition($this->getEntityType()); $keys = $entity_type->getKeys(); $definition = [ - 'table' => $query_base_table, + 'table' => $queryBaseTable, 'type' => 'LEFT', 'field' => $keys['id'], - 'left_table' => $query_base_table, + 'left_table' => $queryBaseTable, 'left_field' => $keys['id'], 'extra' => [ ['left_field' => $keys['revision'], 'field' => $keys['revision'], 'operator' => '>'], @@ -106,7 +106,7 @@ public function query() { $join = $this->joinHandler->createInstance('standard', $definition); - $join_table_alias = $query->addTable($query_base_table, $this->relationship, $join); + $join_table_alias = $query->addTable($queryBaseTable, $this->relationship, $join); $query->addWhere($this->options['group'], "$join_table_alias.{$keys['id']}", NULL, 'IS NULL'); } diff --git a/core/modules/views/src/Plugin/views/pager/Full.php b/core/modules/views/src/Plugin/views/pager/Full.php index 7d3adae..3f2a991 100644 --- a/core/modules/views/src/Plugin/views/pager/Full.php +++ b/core/modules/views/src/Plugin/views/pager/Full.php @@ -12,7 +12,7 @@ * @ViewsPager( * id = "full", * title = @Translation("Paged output, full pager"), - * short_title = @Translation("Full"), + * shortTitle = @Translation("Full"), * help = @Translation("Paged output, full Drupal style"), * theme = "pager", * register_theme = FALSE diff --git a/core/modules/views/src/Plugin/views/pager/Mini.php b/core/modules/views/src/Plugin/views/pager/Mini.php index f92f193..15573f7 100644 --- a/core/modules/views/src/Plugin/views/pager/Mini.php +++ b/core/modules/views/src/Plugin/views/pager/Mini.php @@ -10,7 +10,7 @@ * @ViewsPager( * id = "mini", * title = @Translation("Paged output, mini pager"), - * short_title = @Translation("Mini"), + * shortTitle = @Translation("Mini"), * help = @Translation("A simple pager containing previous and next links."), * theme = "views_mini_pager" * ) diff --git a/core/modules/views/src/Plugin/views/pager/None.php b/core/modules/views/src/Plugin/views/pager/None.php index ae2891a..d9180ff 100644 --- a/core/modules/views/src/Plugin/views/pager/None.php +++ b/core/modules/views/src/Plugin/views/pager/None.php @@ -15,7 +15,7 @@ * id = "none", * title = @Translation("Display all items"), * help = @Translation("Display all items that this view might find."), - * display_types = {"basic"} + * displayTypes = {"basic"} * ) */ class None extends PagerPluginBase { diff --git a/core/modules/views/src/Plugin/views/pager/Some.php b/core/modules/views/src/Plugin/views/pager/Some.php index 59edaea..158a564 100644 --- a/core/modules/views/src/Plugin/views/pager/Some.php +++ b/core/modules/views/src/Plugin/views/pager/Some.php @@ -13,7 +13,7 @@ * id = "some", * title = @Translation("Display a specified number of items"), * help = @Translation("Display a limited number items that this view might find."), - * display_types = {"basic"} + * displayTypes = {"basic"} * ) */ class Some extends PagerPluginBase { diff --git a/core/modules/views/src/Plugin/views/query/QueryPluginBase.php b/core/modules/views/src/Plugin/views/query/QueryPluginBase.php index 83e0bcf..08fc889 100644 --- a/core/modules/views/src/Plugin/views/query/QueryPluginBase.php +++ b/core/modules/views/src/Plugin/views/query/QueryPluginBase.php @@ -269,21 +269,21 @@ public function getEntityTableInfo() { // Start with the base table. $entity_tables = []; $views_data = Views::viewsData(); - $base_table = $this->view->storage->get('base_table'); - $base_table_data = $views_data->get($base_table); + $baseTable = $this->view->storage->get('baseTable'); + $baseTable_data = $views_data->get($baseTable); - if (isset($base_table_data['table']['entity type'])) { - $entity_tables[$base_table_data['table']['entity type']] = [ - 'base' => $base_table, - 'alias' => $base_table, + if (isset($baseTable_data['table']['entity type'])) { + $entity_tables[$baseTable_data['table']['entity type']] = [ + 'base' => $baseTable, + 'alias' => $baseTable, 'relationship_id' => 'none', - 'entity_type' => $base_table_data['table']['entity type'], - 'revision' => $base_table_data['table']['entity revision'], + 'entity_type' => $baseTable_data['table']['entity type'], + 'revision' => $baseTable_data['table']['entity revision'], ]; // Include the entity provider. - if (!empty($base_table_data['table']['provider'])) { - $entity_tables[$base_table_data['table']['entity type']]['provider'] = $base_table_data['table']['provider']; + if (!empty($baseTable_data['table']['provider'])) { + $entity_tables[$baseTable_data['table']['entity type']]['provider'] = $baseTable_data['table']['provider']; } } @@ -294,8 +294,8 @@ public function getEntityTableInfo() { // If this is not one of the entity base tables, skip it. $entity_type = \Drupal::entityTypeManager()->getDefinition($table_data['table']['entity type']); - $entity_base_tables = [$entity_type->getBaseTable(), $entity_type->getDataTable(), $entity_type->getRevisionTable(), $entity_type->getRevisionDataTable()]; - if (!in_array($relationship->definition['base'], $entity_base_tables)) { + $entityBaseTables = [$entity_type->getBaseTable(), $entity_type->getDataTable(), $entity_type->getRevisionTable(), $entity_type->getRevisionDataTable()]; + if (!in_array($relationship->definition['base'], $entityBaseTables)) { continue; } @@ -337,7 +337,7 @@ public function getCacheMaxAge() { */ public function getCacheContexts() { $contexts = []; - if (($views_data = Views::viewsData()->get($this->view->storage->get('base_table'))) && !empty($views_data['table']['entity type'])) { + if (($views_data = Views::viewsData()->get($this->view->storage->get('baseTable'))) && !empty($views_data['table']['entity type'])) { $entity_type_id = $views_data['table']['entity type']; $entity_type = \Drupal::entityManager()->getDefinition($entity_type_id); $contexts = $entity_type->getListCacheContexts(); diff --git a/core/modules/views/src/Plugin/views/query/Sql.php b/core/modules/views/src/Plugin/views/query/Sql.php index 09a754b..65f43d3 100644 --- a/core/modules/views/src/Plugin/views/query/Sql.php +++ b/core/modules/views/src/Plugin/views/query/Sql.php @@ -167,31 +167,31 @@ public static function create(ContainerInterface $container, array $configuratio public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) { parent::init($view, $display, $options); - $base_table = $this->view->storage->get('base_table'); + $baseTable = $this->view->storage->get('baseTable'); $base_field = $this->view->storage->get('base_field'); - $this->relationships[$base_table] = [ + $this->relationships[$baseTable] = [ 'link' => NULL, - 'table' => $base_table, - 'alias' => $base_table, - 'base' => $base_table + 'table' => $baseTable, + 'alias' => $baseTable, + 'base' => $baseTable ]; // init the table queue with our primary table. - $this->tableQueue[$base_table] = [ - 'alias' => $base_table, - 'table' => $base_table, - 'relationship' => $base_table, + $this->tableQueue[$baseTable] = [ + 'alias' => $baseTable, + 'table' => $baseTable, + 'relationship' => $baseTable, 'join' => NULL, ]; // init the tables with our primary table - $this->tables[$base_table][$base_table] = [ + $this->tables[$baseTable][$baseTable] = [ 'count' => 1, - 'alias' => $base_table, + 'alias' => $baseTable, ]; $this->count_field = [ - 'table' => $base_table, + 'table' => $baseTable, 'field' => $base_field, 'alias' => $base_field, 'count' => TRUE, @@ -347,7 +347,7 @@ public function submitOptionsForm(&$form, FormStateInterface $form_state) { */ public function addRelationship($alias, JoinPluginBase $join, $base, $link_point = NULL) { if (empty($link_point)) { - $link_point = $this->view->storage->get('base_table'); + $link_point = $this->view->storage->get('baseTable'); } elseif (!array_key_exists($link_point, $this->relationships)) { return FALSE; @@ -381,7 +381,7 @@ public function addRelationship($alias, JoinPluginBase $join, $base, $link_point 'base' => $base, ]; - $this->tables[$this->view->storage->get('base_table')][$alias] = [ + $this->tables[$this->view->storage->get('baseTable')][$alias] = [ 'count' => 1, 'alias' => $alias, ]; @@ -465,7 +465,7 @@ public function queueTable($table, $relationship = NULL, JoinPluginBase $join = } if (empty($relationship)) { - $relationship = $this->view->storage->get('base_table'); + $relationship = $this->view->storage->get('baseTable'); } if (!array_key_exists($relationship, $this->relationships)) { @@ -473,7 +473,7 @@ public function queueTable($table, $relationship = NULL, JoinPluginBase $join = } if (!$alias && $join && $relationship && !empty($join->adjusted) && $table != $join->table) { - if ($relationship == $this->view->storage->get('base_table')) { + if ($relationship == $this->view->storage->get('baseTable')) { $alias = $table; } else { @@ -497,7 +497,7 @@ public function queueTable($table, $relationship = NULL, JoinPluginBase $join = // If this is a relationship based table, add a marker with // the relationship as a primary table for the alias. if ($table != $alias) { - $this->markTable($alias, $this->view->storage->get('base_table'), $alias); + $this->markTable($alias, $this->view->storage->get('baseTable'), $alias); } // If no join is specified, pull it from the table data. @@ -526,7 +526,7 @@ protected function markTable($table, $relationship, $alias) { if (empty($this->tables[$relationship][$table])) { if (!isset($alias)) { $alias = ''; - if ($relationship != $this->view->storage->get('base_table')) { + if ($relationship != $this->view->storage->get('baseTable')) { // double underscore will help prevent accidental name // space collisions. $alias = $relationship . '__'; @@ -566,14 +566,14 @@ protected function markTable($table, $relationship, $alias) { public function ensureTable($table, $relationship = NULL, JoinPluginBase $join = NULL) { // ensure a relationship if (empty($relationship)) { - $relationship = $this->view->storage->get('base_table'); + $relationship = $this->view->storage->get('baseTable'); } // If the relationship is the primary table, this actually be a relationship // link back from an alias. We store all aliases along with the primary table // to detect this state, because eventually it'll hit a table we already // have and that's when we want to stop. - if ($relationship == $this->view->storage->get('base_table') && !empty($this->tables[$relationship][$table])) { + if ($relationship == $this->view->storage->get('baseTable') && !empty($this->tables[$relationship][$table])) { return $this->tables[$relationship][$table]['alias']; } @@ -644,7 +644,7 @@ public function ensureTable($table, $relationship = NULL, JoinPluginBase $join = */ protected function ensurePath($table, $relationship = NULL, $join = NULL, $traced = [], $add = []) { if (!isset($relationship)) { - $relationship = $this->view->storage->get('base_table'); + $relationship = $this->view->storage->get('baseTable'); } if (!array_key_exists($relationship, $this->relationships)) { @@ -704,7 +704,7 @@ protected function adjustJoin($join, $relationship) { } // Adjusts the left table for our relationship. - if ($relationship != $this->view->storage->get('base_table')) { + if ($relationship != $this->view->storage->get('baseTable')) { // If we're linking to the primary table, the relationship to use will // be the prior relationship. Unless it's a direct link. @@ -741,19 +741,19 @@ protected function adjustJoin($join, $relationship) { * * @param $table * The table to get the join information for. - * @param $base_table + * @param $baseTable * The path we're following to get this join. * * @return \Drupal\views\Plugin\views\join\JoinPluginBase * A Join object or child object, if one exists. */ - public function getJoinData($table, $base_table) { + public function getJoinData($table, $baseTable) { // Check to see if we're linking to a known alias. If so, get the real // table's data instead. if (!empty($this->tableQueue[$table])) { $table = $this->tableQueue[$table]['table']; } - return HandlerBase::getTableJoin($table, $base_table); + return HandlerBase::getTableJoin($table, $baseTable); } /** @@ -768,8 +768,8 @@ public function getTableInfo($table) { } // In rare cases we might *only* have aliased versions of the table. - if (!empty($this->tables[$this->view->storage->get('base_table')][$table])) { - $alias = $this->tables[$this->view->storage->get('base_table')][$table]['alias']; + if (!empty($this->tables[$this->view->storage->get('baseTable')][$table])) { + $alias = $this->tables[$this->view->storage->get('baseTable')][$table]['alias']; if (!empty($this->tableQueue[$alias])) { return $this->tableQueue[$alias]; } @@ -804,7 +804,7 @@ public function getTableInfo($table) { */ public function addField($table, $field, $alias = '', $params = []) { // We check for this specifically because it gets a special alias. - if ($table == $this->view->storage->get('base_table') && $field == $this->view->storage->get('base_field') && empty($alias)) { + if ($table == $this->view->storage->get('baseTable') && $field == $this->view->storage->get('base_field') && empty($alias)) { $alias = $this->view->storage->get('base_field'); } @@ -1220,10 +1220,10 @@ protected function compileFields($query) { $query->addExpression($string, $fieldname, $placeholders); } elseif ($this->distinct && !in_array($fieldname, $this->groupby)) { - $query->addField(!empty($field['table']) ? $field['table'] : $this->view->storage->get('base_table'), $field['field'], $fieldname); + $query->addField(!empty($field['table']) ? $field['table'] : $this->view->storage->get('baseTable'), $field['field'], $fieldname); } elseif (empty($field['aggregate'])) { - $query->addField(!empty($field['table']) ? $field['table'] : $this->view->storage->get('base_table'), $field['field'], $fieldname); + $query->addField(!empty($field['table']) ? $field['table'] : $this->view->storage->get('baseTable'), $field['field'], $fieldname); } if ($this->getCountOptimized) { @@ -1243,7 +1243,7 @@ protected function compileFields($query) { public function query($get_count = FALSE) { // Check query distinct value. if (empty($this->noDistinct) && $this->distinct && !empty($this->fields)) { - $base_field_alias = $this->addField($this->view->storage->get('base_table'), $this->view->storage->get('base_field')); + $base_field_alias = $this->addField($this->view->storage->get('baseTable'), $this->view->storage->get('base_field')); $this->addGroupBy($base_field_alias); $distinct = TRUE; } @@ -1283,7 +1283,7 @@ public function query($get_count = FALSE) { // Go ahead and build the query. // db_select doesn't support to specify the key, so use getConnection directly. $query = Database::getConnection($target, $key) - ->select($this->view->storage->get('base_table'), $this->view->storage->get('base_table'), $options) + ->select($this->view->storage->get('baseTable'), $this->view->storage->get('baseTable'), $options) ->addTag('views') ->addTag('views_' . $this->view->storage->id()); @@ -1346,7 +1346,7 @@ public function query($get_count = FALSE) { // Handle group by of field without table alias to avoid ambiguous // column error. if ($field == $this->view->storage->get('base_field')) { - $field = $this->view->storage->get('base_table') . '.' . $field; + $field = $this->view->storage->get('baseTable') . '.' . $field; } $query->groupBy($field); } @@ -1448,15 +1448,15 @@ public function execute(ViewExecutable $view) { $count_query->addMetaData('view', $view); if (empty($this->options['disable_sql_rewrite'])) { - $base_table_data = Views::viewsData()->get($this->view->storage->get('base_table')); - if (isset($base_table_data['table']['base']['access query tag'])) { - $access_tag = $base_table_data['table']['base']['access query tag']; + $baseTable_data = Views::viewsData()->get($this->view->storage->get('baseTable')); + if (isset($baseTable_data['table']['base']['access query tag'])) { + $access_tag = $baseTable_data['table']['base']['access query tag']; $query->addTag($access_tag); $count_query->addTag($access_tag); } - if (isset($base_table_data['table']['base']['query metadata'])) { - foreach ($base_table_data['table']['base']['query metadata'] as $key => $value) { + if (isset($baseTable_data['table']['base']['query metadata'])) { + foreach ($baseTable_data['table']['base']['query metadata'] as $key => $value) { $query->addMetaData($key, $value); $count_query->addMetaData($key, $value); } diff --git a/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php b/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php index 34e1b08..c1db4e5 100644 --- a/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php +++ b/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php @@ -87,7 +87,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { foreach ($sorts as $sort_id => $sort) { $sort_options[$sort_id] = "$sort[group]: $sort[title]"; } - $base_table_data = Views::viewsData()->get($this->definition['base']); + $baseTable_data = Views::viewsData()->get($this->definition['base']); // Extends the relationship's basic options, allowing the user to pick a // sort and an order for it. @@ -95,7 +95,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { '#type' => 'select', '#title' => $this->t('Representative sort criteria'), // Provide the base field as sane default sort option. - '#default_value' => !empty($this->options['subquery_sort']) ? $this->options['subquery_sort'] : $this->definition['base'] . '.' . $base_table_data['table']['base']['field'], + '#default_value' => !empty($this->options['subquery_sort']) ? $this->options['subquery_sort'] : $this->definition['base'] . '.' . $baseTable_data['table']['base']['field'], '#options' => $sort_options, '#description' => $this->t("The sort criteria is applied to the data brought in by the relationship to determine how a representative item is obtained for each row. For example, to show the most recent node for each user, pick 'Content: Updated date'."), ]; @@ -122,7 +122,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { // Only get views that are suitable: // - base must the base that our relationship joins towards // - must have fields. - if ($view->get('base_table') == $this->definition['base'] && !empty($view->getDisplay('default')['display_options']['fields'])) { + if ($view->get('baseTable') == $this->definition['base'] && !empty($view->getDisplay('default')['display_options']['fields'])) { // TODO: check the field is the correct sort? // or let users hang themselves at this stage and check later? $views[$view->id()] = $view->id(); @@ -151,7 +151,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { * We use this to obtain our subquery SQL. */ protected function getTemporaryView() { - $view = View::create(['base_table' => $this->definition['base']]); + $view = View::create(['baseTable' => $this->definition['base']]); $view->addDisplay('default'); return $view->getExecutable(); } diff --git a/core/modules/views/src/Plugin/views/row/EntityReference.php b/core/modules/views/src/Plugin/views/row/EntityReference.php index 29661e3..e801ea1 100644 --- a/core/modules/views/src/Plugin/views/row/EntityReference.php +++ b/core/modules/views/src/Plugin/views/row/EntityReference.php @@ -15,7 +15,7 @@ * help = @Translation("Displays the fields with an optional template."), * theme = "views_view_fields", * register_theme = FALSE, - * display_types = {"entity_reference"} + * displayTypes = {"entity_reference"} * ) */ class EntityReference extends Fields { diff --git a/core/modules/views/src/Plugin/views/row/EntityRow.php b/core/modules/views/src/Plugin/views/row/EntityRow.php index e98133a..240c86b 100644 --- a/core/modules/views/src/Plugin/views/row/EntityRow.php +++ b/core/modules/views/src/Plugin/views/row/EntityRow.php @@ -26,7 +26,7 @@ class EntityRow extends RowPluginBase { * * @var string */ - public $base_table; + public $baseTable; /** * The actual field which is used for the entity id. @@ -86,7 +86,7 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o $this->entityTypeId = $this->definition['entity_type']; $this->entityType = $this->entityManager->getDefinition($this->entityTypeId); - $this->base_table = $this->entityType->getDataTable() ?: $this->entityType->getBaseTable(); + $this->baseTable = $this->entityType->getDataTable() ?: $this->entityType->getBaseTable(); $this->base_field = $this->entityType->getKey('id'); } diff --git a/core/modules/views/src/Plugin/views/row/Fields.php b/core/modules/views/src/Plugin/views/row/Fields.php index 711704e..90f415e 100644 --- a/core/modules/views/src/Plugin/views/row/Fields.php +++ b/core/modules/views/src/Plugin/views/row/Fields.php @@ -17,7 +17,7 @@ * title = @Translation("Fields"), * help = @Translation("Displays the fields with an optional template."), * theme = "views_view_fields", - * display_types = {"normal"} + * displayTypes = {"normal"} * ) */ class Fields extends RowPluginBase { diff --git a/core/modules/views/src/Plugin/views/row/OpmlFields.php b/core/modules/views/src/Plugin/views/row/OpmlFields.php index aaeecbf..7b8bfb1 100644 --- a/core/modules/views/src/Plugin/views/row/OpmlFields.php +++ b/core/modules/views/src/Plugin/views/row/OpmlFields.php @@ -12,7 +12,7 @@ * title = @Translation("OPML fields"), * help = @Translation("Display fields as OPML items."), * theme = "views_view_row_opml", - * display_types = {"feed"} + * displayTypes = {"feed"} * ) */ class OpmlFields extends RowPluginBase { diff --git a/core/modules/views/src/Plugin/views/row/RowPluginBase.php b/core/modules/views/src/Plugin/views/row/RowPluginBase.php index 3c09eaf..b7d37eb 100644 --- a/core/modules/views/src/Plugin/views/row/RowPluginBase.php +++ b/core/modules/views/src/Plugin/views/row/RowPluginBase.php @@ -63,7 +63,7 @@ public function usesFields() { */ protected function defineOptions() { $options = parent::defineOptions(); - if (isset($this->base_table)) { + if (isset($this->baseTable)) { $options['relationship'] = ['default' => 'none']; } @@ -75,7 +75,7 @@ protected function defineOptions() { */ public function buildOptionsForm(&$form, FormStateInterface $form_state) { parent::buildOptionsForm($form, $form_state); - if (isset($this->base_table)) { + if (isset($this->baseTable)) { $executable = $form_state->get('view')->getExecutable(); // A whole bunch of code to figure out what relationships are valid for @@ -89,7 +89,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { // If this relationship is valid for this type, add it to the list. $data = Views::viewsData()->get($relationship['table']); $base = $data[$relationship['field']]['relationship']['base']; - if ($base == $this->base_table) { + if ($base == $this->baseTable) { $relationship_handler->init($executable, $relationship); $relationship_options[$relationship['id']] = $relationship_handler->adminLabel(); } @@ -134,13 +134,13 @@ public function submitOptionsForm(&$form, FormStateInterface $form_state) {} * {@inheritdoc} */ public function query() { - if (isset($this->base_table)) { + if (isset($this->baseTable)) { if (isset($this->options['relationship']) && isset($this->view->relationship[$this->options['relationship']])) { $relationship = $this->view->relationship[$this->options['relationship']]; $this->field_alias = $this->view->query->addField($relationship->alias, $this->base_field); } else { - $this->field_alias = $this->view->query->addField($this->base_table, $this->base_field); + $this->field_alias = $this->view->query->addField($this->baseTable, $this->base_field); } } } diff --git a/core/modules/views/src/Plugin/views/row/RssFields.php b/core/modules/views/src/Plugin/views/row/RssFields.php index 1b56aae..3590e5a 100644 --- a/core/modules/views/src/Plugin/views/row/RssFields.php +++ b/core/modules/views/src/Plugin/views/row/RssFields.php @@ -13,7 +13,7 @@ * title = @Translation("Fields"), * help = @Translation("Display fields as RSS items."), * theme = "views_view_row_rss", - * display_types = {"feed"} + * displayTypes = {"feed"} * ) */ class RssFields extends RowPluginBase { diff --git a/core/modules/views/src/Plugin/views/style/DefaultStyle.php b/core/modules/views/src/Plugin/views/style/DefaultStyle.php index fe67d9b..166dfa6 100644 --- a/core/modules/views/src/Plugin/views/style/DefaultStyle.php +++ b/core/modules/views/src/Plugin/views/style/DefaultStyle.php @@ -13,7 +13,7 @@ * title = @Translation("Unformatted list"), * help = @Translation("Displays rows one after another."), * theme = "views_view_unformatted", - * display_types = {"normal"} + * displayTypes = {"normal"} * ) */ class DefaultStyle extends StylePluginBase { diff --git a/core/modules/views/src/Plugin/views/style/DefaultSummary.php b/core/modules/views/src/Plugin/views/style/DefaultSummary.php index 0b4325b..f2b1ea9 100644 --- a/core/modules/views/src/Plugin/views/style/DefaultSummary.php +++ b/core/modules/views/src/Plugin/views/style/DefaultSummary.php @@ -14,7 +14,7 @@ * title = @Translation("List"), * help = @Translation("Displays the default summary as a list."), * theme = "views_view_summary", - * display_types = {"summary"} + * displayTypes = {"summary"} * ) */ class DefaultSummary extends StylePluginBase { diff --git a/core/modules/views/src/Plugin/views/style/EntityReference.php b/core/modules/views/src/Plugin/views/style/EntityReference.php index e07a0f1..c10b462 100644 --- a/core/modules/views/src/Plugin/views/style/EntityReference.php +++ b/core/modules/views/src/Plugin/views/style/EntityReference.php @@ -16,7 +16,7 @@ * help = @Translation("Returns results as a PHP array of labels and rendered rows."), * theme = "views_view_unformatted", * register_theme = FALSE, - * display_types = {"entity_reference"} + * displayTypes = {"entity_reference"} * ) */ class EntityReference extends StylePluginBase { diff --git a/core/modules/views/src/Plugin/views/style/Grid.php b/core/modules/views/src/Plugin/views/style/Grid.php index f33f7f9..65814f4 100644 --- a/core/modules/views/src/Plugin/views/style/Grid.php +++ b/core/modules/views/src/Plugin/views/style/Grid.php @@ -15,7 +15,7 @@ * title = @Translation("Grid"), * help = @Translation("Displays rows in a grid."), * theme = "views_view_grid", - * display_types = {"normal"} + * displayTypes = {"normal"} * ) */ class Grid extends StylePluginBase { diff --git a/core/modules/views/src/Plugin/views/style/HtmlList.php b/core/modules/views/src/Plugin/views/style/HtmlList.php index 519dff6..bad112b 100644 --- a/core/modules/views/src/Plugin/views/style/HtmlList.php +++ b/core/modules/views/src/Plugin/views/style/HtmlList.php @@ -14,7 +14,7 @@ * title = @Translation("HTML List"), * help = @Translation("Displays rows as HTML list."), * theme = "views_view_list", - * display_types = {"normal"} + * displayTypes = {"normal"} * ) */ class HtmlList extends StylePluginBase { diff --git a/core/modules/views/src/Plugin/views/style/Opml.php b/core/modules/views/src/Plugin/views/style/Opml.php index 016405e..76ea2ad 100644 --- a/core/modules/views/src/Plugin/views/style/Opml.php +++ b/core/modules/views/src/Plugin/views/style/Opml.php @@ -14,7 +14,7 @@ * title = @Translation("OPML Feed"), * help = @Translation("Generates an OPML feed from a view."), * theme = "views_view_opml", - * display_types = {"feed"} + * displayTypes = {"feed"} * ) */ class Opml extends StylePluginBase { diff --git a/core/modules/views/src/Plugin/views/style/Rss.php b/core/modules/views/src/Plugin/views/style/Rss.php index 96d1dea..e87ef84 100644 --- a/core/modules/views/src/Plugin/views/style/Rss.php +++ b/core/modules/views/src/Plugin/views/style/Rss.php @@ -15,7 +15,7 @@ * title = @Translation("RSS Feed"), * help = @Translation("Generates an RSS feed from a view."), * theme = "views_view_rss", - * display_types = {"feed"} + * displayTypes = {"feed"} * ) */ class Rss extends StylePluginBase { diff --git a/core/modules/views/src/Plugin/views/style/Table.php b/core/modules/views/src/Plugin/views/style/Table.php index bbc9a1e..fa2a07c 100644 --- a/core/modules/views/src/Plugin/views/style/Table.php +++ b/core/modules/views/src/Plugin/views/style/Table.php @@ -17,7 +17,7 @@ * title = @Translation("Table"), * help = @Translation("Displays rows in a table."), * theme = "views_view_table", - * display_types = {"normal"} + * displayTypes = {"normal"} * ) */ class Table extends StylePluginBase implements CacheableDependencyInterface { diff --git a/core/modules/views/src/Plugin/views/style/UnformattedSummary.php b/core/modules/views/src/Plugin/views/style/UnformattedSummary.php index 6460841..24b3b83 100644 --- a/core/modules/views/src/Plugin/views/style/UnformattedSummary.php +++ b/core/modules/views/src/Plugin/views/style/UnformattedSummary.php @@ -14,7 +14,7 @@ * title = @Translation("Unformatted"), * help = @Translation("Displays the summary unformatted, with option for one after another or inline."), * theme = "views_view_summary_unformatted", - * display_types = {"summary"} + * displayTypes = {"summary"} * ) */ class UnformattedSummary extends DefaultSummary { diff --git a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php index 0b3dcc9..2292588 100644 --- a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php +++ b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php @@ -43,7 +43,7 @@ * * @var string */ - protected $base_table; + protected $baseTable; /** * The entity type connected with the wizard. @@ -67,7 +67,7 @@ * * @var array */ - protected $validated_views = []; + protected $validatedViews = []; /** * The table column used for sorting by create date of this wizard. @@ -105,7 +105,7 @@ * * @var array() */ - protected $filter_defaults = [ + protected $filterDefaults = [ 'id' => NULL, 'expose' => ['operator' => FALSE], 'group' => 1, @@ -137,11 +137,11 @@ public function __construct(array $configuration, $plugin_id, $plugin_definition parent::__construct($configuration, $plugin_id, $plugin_definition); $this->bundleInfoService = $bundle_info_service; - $this->base_table = $this->definition['base_table']; + $this->baseTable = $this->definition['baseTable']; $entity_types = \Drupal::entityManager()->getDefinitions(); foreach ($entity_types as $entity_type_id => $entity_type) { - if (in_array($this->base_table, [$entity_type->getBaseTable(), $entity_type->getDataTable(), $entity_type->getRevisionTable(), $entity_type->getRevisionDataTable()], TRUE)) { + if (in_array($this->baseTable, [$entity_type->getBaseTable(), $entity_type->getDataTable(), $entity_type->getRevisionTable(), $entity_type->getRevisionDataTable()], TRUE)) { $this->entityType = $entity_type; $this->entityTypeId = $entity_type_id; } @@ -172,7 +172,7 @@ public function getFilters() { $this->filters = [ $field_name => [ 'value' => TRUE, - 'table' => $this->base_table, + 'table' => $this->baseTable, 'field' => $field_name, 'plugin_id' => 'boolean', 'entity_type' => $this->entityTypeId, @@ -181,7 +181,7 @@ public function getFilters() { ] + $this->filters; } - $default = $this->filter_defaults; + $default = $this->filterDefaults; foreach ($this->filters as $name => $info) { $default['id'] = $name; @@ -213,8 +213,8 @@ public function getSorts() { * {@inheritdoc} */ public function buildForm(array $form, FormStateInterface $form_state) { - $style_options = Views::fetchPluginNames('style', 'normal', [$this->base_table]); - $feed_row_options = Views::fetchPluginNames('row', 'feed', [$this->base_table]); + $style_options = Views::fetchPluginNames('style', 'normal', [$this->baseTable]); + $feed_row_options = Views::fetchPluginNames('row', 'feed', [$this->baseTable]); $path_prefix = $this->url('', [], ['absolute' => TRUE]); // Add filters and sorts which apply to the view as a whole. @@ -610,7 +610,7 @@ protected function buildFormStyle(array &$form, FormStateInterface $form_state, */ protected function rowStyleOptions() { // Get all available row plugins by default. - $options = Views::fetchPluginNames('row', 'normal', [$this->base_table]); + $options = Views::fetchPluginNames('row', 'normal', [$this->baseTable]); return $options; } @@ -689,7 +689,7 @@ protected function instantiateView($form, FormStateInterface $form_state) { 'id' => $form_state->getValue('id'), 'label' => $form_state->getValue('label'), 'description' => $form_state->getValue('description'), - 'base_table' => $this->base_table, + 'baseTable' => $this->baseTable, 'langcode' => \Drupal::languageManager()->getDefaultLanguage()->getId(), ]; @@ -845,7 +845,7 @@ protected function defaultDisplayOptions() { // Add a least one field so the view validates and the user has a preview. // The base field can provide a default in its base settings; otherwise, // choose the first field with a field handler. - $default_table = $this->base_table; + $default_table = $this->baseTable; $data = Views::viewsData()->get($default_table); if (isset($data['table']['base']['defaults']['field'])) { $default_field = $data['table']['base']['defaults']['field']; @@ -927,9 +927,9 @@ protected function defaultDisplayFiltersUser(array $form, FormStateInterface $fo // the base table for the view; the taxonomy vocabulary machine_name, for // example, is stored in taxonomy_vocabulary, not taxonomy_term_data. module_load_include('inc', 'views_ui', 'admin'); - $fields = Views::viewsDataHelper()->fetchFields($this->base_table, 'filter'); - if (isset($fields[$this->base_table . '.' . $bundle_key])) { - $table = $this->base_table; + $fields = Views::viewsDataHelper()->fetchFields($this->baseTable, 'filter'); + if (isset($fields[$this->baseTable . '.' . $bundle_key])) { + $table = $this->baseTable; } else { foreach ($fields as $field_name => $value) { @@ -1020,7 +1020,7 @@ protected function defaultDisplaySortsUser($form, FormStateInterface $form_state $column = $column[1]; } else { - $table = $this->base_table; + $table = $this->baseTable; $column = $column[0]; } @@ -1244,9 +1244,9 @@ protected function retrieveValidatedView(array $form, FormStateInterface $form_s // @todo Figure out why all this hashing is done. Wouldn't it be easier to // store a single entry and that's it? $key = hash('sha256', serialize($form_state->getValues())); - $view = (isset($this->validated_views[$key]) ? $this->validated_views[$key] : NULL); + $view = (isset($this->validatedViews[$key]) ? $this->validatedViews[$key] : NULL); if ($unset) { - unset($this->validated_views[$key]); + unset($this->validatedViews[$key]); } return $view; } @@ -1263,7 +1263,7 @@ protected function retrieveValidatedView(array $form, FormStateInterface $form_s */ protected function setValidatedView(array $form, FormStateInterface $form_state, ViewUI $view) { $key = hash('sha256', serialize($form_state->getValues())); - $this->validated_views[$key] = $view; + $this->validatedViews[$key] = $view; } /** diff --git a/core/modules/views/src/Routing/ViewPageController.php b/core/modules/views/src/Routing/ViewPageController.php index 772103d..2f843b3 100644 --- a/core/modules/views/src/Routing/ViewPageController.php +++ b/core/modules/views/src/Routing/ViewPageController.php @@ -47,7 +47,7 @@ public function handle($view_id, $display_id, RouteMatchInterface $route_match) /** @var \Drupal\views\Plugin\views\display\DisplayPluginBase $class */ $class = $route->getOption('_view_display_plugin_class'); - if ($route->getOption('returns_response')) { + if ($route->getOption('returnsResponse')) { /** @var \Drupal\views\Plugin\views\display\ResponseDisplayPluginInterface $class */ return $class::buildResponse($view_id, $display_id, $args); } diff --git a/core/modules/views/src/ViewExecutable.php b/core/modules/views/src/ViewExecutable.php index 0fda8c8..e0ba9eb 100644 --- a/core/modules/views/src/ViewExecutable.php +++ b/core/modules/views/src/ViewExecutable.php @@ -967,15 +967,15 @@ public function renderPager($exposed_input) { * An array of base tables to be used by the view. */ public function getBaseTables() { - $base_tables = [ - $this->storage->get('base_table') => TRUE, + $baseTables = [ + $this->storage->get('baseTable') => TRUE, '#global' => TRUE, ]; foreach ($this->display_handler->getHandlers('relationship') as $handler) { - $base_tables[$handler->definition['base']] = TRUE; + $baseTables[$handler->definition['base']] = TRUE; } - return $base_tables; + return $baseTables; } /** @@ -986,8 +986,8 @@ public function getBaseTables() { */ public function getBaseEntityType() { if (!isset($this->baseEntityType)) { - $view_base_table = $this->storage->get('base_table'); - $views_data = $this->viewsData->get($view_base_table); + $viewBaseTable = $this->storage->get('baseTable'); + $views_data = $this->viewsData->get($viewBaseTable); if (!empty($views_data['table']['entity type'])) { $entity_type_id = $views_data['table']['entity type']; $this->baseEntityType = \Drupal::entityTypeManager()->getDefinition($entity_type_id); @@ -1170,7 +1170,7 @@ public function initQuery() { } // Create and initialize the query object. - $views_data = Views::viewsData()->get($this->storage->get('base_table')); + $views_data = Views::viewsData()->get($this->storage->get('baseTable')); $this->storage->set('base_field', !empty($views_data['table']['base']['field']) ? $views_data['table']['base']['field'] : ''); if (!empty($views_data['table']['base']['database'])) { $this->base_database = $views_data['table']['base']['database']; diff --git a/core/modules/views/src/Views.php b/core/modules/views/src/Views.php index dd241f7..9aeab38 100644 --- a/core/modules/views/src/Views.php +++ b/core/modules/views/src/Views.php @@ -137,7 +137,7 @@ public static function getView($id) { * An array of possible base tables. * * @return - * A keyed array of in the form of 'base_table' => 'Description'. + * A keyed array of in the form of 'baseTable' => 'Description'. */ public static function fetchPluginNames($type, $key = NULL, array $base = []) { $definitions = static::pluginManager($type)->getDefinitions(); @@ -145,11 +145,11 @@ public static function fetchPluginNames($type, $key = NULL, array $base = []) { foreach ($definitions as $id => $plugin) { // Skip plugins that don't conform to our key, if they have one. - if ($key && isset($plugin['display_types']) && !in_array($key, $plugin['display_types'])) { + if ($key && isset($plugin['displayTypes']) && !in_array($key, $plugin['displayTypes'])) { continue; } - if (empty($plugin['no_ui']) && (empty($base) || empty($plugin['base']) || array_intersect($base, $plugin['base']))) { + if (empty($plugin['noUi']) && (empty($base) || empty($plugin['base']) || array_intersect($base, $plugin['base']))) { $plugins[$id] = $plugin['title']; } } diff --git a/core/modules/views/src/ViewsDataHelper.php b/core/modules/views/src/ViewsDataHelper.php index bfda18c..2fc00d1 100644 --- a/core/modules/views/src/ViewsDataHelper.php +++ b/core/modules/views/src/ViewsDataHelper.php @@ -18,7 +18,7 @@ class ViewsDataHelper { protected $data; /** - * A prepared list of all fields, keyed by base_table and handler type. + * A prepared list of all fields, keyed by baseTable and handler type. * * @var array */ @@ -38,7 +38,7 @@ public function __construct(ViewsData $views_data) { * Fetches a list of all fields available for a given base type. * * @param array|string $base - * A list or a single base_table, for example node. + * A list or a single baseTable, for example node. * @param string $type * The handler type, for example field or filter. * @param bool $grouping @@ -48,7 +48,7 @@ public function __construct(ViewsData $views_data) { * header only, instead of header, footer, and empty regions. * * @return array - * A keyed array of in the form of 'base_table' => 'Description'. + * A keyed array of in the form of 'baseTable' => 'Description'. */ public function fetchFields($base, $type, $grouping = FALSE, $sub_type = NULL) { if (!$this->fields) { @@ -144,9 +144,9 @@ public function fetchFields($base, $type, $grouping = FALSE, $sub_type = NULL) { // Just Fine. if (is_array($base)) { $strings = []; - foreach ($base as $base_table) { - if (isset($this->fields[$base_table][$type])) { - $strings += $this->fields[$base_table][$type]; + foreach ($base as $baseTable) { + if (isset($this->fields[$baseTable][$type])) { + $strings += $this->fields[$baseTable][$type]; } } uasort($strings, ['self', 'fetchedFieldSort']); diff --git a/core/modules/views/tests/fixtures/update/views.view.legacy_bulk_form.yml b/core/modules/views/tests/fixtures/update/views.view.legacy_bulk_form.yml index 5c10b28..6b639e7 100644 --- a/core/modules/views/tests/fixtures/update/views.view.legacy_bulk_form.yml +++ b/core/modules/views/tests/fixtures/update/views.view.legacy_bulk_form.yml @@ -11,7 +11,7 @@ label: 'legacy bulk form' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/fixtures/update/views.view.node_link_update_test.yml b/core/modules/views/tests/fixtures/update/views.view.node_link_update_test.yml index ae6eaa8..a4bb8fc 100644 --- a/core/modules/views/tests/fixtures/update/views.view.node_link_update_test.yml +++ b/core/modules/views/tests/fixtures/update/views.view.node_link_update_test.yml @@ -9,7 +9,7 @@ label: 'node link update test' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/fixtures/update/views.view.placeholder_text_test.yml b/core/modules/views/tests/fixtures/update/views.view.placeholder_text_test.yml index b0d0916..ac83c84 100644 --- a/core/modules/views/tests/fixtures/update/views.view.placeholder_text_test.yml +++ b/core/modules/views/tests/fixtures/update/views.view.placeholder_text_test.yml @@ -11,7 +11,7 @@ label: 'Placeholder text test' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/fixtures/update/views.view.test_boolean_filter_values.yml b/core/modules/views/tests/fixtures/update/views.view.test_boolean_filter_values.yml index 65c2847..81084db 100644 --- a/core/modules/views/tests/fixtures/update/views.view.test_boolean_filter_values.yml +++ b/core/modules/views/tests/fixtures/update/views.view.test_boolean_filter_values.yml @@ -9,7 +9,7 @@ label: Content module: node description: 'Find and manage content.' tag: default -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.base_and_revision.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.base_and_revision.yml index d7d6162..8941eee 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.base_and_revision.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.base_and_revision.yml @@ -9,7 +9,7 @@ label: base_and_revision module: views description: '' tag: '' -base_table: node_field_revision +baseTable: node_field_revision base_field: vid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.computed_field_view.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.computed_field_view.yml index d8de3f1..cd11eb8 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.computed_field_view.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.computed_field_view.yml @@ -8,7 +8,7 @@ label: 'Computed Field View' module: views description: '' tag: '' -base_table: entity_test_computed_field +baseTable: entity_test_computed_field base_field: id core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.entity_test_fields.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.entity_test_fields.yml index 150926c..75dce15 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.entity_test_fields.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.entity_test_fields.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: entity_test +baseTable: entity_test base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.entity_test_row.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.entity_test_row.yml index ee4578f..271aa81 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.entity_test_row.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.entity_test_row.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: entity_test +baseTable: entity_test base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.node_id_argument.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.node_id_argument.yml index 5d2f5ed..11e01d9 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.node_id_argument.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.node_id_argument.yml @@ -9,7 +9,7 @@ label: node_id_argument module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.numeric_test.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.numeric_test.yml index 1246f1c..3ca73bd 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.numeric_test.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.numeric_test.yml @@ -10,7 +10,7 @@ label: 'Numeric test' module: views description: '' tag: '' -base_table: file_managed +baseTable: file_managed base_field: fid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.rest_export_with_authorization.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.rest_export_with_authorization.yml index bef857f..7926e66 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.rest_export_with_authorization.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.rest_export_with_authorization.yml @@ -13,7 +13,7 @@ label: 'Rest Export' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.rest_export_with_authorization_correction.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.rest_export_with_authorization_correction.yml index 27130f2..aa6a2f4 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.rest_export_with_authorization_correction.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.rest_export_with_authorization_correction.yml @@ -12,7 +12,7 @@ label: 'Rest Export' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_access_none.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_access_none.yml index 72be69b..e394521 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_access_none.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_access_none.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_aggregate_count.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_aggregate_count.yml index c8e9488..649bbab 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_aggregate_count.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_aggregate_count.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: entity_test +baseTable: entity_test base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_ajax_view.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_ajax_view.yml index d2d4d43..6a61ef3 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_ajax_view.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_ajax_view.yml @@ -6,7 +6,7 @@ label: 'Test ajax view' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_alias.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_alias.yml index 1dce6dc..a3f4b3a 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_alias.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_alias.yml @@ -8,7 +8,7 @@ label: test_alias module: views description: '' tag: default -base_table: users_field_data +baseTable: users_field_data base_field: nid core: 8.0-dev display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_messages.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_messages.yml index 8292281..0d8eff0 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_messages.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_messages.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_order.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_order.yml index 3a562df..f97547c 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_order.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_order.yml @@ -5,7 +5,7 @@ label: '' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_result.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_result.yml index 8ca5628..25e8e21 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_result.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_result.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_title.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_title.yml index a963e97..d4f702e 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_title.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_title.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_view.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_view.yml index 407228b..a586a25 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_view.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_view.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument.yml index bdff076..e73f659 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument.yml @@ -5,7 +5,7 @@ label: '' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' id: test_argument diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_date.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_date.yml index 1e4db70..4b57acb 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_date.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_date.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_current_user.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_current_user.yml index e5e4af4..e9088f8 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_current_user.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_current_user.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_fixed.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_fixed.yml index c1456f6..166723f 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_fixed.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_fixed.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_node.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_node.yml index 396e798..0a98220 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_node.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_node.yml @@ -11,7 +11,7 @@ label: 'Test argument_default node' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_query_param.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_query_param.yml index 7f97bfd..06c75f5 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_query_param.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_query_param.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_dependency.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_dependency.yml index 2c8541b..44e9341 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_dependency.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_dependency.yml @@ -17,7 +17,7 @@ label: test_argument_dependency module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_validation.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_validation.yml index ec601f7..d96ca25 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_validation.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_validation.yml @@ -9,7 +9,7 @@ label: '' module: views description: 'This view is used to test the argument validator schema.' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: '' core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_validator_term.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_validator_term.yml index 91e239b..0d2d964 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_validator_term.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_validator_term.yml @@ -10,7 +10,7 @@ label: test_argument_validator_term module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_attached_disabled.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_attached_disabled.yml index c36cd48..d5d13c8 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_attached_disabled.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_attached_disabled.yml @@ -11,7 +11,7 @@ label: test_attached_disabled module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_attachment_ui.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_attachment_ui.yml index 529ea0a..978a5f2 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_attachment_ui.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_attachment_ui.yml @@ -8,7 +8,7 @@ label: null module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_cache.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_cache.yml index a96cf07..f81dbfd 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_cache.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_cache.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_click_sort.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_click_sort.yml index 19f6a8e..68f07ea 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_click_sort.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_click_sort.yml @@ -5,7 +5,7 @@ id: test_click_sort module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_content_ajax.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_content_ajax.yml index 0ac2abb..0e9a771 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_content_ajax.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_content_ajax.yml @@ -9,7 +9,7 @@ label: Content module: node description: 'Find and manage content.' tag: default -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_destroy.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_destroy.yml index 035d40f..ea99838 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_destroy.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_destroy.yml @@ -10,7 +10,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_disabled_display.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_disabled_display.yml index 79abcdb..97a5789 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_disabled_display.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_disabled_display.yml @@ -11,7 +11,7 @@ label: test_disabled_display module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml index 8137743..72edc69 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml @@ -9,7 +9,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_attachment.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_attachment.yml index 615ae8c..d5931bf 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_attachment.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_attachment.yml @@ -6,7 +6,7 @@ label: test_display_attachment module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: id core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_defaults.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_defaults.yml index b969c34..21bd65b 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_defaults.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_defaults.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: id core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_empty.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_empty.yml index 25eaf1a..abfe3c9 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_empty.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_empty.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_entity_reference.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_entity_reference.yml index 6989964..07f43ae 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_entity_reference.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_entity_reference.yml @@ -5,7 +5,7 @@ id: test_display_entity_reference module: views description: '' tag: '' -base_table: entity_test +baseTable: entity_test base_field: id core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_feed.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_feed.yml index 51c0838..0b2d90b 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_feed.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_feed.yml @@ -13,7 +13,7 @@ label: test_display_feed module: views description: '' tag: default -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_invalid.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_invalid.yml index f7b1499..3ca5cd2 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_invalid.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_invalid.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_more.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_more.yml index aaf08bb..258b851 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_more.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_more.yml @@ -6,7 +6,7 @@ label: 'Test display more' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_dropbutton.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_dropbutton.yml index 2c0bb91..0acdb66 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_dropbutton.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_dropbutton.yml @@ -9,7 +9,7 @@ label: test_dropbutton module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_duplicate_field_handlers.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_duplicate_field_handlers.yml index 41a9dfa..8b26e43 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_duplicate_field_handlers.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_duplicate_field_handlers.yml @@ -11,7 +11,7 @@ label: 'Test Duplicate Field Handlers' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_area.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_area.yml index 336b043..4caed40 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_area.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_area.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_field_renderers.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_field_renderers.yml index 1572a2f..520ed59 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_field_renderers.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_field_renderers.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_multivalue_basefield.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_multivalue_basefield.yml index d2ecb57..f6c6adf 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_multivalue_basefield.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_multivalue_basefield.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: entity_test_multivalue_basefield +baseTable: entity_test_multivalue_basefield base_field: id core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_operations.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_operations.yml index bb84119..1b80874 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_operations.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_operations.yml @@ -8,7 +8,7 @@ label: test_entity_operations module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: id core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row.yml index ad9f748..63288e4 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: taxonomy_term_field_data +baseTable: taxonomy_term_field_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row_renderers.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row_renderers.yml index 4a8fef6..0d75a14 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row_renderers.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row_renderers.yml @@ -10,7 +10,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row_renderers_revisions_base.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row_renderers_revisions_base.yml index a4ebba1..5bcdbac 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row_renderers_revisions_base.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row_renderers_revisions_base.yml @@ -9,7 +9,7 @@ label: test_entity_row_renderers_revisions_base module: views description: '' tag: '' -base_table: node_field_revision +baseTable: node_field_revision base_field: vid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_test_link.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_test_link.yml index d549ed0..f1b1924 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_test_link.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_test_link.yml @@ -8,7 +8,7 @@ label: 'Test Entity Test Link' module: views description: '' tag: '' -base_table: entity_test +baseTable: entity_test base_field: id core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_test_protected_access.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_test_protected_access.yml index 024b12f..de7307f 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_test_protected_access.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_test_protected_access.yml @@ -10,7 +10,7 @@ label: test_entity_test_protected_access module: views description: '' tag: '' -base_table: entity_test +baseTable: entity_test base_field: id core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_type_filter.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_type_filter.yml index e4d1b93..9540020 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_type_filter.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_type_filter.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_example_area.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_example_area.yml index baa055c..0c5bf2a 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_example_area.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_example_area.yml @@ -5,7 +5,7 @@ id: test_example_area module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_example_area_access.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_example_area_access.yml index ab27d07..203712a 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_example_area_access.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_example_area_access.yml @@ -5,7 +5,7 @@ id: test_example_area_access module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_executable_displays.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_executable_displays.yml index 8f2ef55..8f93fa1 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_executable_displays.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_executable_displays.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_admin_ui.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_admin_ui.yml index d883067..d26cb2c 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_admin_ui.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_admin_ui.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_block.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_block.yml index be96ab4..686fa54 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_block.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_block.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form_buttons.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form_buttons.yml index d33174a..b091588 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form_buttons.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form_buttons.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form_checkboxes.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form_checkboxes.yml index 26b1d32..66c5265 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form_checkboxes.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form_checkboxes.yml @@ -11,7 +11,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form_sort_items_per_page.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form_sort_items_per_page.yml index d7d2d93..b11c588 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form_sort_items_per_page.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form_sort_items_per_page.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: entity_test +baseTable: entity_test base_field: id core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_relationship_admin_ui.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_relationship_admin_ui.yml index 7d5fb3f..e3a5274 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_relationship_admin_ui.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_relationship_admin_ui.yml @@ -9,7 +9,7 @@ label: test_exposed_relationship_admin_ui module: views description: '' tag: '' -base_table: node +baseTable: node base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_feed_icon.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_feed_icon.yml index acb6acb..2ce690d 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_feed_icon.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_feed_icon.yml @@ -11,7 +11,7 @@ label: test_feed_icon module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_alias_test.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_alias_test.yml index 0c72f88..32a30b4 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_alias_test.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_alias_test.yml @@ -5,7 +5,7 @@ id: test_field_alias_test module: views description: '' tag: '' -base_table: entity_test +baseTable: entity_test base_field: id core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_argument_tokens.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_argument_tokens.yml index b7b8c9e..141c12a 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_argument_tokens.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_argument_tokens.yml @@ -6,7 +6,7 @@ label: null module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: id core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_body.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_body.yml index 60d3ced..22afb56 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_body.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_body.yml @@ -12,7 +12,7 @@ label: test_field_body module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_classes.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_classes.yml index 28b3dad..8da557b 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_classes.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_classes.yml @@ -5,7 +5,7 @@ id: test_field_classes module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_config_translation_filter.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_config_translation_filter.yml index 2202d9c..fb6ab00 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_config_translation_filter.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_config_translation_filter.yml @@ -5,7 +5,7 @@ id: test_field_config_translation_filter module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: id core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_entity_test_rendered.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_entity_test_rendered.yml index 541ee96..37c8ade 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_entity_test_rendered.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_entity_test_rendered.yml @@ -9,7 +9,7 @@ label: 'Test Rendered entity test' module: views description: '' tag: '' -base_table: entity_test +baseTable: entity_test base_field: id core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_attachment_test.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_attachment_test.yml index e097264..cd23d4b 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_attachment_test.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_attachment_test.yml @@ -10,7 +10,7 @@ label: test_field_field_attachment_test module: views description: '' tag: '' -base_table: entity_test +baseTable: entity_test base_field: id core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_complex_test.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_complex_test.yml index 2646d06..09b9b64 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_complex_test.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_complex_test.yml @@ -5,7 +5,7 @@ id: test_field_field_complex_test module: views description: '' tag: '' -base_table: entity_test +baseTable: entity_test base_field: id core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_revision_complex_test.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_revision_complex_test.yml index 7680027..973f4b8 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_revision_complex_test.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_revision_complex_test.yml @@ -5,7 +5,7 @@ id: test_field_field_revision_complex_test module: views description: '' tag: '' -base_table: entity_test_rev_revision +baseTable: entity_test_rev_revision base_field: id core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_revision_test.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_revision_test.yml index d1e5c50..d0cf704 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_revision_test.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_revision_test.yml @@ -5,7 +5,7 @@ id: test_field_field_revision_test module: views description: '' tag: '' -base_table: entity_test_rev_revision +baseTable: entity_test_rev_revision base_field: id core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_test.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_test.yml index eabb8f2..d7724b5 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_test.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_field_test.yml @@ -5,7 +5,7 @@ id: test_field_field_test module: views description: '' tag: '' -base_table: entity_test +baseTable: entity_test base_field: id core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_get_entity.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_get_entity.yml index cc3b66c..5db23ef 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_get_entity.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_get_entity.yml @@ -10,7 +10,7 @@ label: test_field_get_entity module: views description: '' tag: default -base_table: comment_field_data +baseTable: comment_field_data base_field: nid core: 8.0-dev display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_header.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_header.yml index 07baa07..9be6cdd 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_header.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_header.yml @@ -6,7 +6,7 @@ label: null module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_output.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_output.yml index 8b3ae47..c7024d1 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_output.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_output.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_tokens.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_tokens.yml index 2a2626c..e70f9ec 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_tokens.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_tokens.yml @@ -6,7 +6,7 @@ label: null module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter.yml index c6f9807..1aaf07f 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter.yml @@ -8,7 +8,7 @@ label: 'Test filters' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_date_between.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_date_between.yml index 47556800..15a51f1 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_date_between.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_date_between.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_group_override.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_group_override.yml index fde1c30..a7a5666 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_group_override.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_group_override.yml @@ -9,7 +9,7 @@ label: test_filter_group_override module: views description: '' tag: default -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_groups.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_groups.yml index 7d95b73..cfd517f 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_groups.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_groups.yml @@ -9,7 +9,7 @@ label: test_filter_groups module: views description: '' tag: default -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml index ef0188a..78401e0 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data core: '8' display: default: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_placeholder_text.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_placeholder_text.yml index 87f7065..fada19a 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_placeholder_text.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_placeholder_text.yml @@ -10,7 +10,7 @@ label: 'Test filter placeholder text' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_form_multiple.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_form_multiple.yml index 138517c..14d1a87 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_form_multiple.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_form_multiple.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_get_attach_displays.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_get_attach_displays.yml index 9681ccd..4309190 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_get_attach_displays.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_get_attach_displays.yml @@ -9,7 +9,7 @@ label: test_get_attach_displays module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_glossary.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_glossary.yml index e2e143e..3941cc1 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_glossary.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_glossary.yml @@ -9,7 +9,7 @@ label: Test glossary module: node description: 'All content, by letter.' tag: default -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_grid.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_grid.yml index 0d02bc0..6b6d461 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_grid.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_grid.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_count.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_count.yml index c6aba49..fdad8ec 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_count.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_count.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: entity_test +baseTable: entity_test base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_count_multicardinality.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_count_multicardinality.yml index c295db5..40f2f50 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_count_multicardinality.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_count_multicardinality.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: entity_test_mul_property_data +baseTable: entity_test_mul_property_data base_field: id core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_field_not_within_bundle.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_field_not_within_bundle.yml index dac925b..9fcf97f 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_field_not_within_bundle.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_field_not_within_bundle.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: entity_test_mul_property_data +baseTable: entity_test_mul_property_data base_field: id core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_in_filters.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_in_filters.yml index da6a676..d1925e0 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_in_filters.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_in_filters.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: entity_test +baseTable: entity_test base_field: '' core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_rows.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_rows.yml index 294e2fd..efd41fc 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_rows.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_rows.yml @@ -12,7 +12,7 @@ label: test_group_rows module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_groupwise_term_ui.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_groupwise_term_ui.yml index c29fb52..81cd23d 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_groupwise_term_ui.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_groupwise_term_ui.yml @@ -10,7 +10,7 @@ label: test_groupwise module: views description: '' tag: default -base_table: taxonomy_term_field_data +baseTable: taxonomy_term_field_data base_field: tid core: 8.0-dev display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_relationships.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_relationships.yml index 1c4c7ac..75a2fda 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_relationships.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_relationships.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_test_access.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_test_access.yml index edd69b0..bbcca96 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_test_access.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_test_access.yml @@ -6,7 +6,7 @@ label: null module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_history.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_history.yml index 39f5d9f..b1355dc 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_history.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_history.yml @@ -10,7 +10,7 @@ label: test_history module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_http_status_code.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_http_status_code.yml index 5b1809a..6896be2 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_http_status_code.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_http_status_code.yml @@ -8,7 +8,7 @@ label: test_http_status_code module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_invalid_tokens.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_invalid_tokens.yml index b57593a..7e9062c 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_invalid_tokens.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_invalid_tokens.yml @@ -6,7 +6,7 @@ label: 'Test invalid tokens' module: views description: 'Test view to invalid token replacement tests.' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: id core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_latest_revision_filter.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_latest_revision_filter.yml index 53f0f72..d8a0139 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_latest_revision_filter.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_latest_revision_filter.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_revision +baseTable: node_field_revision base_field: vid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_menu_link.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_menu_link.yml index d51b920..ab98ab4 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_menu_link.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_menu_link.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_mini_pager.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_mini_pager.yml index 289f83d..de6be58 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_mini_pager.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_mini_pager.yml @@ -9,7 +9,7 @@ label: test_mini_pager module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display.yml index 11c7b37..7ca01ec 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_arguments.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_arguments.yml index 62c008d..5e7a8a8 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_arguments.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_arguments.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: id core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_menu.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_menu.yml index a1eb3b5..4017d5a 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_menu.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_menu.yml @@ -6,7 +6,7 @@ label: 'Test page menu' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: id core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_path.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_path.yml index c0530c4..9e86ba4 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_path.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_path.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_route.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_route.yml index fd1ca94..b0ee9a2 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_route.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_route.yml @@ -10,7 +10,7 @@ label: '' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: id core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_view.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_view.yml index 6b8ad9f..d2a95c1 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_view.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_view.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_full.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_full.yml index 68dae03..439e3a5 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_full.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_full.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_none.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_none.yml index 9757036..bb36797 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_none.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_none.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_some.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_some.yml index 29dccf4..b99f726 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_some.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_some.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_plugin_dependencies.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_plugin_dependencies.yml index 21877c9..1459566 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_plugin_dependencies.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_plugin_dependencies.yml @@ -13,7 +13,7 @@ label: test_plugin_dependencies module: views description: '' tag: default -base_table: comment_field_data +baseTable: comment_field_data base_field: nid core: 8.0-dev display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_preview.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_preview.yml index d0c26bf..32d2339 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_preview.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_preview.yml @@ -8,7 +8,7 @@ label: test_preview module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: id core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_preview_error.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_preview_error.yml index 1c4d390..b6f7a34 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_preview_error.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_preview_error.yml @@ -8,7 +8,7 @@ label: test_preview_error module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: id core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_redirect_view.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_redirect_view.yml index 0829bf1..d5ab564 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_redirect_view.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_redirect_view.yml @@ -9,7 +9,7 @@ label: test_redirect_view module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_relationship_dependency.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_relationship_dependency.yml index f392a52..c1b6f9c 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_relationship_dependency.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_relationship_dependency.yml @@ -10,7 +10,7 @@ label: test_relationship_dependency module: views description: '' tag: default -base_table: comment_field_data +baseTable: comment_field_data base_field: nid core: 8.0-dev display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_row_render_cache.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_row_render_cache.yml index 34a3cc5..73ceec9 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_row_render_cache.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_row_render_cache.yml @@ -10,7 +10,7 @@ label: 'Test render cache' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_row_render_cache_none.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_row_render_cache_none.yml index 3a6bf95..2ce40d3 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_row_render_cache_none.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_row_render_cache_none.yml @@ -10,7 +10,7 @@ label: 'Test no render cache' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_search.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_search.yml index 67873ca..2db719a 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_search.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_search.yml @@ -10,7 +10,7 @@ label: 'Search Test' module: views description: 'Test view for Search integration' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_simple_argument.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_simple_argument.yml index 8badd47..2a5b26c 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_simple_argument.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_simple_argument.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_store_pager_settings.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_store_pager_settings.yml index 1b6bc95..721ab57 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_store_pager_settings.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_store_pager_settings.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_html_list.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_html_list.yml index 99f9bfc..97ff2a5 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_html_list.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_html_list.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: id core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_mapping.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_mapping.yml index 5b528a7..18f37cb 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_mapping.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_mapping.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_opml.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_opml.yml index bb856ce..63b2819 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_opml.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_opml.yml @@ -8,7 +8,7 @@ label: test_style_opml module: views description: '' tag: default -base_table: aggregator_feed +baseTable: aggregator_feed base_field: fid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_summary.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_summary.yml index 468de37..4cf74c9 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_summary.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_summary.yml @@ -5,7 +5,7 @@ label: Test Summary module: views description: '' tag: default -base_table: entity_test +baseTable: entity_test base_field: id core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_table.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_table.yml index b391efc..8f595eb 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_table.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_table.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tag_cache.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tag_cache.yml index 08e2d3a..19dfbcf 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tag_cache.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tag_cache.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_taxonomy_glossary.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_taxonomy_glossary.yml index 8e4182d..0c1424e 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_taxonomy_glossary.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_taxonomy_glossary.yml @@ -8,7 +8,7 @@ label: test_taxonomy_glossary module: views description: '' tag: '' -base_table: taxonomy_term_field_data +baseTable: taxonomy_term_field_data base_field: tid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_token_view.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_token_view.yml index b2e3c7d..5865283 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_token_view.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_token_view.yml @@ -9,7 +9,7 @@ label: test_token_view module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tokens.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tokens.yml index 6032b48..3b7be35 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tokens.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tokens.yml @@ -6,7 +6,7 @@ label: 'Test tokens' module: views description: 'Test view to token replacement tests.' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: id core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_ungroup_rows.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_ungroup_rows.yml index 3acfc42..4a4d8d8 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_ungroup_rows.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_ungroup_rows.yml @@ -12,7 +12,7 @@ label: test_ungroup_rows module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view.yml index f54e92b..7d625c4 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view.yml @@ -6,7 +6,7 @@ label: 'Test view' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml index 7337fcc..f2d08d9 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_broken.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_broken.yml index 0b6de02..36e2922 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_broken.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_broken.yml @@ -6,7 +6,7 @@ label: 'Test view' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_delete.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_delete.yml index fb2cff3..23256df 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_delete.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_delete.yml @@ -6,7 +6,7 @@ label: test_view_delete module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_display_template.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_display_template.yml index ac29cb6..ceae47d 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_display_template.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_display_template.yml @@ -8,7 +8,7 @@ label: test_view_display_template module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: id core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_embed.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_embed.yml index 98ea92d..74fa38e 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_embed.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_embed.yml @@ -6,7 +6,7 @@ label: 'Test view embed' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_empty.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_empty.yml index 951bfd2..5042e8e 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_empty.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_empty.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_entity_test.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_entity_test.yml index 48df3dd..c27ac97 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_entity_test.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_entity_test.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: entity_test_update +baseTable: entity_test_update base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_entity_test_additional_base_field.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_entity_test_additional_base_field.yml index a1cb151..808eba9 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_entity_test_additional_base_field.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_entity_test_additional_base_field.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: entity_test_update +baseTable: entity_test_update base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_entity_test_data.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_entity_test_data.yml index 5492480..867aa50 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_entity_test_data.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_entity_test_data.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: entity_test_update +baseTable: entity_test_update base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_entity_test_revision.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_entity_test_revision.yml index 8a5a477..621602d7 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_entity_test_revision.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_entity_test_revision.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: entity_test_update_revision +baseTable: entity_test_update_revision base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_handler_weight.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_handler_weight.yml index 753510a..4213210 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_handler_weight.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_handler_weight.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_pager_full_zero_items_per_page.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_pager_full_zero_items_per_page.yml index 82be894..2eda446 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_pager_full_zero_items_per_page.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_pager_full_zero_items_per_page.yml @@ -8,7 +8,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_render.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_render.yml index 89080d6..a6fbee3 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_render.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_render.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_sort_translation.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_sort_translation.yml index 09b9e41..807e4bf 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_sort_translation.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_sort_translation.yml @@ -5,7 +5,7 @@ id: test_view_sort_translation module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: id core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_status.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_status.yml index 83300e6..dc8d728 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_status.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_status.yml @@ -6,7 +6,7 @@ label: test_view_status module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: id core: 8.x display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_storage.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_storage.yml index e59b69f..84361d0 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_storage.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_storage.yml @@ -6,7 +6,7 @@ label: 'Storage Test View' module: views description: 'Storage Test View for testing.' tag: test -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_views_groupby_save.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_views_groupby_save.yml index a95fca3..ecb0eab 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_views_groupby_save.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_views_groupby_save.yml @@ -6,7 +6,7 @@ label: '' module: views description: '' tag: '' -base_table: views_test_data +baseTable: views_test_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/row/RowTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/row/RowTest.php index 6af493b..3d97733 100644 --- a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/row/RowTest.php +++ b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/row/RowTest.php @@ -15,7 +15,7 @@ * title = @Translation("Test row plugin"), * help = @Translation("Provides a generic row test plugin."), * theme = "views_view_row_test", - * display_types = {"normal", "test"} + * displayTypes = {"normal", "test"} * ) */ class RowTest extends RowPluginBase { diff --git a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/MappingTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/MappingTest.php index 3ae816a..e59322d 100644 --- a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/MappingTest.php +++ b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/MappingTest.php @@ -15,7 +15,7 @@ * title = @Translation("Field mapping"), * help = @Translation("Maps specific fields to specific purposes."), * theme = "views_view_mapping_test", - * display_types = {"normal", "test"} + * displayTypes = {"normal", "test"} * ) */ class MappingTest extends Mapping { diff --git a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/StyleTemplateTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/StyleTemplateTest.php index b924d90..94ee775 100644 --- a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/StyleTemplateTest.php +++ b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/StyleTemplateTest.php @@ -14,7 +14,7 @@ * title = @Translation("Test style template plugin"), * help = @Translation("Provides a generic style template test plugin."), * theme = "views_view_style_template_test", - * display_types = {"normal", "test"} + * displayTypes = {"normal", "test"} * ) */ class StyleTemplateTest extends StylePluginBase { diff --git a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/StyleTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/StyleTest.php index fa6f57f..7e0ec5a 100644 --- a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/StyleTest.php +++ b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/StyleTest.php @@ -16,7 +16,7 @@ * help = @Translation("Provides a generic style test plugin."), * theme = "views_view_style_test", * register_theme = FALSE, - * display_types = {"normal", "test"} + * displayTypes = {"normal", "test"} * ) */ class StyleTest extends StylePluginBase { diff --git a/core/modules/views/tests/modules/views_test_data/test_views/views.view.test_access_static.yml b/core/modules/views/tests/modules/views_test_data/test_views/views.view.test_access_static.yml index 6f2ff35..f65b2cf 100644 --- a/core/modules/views/tests/modules/views_test_data/test_views/views.view.test_access_static.yml +++ b/core/modules/views/tests/modules/views_test_data/test_views/views.view.test_access_static.yml @@ -10,7 +10,7 @@ label: '' module: views description: '' tag: '' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: '8' display: diff --git a/core/modules/views/tests/src/Functional/Handler/HandlerAllTest.php b/core/modules/views/tests/src/Functional/Handler/HandlerAllTest.php index 1a37ce8..9acd16e 100644 --- a/core/modules/views/tests/src/Functional/Handler/HandlerAllTest.php +++ b/core/modules/views/tests/src/Functional/Handler/HandlerAllTest.php @@ -51,12 +51,12 @@ public function testHandlers() { $this->addDefaultCommentField('node', 'article'); $object_types = array_keys(ViewExecutable::getHandlerTypes()); - foreach ($this->container->get('views.views_data')->get() as $base_table => $info) { + foreach ($this->container->get('views.views_data')->get() as $baseTable => $info) { if (!isset($info['table']['base'])) { continue; } - $view = View::create(['base_table' => $base_table]); + $view = View::create(['baseTable' => $baseTable]); $view = $view->getExecutable(); // @todo The groupwise relationship is currently broken. @@ -66,9 +66,9 @@ public function testHandlers() { // Go through all fields and there through all handler types. foreach ($info as $field => $field_info) { // Table is a reserved key for the metainformation. - if ($field != 'table' && !in_array("$base_table:$field", $exclude)) { + if ($field != 'table' && !in_array("$baseTable:$field", $exclude)) { $item = [ - 'table' => $base_table, + 'table' => $baseTable, 'field' => $field, ]; foreach ($object_types as $type) { @@ -84,7 +84,7 @@ public function testHandlers() { $options['value'] = 1; } } - $view->addHandler('default', $type, $base_table, $field, $options); + $view->addHandler('default', $type, $baseTable, $field, $options); } } } diff --git a/core/modules/views/tests/src/Functional/Handler/HandlerTest.php b/core/modules/views/tests/src/Functional/Handler/HandlerTest.php index cffe6d1..b5f5696 100644 --- a/core/modules/views/tests/src/Functional/Handler/HandlerTest.php +++ b/core/modules/views/tests/src/Functional/Handler/HandlerTest.php @@ -277,7 +277,7 @@ public function testRelationshipUI() { $this->assertNoFieldByName($relationship_name, NULL, 'Make sure that no relationship option is available'); // Create a view of comments with node relationship. - View::create(['base_table' => 'comment_field_data', 'id' => 'test_get_entity_type'])->save(); + View::create(['baseTable' => 'comment_field_data', 'id' => 'test_get_entity_type'])->save(); $this->drupalPostForm('admin/structure/views/nojs/add-handler/test_get_entity_type/default/relationship', ['name[comment_field_data.node]' => 'comment_field_data.node'], t('Add and configure relationships')); $this->drupalPostForm(NULL, [], t('Apply')); // Add a content type filter. diff --git a/core/modules/views/tests/src/Functional/Plugin/ViewsBulkTest.php b/core/modules/views/tests/src/Functional/Plugin/ViewsBulkTest.php index 1b3078b..4da885e 100644 --- a/core/modules/views/tests/src/Functional/Plugin/ViewsBulkTest.php +++ b/core/modules/views/tests/src/Functional/Plugin/ViewsBulkTest.php @@ -16,7 +16,7 @@ class ViewsBulkTest extends ViewTestBase { * * @var \Drupal\user\UserInterface */ - protected $admin_user; + protected $adminUser; /** * Modules to enable. diff --git a/core/modules/views/tests/src/Kernel/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php b/core/modules/views/tests/src/Kernel/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php index 2319a70..0514c05 100644 --- a/core/modules/views/tests/src/Kernel/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php +++ b/core/modules/views/tests/src/Kernel/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php @@ -135,7 +135,7 @@ public function testBaseTableRename() { $view = $entity_storage->load('test_view_entity_test'); // Ensure the base table got renamed, so also the views fields. - $this->assertEqual('entity_test_update_new', $view->get('base_table')); + $this->assertEqual('entity_test_update_new', $view->get('baseTable')); $display = $view->getDisplay('default'); $this->assertEqual('entity_test_update_new', $display['display_options']['fields']['id']['table']); $this->assertEqual('entity_test_update_new', $display['display_options']['fields']['name']['table']); @@ -150,7 +150,7 @@ public function testDataTableRename() { $entity_storage = $this->entityManager->getStorage('view'); $view = $entity_storage->load('test_view_entity_test_data'); - $this->assertEqual('entity_test_update', $view->get('base_table')); + $this->assertEqual('entity_test_update', $view->get('baseTable')); $display = $view->getDisplay('default'); $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']); // Ensure that the data table is used. @@ -164,7 +164,7 @@ public function testDataTableRename() { $view = $entity_storage->load('test_view_entity_test_data'); // Ensure the data table got renamed, so also the views fields. - $this->assertEqual('entity_test_update', $view->get('base_table')); + $this->assertEqual('entity_test_update', $view->get('baseTable')); $display = $view->getDisplay('default'); $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']); $this->assertEqual('entity_test_update_data_new', $display['display_options']['fields']['name']['table']); @@ -180,7 +180,7 @@ public function testRevisionBaseTableRename() { /** @var \Drupal\views\Entity\View $view */ $entity_storage = $this->entityManager->getStorage('view'); $view = $entity_storage->load('test_view_entity_test_revision'); - $this->assertEqual('entity_test_update_revision', $view->get('base_table')); + $this->assertEqual('entity_test_update_revision', $view->get('baseTable')); $display = $view->getDisplay('default'); $this->assertEqual('entity_test_update_revision', $display['display_options']['fields']['id']['table']); $this->assertEqual('entity_test_update_revision', $display['display_options']['fields']['name']['table']); @@ -193,7 +193,7 @@ public function testRevisionBaseTableRename() { $view = $entity_storage->load('test_view_entity_test_revision'); // Ensure the base table got renamed, so also the views fields. - $this->assertEqual('entity_test_update_revision_new', $view->get('base_table')); + $this->assertEqual('entity_test_update_revision_new', $view->get('baseTable')); $display = $view->getDisplay('default'); $this->assertEqual('entity_test_update_revision_new', $display['display_options']['fields']['id']['table']); $this->assertEqual('entity_test_update_revision_new', $display['display_options']['fields']['name']['table']); @@ -213,7 +213,7 @@ public function testRevisionDataTableRename() { /** @var \Drupal\views\Entity\View $view */ $entity_storage = $this->entityManager->getStorage('view'); $view = $entity_storage->load('test_view_entity_test_revision'); - $this->assertEqual('entity_test_update_revision', $view->get('base_table')); + $this->assertEqual('entity_test_update_revision', $view->get('baseTable')); $display = $view->getDisplay('default'); $this->assertEqual('entity_test_update_revision', $display['display_options']['fields']['id']['table']); $this->assertEqual('entity_test_update_revision_data', $display['display_options']['fields']['name']['table']); @@ -226,7 +226,7 @@ public function testRevisionDataTableRename() { $view = $entity_storage->load('test_view_entity_test_revision'); // Ensure the base table got renamed, so also the views fields. - $this->assertEqual('entity_test_update_revision', $view->get('base_table')); + $this->assertEqual('entity_test_update_revision', $view->get('baseTable')); $display = $view->getDisplay('default'); $this->assertEqual('entity_test_update_revision', $display['display_options']['fields']['id']['table']); $this->assertEqual('entity_test_update_revision_data_new', $display['display_options']['fields']['name']['table']); @@ -244,7 +244,7 @@ public function testDataTableAddition() { $view = $entity_storage->load('test_view_entity_test'); // Ensure the data table got renamed, so also the views fields. - $this->assertEqual('entity_test_update', $view->get('base_table')); + $this->assertEqual('entity_test_update', $view->get('baseTable')); $display = $view->getDisplay('default'); $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']); $this->assertEqual('entity_test_update_data', $display['display_options']['fields']['name']['table']); @@ -262,7 +262,7 @@ public function testRevisionEnabling() { $view = $entity_storage->load('test_view_entity_test'); // Ensure that nothing happens. - $this->assertEqual('entity_test_update', $view->get('base_table')); + $this->assertEqual('entity_test_update', $view->get('baseTable')); $display = $view->getDisplay('default'); $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']); $this->assertEqual('entity_test_update', $display['display_options']['fields']['name']['table']); @@ -301,7 +301,7 @@ public function testVariousTableUpdates() { $this->entityDefinitionUpdateManager->applyUpdates(); list($view, $display) = $this->getUpdatedViewAndDisplay(); - $this->assertEqual('entity_test_update', $view->get('base_table')); + $this->assertEqual('entity_test_update', $view->get('baseTable')); $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']); $this->assertEqual('entity_test_update_data', $display['display_options']['fields']['name']['table']); @@ -309,7 +309,7 @@ public function testVariousTableUpdates() { $this->entityDefinitionUpdateManager->applyUpdates(); list($view, $display) = $this->getUpdatedViewAndDisplay(); - $this->assertEqual('entity_test_update', $view->get('base_table')); + $this->assertEqual('entity_test_update', $view->get('baseTable')); $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']); $this->assertEqual('entity_test_update', $display['display_options']['fields']['name']['table']); @@ -320,7 +320,7 @@ public function testVariousTableUpdates() { $this->entityDefinitionUpdateManager->applyUpdates(); list($view, $display) = $this->getUpdatedViewAndDisplay(); - $this->assertEqual('entity_test_update', $view->get('base_table')); + $this->assertEqual('entity_test_update', $view->get('baseTable')); $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']); $this->assertEqual('entity_test_update_data', $display['display_options']['fields']['name']['table']); @@ -328,7 +328,7 @@ public function testVariousTableUpdates() { $this->entityDefinitionUpdateManager->applyUpdates(); list($view, $display) = $this->getUpdatedViewAndDisplay(); - $this->assertEqual('entity_test_update', $view->get('base_table')); + $this->assertEqual('entity_test_update', $view->get('baseTable')); $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']); $this->assertEqual('entity_test_update_data', $display['display_options']['fields']['name']['table']); @@ -336,7 +336,7 @@ public function testVariousTableUpdates() { $this->entityDefinitionUpdateManager->applyUpdates(); list($view, $display) = $this->getUpdatedViewAndDisplay(); - $this->assertEqual('entity_test_update', $view->get('base_table')); + $this->assertEqual('entity_test_update', $view->get('baseTable')); $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']); $this->assertEqual('entity_test_update_data', $display['display_options']['fields']['name']['table']); @@ -346,7 +346,7 @@ public function testVariousTableUpdates() { $this->updateEntityTypeToRevisionable(); list($view, $display) = $this->getUpdatedViewAndDisplay(); - $this->assertEqual('entity_test_update', $view->get('base_table')); + $this->assertEqual('entity_test_update', $view->get('baseTable')); $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']); $this->assertEqual('entity_test_update', $display['display_options']['fields']['name']['table']); @@ -354,7 +354,7 @@ public function testVariousTableUpdates() { $this->entityDefinitionUpdateManager->applyUpdates(); list($view, $display) = $this->getUpdatedViewAndDisplay(); - $this->assertEqual('entity_test_update', $view->get('base_table')); + $this->assertEqual('entity_test_update', $view->get('baseTable')); $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']); $this->assertEqual('entity_test_update_data', $display['display_options']['fields']['name']['table']); @@ -362,7 +362,7 @@ public function testVariousTableUpdates() { $this->entityDefinitionUpdateManager->applyUpdates(); list($view, $display) = $this->getUpdatedViewAndDisplay(); - $this->assertEqual('entity_test_update', $view->get('base_table')); + $this->assertEqual('entity_test_update', $view->get('baseTable')); $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']); $this->assertEqual('entity_test_update', $display['display_options']['fields']['name']['table']); @@ -373,7 +373,7 @@ public function testVariousTableUpdates() { $this->entityDefinitionUpdateManager->applyUpdates(); list($view, $display) = $this->getUpdatedViewAndDisplay(); - $this->assertEqual('entity_test_update', $view->get('base_table')); + $this->assertEqual('entity_test_update', $view->get('baseTable')); $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']); $this->assertEqual('entity_test_update', $display['display_options']['fields']['name']['table']); @@ -381,7 +381,7 @@ public function testVariousTableUpdates() { $this->entityDefinitionUpdateManager->applyUpdates(); list($view, $display) = $this->getUpdatedViewAndDisplay(); - $this->assertEqual('entity_test_update', $view->get('base_table')); + $this->assertEqual('entity_test_update', $view->get('baseTable')); $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']); $this->assertEqual('entity_test_update', $display['display_options']['fields']['name']['table']); @@ -393,7 +393,7 @@ public function testVariousTableUpdates() { $this->entityDefinitionUpdateManager->applyUpdates(); list($view, $display) = $this->getUpdatedViewAndDisplay(); - $this->assertEqual('entity_test_update', $view->get('base_table')); + $this->assertEqual('entity_test_update', $view->get('baseTable')); $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']); $this->assertEqual('entity_test_update_data', $display['display_options']['fields']['name']['table']); @@ -402,7 +402,7 @@ public function testVariousTableUpdates() { $this->entityDefinitionUpdateManager->applyUpdates(); list($view, $display) = $this->getUpdatedViewAndDisplay(); - $this->assertEqual('entity_test_update', $view->get('base_table')); + $this->assertEqual('entity_test_update', $view->get('baseTable')); $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']); $this->assertEqual('entity_test_update', $display['display_options']['fields']['name']['table']); } @@ -419,7 +419,7 @@ public function testVariousTableUpdatesForRevisionView() { list($view, $display) = $this->getUpdatedViewAndDisplay(TRUE); - $this->assertEqual('entity_test_update_revision', $view->get('base_table')); + $this->assertEqual('entity_test_update_revision', $view->get('baseTable')); $this->assertEqual('entity_test_update_revision', $display['display_options']['fields']['id']['table']); $this->assertEqual('entity_test_update_revision', $display['display_options']['fields']['name']['table']); @@ -427,7 +427,7 @@ public function testVariousTableUpdatesForRevisionView() { $this->entityDefinitionUpdateManager->applyUpdates(); list($view, $display) = $this->getUpdatedViewAndDisplay(TRUE); - $this->assertEqual('entity_test_update_revision', $view->get('base_table')); + $this->assertEqual('entity_test_update_revision', $view->get('baseTable')); $this->assertEqual('entity_test_update_revision', $display['display_options']['fields']['id']['table']); $this->assertEqual('entity_test_update_revision_data', $display['display_options']['fields']['name']['table']); @@ -435,7 +435,7 @@ public function testVariousTableUpdatesForRevisionView() { $this->entityDefinitionUpdateManager->applyUpdates(); list($view, $display) = $this->getUpdatedViewAndDisplay(TRUE); - $this->assertEqual('entity_test_update_revision', $view->get('base_table')); + $this->assertEqual('entity_test_update_revision', $view->get('baseTable')); $this->assertEqual('entity_test_update_revision', $display['display_options']['fields']['id']['table']); $this->assertEqual('entity_test_update_revision', $display['display_options']['fields']['name']['table']); diff --git a/core/modules/views/tests/src/Kernel/Handler/FieldFieldAccessTestBase.php b/core/modules/views/tests/src/Kernel/Handler/FieldFieldAccessTestBase.php index 5ff77bc..7d36937 100644 --- a/core/modules/views/tests/src/Kernel/Handler/FieldFieldAccessTestBase.php +++ b/core/modules/views/tests/src/Kernel/Handler/FieldFieldAccessTestBase.php @@ -88,10 +88,10 @@ protected function assertFieldAccess($entity_type_id, $field_name, $field_conten $data_table = $entity_type->getDataTable(); // Use the data table as long as the field is not 'uuid'. This is the only // column that can only be obtained from the base table. - $base_table = ($data_table && ($field_name !== 'uuid')) ? $data_table : $entity_type->getBaseTable(); + $baseTable = ($data_table && ($field_name !== 'uuid')) ? $data_table : $entity_type->getBaseTable(); $entity = View::create([ 'id' => $view_id, - 'base_table' => $base_table, + 'baseTable' => $baseTable, 'display' => [ 'default' => [ 'display_plugin' => 'default', @@ -99,7 +99,7 @@ protected function assertFieldAccess($entity_type_id, $field_name, $field_conten 'display_options' => [ 'fields' => [ $field_name => [ - 'table' => $base_table, + 'table' => $baseTable, 'field' => $field_name, 'id' => $field_name, 'plugin_id' => 'field', diff --git a/core/modules/views/tests/src/Kernel/ViewExecutableTest.php b/core/modules/views/tests/src/Kernel/ViewExecutableTest.php index 7390214..585a08f 100644 --- a/core/modules/views/tests/src/Kernel/ViewExecutableTest.php +++ b/core/modules/views/tests/src/Kernel/ViewExecutableTest.php @@ -50,7 +50,7 @@ class ViewExecutableTest extends ViewsKernelTestBase { 'name', 'description', 'tag', - 'base_table', + 'baseTable', 'label', 'core', 'display', diff --git a/core/modules/views/tests/src/Kernel/ViewStorageTest.php b/core/modules/views/tests/src/Kernel/ViewStorageTest.php index 7cf953a..5dd6c45 100644 --- a/core/modules/views/tests/src/Kernel/ViewStorageTest.php +++ b/core/modules/views/tests/src/Kernel/ViewStorageTest.php @@ -27,7 +27,7 @@ class ViewStorageTest extends ViewsKernelTestBase { 'id', 'description', 'tag', - 'base_table', + 'baseTable', 'label', 'core', 'display', @@ -254,7 +254,7 @@ protected function displayMethodTests() { ); // Tests item related methods(). - $view = $this->controller->create(['base_table' => 'views_test_data']); + $view = $this->controller->create(['baseTable' => 'views_test_data']); $view->addDisplay('default'); $view = $view->getExecutable(); @@ -331,7 +331,7 @@ public function testCreateDuplicate() { 'disabled', 'description', 'tag', - 'base_table', + 'baseTable', 'label', 'core', ]; diff --git a/core/modules/views/tests/src/Kernel/Wizard/WizardPluginBaseKernelTest.php b/core/modules/views/tests/src/Kernel/Wizard/WizardPluginBaseKernelTest.php index beb7b48..51476d7 100644 --- a/core/modules/views/tests/src/Kernel/Wizard/WizardPluginBaseKernelTest.php +++ b/core/modules/views/tests/src/Kernel/Wizard/WizardPluginBaseKernelTest.php @@ -58,7 +58,7 @@ public function testCreateView() { 'id' => $random_id, 'label' => $random_label, 'description' => $random_description, - 'base_table' => 'views_test_data', + 'baseTable' => 'views_test_data', ]); $this->wizard->validateView($form, $form_state); @@ -67,7 +67,7 @@ public function testCreateView() { $this->assertEqual($view->get('id'), $random_id); $this->assertEqual($view->get('label'), $random_label); $this->assertEqual($view->get('description'), $random_description); - $this->assertEqual($view->get('base_table'), 'views_test_data'); + $this->assertEqual($view->get('baseTable'), 'views_test_data'); $this->assertEqual($view->get('langcode'), 'it'); } diff --git a/core/modules/views/tests/src/Unit/EntityViewsDataTest.php b/core/modules/views/tests/src/Unit/EntityViewsDataTest.php index d8b63ce..d259ee2 100644 --- a/core/modules/views/tests/src/Unit/EntityViewsDataTest.php +++ b/core/modules/views/tests/src/Unit/EntityViewsDataTest.php @@ -97,7 +97,7 @@ protected function setUp() { ->willReturn(['class' => '\Drupal\Core\Field\Plugin\Field\FieldType\StringLongItem']); $this->baseEntityType = new TestEntityType([ - 'base_table' => 'entity_test', + 'baseTable' => 'entity_test', 'id' => 'entity_test', 'label' => 'Entity test', 'entity_keys' => [ @@ -562,7 +562,7 @@ public function testBaseTableFields() { public function testDataTableFields() { $entity_type = $this->baseEntityType ->set('data_table', 'entity_test_mul_property_data') - ->set('base_table', 'entity_test_mul') + ->set('baseTable', 'entity_test_mul') ->set('id', 'entity_test_mul') ->setKey('bundle', 'type'); $base_field_definitions = $this->setupBaseFields(EntityTestMul::baseFieldDefinitions($this->baseEntityType)); @@ -716,7 +716,7 @@ public function testDataTableFields() { */ public function testRevisionTableFields() { $entity_type = $this->baseEntityType - ->set('base_table', 'entity_test_mulrev') + ->set('baseTable', 'entity_test_mulrev') ->set('revision_table', 'entity_test_mulrev_revision') ->set('data_table', 'entity_test_mulrev_property_data') ->set('revision_data_table', 'entity_test_mulrev_property_revision') @@ -1086,7 +1086,7 @@ protected static function userEntityInfo() { 'id' => 'user', 'class' => 'Drupal\user\Entity\User', 'label' => 'User', - 'base_table' => 'users', + 'baseTable' => 'users', 'data_table' => 'users_field_data', 'entity_keys' => [ 'id' => 'uid', diff --git a/core/modules/views/tests/src/Unit/Plugin/HandlerBaseTest.php b/core/modules/views/tests/src/Unit/Plugin/HandlerBaseTest.php index ac5a1fe..b8197fb 100644 --- a/core/modules/views/tests/src/Unit/Plugin/HandlerBaseTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/HandlerBaseTest.php @@ -38,7 +38,7 @@ public function testGetEntityTypeForFieldOnBaseTable() { $this->view->expects($this->any()) ->method('get') - ->with('base_table') + ->with('baseTable') ->willReturn('test_entity_type_table'); $this->viewsData->expects($this->any()) ->method('get') @@ -67,7 +67,7 @@ public function testGetEntityTypeForFieldWithRelationship() { $this->view->expects($this->any()) ->method('get') - ->with('base_table') + ->with('baseTable') ->willReturn('test_entity_type_table'); $this->viewsData->expects($this->any()) diff --git a/core/modules/views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php b/core/modules/views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php index 08ec780..3f5155a 100644 --- a/core/modules/views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php @@ -126,7 +126,7 @@ public function testCollectRoutesWithDisplayReturnResponse() { 'path' => 'test_route', ]; $this->pathPlugin = $this->getMockBuilder('Drupal\views\Plugin\views\display\PathPluginBase') - ->setConstructorArgs([[], 'path_base', ['returns_response' => TRUE], $this->routeProvider, $this->state]) + ->setConstructorArgs([[], 'path_base', ['returnsResponse' => TRUE], $this->routeProvider, $this->state]) ->setMethods(NULL) ->getMock(); $this->pathPlugin->initDisplay($view, $display); @@ -134,7 +134,7 @@ public function testCollectRoutesWithDisplayReturnResponse() { $collection = new RouteCollection(); $this->pathPlugin->collectRoutes($collection); $route = $collection->get('view.test_id.page_1'); - $this->assertSame(TRUE, $route->getOption('returns_response')); + $this->assertSame(TRUE, $route->getOption('returnsResponse')); $this->assertEquals('my views title', $route->getDefault('_title')); } diff --git a/core/modules/views/tests/src/Unit/Plugin/field/FieldTest.php b/core/modules/views/tests/src/Unit/Plugin/field/FieldTest.php index 2b929f3..784fab1 100644 --- a/core/modules/views/tests/src/Unit/Plugin/field/FieldTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/field/FieldTest.php @@ -256,7 +256,7 @@ public function testAccess() { $this->view->expects($this->atLeastOnce()) ->method('get') - ->with('base_table') + ->with('baseTable') ->willReturn('test_entity_table'); $this->viewsData->expects($this->atLeastOnce()) diff --git a/core/modules/views/tests/src/Unit/Plugin/query/SqlTest.php b/core/modules/views/tests/src/Unit/Plugin/query/SqlTest.php index 80e8a33..c74b292 100644 --- a/core/modules/views/tests/src/Unit/Plugin/query/SqlTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/query/SqlTest.php @@ -152,7 +152,7 @@ protected function setupEntityTypes($entities_by_type = [], $entity_revisions_by $entity_type0 = new EntityType([ 'label' => 'First', 'id' => 'first', - 'base_table' => 'entity_first', + 'baseTable' => 'entity_first', 'revision_table' => 'entity_first__revision', 'entity_keys' => [ 'id' => 'id', @@ -162,7 +162,7 @@ protected function setupEntityTypes($entities_by_type = [], $entity_revisions_by $entity_type1 = new EntityType([ 'label' => 'second', 'id' => 'second', - 'base_table' => 'entity_second', + 'baseTable' => 'entity_second', 'revision_table' => 'entity_second__revision', 'entity_keys' => [ 'id' => 'id', @@ -173,7 +173,7 @@ protected function setupEntityTypes($entities_by_type = [], $entity_revisions_by $entity_type_manager->getDefinitions()->willReturn([ 'first' => $entity_type0, 'second' => $entity_type1, - 'base_table' => 'entity_second', + 'baseTable' => 'entity_second', ]); $entity_type_manager->getDefinition('first')->willReturn($entity_type0); @@ -247,7 +247,7 @@ protected function setupEntityTypes($entities_by_type = [], $entity_revisions_by public function testLoadEntitiesWithEmptyResult() { $view = $this->prophesize('Drupal\views\ViewExecutable')->reveal(); $view_entity = $this->prophesize(ViewEntityInterface::class); - $view_entity->get('base_table')->willReturn('entity_first'); + $view_entity->get('baseTable')->willReturn('entity_first'); $view_entity->get('base_field')->willReturn('id'); $view->storage = $view_entity->reveal(); @@ -270,7 +270,7 @@ public function testLoadEntitiesWithEmptyResult() { public function testLoadEntitiesWithNoRelationshipAndNoRevision() { $view = $this->prophesize('Drupal\views\ViewExecutable')->reveal(); $view_entity = $this->prophesize(ViewEntityInterface::class); - $view_entity->get('base_table')->willReturn('entity_first'); + $view_entity->get('baseTable')->willReturn('entity_first'); $view_entity->get('base_field')->willReturn('id'); $view->storage = $view_entity->reveal(); @@ -330,7 +330,7 @@ public function testLoadEntitiesWithRelationship() { $this->setupViewWithRelationships($view); $view_entity = $this->prophesize(ViewEntityInterface::class); - $view_entity->get('base_table')->willReturn('entity_first'); + $view_entity->get('baseTable')->willReturn('entity_first'); $view_entity->get('base_field')->willReturn('id'); $view->storage = $view_entity->reveal(); @@ -389,7 +389,7 @@ public function testLoadEntitiesWithNonEntityRelationship() { $this->setupViewWithRelationships($view, 'entity_first_field_data'); $view_entity = $this->prophesize(ViewEntityInterface::class); - $view_entity->get('base_table')->willReturn('entity_first'); + $view_entity->get('baseTable')->willReturn('entity_first'); $view_entity->get('base_field')->willReturn('id'); $view->storage = $view_entity->reveal(); @@ -440,7 +440,7 @@ public function testLoadEntitiesWithRevision() { ->getMock(); $view_entity = $this->prophesize(ViewEntityInterface::class); - $view_entity->get('base_table')->willReturn('entity_first__revision'); + $view_entity->get('baseTable')->willReturn('entity_first__revision'); $view_entity->get('base_field')->willReturn('vid'); $view->storage = $view_entity->reveal(); @@ -487,7 +487,7 @@ public function testLoadEntitiesWithRevisionOfSameEntityType() { $this->setupViewWithRelationships($view, 'entity_first__revision'); $view_entity = $this->prophesize(ViewEntityInterface::class); - $view_entity->get('base_table')->willReturn('entity_first'); + $view_entity->get('baseTable')->willReturn('entity_first'); $view_entity->get('base_field')->willReturn('id'); $view->storage = $view_entity->reveal(); @@ -546,7 +546,7 @@ public function testLoadEntitiesWithRelationshipAndRevision() { $this->setupViewWithRelationships($view); $view_entity = $this->prophesize(ViewEntityInterface::class); - $view_entity->get('base_table')->willReturn('entity_first__revision'); + $view_entity->get('baseTable')->willReturn('entity_first__revision'); $view_entity->get('base_field')->willReturn('vid'); $view->storage = $view_entity->reveal(); diff --git a/core/modules/views/tests/src/Unit/ViewsDataTest.php b/core/modules/views/tests/src/Unit/ViewsDataTest.php index 18d6b7a..2036dc0 100644 --- a/core/modules/views/tests/src/Unit/ViewsDataTest.php +++ b/core/modules/views/tests/src/Unit/ViewsDataTest.php @@ -150,19 +150,19 @@ public function testFetchBaseTables() { $this->setupMockedModuleHandler(); $data = $this->viewsData->getAll(); - $base_tables = $this->viewsData->fetchBaseTables(); + $baseTables = $this->viewsData->fetchBaseTables(); // Ensure that 'provider' is set for each base table. - foreach (array_keys($base_tables) as $base_table) { - $this->assertEquals('views_test_data', $data[$base_table]['table']['provider']); + foreach (array_keys($baseTables) as $baseTable) { + $this->assertEquals('views_test_data', $data[$baseTable]['table']['provider']); } // Test the number of tables returned and their order. - $this->assertCount(6, $base_tables, 'The correct amount of base tables were returned.'); - $base_tables_keys = array_keys($base_tables); - for ($i = 1; $i < count($base_tables); ++$i) { - $prev = $base_tables[$base_tables_keys[$i - 1]]; - $current = $base_tables[$base_tables_keys[$i]]; + $this->assertCount(6, $baseTables, 'The correct amount of base tables were returned.'); + $baseTables_keys = array_keys($baseTables); + for ($i = 1; $i < count($baseTables); ++$i) { + $prev = $baseTables[$baseTables_keys[$i - 1]]; + $current = $baseTables[$baseTables_keys[$i]]; $this->assertTrue($prev['weight'] <= $current['weight'] && $prev['title'] <= $prev['title'], 'The tables are sorted as expected.'); } @@ -172,9 +172,9 @@ public function testFetchBaseTables() { 'help' => '', 'weight' => 0, ]; - foreach ($base_tables as $base_table => $info) { + foreach ($baseTables as $baseTable => $info) { // Merge in default values as in fetchBaseTables(). - $expected = $data[$base_table]['table']['base'] += $defaults; + $expected = $data[$baseTable]['table']['base'] += $defaults; foreach ($defaults as $key => $default) { $this->assertSame($info[$key], $expected[$key]); } diff --git a/core/modules/views/views.post_update.php b/core/modules/views/views.post_update.php index 297363d..0fdcf60 100644 --- a/core/modules/views/views.post_update.php +++ b/core/modules/views/views.post_update.php @@ -40,7 +40,7 @@ function views_post_update_cleanup_duplicate_views_data() { $ids = []; $message = NULL; $data_tables = []; - $base_tables = []; + $baseTables = []; $revision_tables = []; $entities_by_table = []; $duplicate_fields = []; @@ -55,14 +55,14 @@ function views_post_update_cleanup_duplicate_views_data() { if ($data_table = $entity_type->getDataTable()) { $entities_by_table[$data_table] = $entity_type; } - if ($base_table = $entity_type->getBaseTable()) { - $entities_by_table[$base_table] = $entity_type; + if ($baseTable = $entity_type->getBaseTable()) { + $entities_by_table[$baseTable] = $entity_type; } // The following code basically contains the same kind of logic as // \Drupal\Core\Entity\Sql\SqlContentEntityStorage::initTableLayout() to // prefetch all tables (base, data, revision, and revision data). - $base_tables[$entity_type_id] = $entity_type->getBaseTable() ?: $entity_type->id(); + $baseTables[$entity_type_id] = $entity_type->getBaseTable() ?: $entity_type->id(); $revisionable = $entity_type->isRevisionable(); $revision_table = ''; @@ -88,11 +88,11 @@ function views_post_update_cleanup_duplicate_views_data() { $view = $config_factory->getEditable($view_config_name); $displays = $view->get('display'); - if (isset($entities_by_table[$view->get('base_table')])) { - $entity_type = $entities_by_table[$view->get('base_table')]; + if (isset($entities_by_table[$view->get('baseTable')])) { + $entity_type = $entities_by_table[$view->get('baseTable')]; $entity_type_id = $entity_type->id(); $data_table = $data_tables[$entity_type_id]; - $base_table = $base_tables[$entity_type_id]; + $baseTable = $baseTables[$entity_type_id]; $revision_table = $revision_tables[$entity_type_id]; if ($data_table) { @@ -101,7 +101,7 @@ function views_post_update_cleanup_duplicate_views_data() { if (!empty($display['display_options'][$handler_type['plural']])) { foreach ($display['display_options'][$handler_type['plural']] as $field_name => &$field) { $table = $field['table']; - if (($table === $base_table || $table === $revision_table) && in_array($field_name, $duplicate_fields[$entity_type_id])) { + if (($table === $baseTable || $table === $revision_table) && in_array($field_name, $duplicate_fields[$entity_type_id])) { $field['table'] = $data_table; $changed = TRUE; } diff --git a/core/modules/views/views.tokens.inc b/core/modules/views/views.tokens.inc index 9bf5470..269d70d 100644 --- a/core/modules/views/views.tokens.inc +++ b/core/modules/views/views.tokens.inc @@ -113,7 +113,7 @@ function views_tokens($type, $tokens, array $data, array $options, BubbleableMet } break; case 'base-table': - $replacements[$original] = $view->storage->get('base_table'); + $replacements[$original] = $view->storage->get('baseTable'); break; case 'base-field': $replacements[$original] = $view->storage->get('base_field'); diff --git a/core/modules/views/views.views.inc b/core/modules/views/views.views.inc index 633ce9b..6aa5697 100644 --- a/core/modules/views/views.views.inc +++ b/core/modules/views/views.views.inc @@ -1,4 +1,4 @@ -getTargetEntityTypeId(); $entity_type = $entity_manager->getDefinition($entity_type_id); - if (!$base_table = $entity_type->getBaseTable()) { + if (!$baseTable = $entity_type->getBaseTable()) { // We cannot do anything if for some reason there is no base table. return $data; } - $entity_tables = [$base_table => $entity_type_id]; + $entity_tables = [$baseTable => $entity_type_id]; // Some entities may not have a data table. $data_table = $entity_type->getDataTable(); if ($data_table) { @@ -410,7 +410,7 @@ function views_field_default_views_data(FieldStorageConfigInterface $field_stora } else { // If there is no data table, just join directly. - $data[$table_alias]['table']['join'][$base_table] = [ + $data[$table_alias]['table']['join'][$baseTable] = [ 'table' => $table_mapping->getDedicatedDataTableName($field_storage), 'left_field' => $entity_type->getKey('id'), 'field' => 'entity_id', @@ -523,7 +523,7 @@ function views_field_default_views_data(FieldStorageConfigInterface $field_stora if ($type == EntityStorageInterface::FIELD_LOAD_CURRENT) { if ($label != $label_name) { $aliases[] = [ - 'base' => $base_table, + 'base' => $baseTable, 'group' => $group_name, 'title' => $label_name, 'help' => t('This is an alias of @group: @field.', ['@group' => $group_name, '@field' => $label]), @@ -775,7 +775,7 @@ function core_field_views_data(FieldStorageConfigInterface $field_storage) { $target_entity_type = $entity_manager->getDefinition($target_entity_type_id); $entity_type_id = $field_storage->getTargetEntityTypeId(); $entity_type = $entity_manager->getDefinition($entity_type_id); - $target_base_table = $target_entity_type->getDataTable() ?: $target_entity_type->getBaseTable(); + $targetBaseTable = $target_entity_type->getDataTable() ?: $target_entity_type->getBaseTable(); $field_name = $field_storage->getName(); // Provide a relationship for the entity type with the entity reference @@ -790,7 +790,7 @@ function core_field_views_data(FieldStorageConfigInterface $field_storage) { 'group' => $entity_type->getLabel(), 'help' => t('Appears in: @bundles.', ['@bundles' => implode(', ', $field_storage->getBundles())]), 'id' => 'standard', - 'base' => $target_base_table, + 'base' => $targetBaseTable, 'entity type' => $target_entity_type_id, 'base field' => $target_entity_type->getKey('id'), 'relationship field' => $field_name . '_target_id', @@ -801,7 +801,7 @@ function core_field_views_data(FieldStorageConfigInterface $field_storage) { $args['@entity'] = $entity_type->getLabel(); $args['@label'] = $target_entity_type->getLowercaseLabel(); $pseudo_field_name = 'reverse__' . $entity_type_id . '__' . $field_name; - $data[$target_base_table][$pseudo_field_name]['relationship'] = [ + $data[$targetBaseTable][$pseudo_field_name]['relationship'] = [ 'title' => t('@entity using @field_name', $args), 'label' => t('@field_name', ['@field_name' => $field_name]), 'group' => $target_entity_type->getLabel(), diff --git a/core/modules/views_ui/src/Controller/ViewsUIController.php b/core/modules/views_ui/src/Controller/ViewsUIController.php index 9794762..96f7478 100644 --- a/core/modules/views_ui/src/Controller/ViewsUIController.php +++ b/core/modules/views_ui/src/Controller/ViewsUIController.php @@ -216,7 +216,7 @@ public function autocompleteTag(Request $request) { */ public function edit(ViewUI $view, $display_id = NULL) { $name = $view->label(); - $data = $this->viewsData->get($view->get('base_table')); + $data = $this->viewsData->get($view->get('baseTable')); if (isset($data['table']['base']['title'])) { $name .= ' (' . $data['table']['base']['title'] . ')'; diff --git a/core/modules/views_ui/src/Form/Ajax/AddHandler.php b/core/modules/views_ui/src/Form/Ajax/AddHandler.php index 8b53772..52cb7c7 100644 --- a/core/modules/views_ui/src/Form/Ajax/AddHandler.php +++ b/core/modules/views_ui/src/Form/Ajax/AddHandler.php @@ -80,8 +80,8 @@ public function buildForm(array $form, FormStateInterface $form_state) { views_ui_standard_display_dropdown($form, $form_state, $section); // Figure out all the base tables allowed based upon what the relationships provide. - $base_tables = $executable->getBaseTables(); - $options = Views::viewsDataHelper()->fetchFields(array_keys($base_tables), $type, $display->useGroupBy(), $form_state->get('type')); + $baseTables = $executable->getBaseTables(); + $options = Views::viewsDataHelper()->fetchFields(array_keys($baseTables), $type, $display->useGroupBy(), $form_state->get('type')); if (!empty($options)) { $form['override']['controls'] = [ @@ -120,7 +120,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { $grouped_options[$group][$key] = $option; if (!empty($option['aliases']) && is_array($option['aliases'])) { foreach ($option['aliases'] as $id => $alias) { - if (empty($alias['base']) || !empty($base_tables[$alias['base']])) { + if (empty($alias['base']) || !empty($baseTables[$alias['base']])) { $copy = $option; $copy['group'] = $alias['group']; $copy['title'] = $alias['title']; diff --git a/core/modules/views_ui/src/Form/Ajax/ConfigHandler.php b/core/modules/views_ui/src/Form/Ajax/ConfigHandler.php index 5d68f0b..6adcb3d 100644 --- a/core/modules/views_ui/src/Form/Ajax/ConfigHandler.php +++ b/core/modules/views_ui/src/Form/Ajax/ConfigHandler.php @@ -118,7 +118,7 @@ public function buildForm(array $form, FormStateInterface $form_state, Request $ if (!empty($relationship_options)) { // Make sure the existing relationship is even valid. If not, force // it to none. - $base_fields = Views::viewsDataHelper()->fetchFields($view->get('base_table'), $type, $executable->display_handler->useGroupBy()); + $base_fields = Views::viewsDataHelper()->fetchFields($view->get('baseTable'), $type, $executable->display_handler->useGroupBy()); if (isset($base_fields[$item['table'] . '.' . $item['field']])) { $relationship_options = array_merge(['none' => $this->t('Do not use a relationship')], $relationship_options); } diff --git a/core/modules/views_ui/src/Form/Ajax/EditDetails.php b/core/modules/views_ui/src/Form/Ajax/EditDetails.php index fca2099..2891673 100644 --- a/core/modules/views_ui/src/Form/Ajax/EditDetails.php +++ b/core/modules/views_ui/src/Form/Ajax/EditDetails.php @@ -81,8 +81,8 @@ public function submitForm(array &$form, FormStateInterface $form_state) { } $bases = Views::viewsData()->fetchBaseTables(); $page_title = $view->label(); - if (isset($bases[$view->get('base_table')])) { - $page_title .= ' (' . $bases[$view->get('base_table')]['title'] . ')'; + if (isset($bases[$view->get('baseTable')])) { + $page_title .= ' (' . $bases[$view->get('baseTable')]['title'] . ')'; } $form_state->set('page_title', $page_title); diff --git a/core/modules/views_ui/src/ViewEditForm.php b/core/modules/views_ui/src/ViewEditForm.php index cea587e..9c457b0 100644 --- a/core/modules/views_ui/src/ViewEditForm.php +++ b/core/modules/views_ui/src/ViewEditForm.php @@ -468,7 +468,7 @@ public function getDisplayDetails($view, $display) { "#suffix" => '', ]; - foreach (Views::fetchPluginNames('display', NULL, [$view->get('storage')->get('base_table')]) as $type => $label) { + foreach (Views::fetchPluginNames('display', NULL, [$view->get('storage')->get('baseTable')]) as $type => $label) { if ($type == $display['display_plugin']) { continue; } @@ -765,7 +765,7 @@ public function renderDisplayTop(ViewUI $view) { } // Buttons for adding a new display. - foreach (Views::fetchPluginNames('display', NULL, [$view->get('base_table')]) as $type => $label) { + foreach (Views::fetchPluginNames('display', NULL, [$view->get('baseTable')]) as $type => $label) { $element['add_display'][$type] = [ '#type' => 'submit', '#value' => $this->t('Add @display', ['@display' => $label]), diff --git a/core/modules/views_ui/tests/modules/views_ui_test/config/install/views.view.sa_contrib_2013_035.yml b/core/modules/views_ui/tests/modules/views_ui_test/config/install/views.view.sa_contrib_2013_035.yml index d45d509..21b50c7 100644 --- a/core/modules/views_ui/tests/modules/views_ui_test/config/install/views.view.sa_contrib_2013_035.yml +++ b/core/modules/views_ui/tests/modules/views_ui_test/config/install/views.view.sa_contrib_2013_035.yml @@ -9,7 +9,7 @@ label: SA_CONTRIB_2013_035 module: views description: '' tag: ', test' -base_table: node_field_data +baseTable: node_field_data base_field: nid core: 8.x display: diff --git a/core/modules/views_ui/tests/src/Unit/ViewListBuilderTest.php b/core/modules/views_ui/tests/src/Unit/ViewListBuilderTest.php index b4a3df0..6546927 100644 --- a/core/modules/views_ui/tests/src/Unit/ViewListBuilderTest.php +++ b/core/modules/views_ui/tests/src/Unit/ViewListBuilderTest.php @@ -46,7 +46,7 @@ public function testBuildRowEntityList() { 'id' => 'default', 'title' => 'Master', 'theme' => 'views_view', - 'no_ui' => TRUE, + 'noUi' => TRUE, 'admin' => '', ] ], diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist index 7dcb3ba..609b915 100644 --- a/core/phpcs.xml.dist +++ b/core/phpcs.xml.dist @@ -99,10 +99,7 @@ Drupal.NamingConventions.ValidFunctionName.ScopeNotCamelCaps. --> - - - - + diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntitySchemaTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntitySchemaTest.php index 3e285ff..9e80976 100644 --- a/core/tests/Drupal/KernelTests/Core/Entity/EntitySchemaTest.php +++ b/core/tests/Drupal/KernelTests/Core/Entity/EntitySchemaTest.php @@ -43,16 +43,16 @@ public function testCustomFieldCreateDelete() { $this->entityManager->onFieldStorageDefinitionCreate($storage_definitions['custom_bundle_field']); /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */ $table_mapping = $this->entityManager->getStorage('entity_test')->getTableMapping(); - $base_table = current($table_mapping->getTableNames()); + $baseTable = current($table_mapping->getTableNames()); $base_column = current($table_mapping->getColumnNames('custom_base_field')); - $this->assertTrue($this->database->schema()->fieldExists($base_table, $base_column), 'Table column created'); + $this->assertTrue($this->database->schema()->fieldExists($baseTable, $base_column), 'Table column created'); $table = $table_mapping->getDedicatedDataTableName($storage_definitions['custom_bundle_field']); $this->assertTrue($this->database->schema()->tableExists($table), 'Table created'); // Make sure the field schema can be deleted. $this->entityManager->onFieldStorageDefinitionDelete($storage_definitions['custom_base_field']); $this->entityManager->onFieldStorageDefinitionDelete($storage_definitions['custom_bundle_field']); - $this->assertFalse($this->database->schema()->fieldExists($base_table, $base_column), 'Table column dropped'); + $this->assertFalse($this->database->schema()->fieldExists($baseTable, $base_column), 'Table column dropped'); $this->assertFalse($this->database->schema()->tableExists($table), 'Table dropped'); } diff --git a/core/tests/Drupal/Tests/Core/Entity/Sql/DefaultTableMappingTest.php b/core/tests/Drupal/Tests/Core/Entity/Sql/DefaultTableMappingTest.php index 39c9a05..e2c35ad 100644 --- a/core/tests/Drupal/Tests/Core/Entity/Sql/DefaultTableMappingTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/Sql/DefaultTableMappingTest.php @@ -369,7 +369,7 @@ public function testGetFieldTableName($table_names, $expected) { $storage ->expects($this->any()) ->method('getBaseTable') - ->willReturn(isset($table_names['base']) ? $table_names['base'] : 'base_table'); + ->willReturn(isset($table_names['base']) ? $table_names['base'] : 'baseTable'); $storage ->expects($this->any()) @@ -416,21 +416,21 @@ public function testGetFieldTableName($table_names, $expected) { public function providerTestGetFieldTableName() { $data = []; - $data[] = [['data' => 'data_table', 'base' => 'base_table', 'revision' => 'revision_table'], 'data_table']; - $data[] = [['data' => 'data_table', 'revision' => 'revision_table', 'base' => 'base_table'], 'data_table']; - $data[] = [['base' => 'base_table', 'data' => 'data_table', 'revision' => 'revision_table'], 'data_table']; - $data[] = [['base' => 'base_table', 'revision' => 'revision_table', 'data' => 'data_table'], 'data_table']; - $data[] = [['revision' => 'revision_table', 'data' => 'data_table', 'base' => 'base_table'], 'data_table']; - $data[] = [['revision' => 'revision_table', 'base' => 'base_table', 'data' => 'data_table'], 'data_table']; + $data[] = [['data' => 'data_table', 'base' => 'baseTable', 'revision' => 'revision_table'], 'data_table']; + $data[] = [['data' => 'data_table', 'revision' => 'revision_table', 'base' => 'baseTable'], 'data_table']; + $data[] = [['base' => 'baseTable', 'data' => 'data_table', 'revision' => 'revision_table'], 'data_table']; + $data[] = [['base' => 'baseTable', 'revision' => 'revision_table', 'data' => 'data_table'], 'data_table']; + $data[] = [['revision' => 'revision_table', 'data' => 'data_table', 'base' => 'baseTable'], 'data_table']; + $data[] = [['revision' => 'revision_table', 'base' => 'baseTable', 'data' => 'data_table'], 'data_table']; $data[] = [['data' => 'data_table', 'revision' => 'revision_table'], 'data_table']; $data[] = [['revision' => 'revision_table', 'data' => 'data_table'], 'data_table']; - $data[] = [['base' => 'base_table', 'revision' => 'revision_table'], 'base_table']; - $data[] = [['revision' => 'revision_table', 'base' => 'base_table'], 'base_table']; + $data[] = [['base' => 'baseTable', 'revision' => 'revision_table'], 'baseTable']; + $data[] = [['revision' => 'revision_table', 'base' => 'baseTable'], 'baseTable']; $data[] = [['data' => 'data_table'], 'data_table']; - $data[] = [['base' => 'base_table'], 'base_table']; + $data[] = [['base' => 'baseTable'], 'baseTable']; $data[] = [['revision' => 'revision_table'], 'revision_table']; return $data; diff --git a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php index bf3fd46..db4307e 100644 --- a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php @@ -145,7 +145,7 @@ protected function setUp() { /** * Tests SqlContentEntityStorage::getBaseTable(). * - * @param string $base_table + * @param string $baseTable * The base table to be returned by the mocked entity type. * @param string $expected * The expected return value of @@ -156,10 +156,10 @@ protected function setUp() { * * @dataProvider providerTestGetBaseTable */ - public function testGetBaseTable($base_table, $expected) { + public function testGetBaseTable($baseTable, $expected) { $this->entityType->expects($this->once()) ->method('getBaseTable') - ->willReturn($base_table); + ->willReturn($baseTable); $this->setUpEntityStorage();