don't register the Twig validator with symfony/twig-bridge < 7.3

xabbuh · xabbuh · commit 04bbe69f32cb · 2025-04-30T13:06:21.000+02:00
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\TwigBundle\DependencyInjection;
 
+use Symfony\Bridge\Twig\Validator\Constraints\TwigValidator;
 use Symfony\Bundle\TwigBundle\DependencyInjection\Compiler\AttributeExtensionPass;
 use Symfony\Component\AssetMapper\AssetMapper;
 use Symfony\Component\Config\FileLocator;
@@ -25,7 +26,6 @@
 use Symfony\Component\Mailer\Mailer;
 use Symfony\Component\Translation\LocaleSwitcher;
 use Symfony\Component\Translation\Translator;
-use Symfony\Component\Validator\Constraint;
 use Symfony\Contracts\Service\ResetInterface;
 use Twig\Attribute\AsTwigFilter;
 use Twig\Attribute\AsTwigFunction;
@@ -70,7 +70,7 @@ public function load(array $configs, ContainerBuilder $container): void
             $container->removeDefinition('twig.translation.extractor');
         }
 
-        if ($container::willBeAvailable('symfony/validator', Constraint::class, ['symfony/twig-bundle'])) {
+        if ($container::willBeAvailable('symfony/twig-bridge', TwigValidator::class, ['symfony/twig-bundle'])) {
             $loader->load('validator.php');
         }
 
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\TwigBundle\Tests\DependencyInjection;
 
 use Symfony\Bridge\PhpUnit\ExpectUserDeprecationMessageTrait;
+use Symfony\Bridge\Twig\Validator\Constraints\TwigValidator;
 use Symfony\Bundle\TwigBundle\DependencyInjection\Compiler\RuntimeLoaderPass;
 use Symfony\Bundle\TwigBundle\DependencyInjection\TwigExtension;
 use Symfony\Bundle\TwigBundle\Tests\DependencyInjection\AcmeBundle\AcmeBundle;
@@ -54,6 +55,12 @@ public function testLoadEmptyConfiguration()
         if (class_exists(Mailer::class)) {
             $this->assertCount(2, $container->getDefinition('twig.mime_body_renderer')->getArguments());
         }
+
+        if (class_exists(TwigValidator::class)) {
+            $this->assertTrue($container->hasDefinition('twig.validator'));
+        } else {
+            $this->assertFalse($container->hasDefinition('twig.validator'));
+        }
     }
 
     /**
diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json
@@ -35,6 +35,7 @@
         "symfony/translation": "^6.4|^7.0",
         "symfony/yaml": "^6.4|^7.0",
         "symfony/framework-bundle": "^6.4|^7.0",
+        "symfony/validator": "^6.4|^7.0",
         "symfony/web-link": "^6.4|^7.0"
     },
     "conflict": {
