fix merge

Author: nicolas-grekas

Tests/AppVariableTest.php

@@ -168,6 +168,9 @@ public function testGetFlashesWithNoRequest()
         $this->assertEquals(array(), $this->appVariable->getFlashes());
     }
 
+    /**
+     * @runInSeparateProcess
+     */
     public function testGetFlashesWithNoSessionStarted()
     {
         $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
@@ -178,6 +181,9 @@ public function testGetFlashesWithNoSessionStarted()
         $this->assertEquals(array(), $this->appVariable->getFlashes());
     }
 
+    /**
+     * @runInSeparateProcess
+     */
     public function testGetFlashes()
     {
         $flashMessages = $this->setFlashMessages();