minor #27063 [Translator] Further postpone adding resource files (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit d843181bf685 · 2018-04-29T08:06:02.000+02:00
This PR was merged into the 4.1-dev branch. Discussion ---------- [Translator] Further postpone adding resource files | Q | A | ------------- | --- | Branch? | 4.1 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #27010 | License | MIT | Doc PR | - Commits ------- 2aa62df [Translator] Further postpone adding resource files
diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
@@ -46,6 +46,8 @@ class Translator extends BaseTranslator implements WarmableInterface
      */
     private $resources = array();
 
+    private $resourceFiles;
+
     /**
      * Constructor.
      *
@@ -75,7 +77,7 @@ public function __construct(ContainerInterface $container, MessageFormatterInter
 
         $this->options = array_merge($this->options, $options);
         $this->resourceLocales = array_keys($this->options['resource_files']);
-        $this->addResourceFiles($this->options['resource_files']);
+        $this->resourceFiles = $this->options['resource_files'];
 
         parent::__construct($defaultLocale, $formatter, $this->options['cache_dir'], $this->options['debug']);
     }
@@ -103,6 +105,9 @@ public function warmUp($cacheDir)
 
     public function addResource($format, $resource, $locale, $domain = null)
     {
+        if ($this->resourceFiles) {
+            $this->addResourceFiles();
+        }
         $this->resources[] = array($format, $resource, $locale, $domain);
     }
 
@@ -117,6 +122,9 @@ protected function initializeCatalogue($locale)
 
     protected function initialize()
     {
+        if ($this->resourceFiles) {
+            $this->addResourceFiles();
+        }
         foreach ($this->resources as $key => $params) {
             list($format, $resource, $locale, $domain) = $params;
             parent::addResource($format, $resource, $locale, $domain);
@@ -130,8 +138,11 @@ protected function initialize()
         }
     }
 
-    private function addResourceFiles($filesByLocale)
+    private function addResourceFiles()
     {
+        $filesByLocale = $this->resourceFiles;
+        $this->resourceFiles = array();
+
         foreach ($filesByLocale as $locale => $files) {
             foreach ($files as $key => $file) {
                 // filename is domain.locale.format

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,8 @@ class Translator extends BaseTranslator implements WarmableInterface`
`46`	`46`	`*/`
`47`	`47`	`private $resources = array();`
`48`	`48`
	`49`	`+ private $resourceFiles;`
	`50`	`+`
`49`	`51`	`/**`
`50`	`52`	`* Constructor.`
`51`	`53`	`*`
`@@ -75,7 +77,7 @@ public function __construct(ContainerInterface $container, MessageFormatterInter`
`75`	`77`
`76`	`78`	`$this->options = array_merge($this->options, $options);`
`77`	`79`	`$this->resourceLocales = array_keys($this->options['resource_files']);`
`78`		`- $this->addResourceFiles($this->options['resource_files']);`
	`80`	`+ $this->resourceFiles = $this->options['resource_files'];`
`79`	`81`
`80`	`82`	`parent::__construct($defaultLocale, $formatter, $this->options['cache_dir'], $this->options['debug']);`
`81`	`83`	`}`
`@@ -103,6 +105,9 @@ public function warmUp($cacheDir)`
`103`	`105`
`104`	`106`	`public function addResource($format, $resource, $locale, $domain = null)`
`105`	`107`	`{`
	`108`	`+ if ($this->resourceFiles) {`
	`109`	`+ $this->addResourceFiles();`
	`110`	`+ }`
`106`	`111`	`$this->resources[] = array($format, $resource, $locale, $domain);`
`107`	`112`	`}`
`108`	`113`
`@@ -117,6 +122,9 @@ protected function initializeCatalogue($locale)`
`117`	`122`
`118`	`123`	`protected function initialize()`
`119`	`124`	`{`
	`125`	`+ if ($this->resourceFiles) {`
	`126`	`+ $this->addResourceFiles();`
	`127`	`+ }`
`120`	`128`	`foreach ($this->resources as $key => $params) {`
`121`	`129`	`list($format, $resource, $locale, $domain) = $params;`
`122`	`130`	`parent::addResource($format, $resource, $locale, $domain);`
`@@ -130,8 +138,11 @@ protected function initialize()`
`130`	`138`	`}`
`131`	`139`	`}`
`132`	`140`
`133`		`- private function addResourceFiles($filesByLocale)`
	`141`	`+ private function addResourceFiles()`
`134`	`142`	`{`
	`143`	`+ $filesByLocale = $this->resourceFiles;`
	`144`	`+ $this->resourceFiles = array();`
	`145`	`+`
`135`	`146`	`foreach ($filesByLocale as $locale => $files) {`
`136`	`147`	`foreach ($files as $key => $file) {`
`137`	`148`	`// filename is domain.locale.format`