minor #20103 [TwigBundle] Fix CacheWarmingTest are order dependent (tucksaun)

fabpot · fabpot · commit d2c050ebe041 · 2016-09-30T07:21:26.000-07:00
This PR was merged into the 2.7 branch. Discussion ---------- [TwigBundle] Fix CacheWarmingTest are order dependent | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Fix issue reported in #20065 Commits ------- fcd6ec2 [TwigBundle] Fix CacheWarmingTest are order dependent
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Functional/CacheWarmingTest.php b/src/Symfony/Bundle/TwigBundle/Tests/Functional/CacheWarmingTest.php
@@ -72,7 +72,7 @@ public function __construct($withTemplating)
     {
         $this->withTemplating = $withTemplating;
 
-        parent::__construct('dev', true);
+        parent::__construct(($withTemplating ? 'with' : 'without').'_templating', true);
     }
 
     public function getName()
@@ -106,7 +106,7 @@ public function registerContainerConfiguration(LoaderInterface $loader)
 
     public function getCacheDir()
     {
-        return sys_get_temp_dir().'/'.Kernel::VERSION.'/CacheWarmingKernel/cache';
+        return sys_get_temp_dir().'/'.Kernel::VERSION.'/CacheWarmingKernel/cache/'.$this->environment;
     }
 
     public function getLogDir()

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public function __construct($withTemplating)`
`72`	`72`	`{`
`73`	`73`	`$this->withTemplating = $withTemplating;`
`74`	`74`
`75`		`- parent::__construct('dev', true);`
	`75`	`+ parent::__construct(($withTemplating ? 'with' : 'without').'_templating', true);`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`public function getName()`
`@@ -106,7 +106,7 @@ public function registerContainerConfiguration(LoaderInterface $loader)`
`106`	`106`
`107`	`107`	`public function getCacheDir()`
`108`	`108`	`{`
`109`		`- return sys_get_temp_dir().'/'.Kernel::VERSION.'/CacheWarmingKernel/cache';`
	`109`	`+ return sys_get_temp_dir().'/'.Kernel::VERSION.'/CacheWarmingKernel/cache/'.$this->environment;`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`public function getLogDir()`