Merge branch '3.1'

* 3.1:
  [TwigBridge] fix tests
  Tag the FormFieldRegistry as being internal
  [Form] Fix Date\TimeType marked as invalid on request with single_text and zero seconds
  [FrameworkBundle] Register the ArrayDenormalizer
  [Serializer] Fix DataUriNormalizer's regex
  [Validator] Added missing swedish translation
  [TranslationDebug] workaround for getFallbackLocales.
  [Translation] fixed nested fallback catalogue  using multiple locales.
  fixed phpdoc
  [Command] Fixed method comments as phpDoc syntax
  Added single quotes for upgrade guides.

Author: fabpot

DataCollectorTranslator.php

@@ -90,6 +90,20 @@ public function getCatalogue($locale = null)
         return $this->translator->getCatalogue($locale);
     }
 
+    /**
+     * Gets the fallback locales.
+     *
+     * @return array $locales The fallback locales
+     */
+    public function getFallbackLocales()
+    {
+        if ($this->translator instanceof Translator) {
+            return $this->translator->getFallbackLocales();
+        }
+
+        return array();
+    }
+
     /**
      * Passes through all unknown calls onto the translator object.
      */

LoggingTranslator.php

@@ -89,6 +89,20 @@ public function getCatalogue($locale = null)
         return $this->translator->getCatalogue($locale);
     }
 
+    /**
+     * Gets the fallback locales.
+     *
+     * @return array $locales The fallback locales
+     */
+    public function getFallbackLocales()
+    {
+        if ($this->translator instanceof Translator) {
+            return $this->translator->getFallbackLocales();
+        }
+
+        return array();
+    }
+
     /**
      * Passes through all unknown calls onto the translator object.
      */

Tests/TranslatorTest.php

@@ -273,6 +273,16 @@ public function testWhenAResourceHasNoRegisteredLoader()
         $translator->trans('foo');
     }
 
+    public function testNestedFallbackCatalogueWhenUsingMultipleLocales()
+    {
+        $translator = new Translator('fr');
+        $translator->setFallbackLocales(array('ru', 'en'));
+
+        $translator->getCatalogue('fr');
+
+        $this->assertNotNull($translator->getCatalogue('ru')->getFallbackCatalogue());
+    }
+
     public function testFallbackCatalogueResources()
     {
         $translator = new Translator('en_GB', new MessageSelector());

Translator.php

@@ -386,7 +386,7 @@ private function loadFallbackCatalogues($locale)
 
         foreach ($this->computeFallbackLocales($locale) as $fallback) {
             if (!isset($this->catalogues[$fallback])) {
-                $this->doLoadCatalogue($fallback);
+                $this->loadCatalogue($fallback);
             }
 
             $fallbackCatalogue = new MessageCatalogue($fallback, $this->catalogues[$fallback]->all());