bug #14195 [Translation][Profiler] fixed infiinite loop when collect msg from fallback (aitboudad)

aitboudad · aitboudad · commit aae98a924b34 · 2015-04-03T12:34:33.000+01:00
This PR was merged into the 2.7 branch. Discussion ---------- [Translation][Profiler] fixed infiinite loop when collect msg from fallback | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Fixed tickets | ~ | Tests pass? | yes | License | MIT Commits ------- 59f2172 [Translation][Profiler] fixed infiinite loop when collect msg from fallback.
diff --git a/src/Symfony/Component/Translation/DataCollectorTranslator.php b/src/Symfony/Component/Translation/DataCollectorTranslator.php
@@ -137,6 +137,8 @@ private function collectMessage($locale, $domain, $id, $translation)
                     $locale = $fallbackCatalogue->getLocale();
                     break;
                 }
+
+                $fallbackCatalogue = $fallbackCatalogue->getFallBackCatalogue();
             }
         } else {
             $state = self::MESSAGE_MISSING;
diff --git a/src/Symfony/Component/Translation/Tests/DataCollectorTranslatorTest.php b/src/Symfony/Component/Translation/Tests/DataCollectorTranslatorTest.php
@@ -26,11 +26,12 @@ protected function setUp()
     public function testCollectMessages()
     {
         $collector = $this->createCollector();
-        $collector->setFallbackLocales(array('fr'));
+        $collector->setFallbackLocales(array('fr', 'ru'));
 
         $collector->trans('foo');
         $collector->trans('bar');
         $collector->transChoice('choice', 0);
+        $collector->trans('bar_ru');
 
         $expectedMessages = array();
         $expectedMessages[] = array(
@@ -54,6 +55,13 @@ public function testCollectMessages()
               'domain' => 'messages',
               'state' => DataCollectorTranslator::MESSAGE_MISSING,
         );
+        $expectedMessages[] = array(
+              'id' => 'bar_ru',
+              'translation' => 'bar (ru)',
+              'locale' => 'ru',
+              'domain' => 'messages',
+              'state' => DataCollectorTranslator::MESSAGE_EQUALS_FALLBACK,
+        );
 
         $this->assertEquals($expectedMessages, $collector->getCollectedMessages());
     }
@@ -64,6 +72,7 @@ private function createCollector()
         $translator->addLoader('array', new ArrayLoader());
         $translator->addResource('array', array('foo' => 'foo (en)'), 'en');
         $translator->addResource('array', array('bar' => 'bar (fr)'), 'fr');
+        $translator->addResource('array', array('bar_ru' => 'bar (ru)'), 'ru');
 
         $collector = new DataCollectorTranslator($translator);
 

Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,8 @@ private function collectMessage($locale, $domain, $id, $translation)`
`137`	`137`	`$locale = $fallbackCatalogue->getLocale();`
`138`	`138`	`break;`
`139`	`139`	`}`
	`140`	`+`
	`141`	`+ $fallbackCatalogue = $fallbackCatalogue->getFallBackCatalogue();`
`140`	`142`	`}`
`141`	`143`	`} else {`
`142`	`144`	`$state = self::MESSAGE_MISSING;`