diff --git a/core/modules/image/src/ImageServiceProvider.php b/core/modules/image/src/ImageServiceProvider.php index 7e459b9..6757aa0 100644 --- a/core/modules/image/src/ImageServiceProvider.php +++ b/core/modules/image/src/ImageServiceProvider.php @@ -4,8 +4,8 @@ use Drupal\Core\DependencyInjection\ContainerBuilder; use Drupal\Core\DependencyInjection\ServiceProviderInterface; -use Drupal\image\Normalizer\ImageItemWithStylesHalNormalizer; -use Drupal\image\Normalizer\ImageItemWithStylesNormalizer; +use Drupal\image\Normalizer\ImageItemHalNormalizer; +use Drupal\image\Normalizer\ImageItemNormalizer; use Symfony\Component\DependencyInjection\Definition; use Symfony\Component\DependencyInjection\Reference; @@ -22,7 +22,7 @@ public function register(ContainerBuilder $container) { $modules = $container->getParameter('container.modules'); if (isset($modules['serialization'])) { // Add an ImageItem normalizer. - $service_definition = new Definition(ImageItemWithStylesNormalizer::class, [ + $service_definition = new Definition(ImageItemNormalizer::class, [ new Reference('renderer'), ]); // Priority should be higher than @@ -33,7 +33,7 @@ public function register(ContainerBuilder $container) { } if (isset($modules['hal'])) { // Add an ImageItem normalizer. - $service_definition = new Definition(ImageItemWithStylesHalNormalizer::class, [ + $service_definition = new Definition(ImageItemHalNormalizer::class, [ new Reference('serialization.link_manager'), new Reference('serializer.entity_resolver'), new Reference('renderer'), diff --git a/core/modules/image/src/Normalizer/ImageItemWithStylesHalNormalizer.php b/core/modules/image/src/Normalizer/ImageItemHalNormalizer.php similarity index 93% rename from core/modules/image/src/Normalizer/ImageItemWithStylesHalNormalizer.php rename to core/modules/image/src/Normalizer/ImageItemHalNormalizer.php index 3823edf..96b681b 100644 --- a/core/modules/image/src/Normalizer/ImageItemWithStylesHalNormalizer.php +++ b/core/modules/image/src/Normalizer/ImageItemHalNormalizer.php @@ -12,11 +12,11 @@ /** * Decorator for ImageItem HAL normalizer providing URLs to image styles. */ -class ImageItemWithStylesHalNormalizer extends EntityReferenceItemNormalizer { +class ImageItemHalNormalizer extends EntityReferenceItemNormalizer { use ConditionalCacheabilityMetadataBubblingTrait; - use ImageItemWithStylesNormalizerTrait; + use ImageItemNormalizerTrait; /** * {@inheritdoc} diff --git a/core/modules/image/src/Normalizer/ImageItemWithStylesNormalizer.php b/core/modules/image/src/Normalizer/ImageItemNormalizer.php similarity index 90% rename from core/modules/image/src/Normalizer/ImageItemWithStylesNormalizer.php rename to core/modules/image/src/Normalizer/ImageItemNormalizer.php index f11688c..7b2af3d 100644 --- a/core/modules/image/src/Normalizer/ImageItemWithStylesNormalizer.php +++ b/core/modules/image/src/Normalizer/ImageItemNormalizer.php @@ -10,11 +10,11 @@ /** * Decorator for ImageItem normalizer providing URLs to image styles. */ -class ImageItemWithStylesNormalizer extends EntityReferenceFieldItemNormalizer { +class ImageItemNormalizer extends EntityReferenceFieldItemNormalizer { use ConditionalCacheabilityMetadataBubblingTrait; - use ImageItemWithStylesNormalizerTrait; + use ImageItemNormalizerTrait; /** * {@inheritdoc} diff --git a/core/modules/image/src/Normalizer/ImageItemWithStylesNormalizerTrait.php b/core/modules/image/src/Normalizer/ImageItemNormalizerTrait.php similarity index 97% rename from core/modules/image/src/Normalizer/ImageItemWithStylesNormalizerTrait.php rename to core/modules/image/src/Normalizer/ImageItemNormalizerTrait.php index 66868bd..e28e56b 100644 --- a/core/modules/image/src/Normalizer/ImageItemWithStylesNormalizerTrait.php +++ b/core/modules/image/src/Normalizer/ImageItemNormalizerTrait.php @@ -9,7 +9,7 @@ /** * A trait providing ItemItem normalizing decorating methods. */ -trait ImageItemWithStylesNormalizerTrait { +trait ImageItemNormalizerTrait { /** * Adds image style information to normalized ImageItem field data. diff --git a/core/modules/image/tests/src/Kernel/Normalizer/ImageItemWithStylesHalNormalizerTest.php b/core/modules/image/tests/src/Kernel/Normalizer/ImageItemHalNormalizerTest.php similarity index 77% rename from core/modules/image/tests/src/Kernel/Normalizer/ImageItemWithStylesHalNormalizerTest.php rename to core/modules/image/tests/src/Kernel/Normalizer/ImageItemHalNormalizerTest.php index 00bcab3..ca0eaa2 100644 --- a/core/modules/image/tests/src/Kernel/Normalizer/ImageItemWithStylesHalNormalizerTest.php +++ b/core/modules/image/tests/src/Kernel/Normalizer/ImageItemHalNormalizerTest.php @@ -3,10 +3,10 @@ namespace Drupal\Tests\image\Kernel\Normalizer; /** - * @coversDefaultClass \Drupal\image\Normalizer\ImageItemWithStylesHalNormalizer + * @coversDefaultClass \Drupal\image\Normalizer\ImageItemHalNormalizer * @group image */ -class ImageItemWithStylesHalNormalizerTest extends ImageItemWithStylesNormalizerTestBase { +class ImageItemHalNormalizerTest extends ImageItemNormalizerTestBase { /** * {@inheritdoc} diff --git a/core/modules/image/tests/src/Kernel/Normalizer/ImageItemWithStylesNormalizerTest.php b/core/modules/image/tests/src/Kernel/Normalizer/ImageItemNormalizerTest.php similarity index 65% rename from core/modules/image/tests/src/Kernel/Normalizer/ImageItemWithStylesNormalizerTest.php rename to core/modules/image/tests/src/Kernel/Normalizer/ImageItemNormalizerTest.php index 4eb589e..774afed 100644 --- a/core/modules/image/tests/src/Kernel/Normalizer/ImageItemWithStylesNormalizerTest.php +++ b/core/modules/image/tests/src/Kernel/Normalizer/ImageItemNormalizerTest.php @@ -3,10 +3,10 @@ namespace Drupal\Tests\image\Kernel\Normalizer; /** - * @coversDefaultClass \Drupal\image\Normalizer\ImageItemWithStylesNormalizer + * @coversDefaultClass \Drupal\image\Normalizer\ImageItemNormalizer * @group image */ -class ImageItemWithStylesNormalizerTest extends ImageItemWithStylesNormalizerTestBase { +class ImageItemNormalizerTest extends ImageItemNormalizerTestBase { /** * {@inheritdoc} diff --git a/core/modules/image/tests/src/Kernel/Normalizer/ImageItemWithStylesNormalizerTestBase.php b/core/modules/image/tests/src/Kernel/Normalizer/ImageItemNormalizerTestBase.php similarity index 97% rename from core/modules/image/tests/src/Kernel/Normalizer/ImageItemWithStylesNormalizerTestBase.php rename to core/modules/image/tests/src/Kernel/Normalizer/ImageItemNormalizerTestBase.php index 2a3b38d..7a8277e 100644 --- a/core/modules/image/tests/src/Kernel/Normalizer/ImageItemWithStylesNormalizerTestBase.php +++ b/core/modules/image/tests/src/Kernel/Normalizer/ImageItemNormalizerTestBase.php @@ -14,9 +14,9 @@ use Drupal\KernelTests\KernelTestBase; /** - * Base class for ItemItemWithStylesNormalizer testing. + * Base class for ItemItemNormalizer testing. */ -abstract class ImageItemWithStylesNormalizerTestBase extends KernelTestBase { +abstract class ImageItemNormalizerTestBase extends KernelTestBase { /** * {@inheritdoc}