Issue #3306587 by JeroenT: file_create_url() is deprecated in drupal:9.3.0... (9276fb5c) · Commits · project / paragraphs_summary_token

composer.json

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@
		"GPL-2.0-or-later"
		],
		"require": {
		"drupal/core": "^9 \|\| ^10",
		"drupal/core": "^9.3 \|\| ^10",
		"drupal/paragraphs": "^1.0",
		"drupal/token": "^1.0"
		}

paragraphs_summary_token.info.yml

+1 −1

Original line number	Diff line number	Diff line
		name: 'Paragraphs Summary Token'
		type: 'module'
		description: 'Provides a paragraph summary token.'
		core_version_requirement: ^9 \|\| ^10
		core_version_requirement: ^9.3 \|\| ^10
		package: Paragraphs
		dependencies:
		- paragraphs:paragraphs

paragraphs_summary_token.services.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,4 +8,4 @@ services:
		arguments: ['@entity_type.manager', '@language_manager']
		paragraphs_summary_token.image_builder:
		class: Drupal\paragraphs_summary_token\Service\ImageBuilder
		arguments: ['@entity_type.manager', '@language_manager', '@stream_wrapper_manager']
		arguments: ['@entity_type.manager', '@language_manager', '@stream_wrapper_manager', '@file_url_generator']

src/Service/ImageBuilder.php

