Use FallbackFormatter instead of support for multiple formatters

Author: Nyholm

CHANGELOG.md

@@ -11,7 +11,6 @@ CHANGELOG
  * Deprecated the `Symfony\Bundle\FrameworkBundle\Controller\Controller` class in favor of `Symfony\Bundle\FrameworkBundle\Controller\AbstractController`.
  * Enabled autoconfiguration for `Psr\Log\LoggerAwareInterface`
  * Added new "auto" mode for `framework.session.cookie_secure` to turn it on when HTTPS is used
- * Added support for configuring the `Translator` with multiple formatters.
 
 4.1.0
 -----

DependencyInjection/Configuration.php

@@ -690,27 +690,14 @@ private function addTranslatorSection(ArrayNodeDefinition $rootNode)
                     ->{!class_exists(FullStack::class) && class_exists(Translator::class) ? 'canBeDisabled' : 'canBeEnabled'}()
                     ->fixXmlConfig('fallback')
                     ->fixXmlConfig('path')
-                    ->fixXmlConfig('domain_formatter')
                     ->children()
                         ->arrayNode('fallbacks')
                             ->beforeNormalization()->ifString()->then(function ($v) { return array($v); })->end()
                             ->prototype('scalar')->end()
                             ->defaultValue(array('en'))
                         ->end()
                         ->booleanNode('logging')->defaultValue(false)->end()
-                        ->scalarNode('formatter')
-                            ->info('The default formatter to use if none is specified.')
-                            ->defaultValue('translator.formatter.default')
-                        ->end()
-                        ->arrayNode('domain_formatters')
-                            ->info('Configure different formatters per domain.')
-                            ->useAttributeAsKey('domain')
-                            ->prototype('array')
-                                ->children()
-                                    ->scalarNode('service')->cannotBeEmpty()->end()
-                                ->end()
-                            ->end()
-                        ->end()
+                        ->scalarNode('formatter')->defaultValue('translator.formatter.default')->end()
                         ->scalarNode('default_path')
                             ->info('The default path used to load translations')
                             ->defaultValue('%kernel.project_dir%/translations')

DependencyInjection/FrameworkExtension.php

@@ -981,9 +981,6 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
         $container->setAlias('translator.formatter', new Alias($config['formatter'], false));
         $translator = $container->findDefinition('translator.default');
         $translator->addMethodCall('setFallbackLocales', array($config['fallbacks']));
-        foreach ($config['domain_formatters'] as $formatter) {
-            $translator->addMethodCall('addFormatter', array($formatter['domain'], new Reference($formatter['service'])));
-        }
 
         $container->setParameter('translator.logging', $config['logging']);
         $container->setParameter('translator.default_path', $config['default_path']);

Resources/config/schema/symfony-1.0.xsd

@@ -185,19 +185,13 @@
         <xsd:sequence>
             <xsd:element name="fallback" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="path" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
-            <xsd:element name="domain-formatter" type="translator_formatter" minOccurs="0" maxOccurs="unbounded" />
         </xsd:sequence>
         <xsd:attribute name="enabled" type="xsd:boolean" />
         <xsd:attribute name="fallback" type="xsd:string" />
         <xsd:attribute name="logging" type="xsd:boolean" />
         <xsd:attribute name="formatter" type="xsd:string" />
     </xsd:complexType>
 
-    <xsd:complexType name="translator_formatter">
-        <xsd:attribute name="domain" type="xsd:string" use="required" />
-        <xsd:attribute name="service" type="xsd:string" />
-    </xsd:complexType>
-
     <xsd:complexType name="validation">
         <xsd:choice minOccurs="0" maxOccurs="unbounded">
             <xsd:element name="static-method" type="xsd:string" />

Resources/config/translation.xml

@@ -29,13 +29,15 @@
             <tag name="monolog.logger" channel="translation" />
         </service>
 
-        <service id="translator.formatter.default" class="Symfony\Component\Translation\Formatter\MessageFormatter">
+        <service id="translator.formatter.symfony" class="Symfony\Component\Translation\Formatter\MessageFormatter">
             <argument type="service" id="identity_translator" />
         </service>
-
         <service id="translator.formatter.intl" class="Symfony\Component\Translation\Formatter\IntlMessageFormatter" public="false" />
-
-        <service id="translator.selector" class="Symfony\Component\Translation\MessageSelector" public="false" />
+        <service id="translator.formatter.fallback" class="Symfony\Component\Translation\Formatter\FallbackFormatter" public="false">
+            <argument type="service" id="translator.formatter.intl" />
+            <argument type="service" id="translator.formatter.symfony" />
+        </service>
+        <service id="translator.formatter.default" alias="translator.formatter.fallback" />
 
         <service id="translation.loader.php" class="Symfony\Component\Translation\Loader\PhpFileLoader">
             <tag name="translation.loader" alias="php" />