Merge branch '4.2' into 4.3

* 4.2: [Translation] Fixed issue with new vs old TranslatorInterface in TranslationDataCollector [FrameworkBundle] improve cs
symfony · May 26, 2019 · a423bad · a423bad
2 parents 74225d7 + 451b440
commit a423bad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1822,7 +1822,7 @@ private function registerCacheConfiguration(array $config, ContainerBuilder $con
             $definition = new ChildDefinition($pool['adapter']);
 
             if ($pool['tags']) {
-                if ($config['pools'][$pool['tags']]['tags'] ?? false) {
+                if (true !== $pool['tags'] && ($config['pools'][$pool['tags']]['tags'] ?? false)) {
                     $pool['tags'] = '.'.$pool['tags'].'.inner';
                 }
                 $container->register($name, TagAwareAdapter::class)

diff --git a/src/Symfony/Component/Translation/DataCollectorTranslator.php b/src/Symfony/Component/Translation/DataCollectorTranslator.php
@@ -68,10 +68,10 @@ public function transChoice($id, $number, array $parameters = [], $domain = null
     {
         if ($this->translator instanceof TranslatorInterface) {
             $trans = $this->translator->trans($id, ['%count%' => $number] + $parameters, $domain, $locale);
+        } else {
+            $trans = $this->translator->transChoice($id, $number, $parameters, $domain, $locale);
         }
 
-        $trans = $this->translator->transChoice($id, $number, $parameters, $domain, $locale);
-
         $this->collectMessage($locale, $domain, $id, $trans, ['%count%' => $number] + $parameters);
 
         return $trans;