symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
+45Lines changed: 45 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
+45Lines changed: 45 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
+22-7Lines changed: 22 additions & 7 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
+22-7Lines changed: 22 additions & 7 deletions
@@ -135,6 +135,51 @@ public function testGetDefaultLocale()
         $this->assertSame('en', $translator->getLocale());
     }
 
+    /** @dataProvider getDebugModeAndCacheDirCombinations */
+    public function testResourceFilesOptionLoadsBeforeOtherAddedResources($debug, $enableCache)
+    {
+        $someCatalogue = $this->getCatalogue('some_locale', array());
+
+        $loader = $this->getMockBuilder('Symfony\Component\Translation\Loader\LoaderInterface')->getMock();
+
+        $loader->expects($this->at(0))
+            ->method('load')
+            /* The "messages.some_locale.loader" is passed via the resource_file option and shall be loaded first */
+            ->with('messages.some_locale.loader', 'some_locale', 'messages')
+            ->willReturn($someCatalogue);
+
+        $loader->expects($this->at(1))
+            ->method('load')
+            /* This resource is added by an addResource() call and shall be loaded after the resource_files */
+            ->with('second_resource.some_locale.loader', 'some_locale', 'messages')
+            ->willReturn($someCatalogue);
+
+        $options = array(
+            'resource_files' => array('some_locale' => array('messages.some_locale.loader')),
+            'debug' => $debug,
+        );
+
+        if ($enableCache) {
+            $options['cache_dir'] = $this->tmpDir;
+        }
+
+        /** @var Translator $translator */
+        $translator = $this->createTranslator($loader, $options);
+        $translator->addResource('loader', 'second_resource.some_locale.loader', 'some_locale', 'messages');
+
+        $translator->trans('some_message', array(), null, 'some_locale');
+    }
+
+    public function getDebugModeAndCacheDirCombinations()
+    {
+        return array(
+            array(false, false),
+            array(true, false),
+            array(false, true),
+            array(true, true),
+        );
+    }
+
     protected function getCatalogue($locale, $messages, $resources = array())
     {
         $catalogue = new MessageCatalogue($locale);
 
@@ -37,6 +37,14 @@ class Translator extends BaseTranslator implements WarmableInterface
      */
     private $resourceLocales;
 
+    /**
+     * Holds parameters from addResource() calls so we can defer the actual
+     * parent::addResource() calls until initialize() is executed.
+     *
+     * @var array
+     */
+    private $resources = array();
+
     /**
      * Constructor.
      *
@@ -65,9 +73,7 @@ public function __construct(ContainerInterface $container, MessageSelector $sele
 
         $this->options = array_merge($this->options, $options);
         $this->resourceLocales = array_keys($this->options['resource_files']);
-        if (null !== $this->options['cache_dir'] && $this->options['debug']) {
-            $this->loadResources();
-        }
+        $this->addResourceFiles($this->options['resource_files']);
 
         parent::__construct($container->getParameter('kernel.default_locale'), $selector, $this->options['cache_dir'], $this->options['debug']);
     }
@@ -93,6 +99,11 @@ public function warmUp($cacheDir)
         }
     }
 
+    public function addResource($format, $resource, $locale, $domain = null)
+    {
+        $this->resources[] = array($format, $resource, $locale, $domain);
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -104,22 +115,26 @@ protected function initializeCatalogue($locale)
 
     protected function initialize()
     {
-        $this->loadResources();
+        foreach ($this->resources as $key => $params) {
+            list($format, $resource, $locale, $domain) = $params;
+            parent::addResource($format, $resource, $locale, $domain);
+        }
+        $this->resources = array();
+
         foreach ($this->loaderIds as $id => $aliases) {
             foreach ($aliases as $alias) {
                 $this->addLoader($alias, $this->container->get($id));
             }
         }
     }
 
-    private function loadResources()
+    private function addResourceFiles($filesByLocale)
     {
-        foreach ($this->options['resource_files'] as $locale => $files) {
+        foreach ($filesByLocale as $locale => $files) {
             foreach ($files as $key => $file) {
                 // filename is domain.locale.format
                 list($domain, $locale, $format) = explode('.', basename($file), 3);
                 $this->addResource($format, $file, $locale, $domain);
-                unset($this->options['resource_files'][$locale][$key]);
             }
         }
     }
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,14 @@ class Translator extends BaseTranslator implements WarmableInterface`
`37`	`37`	`*/`
`38`	`38`	`private $resourceLocales;`
`39`	`39`
	`40`	`+ /**`
	`41`	`+ * Holds parameters from addResource() calls so we can defer the actual`
	`42`	`+ * parent::addResource() calls until initialize() is executed.`
	`43`	`+ *`
	`44`	`+ * @var array`
	`45`	`+ */`
	`46`	`+ private $resources = array();`
	`47`	`+`
`40`	`48`	`/**`
`41`	`49`	`* Constructor.`
`42`	`50`	`*`
`@@ -65,9 +73,7 @@ public function __construct(ContainerInterface $container, MessageSelector $sele`
`65`	`73`
`66`	`74`	`$this->options = array_merge($this->options, $options);`
`67`	`75`	`$this->resourceLocales = array_keys($this->options['resource_files']);`
`68`		`- if (null !== $this->options['cache_dir'] && $this->options['debug']) {`
`69`		`- $this->loadResources();`
`70`		`- }`
	`76`	`+ $this->addResourceFiles($this->options['resource_files']);`
`71`	`77`
`72`	`78`	`parent::__construct($container->getParameter('kernel.default_locale'), $selector, $this->options['cache_dir'], $this->options['debug']);`
`73`	`79`	`}`
`@@ -93,6 +99,11 @@ public function warmUp($cacheDir)`
`93`	`99`	`}`
`94`	`100`	`}`
`95`	`101`
	`102`	`+ public function addResource($format, $resource, $locale, $domain = null)`
	`103`	`+ {`
	`104`	`+ $this->resources[] = array($format, $resource, $locale, $domain);`
	`105`	`+ }`
	`106`	`+`
`96`	`107`	`/**`
`97`	`108`	`* {@inheritdoc}`
`98`	`109`	`*/`
`@@ -104,22 +115,26 @@ protected function initializeCatalogue($locale)`
`104`	`115`
`105`	`116`	`protected function initialize()`
`106`	`117`	`{`
`107`		`- $this->loadResources();`
	`118`	`+ foreach ($this->resources as $key => $params) {`
	`119`	`+ list($format, $resource, $locale, $domain) = $params;`
	`120`	`+ parent::addResource($format, $resource, $locale, $domain);`
	`121`	`+ }`
	`122`	`+ $this->resources = array();`
	`123`	`+`
`108`	`124`	`foreach ($this->loaderIds as $id => $aliases) {`
`109`	`125`	`foreach ($aliases as $alias) {`
`110`	`126`	`$this->addLoader($alias, $this->container->get($id));`
`111`	`127`	`}`
`112`	`128`	`}`
`113`	`129`	`}`
`114`	`130`
`115`		`- private function loadResources()`
	`131`	`+ private function addResourceFiles($filesByLocale)`
`116`	`132`	`{`
`117`		`- foreach ($this->options['resource_files'] as $locale => $files) {`
	`133`	`+ foreach ($filesByLocale as $locale => $files) {`
`118`	`134`	`foreach ($files as $key => $file) {`
`119`	`135`	`// filename is domain.locale.format`
`120`	`136`	`list($domain, $locale, $format) = explode('.', basename($file), 3);`
`121`	`137`	`$this->addResource($format, $file, $locale, $domain);`
`122`		`- unset($this->options['resource_files'][$locale][$key]);`
`123`	`138`	`}`
`124`	`139`	`}`
`125`	`140`	`}`