Skip to content

Commit 1d5c8b7

Browse files
Merge branch '2.8' into 3.0
* 2.8: [VarDumper] Fix tests on PHP 7 [DomCrawler] Clarify the value returned by getPhpFiles() [DependencyInjection] Fix #16461 Let Container::set() replace existing aliases avoid (string) catchable fatal error for instances of __PHP_Incomplete_Class remove unnecessary retrieval and setting of data Update validators.fr.xlf avoid (string) catchable fatal error for __PHP_Incomplete_Class instances sendContent return as parent. [DomCrawler] Remove the overridden getHash() method to prevent problems when cloning the crawler [FrameworkBundle] Fix a typo Added more exceptions to singularify method Add width attribute on SVG [FrameworkBundle] Support autowiring for TranslationInterface [WebProfiler] Fixed styles for search block and menu profiler for IE Edge Conflicts: src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php src/Symfony/Component/DomCrawler/Crawler.php
2 parents 96328d1 + 7f285dd commit 1d5c8b7

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

Command/TranslationUpdateCommand.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,9 @@ protected function configure()
4747
))
4848
->setDescription('Updates the translation file')
4949
->setHelp(<<<'EOF'
50-
The <info>%command.name%</info> command extract translation strings from templates
50+
The <info>%command.name%</info> command extracts translation strings from templates
5151
of a given bundle or the app folder. It can display them or merge the new ones into the translation files.
52+
5253
When new translation strings are found it can automatically add a prefix to the translation
5354
message.
5455

Resources/config/translation.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<call method="setConfigCacheFactory">
1818
<argument type="service" id="config_cache_factory" />
1919
</call>
20+
21+
<autowiring-type>Symfony\Component\Translation\TranslatorInterface</autowiring-type>
2022
</service>
2123

2224
<service id="translator.logging" class="Symfony\Component\Translation\LoggingTranslator" public="false">

0 commit comments

Comments
 (0)