[FrameworkBundle][Translation][warmUp] use tmp cacheDir.

aitboudad · aitboudad · commit 48f5253e4c21 · 2015-04-10T12:56:36.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
@@ -77,9 +77,18 @@ public function __construct(ContainerInterface $container, MessageSelector $sele
      */
     public function warmUp($cacheDir)
     {
+        // skip warmUp when translator doesn't use cache
+        if (null === $this->options['cache_dir']) {
+            return;
+        }
+
+        $currentDir = $this->options['cache_dir'];
+        $this->options['cache_dir'] = $cacheDir;
         foreach ($this->resourceLocales as $locale) {
             $this->loadCatalogue($locale);
         }
+
+        $this->options['cache_dir'] = $currentDir;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -77,9 +77,18 @@ public function __construct(ContainerInterface $container, MessageSelector $sele`
`77`	`77`	`*/`
`78`	`78`	`public function warmUp($cacheDir)`
`79`	`79`	`{`
	`80`	`+ // skip warmUp when translator doesn't use cache`
	`81`	`+ if (null === $this->options['cache_dir']) {`
	`82`	`+ return;`
	`83`	`+ }`
	`84`	`+`
	`85`	`+ $currentDir = $this->options['cache_dir'];`
	`86`	`+ $this->options['cache_dir'] = $cacheDir;`
`80`	`87`	`foreach ($this->resourceLocales as $locale) {`
`81`	`88`	`$this->loadCatalogue($locale);`
`82`	`89`	`}`
	`90`	`+`
	`91`	`+ $this->options['cache_dir'] = $currentDir;`
`83`	`92`	`}`
`84`	`93`
`85`	`94`	`/**`