Merge branch '4.2' into 4.3

fabpot · fabpot · commit a423badbe5f8 · 2019-05-26T11:06:58.000+02:00
* 4.2:
  [Translation] Fixed issue with new vs old TranslatorInterface in TranslationDataCollector
  [FrameworkBundle] improve cs
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;

Original file line number	Diff line number	Diff line change
`@@ -1822,7 +1822,7 @@ private function registerCacheConfiguration(array $config, ContainerBuilder $con`
`1822`	`1822`	`$definition = new ChildDefinition($pool['adapter']);`
`1823`	`1823`
`1824`	`1824`	`if ($pool['tags']) {`
`1825`		`- if ($config['pools'][$pool['tags']]['tags'] ?? false) {`
	`1825`	`+ if (true !== $pool['tags'] && ($config['pools'][$pool['tags']]['tags'] ?? false)) {`
`1826`	`1826`	`$pool['tags'] = '.'.$pool['tags'].'.inner';`
`1827`	`1827`	`}`
`1828`	`1828`	`$container->register($name, TagAwareAdapter::class)`
Original file line number	Diff line number	Diff line change
`@@ -68,10 +68,10 @@ public function transChoice($id, $number, array $parameters = [], $domain = null`
`68`	`68`	`{`
`69`	`69`	`if ($this->translator instanceof TranslatorInterface) {`
`70`	`70`	`$trans = $this->translator->trans($id, ['%count%' => $number] + $parameters, $domain, $locale);`
	`71`	`+ } else {`
	`72`	`+ $trans = $this->translator->transChoice($id, $number, $parameters, $domain, $locale);`
`71`	`73`	`}`
`72`	`74`
`73`		`- $trans = $this->translator->transChoice($id, $number, $parameters, $domain, $locale);`
`74`		`-`
`75`	`75`	`$this->collectMessage($locale, $domain, $id, $trans, ['%count%' => $number] + $parameters);`
`76`	`76`
`77`	`77`	`return $trans;`