Pull merge.

[yaffs-website] / web / core / modules / field / tests / src / Kernel / String / StringFormatterTest.php

diff --git a/web/core/modules/field/tests/src/Kernel/String/StringFormatterTest.php b/web/core/modules/field/tests/src/Kernel/String/StringFormatterTest.php
index b09eb58c09133e89aee5d8b06e75c7412d12f071..74f16d582a514e7b3e0a581aab770ea75e99abf6 100644 (file)
--- a/web/core/modules/field/tests/src/Kernel/String/StringFormatterTest.php
+++ b/web/core/modules/field/tests/src/Kernel/String/StringFormatterTest.php
@@ -3,7 +3,6 @@
 namespace Drupal\Tests\field\Kernel\String;
 
 use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
 use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\entity_test\Entity\EntityTestRev;
@@ -25,6 +24,13 @@ class StringFormatterTest extends KernelTestBase {
    */
   public static $modules = ['field', 'text', 'entity_test', 'system', 'filter', 'user'];
 
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
   /**
    * @var string
    */
@@ -58,7 +64,7 @@ class StringFormatterTest extends KernelTestBase {
 
     $this->entityType = 'entity_test_rev';
     $this->bundle = $this->entityType;
-    $this->fieldName = Unicode::strtolower($this->randomMachineName());
+    $this->fieldName = mb_strtolower($this->randomMachineName());
 
     $field_storage = FieldStorageConfig::create([
       'field_name' => $this->fieldName,
@@ -80,6 +86,8 @@ class StringFormatterTest extends KernelTestBase {
         'settings' => [],
       ]);
     $this->display->save();
+
+    $this->entityTypeManager = \Drupal::entityTypeManager();
   }
 
   /**
@@ -146,7 +154,7 @@ class StringFormatterTest extends KernelTestBase {
     $value2 = $this->randomMachineName();
     $entity->{$this->fieldName}->value = $value2;
     $entity->save();
-    $entity_new_revision = \Drupal::entityManager()->getStorage('entity_test_rev')->loadRevision($old_revision_id);
+    $entity_new_revision = $this->entityTypeManager->getStorage('entity_test_rev')->loadRevision($old_revision_id);
 
     $this->renderEntityFields($entity, $this->display);
     $this->assertLink($value2, 0);
@@ -155,6 +163,19 @@ class StringFormatterTest extends KernelTestBase {
     $this->renderEntityFields($entity_new_revision, $this->display);
     $this->assertLink($value, 0);
     $this->assertLinkByHref('/entity_test_rev/' . $entity_new_revision->id() . '/revision/' . $entity_new_revision->getRevisionId() . '/view');
+
+    // Check that linking to a revisionable entity works if the entity type does
+    // not specify a 'revision' link template.
+    $entity_type = clone $this->entityTypeManager->getDefinition('entity_test_rev');
+    $link_templates = $entity_type->getLinkTemplates();
+    unset($link_templates['revision']);
+    $entity_type->set('links', $link_templates);
+    \Drupal::state()->set('entity_test_rev.entity_type', $entity_type);
+    $this->entityTypeManager->clearCachedDefinitions();
+
+    $this->renderEntityFields($entity_new_revision, $this->display);
+    $this->assertLink($value, 0);
+    $this->assertLinkByHref($entity->url('canonical'));
   }
 
 }