symfony
diff --git a/‎src/Symfony/Component/Translation/MessageCatalogue.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/MessageCatalogue.php
+7Lines changed: 7 additions & 0 deletions b/‎src/Symfony/Component/Translation/MessageCatalogue.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/MessageCatalogue.php
+7Lines changed: 7 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Translation/Tests/MessageCatalogueTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Tests/MessageCatalogueTest.php
+17-3Lines changed: 17 additions & 3 deletions b/‎src/Symfony/Component/Translation/Tests/MessageCatalogueTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Tests/MessageCatalogueTest.php
+17-3Lines changed: 17 additions & 3 deletions
diff --git a/‎src/Symfony/Component/Translation/Translator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Translator.php
+3-2Lines changed: 3 additions & 2 deletions b/‎src/Symfony/Component/Translation/Translator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Translator.php
+3-2Lines changed: 3 additions & 2 deletions
@@ -190,6 +190,13 @@ public function addCatalogue(MessageCatalogueInterface $catalogue)
     public function addFallbackCatalogue(MessageCatalogueInterface $catalogue)
     {
         // detect circular references
+        $c = $catalogue;
+        while ($c = $c->getFallbackCatalogue()) {
+            if ($c->getLocale() === $this->getLocale()) {
+                throw new \LogicException(sprintf('Circular reference detected when adding a fallback catalogue for locale "%s".', $catalogue->getLocale()));
+            }
+        }
+
         $c = $this;
         do {
             if ($c->getLocale() === $catalogue->getLocale()) {
 
@@ -127,7 +127,7 @@ public function testAddFallbackCatalogue()
     /**
      * @expectedException \LogicException
      */
-    public function testAddFallbackCatalogueWithCircularReference()
+    public function testAddFallbackCatalogueWithParentCircularReference()
     {
         $main = new MessageCatalogue('en_US');
         $fallback = new MessageCatalogue('fr_FR');
@@ -136,6 +136,20 @@ public function testAddFallbackCatalogueWithCircularReference()
         $main->addFallbackCatalogue($fallback);
     }
 
+    /**
+     * @expectedException \LogicException
+     */
+    public function testAddFallbackCatalogueWithFallbackCircularReference()
+    {
+        $fr = new MessageCatalogue('fr');
+        $en = new MessageCatalogue('en');
+        $es = new MessageCatalogue('es');
+
+        $fr->addFallbackCatalogue($en);
+        $es->addFallbackCatalogue($en);
+        $en->addFallbackCatalogue($fr);
+    }
+
     /**
      * @expectedException \LogicException
      */
@@ -178,10 +192,10 @@ public function testMetadataSetGetDelete()
         $this->assertEquals(array(), $catalogue->getMetadata('key2', 'messages'), 'Metadata key2 is array');
 
         $catalogue->deleteMetadata('key2', 'messages');
-        $this->assertEquals(null, $catalogue->getMetadata('key2', 'messages'), 'Metadata key2 should is deleted.');
+        $this->assertNull($catalogue->getMetadata('key2', 'messages'), 'Metadata key2 should is deleted.');
 
         $catalogue->deleteMetadata('key2', 'domain');
-        $this->assertEquals(null, $catalogue->getMetadata('key2', 'domain'), 'Metadata key2 should is deleted.');
+        $this->assertNull($catalogue->getMetadata('key2', 'domain'), 'Metadata key2 should is deleted.');
     }
 
     public function testMetadataMerge()
 
@@ -276,8 +276,9 @@ private function loadFallbackCatalogues($locale)
                 $this->doLoadCatalogue($fallback);
             }
 
-            $current->addFallbackCatalogue($this->catalogues[$fallback]);
-            $current = $this->catalogues[$fallback];
+            $fallbackCatalogue = new MessageCatalogue($fallback, $this->catalogues[$fallback]->all());
+            $current->addFallbackCatalogue($fallbackCatalogue);
+            $current = $fallbackCatalogue;
         }
     }
Original file line number	Diff line number	Diff line change
`@@ -276,8 +276,9 @@ private function loadFallbackCatalogues($locale)`
`276`	`276`	`$this->doLoadCatalogue($fallback);`
`277`	`277`	`}`
`278`	`278`
`279`		`- $current->addFallbackCatalogue($this->catalogues[$fallback]);`
`280`		`- $current = $this->catalogues[$fallback];`
	`279`	`+ $fallbackCatalogue = new MessageCatalogue($fallback, $this->catalogues[$fallback]->all());`
	`280`	`+ $current->addFallbackCatalogue($fallbackCatalogue);`
	`281`	`+ $current = $fallbackCatalogue;`
`281`	`282`	`}`
`282`	`283`	`}`
`283`	`284`