Merge branch '2.3' into 2.7

* 2.3:
  fix container cache key generation
  [Translation] Add resources from fallback locale
  [DependencyInjection] enforce tags to have a name
  [YAML] Refine the return value of Yaml::parse()

Author: fabpot

Tests/TranslatorTest.php

@@ -273,6 +273,30 @@ public function testWhenAResourceHasNoRegisteredLoader()
         $translator->trans('foo');
     }
 
+    public function testFallbackCatalogueResources()
+    {
+        $translator = new Translator('en_GB', new MessageSelector());
+        $translator->addLoader('yml', new \Symfony\Component\Translation\Loader\YamlFileLoader());
+        $translator->addResource('yml', __DIR__.'/fixtures/empty.yml', 'en_GB');
+        $translator->addResource('yml', __DIR__.'/fixtures/resources.yml', 'en');
+
+        // force catalogue loading
+        $this->assertEquals('bar', $translator->trans('foo', array()));
+
+        $cataloguesProperty = new \ReflectionProperty($translator, 'catalogues');
+        $cataloguesProperty->setAccessible(true);
+        $catalogues = $cataloguesProperty->getValue($translator);
+
+        $resources = $catalogues['en']->getResources();
+        $this->assertCount(1, $resources);
+        $this->assertContains( __DIR__.'/fixtures/resources.yml', $resources);
+
+        $resources = $catalogues['en_GB']->getResources();
+        $this->assertCount(2, $resources);
+        $this->assertContains( __DIR__.'/fixtures/empty.yml', $resources);
+        $this->assertContains( __DIR__.'/fixtures/resources.yml', $resources);
+    }
+
     /**
      * @dataProvider getTransTests
      */

Translator.php

@@ -424,6 +424,9 @@ private function loadFallbackCatalogues($locale)
             }
 
             $fallbackCatalogue = new MessageCatalogue($fallback, $this->catalogues[$fallback]->all());
+            foreach ($this->catalogues[$fallback]->getResources() as $resource) {
+                $fallbackCatalogue->addResource($resource);
+            }
             $current->addFallbackCatalogue($fallbackCatalogue);
             $current = $fallbackCatalogue;
         }