diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.7' into 2.8

Browse Source 
* 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:
Fabien Potencier 2016-09-30 07:22:20 -07:00
commit fe4ae0befc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Bundle/TwigBundle/Tests/Functional/CacheWarmingTest.php
View File

@ -72,7 +72,7 @@ class CacheWarmingKernel extends Kernel
{
$this->withTemplating = $withTemplating;
parent::__construct('dev', true);
parent::__construct(($withTemplating ? 'with' : 'without').'_templating', true);
}
public function getName()
@ -106,7 +106,7 @@ class CacheWarmingKernel extends Kernel
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()