+13 −2

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@ namespace Drupal\paragraphs_summary_token\Service;
		use Drupal\Core\Entity\EntityTypeManagerInterface;
		use Drupal\Core\Field\EntityReferenceFieldItemListInterface;
		use Drupal\Core\Field\FieldItemListInterface;
		use Drupal\Core\File\FileUrlGeneratorInterface;
		use Drupal\Core\Language\LanguageManagerInterface;
		use Drupal\Core\StreamWrapper\StreamWrapperManagerInterface;
		use Drupal\entity_reference_revisions\EntityReferenceRevisionsFieldItemList;
		@@ -28,6 +29,13 @@ class ImageBuilder implements ImageBuilderInterface {
		*/
		protected $fileStorage;

		/**
		* The file url generator service.
		*
		* @var \Drupal\Core\File\FileUrlGeneratorInterface
		*/
		protected $fileUrlGenerator;

		/**
		* The language manager.
		*
		@@ -51,13 +59,16 @@ class ImageBuilder implements ImageBuilderInterface {
		* The language manager.
		* @param \Drupal\Core\StreamWrapper\StreamWrapperManagerInterface $streamWrapperManager
		* The stream wrapper manager.
		* @param \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator
		* The file URL generator service.
		*
		* @throws \Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException
		* @throws \Drupal\Component\Plugin\Exception\PluginNotFoundException
		*/
		public function __construct(EntityTypeManagerInterface $entityTypeManager, LanguageManagerInterface $languageManager, StreamWrapperManagerInterface $streamWrapperManager) {
		public function __construct(EntityTypeManagerInterface $entityTypeManager, LanguageManagerInterface $languageManager, StreamWrapperManagerInterface $streamWrapperManager, FileUrlGeneratorInterface $file_url_generator) {
		$this->setFieldStorageConfigStorage($entityTypeManager->getStorage('field_storage_config'));
		$this->fileStorage = $entityTypeManager->getStorage('file');
		$this->fileUrlGenerator = $file_url_generator;
		$this->languageManager = $languageManager;
		$this->streamWrapperManager = $streamWrapperManager;
		}
		@@ -76,7 +87,7 @@ class ImageBuilder implements ImageBuilderInterface {
		return $image_style->buildUrl($image_url);
		}

		return file_create_url($image_url);
		return $this->fileUrlGenerator->generateAbsoluteString($image_url);
		}

		/**

tests/src/Kernel/ImageBuilderTest.php

+17 −9

Original line number	Diff line number	Diff line
		@@ -19,6 +19,13 @@ class ImageBuilderTest extends KernelTestBase {
		use ParagraphsSummaryTokenTestTrait;
		use ParagraphsTestBaseTrait;

		/**
		* The file url generator service.
		*
		* @var \Drupal\Core\File\FileUrlGeneratorInterface
		*/
		protected $fileUrlGenerator;

		/**
		* The image builder.
		*
		@@ -29,7 +36,7 @@ class ImageBuilderTest extends KernelTestBase {
		/**
		* The image style.
		*
		* @var Drupal\image\Entity\ImageStyle
		* @var \Drupal\image\Entity\ImageStyle
		*/
		protected $imageStyle;

		@@ -89,6 +96,7 @@ class ImageBuilderTest extends KernelTestBase {

		// Initialize services.
		$this->imageBuilder = $this->container->get('paragraphs_summary_token.image_builder');
		$this->fileUrlGenerator = $this->container->get('file_url_generator');
		}

		/**
		@@ -110,7 +118,7 @@ class ImageBuilderTest extends KernelTestBase {
		$node->save();

		$this->assertEquals(
		file_create_url($image->getFileUri()),
		$this->fileUrlGenerator->generateAbsoluteString($image->getFileUri()),
		$this->imageBuilder->build($node->get('field_paragraphs'))
		);

		@@ -152,7 +160,7 @@ class ImageBuilderTest extends KernelTestBase {
		$node->save();

		$this->assertEquals(
		file_create_url($image_1->getFileUri()),
		$this->fileUrlGenerator->generateAbsoluteString($image_1->getFileUri()),
		$this->imageBuilder->build($node->get('field_paragraphs'))
		);

		@@ -230,7 +238,7 @@ class ImageBuilderTest extends KernelTestBase {
		$node->save();

		$this->assertEquals(
		file_create_url($image_1->getFileUri()),
		$this->fileUrlGenerator->generateAbsoluteString($image_1->getFileUri()),
		$this->imageBuilder->build($node->get('field_paragraphs'))
		);

		@@ -259,7 +267,7 @@ class ImageBuilderTest extends KernelTestBase {
		$node->save();

		$this->assertEquals(
		file_create_url($media->get('field_media_image')->entity->getFileUri()),
		$this->fileUrlGenerator->generateAbsoluteString($media->get('field_media_image')->entity->getFileUri()),
		$this->imageBuilder->build($node->get('field_paragraphs'))
		);

		@@ -293,7 +301,7 @@ class ImageBuilderTest extends KernelTestBase {
		$node->save();

		$this->assertEquals(
		file_create_url($media->get('field_media_image')->entity->getFileUri()),
		$this->fileUrlGenerator->generateAbsoluteString($media->get('field_media_image')->entity->getFileUri()),
		$this->imageBuilder->build($node->get('field_paragraphs'))
		);

		@@ -371,7 +379,7 @@ class ImageBuilderTest extends KernelTestBase {
		$node->save();

		$this->assertEquals(
		file_create_url($media_1->get('field_media_image')->entity->getFileUri()),
		$this->fileUrlGenerator->generateAbsoluteString($media_1->get('field_media_image')->entity->getFileUri()),
		$this->imageBuilder->build($node->get('field_paragraphs'))
		);

		@@ -407,7 +415,7 @@ class ImageBuilderTest extends KernelTestBase {
		$node->save();

		$this->assertEquals(
		file_create_url($media->get('field_media_image')->entity->getFileUri()),
		$this->fileUrlGenerator->generateAbsoluteString($media->get('field_media_image')->entity->getFileUri()),
		$this->imageBuilder->build($node->get('field_paragraphs'))
		);

		@@ -443,7 +451,7 @@ class ImageBuilderTest extends KernelTestBase {
		$node->save();

		$this->assertEquals(
		file_create_url($image_media->get('field_media_image')->entity->getFileUri()),
		$this->fileUrlGenerator->generateAbsoluteString($image_media->get('field_media_image')->entity->getFileUri()),
		$this->imageBuilder->build($node->get('field_paragraphs'))
		);