Security update for Core, with self-updated composer

[yaffs-website] / web / core / modules / taxonomy / tests / src / Functional / Views / TaxonomyTermViewTest.php

diff --git a/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermViewTest.php b/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermViewTest.php
index 15f47231ca5475bf098663478bcd4fa46fbefde2..f69c49c7147c4ae8d9075cf81a4d7f9598e29e25 100644 (file)
--- a/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermViewTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermViewTest.php
@@ -5,6 +5,7 @@ namespace Drupal\Tests\taxonomy\Functional\Views;
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\node\Entity\Node;
 use Drupal\user\Entity\Role;
 use Drupal\user\RoleInterface;
 use Drupal\views\Views;
@@ -91,8 +92,7 @@ class TaxonomyTermViewTest extends TaxonomyTestBase {
     $this->assertText($node->label());
 
     \Drupal::service('module_installer')->install(['language', 'content_translation']);
-    $language = ConfigurableLanguage::createFromLangcode('ur');
-    $language->save();
+    ConfigurableLanguage::createFromLangcode('ur')->save();
     // Enable translation for the article content type and ensure the change is
     // picked up.
     \Drupal::service('content_translation.manager')->setEnabled('node', 'article', TRUE);
@@ -124,6 +124,12 @@ class TaxonomyTermViewTest extends TaxonomyTestBase {
     // query anymore.
     // @see \Drupal\views\Plugin\views\filter\LanguageFilter::query()
     $node->delete();
+
+    // We also have to remove the nodes created by the parent ::setUp() method
+    // if we want to be able to uninstall the Content Translation module.
+    foreach (Node::loadMultiple() as $node) {
+      $node->delete();
+    }
     \Drupal::service('module_installer')->uninstall(['content_translation', 'language']);
 
     $view = Views::getView('taxonomy_term');