diff --git a/core/modules/file/src/FileViewsData.php b/core/modules/file/src/FileViewsData.php index 5c402fe..5a977a2 100644 --- a/core/modules/file/src/FileViewsData.php +++ b/core/modules/file/src/FileViewsData.php @@ -25,7 +25,6 @@ public function getViewsData() { $data['file_managed']['table']['base']['defaults']['field'] = 'filename'; $data['file_managed']['table']['wizard_id'] = 'file_managed'; - // Describes fid field in file_managed table. $data['file_managed']['fid']['field']['id'] ='file'; $data['file_managed']['fid']['argument'] = array( 'id' => 'file_fid', @@ -43,16 +42,12 @@ public function getViewsData() { 'label' => t('File usage'), ); - // Describes filename field in file_managed table. $data['file_managed']['filename']['field']['id'] = 'file'; - // Describes uri field in file_managed table. $data['file_managed']['uri']['field']['id'] = 'file_uri'; - // Describes filemime field in file_managed table. $data['file_managed']['filemime']['field']['id'] = 'file_filemime'; - // Describes extension field in file_managed table. $data['file_managed']['extension'] = array( 'title' => t('Extension'), 'help' => t('The extension of the file.'), @@ -63,18 +58,14 @@ public function getViewsData() { ), ); - // Describes filesize field in file_managed table. $data['file_managed']['filesize']['field']['id'] = 'file_size'; - // Describes status field in file_managed table. $data['file_managed']['status']['field']['id'] = 'file_status'; $data['file_managed']['status']['filter']['id'] = 'file_status'; - // Describes uid field in file_managed table. $data['file_managed']['uid']['relationship']['title'] = t('User who uploaded'); $data['file_managed']['uid']['relationship']['label'] = t('User who uploaded'); - // Sets 'group' index for file_usage table. $data['file_usage']['table']['group'] = t('File Usage'); // Provide field-type-things to several base tables; on the core files table diff --git a/core/modules/node/src/NodeViewsData.php b/core/modules/node/src/NodeViewsData.php index 8e2b44d..008d175 100644 --- a/core/modules/node/src/NodeViewsData.php +++ b/core/modules/node/src/NodeViewsData.php @@ -33,7 +33,6 @@ public function getViewsData() { 'validate type' => 'nid', ]; - // This definition has more items in it than it needs to as an example. $data['node_field_data']['title']['field']['id'] = 'node'; $data['node_field_data']['title']['field']['link_to_node default'] = TRUE; diff --git a/core/modules/views/src/EntityViewsData.php b/core/modules/views/src/EntityViewsData.php index 48d8a87..649cbb8 100644 --- a/core/modules/views/src/EntityViewsData.php +++ b/core/modules/views/src/EntityViewsData.php @@ -17,6 +17,7 @@ use Drupal\Core\StringTranslation\StringTranslationTrait; use Drupal\Core\StringTranslation\TranslationInterface; use Drupal\Core\TypedData\TypedDataManager; +use Symfony\Component\DependencyInjection\Container; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -361,7 +362,7 @@ protected function mapSingleFieldViewsData($table, $field_name, $data_type, $sch $views_field['sort']['id'] = 'standard'; } - $process_method = "processViewsDataFor$data_type"; + $process_method = 'processViewsDataFor' . Container::camelize($data_type); if (method_exists($this, $process_method)) { $this->{$process_method}($table, $field_name, $views_field); } @@ -401,7 +402,7 @@ protected function processViewsDataForLanguage($table, $field_name, array &$view * @param array $views_field * The views field data. */ - protected function processViewsDataForString($table, $field_name, array &$views_field) { + protected function processViewsDataForEntityReference($table, $field_name, array &$views_field) { if ($field_name == $this->entityType->getKey('bundle')) { // @todo Use the other bundle handlers, once // https://www.drupal.org/node/2322949 is in.