diff --git a/core/modules/image/image.module b/core/modules/image/image.module index 0fb38118bd..05255ca615 100644 --- a/core/modules/image/image.module +++ b/core/modules/image/image.module @@ -569,7 +569,7 @@ function image_form_editor_image_dialog_validate(array &$form, FormStateInterfac // Set the 'src' attribute to the image style URL. FilterImageStyle will // look at the 'data-editor-file-uuid' attribute, not the 'src' attribute // to render the appropriate output. - $attributes['src'] = $image_style ? file_url_transform_relative($image_style->buildUrl($uri)) : ''; + $attributes['src'] = $image_style ? \Drupal::service('file_url_generator')->transformRelative($image_style->buildUrl($uri)) : ''; /** @var \Drupal\Core\Image\ImageInterface $image */ $image = \Drupal::service('image.factory')->get($uri); diff --git a/core/modules/image/tests/src/Kernel/EditorImageStyleDialogTest.php b/core/modules/image/tests/src/Kernel/EditorImageStyleDialogTest.php index 89803b6bde..51f26e0052 100644 --- a/core/modules/image/tests/src/Kernel/EditorImageStyleDialogTest.php +++ b/core/modules/image/tests/src/Kernel/EditorImageStyleDialogTest.php @@ -99,11 +99,11 @@ protected function setUpForm(bool $enable_image_filter) { $editor->save(); /** @var \Drupal\file\FileInterface $file */ - $file = file_save_data(file_get_contents($this->root . '/core/modules/image/sample.png'), 'public://'); + $file = \Drupal::service('file.repository')->writeData(file_get_contents($this->root . '/core/modules/image/sample.png'), 'public://'); $input = [ 'editor_object' => [ - 'src' => file_url_transform_relative($file->getFileUri()), + 'src' => \Drupal::service('file_url_generator')->generateString($file->getFileUri()), 'alt' => 'Balloons floating above a field.', 'data-entity-type' => 'file', 'data-entity-uuid' => $file->uuid(),