Issue #2829173 by mark_fullmer, PCate, oldeb, johnnny83, Berdir: File is inserted with absolute URL

src/Plugin/Linkit/Substitution/File.php

@@ -24,7 +24,7 @@ class File extends PluginBase implements SubstitutionInterface {
   public function getUrl(EntityInterface $entity) {
     $url = new GeneratedUrl();
     /** @var \Drupal\file\FileInterface $entity */
-    $url->setGeneratedUrl(\Drupal::service('file_url_generator')->generateAbsoluteString($entity->getFileUri()));
+    $url->setGeneratedUrl($entity->createFileUrl());
     $url->addCacheableDependency($entity);
     return $url;
   }

src/Plugin/Linkit/Substitution/Media.php

@@ -48,7 +48,7 @@ class Media extends PluginBase implements SubstitutionInterface, ContainerFactor
     if ($source_field && $entity->hasField($source_field->getName()) && $entity->get($source_field->getName())->entity instanceof FileInterface) {
       /** @var \Drupal\file\FileInterface $file */
       $file = $entity->get($source_field->getName())->entity;
-      $url->setGeneratedUrl(\Drupal::service('file_url_generator')->generateAbsoluteString($file->getFileUri()));
+      $url->setGeneratedUrl($file->createFileUrl());
       $url->addCacheableDependency($entity);
       return $url;
     }

tests/src/Kernel/AssertLinkitFilterTrait.php

@@ -29,7 +29,7 @@ trait AssertLinkitFilterTrait {
   protected function assertLinkitFilter(EntityInterface $entity, $langcode = LanguageInterface::LANGCODE_SITE_DEFAULT) {
     if ($entity->getEntityTypeId() === "file") {
       /** @var \Drupal\file\Entity\File $entity */
-      $href = \Drupal::service('file_url_generator')->generateAbsoluteString($entity->getFileUri());
+      $href = \Drupal::service('file_url_generator')->generateString($entity->getFileUri());
     }
     else {
       $href = $entity->toUrl()->toString();
@@ -53,7 +53,7 @@ trait AssertLinkitFilterTrait {
   protected function assertLinkitFilterWithTitle(EntityInterface $entity, $langcode = LanguageInterface::LANGCODE_SITE_DEFAULT) {
     if ($entity->getEntityTypeId() === "file") {
       /** @var \Drupal\file\Entity\File $entity */
-      $href = \Drupal::service('file_url_generator')->generateAbsoluteString($entity->getFileUri());
+      $href = \Drupal::service('file_url_generator')->generateString($entity->getFileUri());
     }
     else {
       $href = $entity->toUrl()->toString();

tests/src/Kernel/SubstitutionPluginTest.php

@@ -110,7 +110,7 @@ class SubstitutionPluginTest extends LinkitKernelTestBase {
       'status' => FileInterface::STATUS_PERMANENT,
     ]);
     $file->save();
-    $this->assertEquals($GLOBALS['base_url'] . '/' . $this->siteDirectory . '/files/druplicon.txt', $fileSubstitution->getUrl($file)->getGeneratedUrl());
+    $this->assertEquals('/' . $this->siteDirectory . '/files/druplicon.txt', $fileSubstitution->getUrl($file)->getGeneratedUrl());
 
     $entity_type = $this->entityTypeManager->getDefinition('file');
     $this->assertTrue(FileSubstitutionPlugin::isApplicable($entity_type), 'The entity type File is applicable the file substitution.');
@@ -170,7 +170,7 @@ class SubstitutionPluginTest extends LinkitKernelTestBase {
     $media->save();
 
     $media_substitution = $this->substitutionManager->createInstance('media');
-    $expected = $GLOBALS['base_url'] . '/' . $this->siteDirectory . '/files/druplicon.txt';
+    $expected = '/' . $this->siteDirectory . '/files/druplicon.txt';
     $this->assertEquals($expected, $media_substitution->getUrl($media)->getGeneratedUrl());
 
     // Ensure the url is identical when media entities have a standalone URL