Merge branch '3.4'

* 3.4: (83 commits)
  add missing version attribute
  Show exception is checked twice in ExceptionController of twig
  allow SSI fragments configuration in XML files
  Display a better error message when the toolbar cannot be displayed
  [SecurityBundle] Add user impersonation info and exit action to the profiler
  render hidden _method field in form_rest()
  Add Doctrine Cache to dev dependencies to fix failing unit tests.
  return fallback locales whenever possible
  Fix Predis client cluster with pipeline
  [Dotenv] Test load() with multiple paths
  [Console] Fix catching exception type in QuestionHelper
  Improved the exception page when there is no message
  [WebProfilerBundle] Eliminate line wrap on count columnt (routing)
  [Profiler][Validator] Add a validator panel in profiler
  [Validator] replace hardcoded service id
  [Routing] Fix XmlFileLoader exception message
  Remove duplicate changelog entries
  [DI] Dedup tags when using instanceof/autoconfigure
  [Translation] Fix FileLoader::loadResource() php doc
  [Serializer] Fix workaround min php version
  ...

Author: xabbuh

DataCollectorTranslator.php

@@ -97,7 +97,7 @@ public function getCatalogue($locale = null)
      */
     public function getFallbackLocales()
     {
-        if ($this->translator instanceof Translator) {
+        if ($this->translator instanceof Translator || method_exists($this->translator, 'getFallbackLocales')) {
             return $this->translator->getFallbackLocales();
         }
 

Dumper/YamlFileDumper.php

@@ -23,6 +23,13 @@
  */
 class YamlFileDumper extends FileDumper
 {
+    private $extension;
+
+    public function __construct(/**string */$extension = 'yml')
+    {
+        $this->extension = $extension;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -50,6 +57,6 @@ public function formatCatalogue(MessageCatalogue $messages, $domain, array $opti
      */
     protected function getExtension()
     {
-        return 'yml';
+        return $this->extension;
     }
 }

Loader/FileLoader.php

@@ -54,7 +54,7 @@ public function load($resource, $locale, $domain = 'messages')
         return $catalogue;
     }
 
-    /*
+    /**
      * @param string $resource
      *
      * @return array

LoggingTranslator.php

@@ -96,7 +96,7 @@ public function getCatalogue($locale = null)
      */
     public function getFallbackLocales()
     {
-        if ($this->translator instanceof Translator) {
+        if ($this->translator instanceof Translator || method_exists($this->translator, 'getFallbackLocales')) {
             return $this->translator->getFallbackLocales();
         }