Skip to content
Snippets Groups Projects
Commit 969101ba authored by Project Update Bot's avatar Project Update Bot Committed by snater
Browse files

Issue #3288033 by Project Update Bot: Automated Drupal 10 compatibility fixes

parent 6de70afb
No related branches found
No related tags found
No related merge requests found
......@@ -538,7 +538,7 @@ function insert_insert_variables($insertType, array &$element, $styleName, array
'entity_type' => $file->getEntityTypeId(),
'mime_type' => $file->getMimeType(),
'uuid' => $file->uuid(),
'url' => file_create_url($file->getFileUri()),
'url' => \Drupal::service('file_url_generator')->generateAbsoluteString($file->getFileUri()),
];
if (!$config->get('absolute')) {
......
......@@ -12,7 +12,7 @@ abstract class InsertColorboxTestBase extends InsertImageTestBase {
/**
* @var array
*/
public static $modules = [
protected static $modules = [
'node', 'file', 'image', 'insert', 'insert_colorbox', 'field_ui',
];
......
......@@ -58,11 +58,11 @@ function insert_responsive_image_insert_variables($insertType, array &$element,
$style = ImageStyle::load($responsiveStyle->getFallbackImageStyle());
$vars['url'] = $style === NULL
? file_create_url($file->getFileUri())
? \Drupal::service('file_url_generator')->generateAbsoluteString($file->getFileUri())
: $style->buildUrl($file->getFileUri());
if (!\Drupal::config('insert.config')->get('absolute')) {
$vars['url'] = file_url_transform_relative($vars['url']);
$vars['url'] = \Drupal::service('file_url_generator')->transformRelative($vars['url']);
}
// Have Responsive Image module generate the srcset and sizes attributes:
......
......@@ -13,7 +13,7 @@ abstract class InsertResponsiveImageTestBase extends InsertImageTestBase {
/**
* @inheritdoc
*/
public static $modules = [
protected static $modules = [
'node',
'image',
'insert',
......@@ -25,7 +25,7 @@ abstract class InsertResponsiveImageTestBase extends InsertImageTestBase {
/**
* @inheritdoc
*/
protected function setUp() {
protected function setUp(): void {
parent::setUp();
// Install the 'wide' responsive image style.
......
......@@ -25,7 +25,7 @@ abstract class InsertFileTestBase extends WebDriverTestBase {
/**
* @var array
*/
public static $modules = ['node', 'file', 'insert', 'field_ui'];
protected static $modules = ['node', 'file', 'insert', 'field_ui'];
/**
* @var \Drupal\user\UserInterface
......@@ -40,7 +40,7 @@ abstract class InsertFileTestBase extends WebDriverTestBase {
/**
*
*/
protected function setUp() {
protected function setUp(): void {
parent::setUp();
$this->contentTypeName = 'article';
......
......@@ -13,14 +13,14 @@ abstract class InsertImageCKEditorTestBase extends InsertImageTestBase {
/**
* @inheritdoc
*/
public static $modules = [
protected static $modules = [
'node', 'file', 'image', 'insert', 'editor', 'field_ui', 'ckeditor',
];
/**
* @inheritdoc
*/
protected function setUp() {
protected function setUp(): void {
parent::setUp();
// Create text format and associate CKEditor.
......
......@@ -16,7 +16,7 @@ abstract class InsertImageTestBase extends InsertFileTestBase {
/**
* @var array
*/
public static $modules = [
protected static $modules = [
'node', 'file', 'image', 'insert', 'editor', 'field_ui',
];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment