Merge branch '2.7' into 2.8
* 2.7: [TwigBundle] Fix CacheWarmingTest are order dependent Revert "bug #20080 [Form] compound forms without children should be considered rendered implicitly (backbone87)" #17580 compound forms without children should be considered rendered implicitly
This commit is contained in:
commit
fe4ae0befc
@ -72,7 +72,7 @@ class CacheWarmingKernel extends Kernel
|
|||||||
{
|
{
|
||||||
$this->withTemplating = $withTemplating;
|
$this->withTemplating = $withTemplating;
|
||||||
|
|
||||||
parent::__construct('dev', true);
|
parent::__construct(($withTemplating ? 'with' : 'without').'_templating', true);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getName()
|
public function getName()
|
||||||
@ -106,7 +106,7 @@ class CacheWarmingKernel extends Kernel
|
|||||||
|
|
||||||
public function getCacheDir()
|
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()
|
public function getLogDir()
|
||||||
|
Reference in New Issue
Block a user