Merge branch '3.4'

* 3.4:
  [HttpKernel] Disable container inlining when legacy inlining has been used
  Let getFlashes starts the session
  Update default translations path
  [FrameworkBundle] Ignore failures when removing the old cache dir

Author: nicolas-grekas

AppVariable.php

@@ -156,10 +156,9 @@ public function getDebug()
      */
     public function getFlashes($types = null)
     {
-        // needed to avoid starting the session automatically when looking for flash messages
         try {
             $session = $this->getSession();
-            if (null === $session || !$session->isStarted()) {
+            if (null === $session) {
                 return array();
             }
         } catch (\RuntimeException $e) {

Tests/AppVariableTest.php

@@ -173,12 +173,8 @@ public function testGetFlashesWithNoRequest()
      */
     public function testGetFlashesWithNoSessionStarted()
     {
-        $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
-        $request->method('getSession')->willReturn(new Session());
-
-        $this->setRequestStack($request);
-
-        $this->assertEquals(array(), $this->appVariable->getFlashes());
+        $flashMessages = $this->setFlashMessages(false);
+        $this->assertEquals($flashMessages, $this->appVariable->getFlashes());
     }
 
     /**
@@ -256,7 +252,7 @@ protected function setTokenStorage($user)
         $token->method('getUser')->willReturn($user);
     }
 
-    private function setFlashMessages()
+    private function setFlashMessages($sessionHasStarted = true)
     {
         $flashMessages = array(
             'notice' => array('Notice #1 message'),
@@ -266,8 +262,8 @@ private function setFlashMessages()
         $flashBag = new FlashBag();
         $flashBag->initialize($flashMessages);
 
-        $session = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\Session')->getMock();
-        $session->method('isStarted')->willReturn(true);
+        $session = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\Session')->disableOriginalConstructor()->getMock();
+        $session->method('isStarted')->willReturn($sessionHasStarted);
         $session->method('getFlashBag')->willReturn($flashBag);
 
         $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();