Pull merge.

[yaffs-website] / web / core / modules / taxonomy / src / Tests / TaxonomyTestTrait.php

diff --git a/web/core/modules/taxonomy/src/Tests/TaxonomyTestTrait.php b/web/core/modules/taxonomy/src/Tests/TaxonomyTestTrait.php
index 744ab1b28b497c5a8feb6ff9cb0b65ce912370fb..a1b4a552144a6c2124fcb9f35f62f63b09dfb629 100644 (file)
--- a/web/core/modules/taxonomy/src/Tests/TaxonomyTestTrait.php
+++ b/web/core/modules/taxonomy/src/Tests/TaxonomyTestTrait.php
@@ -2,13 +2,17 @@
 
 namespace Drupal\taxonomy\Tests;
 
-use Drupal\Component\Utility\Unicode;
+@trigger_error(__NAMESPACE__ . '\TaxonomyTestTrait is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, use \Drupal\Tests\taxonomy\Functional\TaxonomyTestTrait', E_USER_DEPRECATED);
+
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\taxonomy\Entity\Vocabulary;
 use Drupal\taxonomy\Entity\Term;
 
 /**
  * Provides common helper methods for Taxonomy module tests.
+ *
+ * @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0.
+ * Use \Drupal\Tests\taxonomy\Functional\TaxonomyTestTrait
  */
 trait TaxonomyTestTrait {
 
@@ -20,7 +24,7 @@ trait TaxonomyTestTrait {
     $vocabulary = Vocabulary::create([
       'name' => $this->randomMachineName(),
       'description' => $this->randomMachineName(),
-      'vid' => Unicode::strtolower($this->randomMachineName()),
+      'vid' => mb_strtolower($this->randomMachineName()),
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
       'weight' => mt_rand(0, 10),
     ]);