Avoid failing test classes extending from AbstractSonataAdminExtension

src/DependencyInjection/AbstractSonataAdminExtension.php

@@ -78,7 +78,9 @@ protected function fixTemplatesConfiguration(
             ],
         ];
 
-        $useIntlTemplates = $container->getParameter('sonata.admin.configuration.use_intl_templates');
+        $useIntlTemplates = $container->hasParameter('sonata.admin.configuration.use_intl_templates')
+            ? $container->getParameter('sonata.admin.configuration.use_intl_templates')
+            : false;
 
         if ($useIntlTemplates) {
             $defaultConfig['templates']['types']['list'] = array_merge($defaultConfig['templates']['types']['list'], [

src/DependencyInjection/SonataAdminExtension.php

@@ -16,10 +16,8 @@
 use JMS\DiExtraBundle\DependencyInjection\Configuration as JMSDiExtraBundleDependencyInjectionConfiguration;
 use Sonata\AdminBundle\DependencyInjection\Compiler\ModelManagerCompilerPass;
 use Sonata\AdminBundle\Model\ModelManagerInterface;
-use Sonata\AdminBundle\Twig\Extension\IntlExtension;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
@@ -31,7 +29,6 @@
 use Symfony\Component\Form\Extension\Core\Type\TextareaType as SymfonyTextareaType;
 use Symfony\Component\Form\Extension\Core\Type\TextType as SymfonyTextType;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Twig\Extra\Intl\IntlExtension as TwigIntlExtension;
 
 /**
  * @final since sonata-project/admin-bundle 3.52
@@ -94,17 +91,11 @@ public function load(array $configs, ContainerBuilder $container)
         $useIntlTemplates = $container->getParameter('sonata.admin.configuration.use_intl_templates');
 
         if ($useIntlTemplates) {
+            $loader->load('intl.xml');
+
             if ('@SonataAdmin/CRUD/history_revision_timestamp.html.twig' === $config['templates']['history_revision_timestamp']) {
                 $config['templates']['history_revision_timestamp'] = '@SonataAdmin/CRUD/Intl/history_revision_timestamp.html.twig';
             }
-
-            $twigIntlExtension = new Definition(TwigIntlExtension::class);
-
-            $sonataIntlExtension = new Definition(IntlExtension::class);
-            $sonataIntlExtension->addArgument($twigIntlExtension);
-            $sonataIntlExtension->addTag('twig.extension');
-
-            $container->setDefinition(IntlExtension::class, $sonataIntlExtension);
         }
 
         $container->setParameter('sonata.admin.configuration.global_search.empty_boxes', $config['global_search']['empty_boxes']);

src/Resources/config/intl.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+    <services>
+        <service id="Twig\Extra\Intl\IntlExtension"/>
+
+        <service id="Sonata\AdminBundle\Twig\Extension\IntlExtension">
+            <argument type="service" id="Twig\Extra\Intl\IntlExtension"/>
+            <tag name="twig.extension"/>
+        </service>
+    </services>
+</container>

src/Twig/Extension/IntlExtension.php

@@ -23,17 +23,19 @@
  */
 final class IntlExtension extends AbstractExtension
 {
+    /**
+     * @var TwigIntlExtension
+     */
     private $extension;
 
     public function __construct(TwigIntlExtension $extension)
     {
         $this->extension = $extension;
     }
 
-    public function getFilters()
+    public function getFilters(): array
     {
         return [
-            // localized formatters
             new TwigFilter('sonata_format_currency', [$this, 'formatCurrency']),
             new TwigFilter('sonata_format_number', [$this, 'formatNumber']),
             new TwigFilter('sonata_format_datetime', [$this, 'formatDateTime'], ['needs_environment' => true]),