diff -u b/core/modules/taxonomy/src/TermViewsData.php b/core/modules/taxonomy/src/TermViewsData.php --- b/core/modules/taxonomy/src/TermViewsData.php +++ b/core/modules/taxonomy/src/TermViewsData.php @@ -66,11 +66,11 @@ ]; $data['taxonomy_term_field_data']['vid']['help'] = $this->t('Filter the results of "Taxonomy: Term" to a particular vocabulary.'); - $data['taxonomy_term_field_data']['vid']['field']['help'] = t('The vocabulary name.'); + $data['taxonomy_term_field_data']['vid']['field']['help'] = $this->t('The vocabulary name.'); $data['taxonomy_term_field_data']['vid']['argument']['id'] = 'vocabulary_vid'; - $data['taxonomy_term_field_data']['vid']['sort']['title'] = t('Vocabulary ID'); - $data['taxonomy_term_field_data']['vid']['sort']['help'] = t('The raw vocabulary ID.'); + $data['taxonomy_term_field_data']['vid']['sort']['title'] = $this->t('Vocabulary ID'); + $data['taxonomy_term_field_data']['vid']['sort']['help'] = $this->t('The raw vocabulary ID.'); $data['taxonomy_term_field_data']['name']['field']['id'] = 'term_name'; $data['taxonomy_term_field_data']['name']['argument']['many to one'] = TRUE; @@ -139,12 +139,12 @@ $data['taxonomy_index']['table']['join'] = [ 'taxonomy_term_field_data' => [ - // links directly to taxonomy_term_field_data via tid + // Links directly to taxonomy_term_field_data via tid. 'left_field' => 'tid', 'field' => 'tid', ], 'node_field_data' => [ - // links directly to node via nid + // Links directly to node via nid. 'left_field' => 'nid', 'field' => 'nid', ], diff -u b/core/modules/taxonomy/taxonomy.post_update.php b/core/modules/taxonomy/taxonomy.post_update.php --- b/core/modules/taxonomy/taxonomy.post_update.php +++ b/core/modules/taxonomy/taxonomy.post_update.php @@ -4,2 +4,8 @@ * @file + */ + +use Drupal\Core\Site\Settings; + +/** + * @file * Post update functions for Taxonomy. @@ -65,7 +71,8 @@ if ($sandbox['progress'] != $sandbox['max']) { $sandbox['#finished'] = ($sandbox['progress'] >= $sandbox['max']); - } else { + } + else { $sandbox['#finished'] = 1; } } diff -u b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermViewTest.php b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermViewTest.php --- b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermViewTest.php +++ b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermViewTest.php @@ -56,7 +56,6 @@ $this->drupalLogin($this->adminUser); // Create a vocabulary and add two term reference fields to article nodes. - $this->fieldName1 = mb_strtolower($this->randomMachineName()); $handler_settings = [