remove definition if Translator is not available

Jean-Beru · Jean-Beru · commit c697ea5ef7d2 · 2023-08-01T09:47:14.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1879,6 +1879,10 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
             $container->removeDefinition('serializer.normalizer.mime_message');
         }
 
+        if (!class_exists(Translator::class)) {
+            $container->removeDefinition('serializer.normalizer.translatable');
+        }
+
         // compat with Symfony < 6.3
         if (!is_subclass_of(ProblemNormalizer::class, SerializerAwareInterface::class)) {
             $container->getDefinition('serializer.normalizer.problem')
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.php
@@ -115,7 +115,7 @@
             ->tag('serializer.normalizer', ['priority' => -890])
 
         ->set('serializer.normalizer.translatable', TranslatableNormalizer::class)
-            ->args(['$translator' => service('translator')->nullOnInvalid()])
+            ->args(['$translator' => service('translator')])
             ->tag('serializer.normalizer', ['priority' => -890])
 
         ->set('serializer.normalizer.form_error', FormErrorNormalizer::class)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
@@ -1596,7 +1596,7 @@ public function testTranslatableNormalizerRegistered()
 
         $this->assertEquals(TranslatableNormalizer::class, $definition->getClass());
         $this->assertEquals(-890, $tag[0]['priority']);
-        $this->assertEquals(new Reference('translator', ContainerInterface::NULL_ON_INVALID_REFERENCE), $definition->getArgument('$translator'));
+        $this->assertEquals(new Reference('translator'), $definition->getArgument('$translator'));
     }
 
     public function testSerializerCacheActivated()
diff --git a/src/Symfony/Component/Serializer/Normalizer/TranslatableNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/TranslatableNormalizer.php
@@ -24,8 +24,8 @@ final class TranslatableNormalizer implements NormalizerInterface
     ];
 
     public function __construct(
+        private readonly TranslatorInterface $translator,
         array $defaultContext = [],
-        private readonly ?TranslatorInterface $translator = null,
     ) {
         $this->defaultContext = array_merge($this->defaultContext, $defaultContext);
     }
@@ -44,7 +44,7 @@ public function normalize(mixed $object, string $format = null, array $context =
 
     public function supportsNormalization(mixed $data, string $format = null, array $context = []): bool
     {
-        return null !== $this->translator && $data instanceof TranslatableInterface;
+        return $data instanceof TranslatableInterface;
     }
 
     public function getSupportedTypes(?string $format): array
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/TranslatableNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/TranslatableNormalizerTest.php
@@ -22,7 +22,7 @@ class TranslatableNormalizerTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->normalizer = new TranslatableNormalizer([], $this->createMock(TranslatorInterface::class));
+        $this->normalizer = new TranslatableNormalizer($this->createMock(TranslatorInterface::class));
     }
 
     public function testSupportsNormalization()
@@ -31,14 +31,6 @@ public function testSupportsNormalization()
         $this->assertFalse($this->normalizer->supportsNormalization(new \stdClass()));
     }
 
-    public function testSupportsNormalizationWithoutTranslator()
-    {
-        $normalizer = new TranslatableNormalizer();
-
-        $this->assertFalse($normalizer->supportsNormalization(new TestMessage()));
-        $this->assertFalse($normalizer->supportsNormalization(new \stdClass()));
-    }
-
     public function testNormalize()
     {
         $message = new TestMessage();
@@ -51,8 +43,8 @@ public function testNormalize()
     public function testNormalizeWithNormalizationLocalePassedInConstructor()
     {
         $normalizer = new TranslatableNormalizer(
-            ['translatable_normalization_locale' => 'es'],
             $this->createMock(TranslatorInterface::class),
+            ['translatable_normalization_locale' => 'es'],
         );
         $message = new TestMessage();
 

Original file line number	Diff line number	Diff line change
`@@ -1596,7 +1596,7 @@ public function testTranslatableNormalizerRegistered()`
`1596`	`1596`
`1597`	`1597`	`$this->assertEquals(TranslatableNormalizer::class, $definition->getClass());`
`1598`	`1598`	`$this->assertEquals(-890, $tag[0]['priority']);`
`1599`		`- $this->assertEquals(new Reference('translator', ContainerInterface::NULL_ON_INVALID_REFERENCE), $definition->getArgument('$translator'));`
	`1599`	`+ $this->assertEquals(new Reference('translator'), $definition->getArgument('$translator'));`
`1600`	`1600`	`}`
`1601`	`1601`
`1602`	`1602`	`public function testSerializerCacheActivated()`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@ final class TranslatableNormalizer implements NormalizerInterface`
`24`	`24`	`];`
`25`	`25`
`26`	`26`	`public function __construct(`
	`27`	`+ private readonly TranslatorInterface $translator,`
`27`	`28`	`array $defaultContext = [],`
`28`		`- private readonly ?TranslatorInterface $translator = null,`
`29`	`29`	`) {`
`30`	`30`	`$this->defaultContext = array_merge($this->defaultContext, $defaultContext);`
`31`	`31`	`}`
`@@ -44,7 +44,7 @@ public function normalize(mixed $object, string $format = null, array $context =`
`44`	`44`
`45`	`45`	`public function supportsNormalization(mixed $data, string $format = null, array $context = []): bool`
`46`	`46`	`{`
`47`		`- return null !== $this->translator && $data instanceof TranslatableInterface;`
	`47`	`+ return $data instanceof TranslatableInterface;`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`public function getSupportedTypes(?string $format): array`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class TranslatableNormalizerTest extends TestCase`
`22`	`22`
`23`	`23`	`protected function setUp(): void`
`24`	`24`	`{`
`25`		`- $this->normalizer = new TranslatableNormalizer([], $this->createMock(TranslatorInterface::class));`
	`25`	`+ $this->normalizer = new TranslatableNormalizer($this->createMock(TranslatorInterface::class));`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public function testSupportsNormalization()`
`@@ -31,14 +31,6 @@ public function testSupportsNormalization()`
`31`	`31`	`$this->assertFalse($this->normalizer->supportsNormalization(new \stdClass()));`
`32`	`32`	`}`
`33`	`33`
`34`		`- public function testSupportsNormalizationWithoutTranslator()`
`35`		`- {`
`36`		`- $normalizer = new TranslatableNormalizer();`
`37`		`-`
`38`		`- $this->assertFalse($normalizer->supportsNormalization(new TestMessage()));`
`39`		`- $this->assertFalse($normalizer->supportsNormalization(new \stdClass()));`
`40`		`- }`
`41`		`-`
`42`	`34`	`public function testNormalize()`
`43`	`35`	`{`
`44`	`36`	`$message = new TestMessage();`
`@@ -51,8 +43,8 @@ public function testNormalize()`
`51`	`43`	`public function testNormalizeWithNormalizationLocalePassedInConstructor()`
`52`	`44`	`{`
`53`	`45`	`$normalizer = new TranslatableNormalizer(`
`54`		`- ['translatable_normalization_locale' => 'es'],`
`55`	`46`	`$this->createMock(TranslatorInterface::class),`
	`47`	`+ ['translatable_normalization_locale' => 'es'],`
`56`	`48`	`);`
`57`	`49`	`$message = new TestMessage();`
`58`	`50`