diff --git a/core/modules/field_ui/tests/src/Functional/ManageDisplayTest.php b/core/modules/field_ui/tests/src/Functional/ManageDisplayTest.php
index 6ea43734229c8ff507df30bda3f5b29c7c0756af..ba52fa8ce27da2e7ed610842629e6a57c3550bc9 100644
--- a/core/modules/field_ui/tests/src/Functional/ManageDisplayTest.php
+++ b/core/modules/field_ui/tests/src/Functional/ManageDisplayTest.php
@@ -202,7 +202,9 @@ public function testNonInitializedFields() {
* Tests hiding the view modes fieldset when there's only one available.
*/
public function testSingleViewMode() {
- $this->drupalGet('admin/structure/taxonomy/manage/' . $this->vocabulary . '/display');
+ // Create a test field.
+ $this->fieldUIAddNewField('admin/structure/taxonomy/manage/' . $this->vocabulary . '/overview', 'test', 'test');
+ $this->drupalGet('admin/structure/taxonomy/manage/' . $this->vocabulary . '/overview/display');
$this->assertSession()->pageTextNotContains('Use custom display settings for the following view modes');
// This may not trigger a notice when 'view_modes_custom' isn't available.
diff --git a/core/modules/forum/config/optional/core.entity_form_display.taxonomy_term.forums.default.yml b/core/modules/forum/config/optional/core.entity_form_display.taxonomy_term.forums.default.yml
index 77d5c7f3835f0321dc7b0c43b65f0586f2eb4775..c6ce1c677c892504da0d26789eab912da459d5e6 100644
--- a/core/modules/forum/config/optional/core.entity_form_display.taxonomy_term.forums.default.yml
+++ b/core/modules/forum/config/optional/core.entity_form_display.taxonomy_term.forums.default.yml
@@ -11,11 +11,13 @@ targetEntityType: taxonomy_term
bundle: forums
mode: default
content:
- description:
+ forum_description:
type: text_textfield
weight: 0
region: content
- settings: { }
+ settings:
+ rows: 5
+ placeholder: ''
third_party_settings: { }
name:
type: string_textfield
diff --git a/core/modules/forum/config/optional/field.field.taxonomy_term.forums.forum_description.yml b/core/modules/forum/config/optional/field.field.taxonomy_term.forums.forum_description.yml
new file mode 100644
index 0000000000000000000000000000000000000000..4ca9a4703bb3e2c64802e1b0a27f09eb63680646
--- /dev/null
+++ b/core/modules/forum/config/optional/field.field.taxonomy_term.forums.forum_description.yml
@@ -0,0 +1,21 @@
+langcode: en
+status: true
+dependencies:
+ config:
+ - field.storage.taxonomy_term.field_description
+ - taxonomy.vocabulary.forums
+ module:
+ - text
+id: taxonomy_term.forums.forum_description
+field_name: forum_description
+entity_type: taxonomy_term
+bundle: forums
+label: Description
+description: ''
+required: false
+translatable: false
+default_value: { }
+default_value_callback: ''
+settings: { }
+third_party_settings: { }
+field_type: text_long
diff --git a/core/modules/forum/forum.install b/core/modules/forum/forum.install
index 7b6f40f9bac288bebc03c1c93a66d172c8ba15bb..daca7f7e253ae406779512b692ac71c0095e2d72 100644
--- a/core/modules/forum/forum.install
+++ b/core/modules/forum/forum.install
@@ -23,7 +23,6 @@ function forum_install($is_syncing) {
// Create a default forum so forum posts can be created.
$term = Term::create([
'name' => t('General discussion'),
- 'description' => '',
'parent' => [0],
'vid' => 'forums',
'forum_container' => 0,
diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module
index 10f0b37ba5ed8e799b841455cc5e218538a4f5ad..51fa48055816fa79d561b345060c3e8c615e6c67 100644
--- a/core/modules/forum/forum.module
+++ b/core/modules/forum/forum.module
@@ -548,7 +548,7 @@ function template_preprocess_forum_list(&$variables) {
$row = 0;
// Sanitize each forum so that the template can safely print the data.
foreach ($variables['forums'] as $id => $forum) {
- $variables['forums'][$id]->description = ['#markup' => $forum->description->value];
+ $variables['forums'][$id]->description = ['#markup' => $forum->forum_description->processed];
$variables['forums'][$id]->link = forum_uri($forum);
$variables['forums'][$id]->name = $forum->label();
$variables['forums'][$id]->is_container = !empty($forum->forum_container->value);
diff --git a/core/modules/forum/templates/forum-list.html.twig b/core/modules/forum/templates/forum-list.html.twig
index 6bf4220b827a364d62aeddd3e8419776ce7b0703..69f1047d0888f3d032d637024226a0a013cc8cd2 100644
--- a/core/modules/forum/templates/forum-list.html.twig
+++ b/core/modules/forum/templates/forum-list.html.twig
@@ -15,8 +15,7 @@
* - icon_title: Text alternative for the forum icon.
* - name: The name of the forum.
* - link: The URL to link to this forum.
- * - description: The description field for the forum, containing:
- * - value: The descriptive text for the forum.
+ * - description: The description field for the forum.
* - new_topics: A flag indicating if the forum contains unread posts.
* - new_url: A URL to the forum's unread posts.
* - new_text: Text for the above URL, which tells how many new posts.
@@ -55,8 +54,8 @@
{{ forum.icon_title }}
- {% if forum.description.value %}
- {{ forum.description.value }}
+ {% if forum.description %}
+ {{ forum.description }}
{% endif %}
{% if forum.depth > 0 %}{% for i in 1..forum.depth %}{% endfor %}{% endif %}
diff --git a/core/modules/forum/tests/src/Functional/ForumTest.php b/core/modules/forum/tests/src/Functional/ForumTest.php
index 8e8ea18eebdf8b45a63bd670141e8926993e6fd4..149769f4c28af4628aa18282e431334882ae8b59 100644
--- a/core/modules/forum/tests/src/Functional/ForumTest.php
+++ b/core/modules/forum/tests/src/Functional/ForumTest.php
@@ -67,17 +67,17 @@ class ForumTest extends BrowserTestBase {
protected $postCommentUser;
/**
- * An array representing a forum container.
+ * A taxonomy term representing a forum container.
*/
protected $forumContainer;
/**
- * An array representing a forum.
+ * A taxonomy term representing a forum.
*/
protected $forum;
/**
- * An array representing a root forum.
+ * A taxonomy term representing a root forum.
*/
protected $rootForum;
@@ -171,7 +171,7 @@ public function testForum() {
// active forum topics list.
$this->drupalLogin($this->webUser);
// Verify that this user is shown a message that they may not post content.
- $this->drupalGet('forum/' . $this->forum['tid']);
+ $this->drupalGet('forum/' . $this->forum->id());
$this->assertSession()->pageTextContains('You are not allowed to post new content in the forum');
// Log in, and do basic tests for a user with permission to edit any forum
@@ -191,7 +191,7 @@ public function testForum() {
// Verify that this user is shown a local task to add new forum content.
$this->drupalGet('forum');
$this->assertSession()->linkExists('Add new Forum topic');
- $this->drupalGet('forum/' . $this->forum['tid']);
+ $this->drupalGet('forum/' . $this->forum->id());
$this->assertSession()->linkExists('Add new Forum topic');
// Log in a user with permission to edit any forum content.
@@ -216,7 +216,7 @@ public function testForum() {
// Topics cell contains number of topics (6), number of unread topics (also
// 6), and the forum name.
- $this->assertEquals('6 6 new posts in forum ' . $this->forum['name'], $cells[1]->getText(), 'Number of topics found.');
+ $this->assertEquals('6 6 new posts in forum ' . $this->forum->label(), $cells[1]->getText(), 'Number of topics found.');
// Verify total number of posts in forum.
$this->assertEquals('6', $cells[2]->getText(), 'Number of posts found.');
@@ -243,16 +243,16 @@ public function testForum() {
// Test editing a forum topic that has a comment.
$this->drupalLogin($this->editAnyTopicsUser);
- $this->drupalGet('forum/' . $this->forum['tid']);
+ $this->drupalGet('forum/' . $this->forum->id());
$this->drupalGet('node/' . $node->id() . '/edit');
$this->submitForm([], 'Save');
$this->assertSession()->statusCodeEquals(200);
// Test the root forum page title change.
$this->drupalGet('forum');
- $this->assertSession()->responseHeaderContains('X-Drupal-Cache-Tags', 'config:taxonomy.vocabulary.' . $this->forum['vid']);
+ $this->assertSession()->responseHeaderContains('X-Drupal-Cache-Tags', 'config:taxonomy.vocabulary.' . $this->forum->getVocabularyId());
$this->assertSession()->titleEquals('Forums | Drupal');
- $vocabulary = Vocabulary::load($this->forum['vid']);
+ $vocabulary = Vocabulary::load($this->forum->getVocabularyId());
$vocabulary->set('name', 'Discussions');
$vocabulary->save();
$this->drupalGet('forum');
@@ -260,7 +260,7 @@ public function testForum() {
// Test anonymous action link.
$this->drupalLogout();
- $this->drupalGet('forum/' . $this->forum['tid']);
+ $this->drupalGet('forum/' . $this->forum->id());
$this->assertSession()->linkExists('Log in to post new content in the forum.');
}
@@ -436,7 +436,7 @@ public function createForum($type, $parent = 0) {
$edit = [
'name[0][value]' => $name,
- 'description[0][value]' => $description,
+ 'forum_description[0][value]' => $description,
'parent[0]' => $parent,
'weight' => '0',
];
@@ -457,7 +457,7 @@ public function createForum($type, $parent = 0) {
$term = $taxonomy_term_storage->loadByProperties([
'vid' => $this->config('forum.settings')->get('vocabulary'),
'name' => $name,
- 'description__value' => $description,
+ 'forum_description__value' => $description,
]);
$term = array_shift($term);
$this->assertNotEmpty($term, "The forum type '$type' should exist in the database.");
@@ -547,7 +547,7 @@ public function testForumWithNewPost() {
// Log in as the first user.
$this->drupalLogin($this->adminUser);
// Check that forum renders properly.
- $this->drupalGet("forum/{$this->forum['tid']}");
+ $this->drupalGet("forum/{$this->forum->id()}");
$this->assertSession()->statusCodeEquals(200);
// Verify there is no unintentional HTML tag escaping.
@@ -642,7 +642,7 @@ private function verifyForums(EntityInterface $node, $admin, $response = 200) {
Link::createFromRoute('Home', ''),
Link::createFromRoute('Forums', 'forum.index'),
Link::createFromRoute($this->forumContainer['name'], 'forum.page', ['taxonomy_term' => $this->forumContainer['tid']]),
- Link::createFromRoute($this->forum['name'], 'forum.page', ['taxonomy_term' => $this->forum['tid']]),
+ Link::createFromRoute($this->forum->label(), 'forum.page', ['taxonomy_term' => $this->forum->id()]),
];
$breadcrumb = [
'#theme' => 'breadcrumb',
diff --git a/core/modules/path/tests/src/Functional/PathTaxonomyTermTest.php b/core/modules/path/tests/src/Functional/PathTaxonomyTermTest.php
index f49d702de06ffbd2148741b2764ff9e5195de7eb..b14e1291345db87925b441951b0c7d6cef452720 100644
--- a/core/modules/path/tests/src/Functional/PathTaxonomyTermTest.php
+++ b/core/modules/path/tests/src/Functional/PathTaxonomyTermTest.php
@@ -54,7 +54,6 @@ public function testTermAlias() {
$description = $this->randomMachineName();
$edit = [
'name[0][value]' => $this->randomMachineName(),
- 'description[0][value]' => $description,
'path[0][alias]' => '/' . $this->randomMachineName(),
];
$this->drupalGet('admin/structure/taxonomy/manage/' . $vocabulary->id() . '/add');
@@ -68,7 +67,7 @@ public function testTermAlias() {
// Confirm that the alias works.
$this->drupalGet($edit['path[0][alias]']);
- $this->assertSession()->pageTextContains($description);
+ $this->assertSession()->pageTextContains($edit['name[0][value]']);
// Confirm the 'canonical' and 'shortlink' URLs.
$this->assertSession()->elementExists('xpath', "//link[contains(@rel, 'canonical') and contains(@href, '" . $edit['path[0][alias]'] . "')]");
@@ -82,11 +81,11 @@ public function testTermAlias() {
// Confirm that the changed alias works.
$this->drupalGet(trim($edit2['path[0][alias]'], '/'));
- $this->assertSession()->pageTextContains($description);
+ $this->assertSession()->pageTextContains($edit['name[0][value]']);
// Confirm that the old alias no longer works.
$this->drupalGet(trim($edit['path[0][alias]'], '/'));
- $this->assertSession()->pageTextNotContains($description);
+ $this->assertSession()->pageTextNotContains($edit['name[0][value]']);
$this->assertSession()->statusCodeEquals(404);
// Remove the term's URL alias.
@@ -97,7 +96,7 @@ public function testTermAlias() {
// Confirm that the alias no longer works.
$this->drupalGet(trim($edit2['path[0][alias]'], '/'));
- $this->assertSession()->pageTextNotContains($description);
+ $this->assertSession()->pageTextNotContains($edit['name[0][value]']);
$this->assertSession()->statusCodeEquals(404);
}
diff --git a/core/modules/taxonomy/src/Entity/Term.php b/core/modules/taxonomy/src/Entity/Term.php
index 5b4d8dbdb952adddac3829d27d0fa5a408cc2e36..084f09515ad9c7dc49e882abc889a214801794e2 100644
--- a/core/modules/taxonomy/src/Entity/Term.php
+++ b/core/modules/taxonomy/src/Entity/Term.php
@@ -166,22 +166,6 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
])
->setDisplayConfigurable('form', TRUE);
- $fields['description'] = BaseFieldDefinition::create('text_long')
- ->setLabel(t('Description'))
- ->setTranslatable(TRUE)
- ->setRevisionable(TRUE)
- ->setDisplayOptions('view', [
- 'label' => 'hidden',
- 'type' => 'text_default',
- 'weight' => 0,
- ])
- ->setDisplayConfigurable('view', TRUE)
- ->setDisplayOptions('form', [
- 'type' => 'text_textfield',
- 'weight' => 0,
- ])
- ->setDisplayConfigurable('form', TRUE);
-
$fields['weight'] = BaseFieldDefinition::create('integer')
->setLabel(t('Weight'))
->setDescription(t('The weight of this term in relation to other terms.'))
@@ -218,36 +202,6 @@ public static function bundleFieldDefinitions(EntityTypeInterface $entity_type,
return $fields;
}
- /**
- * {@inheritdoc}
- */
- public function getDescription() {
- return $this->get('description')->value;
- }
-
- /**
- * {@inheritdoc}
- */
- public function setDescription($description) {
- $this->set('description', $description);
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFormat() {
- return $this->get('description')->format;
- }
-
- /**
- * {@inheritdoc}
- */
- public function setFormat($format) {
- $this->get('description')->format = $format;
- return $this;
- }
-
/**
* {@inheritdoc}
*/
diff --git a/core/modules/taxonomy/src/TermInterface.php b/core/modules/taxonomy/src/TermInterface.php
index 7e0fa72a81213ecb8c7bb41c7da9508054224c42..75955552802514a058a52a6a1f7093b0e608acb3 100644
--- a/core/modules/taxonomy/src/TermInterface.php
+++ b/core/modules/taxonomy/src/TermInterface.php
@@ -12,42 +12,6 @@
*/
interface TermInterface extends ContentEntityInterface, EntityChangedInterface, EntityPublishedInterface, RevisionLogInterface {
- /**
- * Gets the term description.
- *
- * @return string
- * The term description.
- */
- public function getDescription();
-
- /**
- * Sets the term description.
- *
- * @param string $description
- * The term description.
- *
- * @return $this
- */
- public function setDescription($description);
-
- /**
- * Gets the text format name for the term description.
- *
- * @return string
- * The text format name.
- */
- public function getFormat();
-
- /**
- * Sets the text format name for the term description.
- *
- * @param string $format
- * The text format name.
- *
- * @return $this
- */
- public function setFormat($format);
-
/**
* Gets the term name.
*
diff --git a/core/modules/taxonomy/taxonomy.tokens.inc b/core/modules/taxonomy/taxonomy.tokens.inc
index f6cfc6292ac5caa932b3aba80f2ffa8bf2a677e1..faa3ad37b1fc0b6c9ad4073c0d32c5b3a3a0c143 100644
--- a/core/modules/taxonomy/taxonomy.tokens.inc
+++ b/core/modules/taxonomy/taxonomy.tokens.inc
@@ -32,10 +32,6 @@ function taxonomy_token_info() {
'name' => t("Name"),
'description' => t("The name of the taxonomy term."),
];
- $term['description'] = [
- 'name' => t("Description"),
- 'description' => t("The optional description of the taxonomy term."),
- ];
$term['node-count'] = [
'name' => t("Node count"),
'description' => t("The number of nodes tagged with the taxonomy term."),
@@ -108,12 +104,6 @@ function taxonomy_tokens($type, $tokens, array $data, array $options, Bubbleable
$replacements[$original] = $term->getName();
break;
- case 'description':
- // "processed" returns a \Drupal\Component\Render\MarkupInterface via
- // check_markup().
- $replacements[$original] = $term->description->processed;
- break;
-
case 'url':
$replacements[$original] = $term->toUrl('canonical', ['absolute' => TRUE])->toString();
break;
diff --git a/core/modules/taxonomy/templates/taxonomy-term.html.twig b/core/modules/taxonomy/templates/taxonomy-term.html.twig
index 14129e1b4d6aae4551b989747bee7daa6cbe0094..0ba1cd14baf0a6625240470696c1bff419cb3492 100644
--- a/core/modules/taxonomy/templates/taxonomy-term.html.twig
+++ b/core/modules/taxonomy/templates/taxonomy-term.html.twig
@@ -6,7 +6,7 @@
* Available variables:
* - url: URL of the current term.
* - name: (optional) Name of the current term.
- * - content: Items for the content of the term (fields and description).
+* - content: Items for the content of the term fields.
* Use 'content' to print them all, or print a subset such as
* 'content.description'. Use the following code to exclude the
* printing of a given child element:
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 b2c509cf4209cc0b64cf5ffe0a5728773c566487..1805155f608fb5fea31f0e11ac3b49a12e1cffa4 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
@@ -135,118 +135,6 @@ display:
empty: { }
relationships: { }
arguments: { }
- page_dc:
- display_plugin: page
- id: page_dc
- display_title: 'Description Comida'
- position: 3
- display_options:
- display_description: ''
- path: test-desc-filter
- filters:
- description__value:
- id: description__value
- table: taxonomy_term_field_data
- field: description__value
- relationship: none
- group_type: group
- admin_label: ''
- operator: contains
- value: Comida
- group: 1
- exposed: false
- expose:
- operator_id: ''
- label: ''
- description: ''
- use_operator: false
- operator: ''
- identifier: ''
- required: false
- remember: false
- multiple: false
- remember_roles:
- authenticated: authenticated
- is_grouped: false
- group_info:
- label: ''
- description: ''
- identifier: ''
- optional: true
- widget: select
- multiple: false
- remember: false
- default_group: All
- default_group_multiple: { }
- group_items: { }
- plugin_id: string
- entity_type: taxonomy_term
- entity_field: description
- defaults:
- filters: false
- filter_groups: false
- title: false
- filter_groups:
- operator: AND
- groups:
- 1: AND
- title: 'Description filter page'
- page_dp:
- display_plugin: page
- id: page_dp
- display_title: 'Description Comida'
- position: 3
- display_options:
- display_description: ''
- path: test-desc-paris
- filters:
- description__value:
- id: description__value
- table: taxonomy_term_field_data
- field: description__value
- relationship: none
- group_type: group
- admin_label: ''
- operator: contains
- value: Paris
- group: 1
- exposed: false
- expose:
- operator_id: ''
- label: ''
- description: ''
- use_operator: false
- operator: ''
- identifier: ''
- required: false
- remember: false
- multiple: false
- remember_roles:
- authenticated: authenticated
- is_grouped: false
- group_info:
- label: ''
- description: ''
- identifier: ''
- optional: true
- widget: select
- multiple: false
- remember: false
- default_group: All
- default_group_multiple: { }
- group_items: { }
- plugin_id: string
- entity_type: taxonomy_term
- entity_field: description
- defaults:
- filters: false
- filter_groups: false
- title: false
- filter_groups:
- operator: AND
- groups:
- 1: AND
- title: 'Description filter page'
page_fc:
display_plugin: page
id: page_fc
diff --git a/core/modules/taxonomy/tests/src/Functional/TermTest.php b/core/modules/taxonomy/tests/src/Functional/TermTest.php
index 61985d5b0032586226c6b2ef36308947285523e6..9cfeca8206289a2e269a096b79df71374043a66d 100644
--- a/core/modules/taxonomy/tests/src/Functional/TermTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/TermTest.php
@@ -338,7 +338,6 @@ public function testTermInterface() {
\Drupal::service('module_installer')->install(['views']);
$edit = [
'name[0][value]' => $this->randomMachineName(12),
- 'description[0][value]' => $this->randomMachineName(100),
];
// Explicitly set the parents field to 'root', to ensure that
// TermForm::save() handles the invalid term ID correctly.
@@ -364,11 +363,9 @@ public function testTermInterface() {
// Verify that the randomly generated term is present.
$this->assertSession()->pageTextContains($edit['name[0][value]']);
- $this->assertSession()->pageTextContains($edit['description[0][value]']);
$edit = [
'name[0][value]' => $this->randomMachineName(14),
- 'description[0][value]' => $this->randomMachineName(102),
];
// Edit the term.
@@ -390,21 +387,6 @@ public function testTermInterface() {
// View the term and check that it is correct.
$this->drupalGet('taxonomy/term/' . $term->id());
$this->assertSession()->pageTextContains($edit['name[0][value]']);
- $this->assertSession()->pageTextContains($edit['description[0][value]']);
-
- // Did this page request display a 'term-listing-heading'?
- $this->assertSession()->elementExists('xpath', '//div[@class="views-element-container"]/div/header/div/div/p');
- // Check that it does NOT show a description when description is blank.
- $term->setDescription(NULL);
- $term->save();
- $this->drupalGet('taxonomy/term/' . $term->id());
- $this->assertSession()->elementNotExists('xpath', '//div[@class="views-element-container"]/div/header/div/div/p');
-
- // Check that the description value is processed.
- $value = $this->randomMachineName();
- $term->setDescription($value);
- $term->save();
- $this->assertEquals("{$value}
\n", $term->description->processed);
// Check that the term feed page is working.
$this->drupalGet('taxonomy/term/' . $term->id() . '/feed');
@@ -423,7 +405,6 @@ public function testTermInterface() {
$this->drupalGet('admin/structure/taxonomy/manage/' . $this->vocabulary->id() . '/add');
$edit = [
'name[0][value]' => $this->randomMachineName(12),
- 'description[0][value]' => $this->randomMachineName(100),
];
// Create the term to edit.
@@ -447,7 +428,6 @@ public function testTermSaveOverrideSelector() {
// Create a Term.
$edit = [
'name[0][value]' => $this->randomMachineName(12),
- 'description[0][value]' => $this->randomMachineName(100),
];
// Create the term to edit.
$this->drupalGet('admin/structure/taxonomy/manage/' . $this->vocabulary->id() . '/add');
@@ -541,7 +521,6 @@ public function testTermMultipleParentsInterface() {
// Add a new term with multiple parents.
$edit = [
'name[0][value]' => $this->randomMachineName(12),
- 'description[0][value]' => $this->randomMachineName(100),
'parent[]' => [0, $parent->id()],
];
// Save the new term.
@@ -555,7 +534,6 @@ public function testTermMultipleParentsInterface() {
$term = reset($terms);
$this->assertNotNull($term, 'Term found in database.');
$this->assertEquals($edit['name[0][value]'], $term->getName(), 'Term name was successfully saved.');
- $this->assertEquals($edit['description[0][value]'], $term->getDescription(), 'Term description was successfully saved.');
// Check that the parent tid is still there. The other parent () is
// not added by \Drupal\taxonomy\TermStorageInterface::loadParents().
$parents = $this->container->get('entity_type.manager')->getStorage('taxonomy_term')->loadParents($term->id());
@@ -599,7 +577,6 @@ public function testReSavingTags() {
public function testTermBreadcrumbs() {
$edit = [
'name[0][value]' => $this->randomMachineName(14),
- 'description[0][value]' => $this->randomMachineName(100),
'parent[]' => [0],
];
diff --git a/core/modules/taxonomy/tests/src/Functional/TokenReplaceTest.php b/core/modules/taxonomy/tests/src/Functional/TokenReplaceTest.php
index 43105bd1f87c0dd2db8289d09ba4601b67c935d1..c7a35931fd8d8d56e66895ed7991bb2c25db51fe 100644
--- a/core/modules/taxonomy/tests/src/Functional/TokenReplaceTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/TokenReplaceTest.php
@@ -96,7 +96,6 @@ public function testTaxonomyTokenReplacement() {
$tests = [];
$tests['[term:tid]'] = $term1->id();
$tests['[term:name]'] = $term1->getName();
- $tests['[term:description]'] = $term1->description->processed;
$tests['[term:url]'] = $term1->toUrl('canonical', ['absolute' => TRUE])->toString();
$tests['[term:node-count]'] = 0;
$tests['[term:parent:name]'] = '[term:parent:name]';
@@ -108,7 +107,6 @@ public function testTaxonomyTokenReplacement() {
$metadata_tests = [];
$metadata_tests['[term:tid]'] = $base_bubbleable_metadata;
$metadata_tests['[term:name]'] = $base_bubbleable_metadata;
- $metadata_tests['[term:description]'] = $base_bubbleable_metadata;
$metadata_tests['[term:url]'] = $base_bubbleable_metadata;
$metadata_tests['[term:node-count]'] = $base_bubbleable_metadata;
$metadata_tests['[term:parent:name]'] = $base_bubbleable_metadata;
@@ -127,7 +125,6 @@ public function testTaxonomyTokenReplacement() {
$tests = [];
$tests['[term:tid]'] = $term2->id();
$tests['[term:name]'] = $term2->getName();
- $tests['[term:description]'] = $term2->description->processed;
$tests['[term:url]'] = $term2->toUrl('canonical', ['absolute' => TRUE])->toString();
$tests['[term:node-count]'] = 1;
$tests['[term:parent:name]'] = $term1->getName();
diff --git a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyFieldFilterTest.php b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyFieldFilterTest.php
index 14462824c2c26a2318451ffcfb910dcb3c828af0..0edf4c865f9a56741e5efe6ddb38880cb520af22 100644
--- a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyFieldFilterTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyFieldFilterTest.php
@@ -96,10 +96,13 @@ protected function setUp($import_test_views = TRUE, $modules = []): void {
])->save();
// Create term with translations.
- $taxonomy = $this->createTermWithProperties(['name' => $this->termNames['en'], 'langcode' => 'en', 'description' => $this->termNames['en'], 'field_foo' => $this->termNames['en']]);
+ $taxonomy = $this->createTermWithProperties([
+ 'name' => $this->termNames['en'],
+ 'langcode' => 'en',
+ 'field_foo' => $this->termNames['en'],
+ ]);
foreach (['es', 'fr'] as $langcode) {
$translation = $taxonomy->addTranslation($langcode, ['name' => $this->termNames[$langcode]]);
- $translation->description->value = $this->termNames[$langcode];
$translation->field_foo->value = $this->termNames[$langcode];
}
$taxonomy->save();
@@ -115,27 +118,31 @@ protected function setUp($import_test_views = TRUE, $modules = []): void {
public function testFilters() {
// Test the name filter page, which filters for name contains 'Comida'.
// Should show just the Spanish translation, once.
- $this->assertPageCounts('test-name-filter', ['es' => 1, 'fr' => 0, 'en' => 0], 'Comida name filter');
-
- // Test the description filter page, which filters for description contains
- // 'Comida'. Should show just the Spanish translation, once.
- $this->assertPageCounts('test-desc-filter', ['es' => 1, 'fr' => 0, 'en' => 0], 'Comida description filter');
+ $this->assertPageCounts('test-name-filter', [
+ 'es' => 1,
+ 'fr' => 0,
+ 'en' => 0,
+ ], 'Comida name filter');
// Test the field filter page, which filters for field_foo contains
// 'Comida'. Should show just the Spanish translation, once.
- $this->assertPageCounts('test-field-filter', ['es' => 1, 'fr' => 0, 'en' => 0], 'Comida field filter');
+ $this->assertPageCounts('test-field-filter', [
+ 'es' => 1,
+ 'fr' => 0,
+ 'en' => 0,
+ ], 'Comida field filter');
// Test the name Paris filter page, which filters for name contains
// 'Paris'. Should show each translation once.
$this->assertPageCounts('test-name-paris', ['es' => 1, 'fr' => 1, 'en' => 1], 'Paris name filter');
- // Test the description Paris page, which filters for description contains
- // 'Paris'. Should show each translation, once.
- $this->assertPageCounts('test-desc-paris', ['es' => 1, 'fr' => 1, 'en' => 1], 'Paris description filter');
-
// Test the field Paris filter page, which filters for field_foo contains
// 'Paris'. Should show each translation once.
- $this->assertPageCounts('test-field-paris', ['es' => 1, 'fr' => 1, 'en' => 1], 'Paris field filter');
+ $this->assertPageCounts('test-field-paris', [
+ 'es' => 1,
+ 'fr' => 1,
+ 'en' => 1,
+ ], 'Paris field filter');
}
@@ -161,7 +168,7 @@ protected function assertPageCounts(string $path, array $counts, string $message
// page, and they are the same. So the title/body string should appear on
// the page twice as many times as the input count.
foreach ($counts as $langcode => $count) {
- $this->assertEquals(2 * $count, substr_count($text, $this->termNames[$langcode]), 'Translation ' . $langcode . ' has count ' . $count . ' with ' . $message);
+ $this->assertEquals(substr_count($text, $this->termNames[$langcode]), $count, 'Translation ' . $langcode . ' has count ' . $count . ' with ' . $message);
}
}
@@ -174,21 +181,19 @@ protected function assertPageCounts(string $path, array $counts, string $message
* @return \Drupal\taxonomy\TermInterface
* The created taxonomy term.
*/
- protected function createTermWithProperties($properties) {
+ protected function createTermWithProperties(array $properties) {
// Use the first available text format.
$filter_formats = filter_formats();
$format = array_pop($filter_formats);
$properties += [
'name' => $this->randomMachineName(),
- 'description' => $this->randomMachineName(),
'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
'field_foo' => $this->randomMachineName(),
];
$term = Term::create([
'name' => $properties['name'],
- 'description' => $properties['description'],
'format' => $format->id(),
'vid' => $this->vocabulary->id(),
'langcode' => $properties['langcode'],
diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTest.php
index 10aed218a41daee99f0247785559299c1ee7b098..821cc3522b8f6cdc7dc992a412263247471dc3f2 100644
--- a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTest.php
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTest.php
@@ -88,7 +88,6 @@ public function testTaxonomyTerms() {
$term = $terms[$tid];
$language = isset($values['language']) ? $values['language'] . ' - ' : '';
$this->assertSame("{$language}term {$tid} of vocabulary {$values['source_vid']}", $term->name->value);
- $this->assertSame("{$language}description of term {$tid} of vocabulary {$values['source_vid']}", $term->description->value);
$this->assertSame($values['vid'], $term->vid->target_id);
$this->assertSame((string) $values['weight'], $term->weight->value);
if ($values['parent'] === [0]) {