Merge branch '3.2'

* 3.2:
  [FrameworkBundle] Fix cleaning of test dirs

Author: nicolas-grekas

Tests/Functional/SessionTest.php

@@ -134,18 +134,4 @@ public function getConfigs()
             array('config.yml', false),
         );
     }
-
-    protected function setUp()
-    {
-        parent::setUp();
-
-        $this->deleteTmpDir('SessionTest');
-    }
-
-    protected function tearDown()
-    {
-        parent::tearDown();
-
-        $this->deleteTmpDir('SessionTest');
-    }
 }

Tests/Functional/WebTestCase.php

@@ -13,7 +13,6 @@
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase as BaseWebTestCase;
 use Symfony\Component\Filesystem\Filesystem;
-use Symfony\Component\HttpKernel\Kernel;
 
 class WebTestCase extends BaseWebTestCase
 {
@@ -23,9 +22,19 @@ public static function assertRedirect($response, $location)
         self::assertEquals('http://localhost'.$location, $response->headers->get('Location'));
     }
 
-    protected function deleteTmpDir($testCase)
+    public static function setUpBeforeClass()
     {
-        if (!file_exists($dir = sys_get_temp_dir().'/'.Kernel::VERSION.'/'.$testCase)) {
+        static::deleteTmpDir();
+    }
+
+    public static function tearDownAfterClass()
+    {
+        static::deleteTmpDir();
+    }
+
+    protected static function deleteTmpDir()
+    {
+        if (!file_exists($dir = sys_get_temp_dir().'/'.static::getVarDir())) {
             return;
         }
 
@@ -49,10 +58,16 @@ protected static function createKernel(array $options = array())
         }
 
         return new $class(
+            static::getVarDir(),
             $options['test_case'],
             isset($options['root_config']) ? $options['root_config'] : 'config.yml',
-            isset($options['environment']) ? $options['environment'] : 'frameworkbundletest'.strtolower($options['test_case']),
+            isset($options['environment']) ? $options['environment'] : strtolower(static::getVarDir().$options['test_case']),
             isset($options['debug']) ? $options['debug'] : true
         );
     }
+
+    protected static function getVarDir()
+    {
+        return substr(strrchr(get_called_class(), '\\'), 1);
+    }
 }

Tests/Functional/app/AppKernel.php

@@ -22,14 +22,16 @@
  */
 class AppKernel extends Kernel
 {
+    private $varDir;
     private $testCase;
     private $rootConfig;
 
-    public function __construct($testCase, $rootConfig, $environment, $debug)
+    public function __construct($varDir, $testCase, $rootConfig, $environment, $debug)
     {
         if (!is_dir(__DIR__.'/'.$testCase)) {
             throw new \InvalidArgumentException(sprintf('The test case "%s" does not exist.', $testCase));
         }
+        $this->varDir = $varDir;
         $this->testCase = $testCase;
 
         $fs = new Filesystem();
@@ -57,12 +59,12 @@ public function getRootDir()
 
     public function getCacheDir()
     {
-        return sys_get_temp_dir().'/'.Kernel::VERSION.'/'.$this->testCase.'/cache/'.$this->environment;
+        return sys_get_temp_dir().'/'.$this->varDir.'/'.$this->testCase.'/cache/'.$this->environment;
     }
 
     public function getLogDir()
     {
-        return sys_get_temp_dir().'/'.Kernel::VERSION.'/'.$this->testCase.'/logs';
+        return sys_get_temp_dir().'/'.$this->varDir.'/'.$this->testCase.'/logs';
     }
 
     public function registerContainerConfiguration(LoaderInterface $loader)
@@ -72,13 +74,13 @@ public function registerContainerConfiguration(LoaderInterface $loader)
 
     public function serialize()
     {
-        return serialize(array($this->testCase, $this->rootConfig, $this->getEnvironment(), $this->isDebug()));
+        return serialize(array($this->varDir, $this->testCase, $this->rootConfig, $this->getEnvironment(), $this->isDebug()));
     }
 
     public function unserialize($str)
     {
         $a = unserialize($str);
-        $this->__construct($a[0], $a[1], $a[2], $a[3]);
+        $this->__construct($a[0], $a[1], $a[2], $a[3], $a[4]);
     }
 
     protected function getKernelParameters()