renamed translator.real to translator.default
This commit is contained in:
parent
d6cbbdd26c
commit
b4b8f35da2
@ -18,7 +18,7 @@ class TranslatorPass implements CompilerPassInterface
|
||||
{
|
||||
public function process(ContainerBuilder $container)
|
||||
{
|
||||
if (!$container->hasDefinition('translator.real')) {
|
||||
if (!$container->hasDefinition('translator.default')) {
|
||||
return;
|
||||
}
|
||||
|
||||
@ -26,6 +26,6 @@ class TranslatorPass implements CompilerPassInterface
|
||||
foreach ($container->findTaggedServiceIds('translation.loader') as $id => $attributes) {
|
||||
$loaders[$id] = $attributes[0]['alias'];
|
||||
}
|
||||
$container->findDefinition('translator.real')->replaceArgument(2, $loaders);
|
||||
$container->findDefinition('translator.default')->replaceArgument(2, $loaders);
|
||||
}
|
||||
}
|
||||
|
@ -466,8 +466,8 @@ class FrameworkExtension extends Extension
|
||||
{
|
||||
if (!empty($config['enabled'])) {
|
||||
// Use the "real" translator instead of the identity default
|
||||
$container->setAlias('translator', 'translator.real');
|
||||
$translator = $container->findDefinition('translator.real');
|
||||
$container->setAlias('translator', 'translator.default');
|
||||
$translator = $container->findDefinition('translator.default');
|
||||
$translator->addMethodCall('setFallbackLocale', array($config['fallback']));
|
||||
|
||||
// Discover translation directories
|
||||
|
@ -14,7 +14,7 @@
|
||||
</parameters>
|
||||
|
||||
<services>
|
||||
<service id="translator.real" class="%translator.class%">
|
||||
<service id="translator.default" class="%translator.class%">
|
||||
<argument type="service" id="service_container" />
|
||||
<argument type="service" id="translator.selector" />
|
||||
<argument type="collection" /> <!-- translation loaders -->
|
||||
|
@ -129,11 +129,11 @@ abstract class FrameworkExtensionTest extends TestCase
|
||||
{
|
||||
$container = $this->createContainerFromFile('full');
|
||||
|
||||
$this->assertTrue($container->hasDefinition('translator.real'), '->registerTranslatorConfiguration() loads translation.xml');
|
||||
$this->assertEquals('translator.real', (string) $container->getAlias('translator'), '->registerTranslatorConfiguration() redefines translator service from identity to real translator');
|
||||
$this->assertTrue($container->hasDefinition('translator.default'), '->registerTranslatorConfiguration() loads translation.xml');
|
||||
$this->assertEquals('translator.default', (string) $container->getAlias('translator'), '->registerTranslatorConfiguration() redefines translator service from identity to real translator');
|
||||
|
||||
$resources = array();
|
||||
foreach ($container->getDefinition('translator.real')->getMethodCalls() as $call) {
|
||||
foreach ($container->getDefinition('translator.default')->getMethodCalls() as $call) {
|
||||
if ('addResource' == $call[0]) {
|
||||
$resources[] = $call[1];
|
||||
}
|
||||
@ -145,7 +145,7 @@ abstract class FrameworkExtensionTest extends TestCase
|
||||
'->registerTranslatorConfiguration() finds FrameworkExtension translation resources'
|
||||
);
|
||||
|
||||
$calls = $container->getDefinition('translator.real')->getMethodCalls();
|
||||
$calls = $container->getDefinition('translator.default')->getMethodCalls();
|
||||
$this->assertEquals('fr', $calls[0][1][0]);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user